Jingga/oms-InvestmentManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-InvestmentManagement.git synced 2026-02-16 04:08:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix namespace bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-06-18 13:02:51 +00:00
parent 0ea25ff216
commit 999e85b138
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Controller/ApiController.php
View File

@ -4,7 +4,7 @@
* *
* PHP Version 8.1 * PHP Version 8.1
* *
* @package Modules\FleetManagement * @package Modules\InvestmentManagement
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 2.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0
@ -12,20 +12,20 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
namespace Modules\FleetManagement\Controller; namespace Modules\InvestmentManagement\Controller;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\FleetManagement\Models\Amount; use Modules\InvestmentManagement\Models\Amount;
use Modules\FleetManagement\Models\AmountGroup; use Modules\InvestmentManagement\Models\AmountGroup;
use Modules\FleetManagement\Models\AmountTypeL11nMapper; use Modules\InvestmentManagement\Models\AmountTypeL11nMapper;
use Modules\FleetManagement\Models\AmountTypeMapper; use Modules\InvestmentManagement\Models\AmountTypeMapper;
use Modules\FleetManagement\Models\Investment; use Modules\InvestmentManagement\Models\Investment;
use Modules\FleetManagement\Models\InvestmentObject; use Modules\InvestmentManagement\Models\InvestmentObject;
use Modules\FleetManagement\Models\InvestmentObjectMapper; use Modules\InvestmentManagement\Models\InvestmentObjectMapper;
use Modules\FleetManagement\Models\InvestmentMapper; use Modules\InvestmentManagement\Models\InvestmentMapper;
use Modules\FleetManagement\Models\InvestmentStatus; use Modules\InvestmentManagement\Models\InvestmentStatus;
use Modules\FleetManagement\Models\InvestmentTypeL11nMapper; use Modules\InvestmentManagement\Models\InvestmentTypeL11nMapper;
use Modules\FleetManagement\Models\InvestmentTypeMapper; use Modules\InvestmentManagement\Models\InvestmentTypeMapper;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
@ -44,9 +44,9 @@ use phpOMS\Model\Message\FormValidation;
use phpOMS\Stdlib\Base\FloatInt; use phpOMS\Stdlib\Base\FloatInt;
/** /**
* FleetManagement class. * InvestmentManagement class.
* *
* @package Modules\FleetManagement * @package Modules\InvestmentManagement
* @license OMS License 2.0 * @license OMS License 2.0
* @link https://jingga.app * @link https://jingga.app
* @since 1.0.0 * @since 1.0.0
@ -111,6 +111,7 @@ final class ApiInvestmentController extends Controller
$investment->description = $request->getDataString('description') ?? ''; $investment->description = $request->getDataString('description') ?? '';
$investment->unit = $request->getDataInt('unit') ?? $this->app->unitId; $investment->unit = $request->getDataInt('unit') ?? $this->app->unitId;
$investment->createdBy = new NullAccount($request->header->account); $investment->createdBy = new NullAccount($request->header->account);
$investment->performanceDate = $request->getDataDateTime('performance') ?? $investment->createdAt;
return $investment; return $investment;
} }
@ -250,7 +251,7 @@ final class ApiInvestmentController extends Controller
return; return;
} }
/** @var \Modules\FleetManagement\Models\Investment $investment */ /** @var \Modules\InvestmentManagement\Models\Investment $investment */
$investment = InvestmentMapper::get()->where('id', (int) $request->getData('investment'))->execute(); $investment = InvestmentMapper::get()->where('id', (int) $request->getData('investment'))->execute();
$path = $this->createInvestmentDir($investment); $path = $this->createInvestmentDir($investment);
@ -432,7 +433,7 @@ final class ApiInvestmentController extends Controller
return; return;
} }
/** @var InvestmentOption $investment */ /** @var InvestmentObject $investment */
$investment = $this->createInvestmentOptionFromRequest($request); $investment = $this->createInvestmentOptionFromRequest($request);
$this->createModel($request->header->account, $investment, InvestmentObjectMapper::class, 'investment_option', $request->getOrigin()); $this->createModel($request->header->account, $investment, InvestmentObjectMapper::class, 'investment_option', $request->getOrigin());
@ -493,7 +494,6 @@ final class ApiInvestmentController extends Controller
$investment->supplier = $request->getDataInt('supplier') ?? 0; $investment->supplier = $request->getDataInt('supplier') ?? 0;
$investment->supplierName = $request->getDataString('supplierName') ?? ''; $investment->supplierName = $request->getDataString('supplierName') ?? '';
$investment->item = $request->getDataInt('item'); $investment->item = $request->getDataInt('item');
$investment->performanceDate = $request->getDataDateTime('performance') ?? $investment->createdAt;
// @todo: reconsider the following lines. This seems rather complicated. // @todo: reconsider the following lines. This seems rather complicated.
if ($request->hasData('amount')) { if ($request->hasData('amount')) {
@ -706,14 +706,14 @@ final class ApiInvestmentController extends Controller
*/ */
public function apiMediaAddToInvestmentObject(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiMediaAddToInvestmentObject(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateMediaAddToInvestment($request))) { if (!empty($val = $this->validateMediaAddToInvestmentObject($request))) {
$response->data[$request->uri->__toString()] = new FormValidation($val); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
/** @var \Modules\FleetManagement\Models\InvestmentObject $investment */ /** @var \Modules\InvestmentManagement\Models\InvestmentObject $investment */
$investment = InvestmentObjectMapper::get()->where('id', (int) $request->getData('option'))->execute(); $investment = InvestmentObjectMapper::get()->where('id', (int) $request->getData('option'))->execute();
$path = $this->createInvestmentObjectDir($investment); $path = $this->createInvestmentObjectDir($investment);
@ -809,7 +809,7 @@ final class ApiInvestmentController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateMediaAddToInvestment(RequestAbstract $request) : array private function validateMediaAddToInvestmentObject(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['media'] = (!$request->hasData('media') && empty($request->files))) if (($val['media'] = (!$request->hasData('media') && empty($request->files)))
@ -951,7 +951,7 @@ final class ApiInvestmentController extends Controller
return; return;
} }
$request->setData('virtualpath', '/Modules/FleetManagement/Investment/' . $request->getData('id'), true); $request->setData('virtualpath', '/Modules/InvestmentManagement/Investment/' . $request->getData('id'), true);
$this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data); $this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data);
if ($response->header->status !== RequestStatusCode::R_200) { if ($response->header->status !== RequestStatusCode::R_200) {