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

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-02-04 20:34:12 +00:00
parent 792ee4018c
commit 831af335af
2 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Controller/ApiEquipmentController.php
View File

@ -112,8 +112,10 @@ final class ApiEquipmentController extends Controller
{ {
$path = $this->createEquipmentDir($equipment); $path = $this->createEquipmentDir($equipment);
$collection = null;
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -123,7 +125,6 @@ final class ApiEquipmentController extends Controller
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH
); );
$collection = null;
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
@ -160,54 +161,51 @@ final class ApiEquipmentController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
$collection = null; foreach ($mediaFiles as $file) {
/** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
foreach ($mediaFiles as $file) { $this->createModelRelation(
/** @var \Modules\Media\Models\Media $media */ $request->header->account,
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $equipment->id,
$media->id,
EquipmentMapper::class,
'files',
'',
$request->getOrigin()
);
$this->createModelRelation( $ref = new Reference();
$request->header->account, $ref->name = $media->name;
$equipment->id, $ref->source = new NullMedia($media->id);
$media->id, $ref->createdBy = new NullAccount($request->header->account);
EquipmentMapper::class, $ref->setVirtualPath($path);
'files',
'',
$request->getOrigin()
);
$ref = new Reference(); $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$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()); if ($collection === null) {
/** @var \Modules\Media\Models\Collection $collection */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection === null) { if ($collection->id === 0) {
/** @var \Modules\Media\Models\Collection $collection */ $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); $path,
$request->header->account,
if ($collection->id === 0) { __DIR__ . '/../../../Modules/Media/Files' . $path
$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()
);
} }
$this->createModelRelation(
$request->header->account,
$collection->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
} }
@ -260,7 +258,7 @@ final class ApiEquipmentController extends Controller
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -321,18 +319,17 @@ final class ApiEquipmentController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
$equipment->id, $equipment->id,
(int) $media, (int) $media,
EquipmentMapper::class, EquipmentMapper::class,
'files', 'files',
'', '',
$request->getOrigin() $request->getOrigin()
); );
}
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to equipment.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to equipment.', [
@ -562,8 +559,6 @@ final class ApiEquipmentController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo Implement API validation function
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateEquipmentDelete(RequestAbstract $request) : array private function validateEquipmentDelete(RequestAbstract $request) : array

2
Controller/BackendController.php
View File

@ -212,6 +212,8 @@ final class BackendController extends Controller
$view->data['inspections'] = $inspections; $view->data['inspections'] = $inspections;
// @feature Create a new read mapper function that returns relation models instead of its own model
// https://github.com/Karaka-Management/phpOMS/issues/320
$query = new Builder($this->app->dbPool->get()); $query = new Builder($this->app->dbPool->get());
$results = $query->selectAs(EquipmentMapper::HAS_MANY['files']['external'], 'file') $results = $query->selectAs(EquipmentMapper::HAS_MANY['files']['external'], 'file')
->from(EquipmentMapper::TABLE) ->from(EquipmentMapper::TABLE)