Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Eichhorn committed Apr 12, 2024
1 parent 7c5c640 commit d8d99d4
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 87 deletions.
54 changes: 27 additions & 27 deletions Admin/Install/Navigation.install.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"type": 2,
"subtype": 1,
"name": "Attributes",
"uri": "{/base}/item/attribute/type/list?{?}",
"uri": "{/base}/item/attribute/type/list",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -33,7 +33,7 @@
"type": 3,
"subtype": 1,
"name": "Types",
"uri": "{/base}/item/attribute/type/list?{?}",
"uri": "{/base}/item/attribute/type/list",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -48,7 +48,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/item/attribute/type/create?{?}",
"uri": "{/base}/item/attribute/type/create",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -65,7 +65,7 @@
"type": 2,
"subtype": 1,
"name": "Items",
"uri": "{/base}/item/list?{?}",
"uri": "{/base}/item/list",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -79,7 +79,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/item/list?{?}",
"uri": "{/base}/item/list",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -93,7 +93,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/item/view?{?}",
"uri": "{/base}/item/view",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -110,7 +110,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/item/create?{?}",
"uri": "{/base}/item/create",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -127,7 +127,7 @@
"type": 2,
"subtype": 1,
"name": "Materials",
"uri": "{/base}/item/material/list?{?}",
"uri": "{/base}/item/material/list",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -141,7 +141,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/item/material/list?{?}",
"uri": "{/base}/item/material/list",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -156,7 +156,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/item/material/create?{?}",
"uri": "{/base}/item/material/create",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -175,7 +175,7 @@
"type": 2,
"subtype": 1,
"name": "Items",
"uri": "{/base}/sales/item/list?{?}",
"uri": "{/base}/sales/item/list",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -189,7 +189,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/sales/item/list?{?}",
"uri": "{/base}/sales/item/list",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -203,7 +203,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/sales/item/view?{?}",
"uri": "{/base}/sales/item/view",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -220,7 +220,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/sales/item/create?{?}",
"uri": "{/base}/sales/item/create",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -237,7 +237,7 @@
"type": 2,
"subtype": 1,
"name": "Items",
"uri": "{/base}/purchase/item/list?{?}",
"uri": "{/base}/purchase/item/list",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -251,7 +251,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/purchase/item/list?{?}",
"uri": "{/base}/purchase/item/list",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -265,7 +265,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/purchase/item/view?{?}",
"uri": "{/base}/purchase/item/view",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -282,7 +282,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/purchase/item/create?{?}",
"uri": "{/base}/purchase/item/create",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -299,7 +299,7 @@
"type": 2,
"subtype": 1,
"name": "Items",
"uri": "{/base}/warehouse/item/list?{?}",
"uri": "{/base}/warehouse/item/list",
"target": "self",
"icon": null,
"order": 10,
Expand All @@ -313,7 +313,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/warehouse/item/list?{?}",
"uri": "{/base}/warehouse/item/list",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -327,7 +327,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/warehouse/item/view?{?}",
"uri": "{/base}/warehouse/item/view",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -344,7 +344,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/warehouse/item/create?{?}",
"uri": "{/base}/warehouse/item/create",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -361,7 +361,7 @@
"type": 2,
"subtype": 1,
"name": "Items",
"uri": "{/base}/production/item/list?{?}",
"uri": "{/base}/production/item/list",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -375,7 +375,7 @@
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/base}/production/item/list?{?}",
"uri": "{/base}/production/item/list",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -389,7 +389,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/production/item/view?{?}",
"uri": "{/base}/production/item/view",
"target": "self",
"icon": null,
"order": 1,
Expand All @@ -406,7 +406,7 @@
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/base}/production/item/create?{?}",
"uri": "{/base}/production/item/create",
"target": "self",
"icon": null,
"order": 5,
Expand All @@ -423,7 +423,7 @@
"type": 3,
"subtype": 1,
"name": "Item",
"uri": "{/base}/purchase/analysis/item?{?}",
"uri": "{/base}/purchase/analysis/item",
"target": "self",
"icon": null,
"order": 10,
Expand Down
81 changes: 21 additions & 60 deletions Controller/ApiController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
use Modules\ItemManagement\Models\StockIdentifierType;
use Modules\Media\Models\Collection;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\MediaTypeMapper;
use Modules\Media\Models\PathSettings;
use phpOMS\Account\PermissionType;
Expand Down Expand Up @@ -308,47 +307,28 @@ public function apiItemCreate(RequestAbstract $request, ResponseAbstract $respon

$uploadedFiles = $request->files['item_profile_image'] ?? [];
if (!empty($uploadedFiles)) {
/** @var \Modules\Media\Models\MediaType $profileImageType */
$profileImageType = MediaTypeMapper::get()
->where('name', 'item_profile_image')
->execute();

// upload image
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
$this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [],
fileNames: [],
files: $uploadedFiles,
account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
pathSettings: PathSettings::FILE_PATH
);

// create type / media relation
/** @var \Modules\Media\Models\MediaType $profileImageType */
$profileImageType = MediaTypeMapper::get()
->where('name', 'item_profile_image')
->execute();

$this->createModelRelation(
$request->header->account,
$uploaded[0]->id,
$profileImageType->id,
MediaMapper::class,
'types',
'',
$request->getOrigin()
);

// create item relation
$this->createModelRelation(
$request->header->account,
$item->id,
$uploaded[0]->id,
ItemMapper::class,
'files',
'',
$request->getOrigin()
pathSettings: PathSettings::FILE_PATH,
type: $profileImageType->id,
rel: $item->id,
mapper: ItemMapper::class,
field: 'files'
);
}

