Jingga/oms-ContractManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ContractManagement.git synced 2026-02-13 08:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use direct data access for response data

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 03:42:44 +02:00
parent c50322e7de
commit fca1de738f
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -58,7 +58,7 @@ final class ApiController extends Controller
public function apiContractCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiContractCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateContractCreate($request))) { if (!empty($val = $this->validateContractCreate($request))) {
$response->set('contract_create', new FormValidation($val)); $response->data['contract_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -147,7 +147,7 @@ final class ApiController extends Controller
*/ */
public function apiContractDocumentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiContractDocumentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$uploadedFiles = $request->getFiles(); $uploadedFiles = $request->files;
if (empty($uploadedFiles)) { if (empty($uploadedFiles)) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Contract', 'Invalid contract image', $uploadedFiles); $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Contract', 'Invalid contract image', $uploadedFiles);
@ -214,7 +214,7 @@ final class ApiController extends Controller
public function apiContractTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiContractTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateContractTypeCreate($request))) { if (!empty($val = $this->validateContractTypeCreate($request))) {
$response->set('contract_type_create', new FormValidation($val)); $response->data['contract_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -280,7 +280,7 @@ final class ApiController extends Controller
public function apiContractTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiContractTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateContractTypeL11nCreate($request))) { if (!empty($val = $this->validateContractTypeL11nCreate($request))) {
$response->set('contract_type_create', new FormValidation($val)); $response->data['contract_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;

22
Models/Contract.php
View File

@ -42,14 +42,6 @@ class Contract
public bool $isTemplate = false; public bool $isTemplate = false;
/**
* Files.
*
* @var Media[]
* @since 1.0.0
*/
private array $files = [];
public string $title = ''; public string $title = '';
public string $description = ''; public string $description = '';
@ -106,18 +98,6 @@ class Contract
$this->account = new NullAccount(); $this->account = new NullAccount();
} }
/**
* Get files
*
* @return Media[]
*
* @since 1.0.0
*/
public function getFiles() : array
{
return $this->files;
}
/** /**
* Add media to item * Add media to item
* *
@ -159,4 +139,6 @@ class Contract
{ {
return $this->toArray(); return $this->toArray();
} }
use \Modules\Media\Models\MediaListTrait;
} }

2
Theme/Backend/contract-single.tpl.php
View File

@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory;
* @var \Modules\ContractManagement\Models\Contract $contract * @var \Modules\ContractManagement\Models\Contract $contract
*/ */
$contract = $this->getData('contract'); $contract = $this->getData('contract');
$contractFile = $contract->getFiles(); $contractFile = $contract->files;
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

4
tests/Models/ContractTest.php
View File

@ -40,7 +40,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->contract->id); self::assertEquals(0, $this->contract->id);
self::assertEquals([], $this->contract->getFiles()); self::assertEquals([], $this->contract->files);
} }
/** /**
@ -50,7 +50,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
public function testMediaInputOutput() : void public function testMediaInputOutput() : void
{ {
$this->contract->addFile(new Media()); $this->contract->addFile(new Media());
self::assertCount(1, $this->contract->getFiles()); self::assertCount(1, $this->contract->files);
} }
/** /**