Jingga/oms-Comments
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Comments.git synced 2026-01-11 16:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:06 +00:00
parent a19196cec1
commit fea6b4d60d
1 changed files with 25 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Controller/ApiController.php
View File

@ -24,11 +24,7 @@ use Modules\Comments\Models\CommentMapper;
use Modules\Comments\Models\CommentStatus; use Modules\Comments\Models\CommentStatus;
use Modules\Comments\Models\CommentVote; use Modules\Comments\Models\CommentVote;
use Modules\Comments\Models\CommentVoteMapper; use Modules\Comments\Models\CommentVoteMapper;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\Reference;
use Modules\Media\Models\ReferenceMapper;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
@ -196,97 +192,41 @@ final class ApiController extends Controller
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->where('id', $request->header->account)->execute(); $account = AccountMapper::get()->where('id', $request->header->account)->execute();
$collection = null;
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
[],
[],
$uploadedFiles,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path,
$path,
);
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$comment->id,
$media->id,
CommentMapper::class,
'files',
'',
$request->getOrigin()
);
$accountPath = '/Accounts/' . $account->id . ' ' . $account->login $accountPath = '/Accounts/' . $account->id . ' ' . $account->login
. '/Comments/' . '/Comments/'
. $comment->createdAt->format('Y/m') . $comment->createdAt->format('Y/m')
. '/' . $comment->id; . '/' . $comment->id;
$ref = new Reference(); if (!empty($request->files)) {
$ref->name = $media->name; $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
$ref->source = new NullMedia($media->id); names: [],
$ref->createdBy = new NullAccount($request->header->account); fileNames: [],
$ref->setVirtualPath($accountPath); files: $request->files,
account: $request->header->account,
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( rel: $comment->id,
$accountPath, mapper: CommentMapper::class,
$request->header->account, field: 'files'
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Comments/' . $comment->createdAt->format('Y/m') . '/' . $comment->id
); );
$this->createModelRelation( if ($account->id !== 0) {
$request->header->account, $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$collection->id, account: $request->header->account,
$ref->id, files: \array_map(function (Media $media) { return $media->id; }, $uploaded->sources),
CollectionMapper::class, collectionPath: $accountPath
'sources',
'',
$request->getOrigin()
); );
} }
} }
$mediaFiles = $request->getDataJson('media'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $file) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
/** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$comment->id, $comment->id,
$media->id,
CommentMapper::class, CommentMapper::class,
'files', 'files',
'', $path
$request->getOrigin()
);
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->id);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
); );
} }
} }