Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-17 00:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

phpstan and phpcs fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-29 16:41:17 +02:00
parent 42b096a46a
commit e1d922f402
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Install/Navigation.install.json
View File

@ -10,7 +10,7 @@
"icon": null, "icon": null,
"order": 40, "order": 40,
"from": "News", "from": "News",
"permission": { "permission": 2, "type": null, "element": null }, "permission": { "permission": 2, "category": null, "element": null },
"parent": 1006901001, "parent": 1006901001,
"children": [ "children": [
{ {
@ -24,7 +24,7 @@
"icon": null, "icon": null,
"order": 1, "order": 1,
"from": "News", "from": "News",
"permission": { "permission": 2, "type": null, "element": null }, "permission": { "permission": 2, "category": null, "element": null },
"parent": 1000601001, "parent": 1000601001,
"children": [] "children": []
}, },
@ -39,7 +39,7 @@
"icon": null, "icon": null,
"order": 5, "order": 5,
"from": "News", "from": "News",
"permission": { "permission": 2, "type": null, "element": null }, "permission": { "permission": 2, "category": null, "element": null },
"parent": 1000601001, "parent": 1000601001,
"children": [] "children": []
}, },
@ -54,7 +54,7 @@
"icon": null, "icon": null,
"order": 10, "order": 10,
"from": "News", "from": "News",
"permission": { "permission": 4, "type": null, "element": null }, "permission": { "permission": 4, "category": null, "element": null },
"parent": 1000601001, "parent": 1000601001,
"children": [] "children": []
}, },
@ -69,7 +69,7 @@
"icon": null, "icon": null,
"order": 15, "order": 15,
"from": "News", "from": "News",
"permission": { "permission": 4, "type": null, "element": null }, "permission": { "permission": 4, "category": null, "element": null },
"parent": 1000601001, "parent": 1000601001,
"children": [] "children": []
}, },
@ -84,7 +84,7 @@
"icon": null, "icon": null,
"order": 15, "order": 15,
"from": "News", "from": "News",
"permission": { "permission": 4, "type": null, "element": null }, "permission": { "permission": 4, "category": null, "element": null },
"parent": 1000601001, "parent": 1000601001,
"children": [] "children": []
} }

37
Controller/ApiController.php
View File

@ -160,9 +160,19 @@ final class ApiController extends Controller
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully created', $newsArticle); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'News', 'News successfully created', $newsArticle);
} }
/**
* Create media files for news article
*
* @param NewsArticle $news News article
* @param RequestAbstract $request Request incl. media do upload
*
* @return void
*
* @since 1.0.0
*/
private function createNewsMedia(NewsArticle $news, RequestAbstract $request) : void private function createNewsMedia(NewsArticle $news, RequestAbstract $request) : void
{ {
$path = $this->createNewsDir($news); $path = $this->createNewsDir($news);
$account = AccountMapper::get()->where('id', $request->header->account)->execute(); $account = AccountMapper::get()->where('id', $request->header->account)->execute();
if (!empty($uploadedFiles = $request->getFiles() ?? [])) { if (!empty($uploadedFiles = $request->getFiles() ?? [])) {
@ -181,11 +191,13 @@ final class ApiController extends Controller
MediaMapper::create()->execute($media); MediaMapper::create()->execute($media);
NewsArticleMapper::writer()->createRelationTable('media', [$media->getId()], $news->getId()); NewsArticleMapper::writer()->createRelationTable('media', [$media->getId()], $news->getId());
$ref = new Reference(); $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId()); $ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->createdBy = new NullAccount($request->header->account); $ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()); $ref->setVirtualPath($accountPath);
ReferenceMapper::create()->execute($ref); ReferenceMapper::create()->execute($ref);
@ -194,7 +206,6 @@ final class ApiController extends Controller
if ($collection instanceof NullCollection) { if ($collection instanceof NullCollection) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$accountPath, $accountPath,
$request->header->account, $request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId() __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()
@ -212,8 +223,8 @@ final class ApiController extends Controller
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
NewsArticleMapper::writer()->createRelationTable('media', [(int) $media], $news->getId()); NewsArticleMapper::writer()->createRelationTable('media', [(int) $media], $news->getId());
$ref = new Reference(); $ref = new Reference();
$ref->source = new NullMedia((int) $media); $ref->source = new NullMedia((int) $media);
$ref->createdBy = new NullAccount($request->header->account); $ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path); $ref->setVirtualPath($path);
@ -224,7 +235,6 @@ final class ApiController extends Controller
if ($collection instanceof NullCollection) { if ($collection instanceof NullCollection) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path, $path,
$request->header->account, $request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path __DIR__ . '/../../../Modules/Media/Files' . $path
@ -237,6 +247,15 @@ final class ApiController extends Controller
} }
} }
/**
* Create media directory path
*
* @param NewsArticle $news News article
*
* @return string
*
* @since 1.0.0
*/
private function createNewsDir(NewsArticle $news) : string private function createNewsDir(NewsArticle $news) : string
{ {
return '/Modules/News/' return '/Modules/News/'