$this->createItemSegmentation($request, $response, $item);

$this->createStandardCreateResponse($request, $response, $item);
}

Expand Down Expand Up @@ -407,7 +387,7 @@ private function createItemSegmentation(RequestAbstract $request, ResponseAbstra
private function createMediaDirForItem(int $id, int $createdBy) : Collection
{
$collection = new Collection();
$collection->name = $id;
$collection->name = (string) $id;
$collection->setVirtualPath('/Modules/ItemManagement/Items');
$collection->setPath('/Modules/Media/Files/Modules/ItemManagement/Items/' . $id);
$collection->createdBy = new NullAccount($createdBy);
Expand Down Expand Up @@ -770,11 +750,9 @@ public function apiFileCreate(RequestAbstract $request, ResponseAbstract $respon
return;
}

$uploadedFiles = $request->files;

if (empty($uploadedFiles)) {
if (empty($request->files)) {
$response->header->status = RequestStatusCode::R_400;
$this->createInvalidCreateResponse($request, $response, $uploadedFiles);
$this->createInvalidCreateResponse($request, $response, $request->files);

return;
}
Expand All @@ -789,40 +767,23 @@ public function apiFileCreate(RequestAbstract $request, ResponseAbstract $respon
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: $request->getDataList('names'),
fileNames: $request->getDataList('filenames'),
files: $uploadedFiles,
files: $request->files,
account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path,
pathSettings: PathSettings::FILE_PATH
pathSettings: PathSettings::FILE_PATH,
type: $request->getDataInt('type'),
rel: $item->id,
mapper: ItemMapper::class,
field: 'files'
);

if ($request->hasData('type')) {
foreach ($uploaded as $file) {
$this->createModelRelation(
$request->header->account,
$file->id,
$request->getDataInt('type'),
MediaMapper::class,
'types',
'',
$request->getOrigin()
);
}
}

if (empty($uploaded)) {
if (empty($uploaded->sources)) {
$this->createInvalidAddResponse($request, $response, []);

return;
}

$this->createModelRelation(
$request->header->account,
(int) $request->getData('item'),
\reset($uploaded)->id,
ItemMapper::class, 'files', '', $request->getOrigin()
);

$this->createStandardUpdateResponse($request, $response, $uploaded);
}

Expand Down

0 comments on commit d8d99d4

Please sign in to comment.