Merge pull request #8 from whitedigital-eu/improvements

Improvements
whitedigital-eu · Apr 8, 2024 · 4506e9a · 4506e9a
2 parents 1671674 + e5cf069
commit 4506e9a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/src/Contracts/Task.php b/src/Contracts/Task.php
@@ -12,9 +12,7 @@ public function getGenerator(): Generator;
 
     public function getTransformer(): Transformer;
 
-    public function getRequiredFields(): array;
-
-    public function getOptionalFields(): array;
+    public function getTransformerFields(): array;
 
     public function generate(mixed $input): Document;
 

diff --git a/src/DataProvider/DocumentDataProvider.php b/src/DataProvider/DocumentDataProvider.php
@@ -22,6 +22,11 @@ public function setTask(DocumentTask $task): void
         $this->task = $task;
     }
 
+    /**
+     * @throws ReflectionException
+     * @throws ExceptionInterface
+     * @throws ResourceClassNotFoundException
+     */
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
         if ('generate' === $operation->getName()) {
@@ -41,6 +46,11 @@ protected function createResource(BaseEntity $entity, array $context): DocumentR
         return DocumentResource::create($entity, $context);
     }
 
+    /**
+     * @throws ReflectionException
+     * @throws ExceptionInterface
+     * @throws ResourceClassNotFoundException
+     */
     private function receipt(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
     {
         $entity = $this->entityManager->find($this->getEntityClass($operation), $uriVariables['id']);

diff --git a/src/Task/AbstractDocumentTask.php b/src/Task/AbstractDocumentTask.php
@@ -15,7 +15,6 @@
 use function array_diff_key;
 use function array_flip;
 use function array_keys;
-use function array_merge;
 use function count;
 use function get_debug_type;
 use function implode;
@@ -57,8 +56,7 @@ final public function generate(mixed $input): Document
         $storageItem = (new StorageItem())->setFile(new ReplacingFile($result));
         $this->em->persist($storageItem);
 
-        $sourceFields = array_merge($this->getRequiredFields(), $this->getOptionalFields());
-        $sourceDump = self::makeOneDimension($sourceFields, onlyLast: true);
+        $sourceDump = self::makeOneDimension($this->getTransformerFields(), onlyLast: true);
         $dataDump = self::makeOneDimension($data, onlyLast: true);
         $extraKeys = array_diff(array_keys($sourceDump), array_keys($dataDump));
         $sourceDump = array_diff_key($sourceDump, array_flip($extraKeys));
@@ -76,11 +74,6 @@ final public function generate(mixed $input): Document
         return $document;
     }
 
-    public function getOptionalFields(): array
-    {
-        return [];
-    }
-
     public function getGenerator(): Generator
     {
         return $this->generator;
@@ -100,19 +93,17 @@ protected function validate(array $data): void
     {
         $count = 0;
         $invalid = [];
-        $fullData = array_merge($this->getRequiredFields(), $this->getOptionalFields());
 
         $dataDump = self::makeOneDimension($data, onlyLast: true);
-        $fullDump = self::makeOneDimension($fullData, onlyLast: true);
-        $requiredDump = self::makeOneDimension($this->getRequiredFields(), onlyLast: true);
-        $requiredCount = count($requiredDump);
+        $fullDump = self::makeOneDimension($this->getTransformerFields(), onlyLast: true);
+        $requiredCount = count($fullDump);
 
         foreach ($dataDump as $key => $value) {
             $check = $key;
             if (preg_match('/\.\d+\./', $check) && preg_match('/[0-9]/', $check) > 0) {
                 preg_match_all('/\d+/', $check, $matches);
                 $check = preg_replace("/\d/", '0', $check);
-                if ('0' !== $matches[0][0]) {
+                if ('0' !== $matches[0][0] && isset($fullDump[$check])) {
                     $requiredCount++;
                 }
             }
@@ -125,16 +116,16 @@ protected function validate(array $data): void
                 throw new InvalidArgumentException(sprintf('Incompatible input type. Expected "%s", got "%s"', $fullDump[$check], get_debug_type($value)));
             }
 
-            $count += (int) isset($requiredDump[$check]);
-        }
-
-        if ($requiredCount !== $count) {
-            throw new InvalidArgumentException(sprintf('Missing required fields: "%s"', implode(', ', array_diff(array_keys($requiredDump), array_keys($dataDump)))));
+            $count += (int) isset($fullDump[$check]);
         }
 
         if ([] !== $invalid) {
             throw new InvalidArgumentException(sprintf('Invalid mapping found: "%s"', implode(', ', $invalid)));
         }
+
+        if ($requiredCount !== $count) {
+            throw new InvalidArgumentException(sprintf('Missing required fields: "%s"', implode(', ', array_diff(array_keys($fullDump), array_keys($dataDump)))));
+        }
     }
 
     /*

diff --git a/src/Task/DocumentTask.php b/src/Task/DocumentTask.php
@@ -19,7 +19,7 @@ public function __construct(
         parent::__construct($em, $generator, $transformer);
     }
 
-    public function getRequiredFields(): array
+    public function getTransformerFields(): array
     {
         return $this->getInput()->getSourceData();
     }