fix: To reflect the UI choice of not showing pickup barcodes into the

API. Pickup tasks will return `barcode: null`
coopcycle · Nov 20, 2024 · 7e294fd · 7e294fd
1 parent e7adbae
commit 7e294fd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/Entity/Task.php b/src/Entity/Task.php
@@ -1326,8 +1326,12 @@ public static function fixTimeWindow(Task $task)
     /**
     * @Groups({"barcode"})
     */
-    public function getBarcodes(): array
+    public function getBarcodes(): ?array
     {
+        if ($this->getType() !== Task::TYPE_DROPOFF) {
+            return null;
+        }
+
         $task_code = BarcodeUtils::getRawBarcodeFromTask($this);
         $barcodes = [
             'task' => [$task_code, BarcodeUtils::getToken($task_code)],

diff --git a/src/Serializer/TaskNormalizer.php b/src/Serializer/TaskNormalizer.php
@@ -76,19 +76,23 @@ public function normalize($object, $format = null, array $context = array())
             }
         }
 
-        $barcode = BarcodeUtils::getRawBarcodeFromTask($object);
-        $barcode_token = BarcodeUtils::getToken($barcode);
-        $data['barcode'] = [
-            'barcode' => $barcode,
-            'label' => [
-                'token' => $barcode_token,
-                'url' => $this->urlGenerator->generate(
-                    'task_label_pdf',
-                    ['code' => $barcode, 'token' => $barcode_token],
-                    UrlGeneratorInterface::ABSOLUTE_URL
-                )
-            ]
-        ];
+        if ($data['type'] === Task::TYPE_DROPOFF) {
+            $barcode = BarcodeUtils::getRawBarcodeFromTask($object);
+            $barcode_token = BarcodeUtils::getToken($barcode);
+            $data['barcode'] = [
+                'barcode' => $barcode,
+                'label' => [
+                    'token' => $barcode_token,
+                    'url' => $this->urlGenerator->generate(
+                        'task_label_pdf',
+                        ['code' => $barcode, 'token' => $barcode_token],
+                        UrlGeneratorInterface::ABSOLUTE_URL
+                    )
+                ]
+            ];
+        } else {
+            $data['barcode'] = null;
+        }
 
         if (!is_null($object->getPrefetchedPackagesAndWeight())) {
             $data['packages'] = !is_null($object->getPrefetchedPackagesAndWeight()['packages']) ? $object->getPrefetchedPackagesAndWeight()['packages'] : [];