feature: cash deliveries should have amount of money in the task info for the messenger (API)

app/config/config.yml

@@ -304,13 +304,15 @@ doctrine:
             numrange: string
             tsrange: string
 
+        # Tells Doctrine what database features are supported
+        # Make sure that your production database uses this version or higher.
         # If you don't define this option and you haven't created your database yet,
         # you may get PDOException errors because Doctrine will try to guess
         # the database server version automatically and none is available.
         # http://symfony.com/doc/current/reference/configuration/doctrine.html
         # Should be fixed in next Doctrine version
         # https://github.com/doctrine/dbal/pull/2671
-        server_version: 9.4
+        server_version: '13'
 
         # Add a schema filter to avoid having PostGIS tables tiger.* & topology.* in migrations diff
         # https://symfony.com/doc/master/bundles/DoctrineMigrationsBundle/index.html#manual-tables

app/config/services.yml

@@ -626,6 +626,8 @@ services:
   sylius.repository.order:
     alias: AppBundle\Entity\Sylius\OrderRepository
 
+  AppBundle\Entity\TaskListRepository: ~
+
   AppBundle\Entity\Task\RecurrenceRuleRepository: ~
 
   AppBundle\Service\Routing\Osrm: ~

app/config/services/serializer.yml

@@ -30,6 +30,16 @@ services:
       - "@api_platform.jsonld.normalizer.item"
     tags: [ { name: serializer.normalizer, priority: 128 } ]
 
+  AppBundle\Serializer\MyTaskDtoNormalizer:
+    arguments:
+      - "@api_platform.jsonld.normalizer.item"
+    tags: [ { name: serializer.normalizer, priority: 128 } ]
+
+  AppBundle\Serializer\MyTaskListDtoNormalizer:
+    arguments:
+      - "@api_platform.jsonld.normalizer.object"
+    tags: [ { name: serializer.normalizer, priority: 128 } ]
+
   AppBundle\Serializer\TaskImageNormalizer:
     arguments:
       $normalizer: '@api_platform.jsonld.normalizer.item'

src/Action/MyTasks.php

@@ -63,7 +63,7 @@ private function loadExisting(\DateTime $date): ?TaskList
 
             // reset array index to 0 with array_values, otherwise you might get weird stuff in the serializer
             $notCancelled = array_values(
-                    array_filter(array_filter($taskList->getTasks(), function (Task $task) {
+                array_filter(array_filter($taskList->getTasks(), function (Task $task) {
                     return !$task->isCancelled();
                 }))
             );

src/Action/MyTasks2.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace AppBundle\Action;
+
+use AppBundle\Entity\TaskListRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use AppBundle\Action\Utils\TokenStorageTrait;
+use AppBundle\Entity\TaskList;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+final class MyTasks2
+{
+    use TokenStorageTrait;
+
+    /**
+     * @var TaskListRepository
+     */
+    private readonly EntityRepository $taskListRepository;
+
+    public function __construct(
+        TokenStorageInterface $tokenStorage,
+        private readonly EntityManagerInterface $entityManager)
+    {
+        $this->tokenStorage = $tokenStorage;
+        $this->taskListRepository = $this->entityManager->getRepository(TaskList::class);
+    }
+
+    public function __invoke(Request $request)
+    {
+        $user = $this->getUser();
+        $date = new \DateTime($request->get('date'));
+
+        $taskListDto = $this->taskListRepository->findMyTaskListAsDto($user, $date);
+
+        if (null === $taskListDto) {
+
+            $taskList = new TaskList();
+            $taskList->setCourier($user);
+            $taskList->setDate($date);
+
+            try {
+                $this->entityManager->persist($taskList);
+                $this->entityManager->flush();
+            } catch (UniqueConstraintViolationException $e) {
+                // If 2 requests are received at the very same time,
+                // we can have a race condition
+                // @see https://github.com/coopcycle/coopcycle-app/issues/1265
+                $taskListDto = $this->taskListRepository->findMyTaskListAsDto($user, $date);
+            }
+        }
+
+        return $taskListDto;
+    }
+}

src/Api/Dto/MyTaskDto.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace AppBundle\Api\Dto;
+
+use AppBundle\Entity\Address;
+use DateTime;
+use Symfony\Component\Serializer\Annotation\Groups;
+
+final class MyTaskDto
+{
+    #[Groups(["task"])]
+    public readonly int $id;
+
+    #[Groups(["task"])]
+    public readonly DateTime $createdAt;
+
+    #[Groups(["task"])]
+    public readonly DateTime $updatedAt;
+
+    #[Groups(["task"])]
+    public readonly string $orgName;
+
+    #[Groups(["task"])]
+    public readonly string $type;
+
+    #[Groups(["task"])]
+    public readonly string $status;
+
+    #[Groups(["task"])]
+    public readonly Address $address;
+
+    #[Groups(["task"])]
+    public readonly DateTime $after;
+
+    #[Groups(["task"])]
+    public readonly DateTime $before;
+
+    #[Groups(["task"])]
+    public readonly ?int $previous;
+
+    #[Groups(["task"])]
+    public readonly ?int $next;
+
+    #[Groups(["task"])]
+    public readonly array $tags;
+
+    #[Groups(["task"])]
+    public readonly bool $doorstep;
+
+    #[Groups(["task"])]
+    public readonly ?string $comment;
+
+    #[Groups(["task"])]
+    public readonly array $packages;
+
+    #[Groups(["task"])]
+    public readonly ?int $weight;
+
+    #[Groups(["task"])]
+    public readonly bool $hasIncidents;
+
+    #[Groups(["task"])]
+    public readonly ?int $delivery_position;
+
+    #[Groups(["task"])]
+    public readonly ?string $order_number;
+
+    #[Groups(["task"])]
+    public readonly ?string $payment_method;
+
+    #[Groups(["task"])]
+    public readonly ?int $order_total;
+
+    public function __construct(
+        int $id,
+        DateTime $createdAt,
+        DateTime $updatedAt,
+        string $type,
+        string $status,
+        Address $address,
+        DateTime $after,
+        DateTime $before,
+        ?int $previous,
+        ?int $next,
+        array $tags,
+        bool $doorstep,
+        ?string $comment,
+        array $packages,
+        ?int $weight,
+        bool $hasIncidents,
+        string $orgName,
+        ?int $deliveryPosition,
+        ?string $orderNumber,
+        ?string $paymentMethod,
+        ?int $orderTotal
+    )
+    {
+        $this->id = $id;
+        $this->createdAt = $createdAt;
+        $this->updatedAt = $updatedAt;
+        $this->type = $type;
+        $this->status = $status;
+        $this->address = $address;
+        $this->after = $after;
+        $this->before = $before;
+        $this->previous = $previous;
+        $this->next = $next;
+        $this->tags = $tags;
+        $this->doorstep = $doorstep;
+        $this->comment = $comment;
+        $this->packages = $packages;
+        $this->weight = $weight;
+        $this->hasIncidents = $hasIncidents;
+        $this->orgName = $orgName;
+        $this->delivery_position = $deliveryPosition;
+        $this->order_number = $orderNumber;
+        $this->payment_method = $paymentMethod;
+        $this->order_total = $orderTotal;
+    }
+}

src/Api/Dto/MyTaskListDto.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace AppBundle\Api\Dto;
+
+use AppBundle\Entity\Trailer;
+use AppBundle\Entity\Vehicle;
+use DateTime;
+use Symfony\Component\Serializer\Annotation\Groups;
+
+class MyTaskListDto
+{
+    #[Groups(["task_list"])]
+    public readonly int $id;
+
+    #[Groups(["task_list"])]
+    public readonly DateTime $createdAt;
+
+    #[Groups(["task_list"])]
+    public readonly DateTime $updatedAt;
+
+    #[Groups(["task_list"])]
+    public readonly DateTime $date;
+
+    #[Groups(["task_list"])]
+    public readonly string $username;
+
+    /**
+     * @var MyTaskDto[]
+     */
+    #[Groups(["task_list"])]
+    public readonly array $items;
+
+    #[Groups(["task_list"])]
+    public readonly int $distance;
+
+    #[Groups(["task_list"])]
+    public readonly int $duration;
+
+    #[Groups(["task_list"])]
+    public readonly string $polyline;
+
+    //TODO
+    #[Groups(["task_list"])]
+    public readonly ?Vehicle $vehicle;
+
+    //TODO
+    #[Groups(["task_list"])]
+    public readonly ?Trailer $trailer;
+
+    /**
+     * @param int $id
+     * @param DateTime $createdAt
+     * @param DateTime $updatedAt
+     * @param DateTime $date
+     * @param string $username
+     * @param MyTaskDto[] $items
+     * @param int $distance
+     * @param int $duration
+     * @param string $polyline
+     * @param Vehicle|null $vehicle
+     * @param Trailer|null $trailer
+     */
+    public function __construct(
+        int $id,
+        DateTime $createdAt,
+        DateTime $updatedAt,
+        DateTime $date,
+        string $username,
+        array $items,
+        int $distance,
+        int $duration,
+        string $polyline,
+        ?Vehicle $vehicle,
+        ?Trailer $trailer)
+    {
+        $this->id = $id;
+        $this->createdAt = $createdAt;
+        $this->updatedAt = $updatedAt;
+        $this->date = $date;
+        $this->username = $username;
+        $this->items = $items;
+        $this->distance = $distance;
+        $this->duration = $duration;
+        $this->polyline = $polyline;
+        $this->vehicle = $vehicle;
+        $this->trailer = $trailer;
+    }
+}

src/Api/Dto/TaskPackageDto.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace AppBundle\Api\Dto;
+
+use Symfony\Component\Serializer\Annotation\Groups;
+
+class TaskPackageDto
+{
+    #[Groups(["task"])]
+    public readonly string $shortCode;
+
+    #[Groups(["task"])]
+    public readonly string $name;
+
+    #[Groups(["task"])]
+    public readonly int $averageVolumeUnits;
+
+    #[Groups(["task"])]
+    public readonly int $quantity;
+
+    public function __construct(
+        string $shortCode,
+        string $name,
+        int $averageVolumeUnits,
+        int $quantity)
+    {
+        $this->shortCode = $shortCode;
+        $this->name = $name;
+        $this->averageVolumeUnits = $averageVolumeUnits;
+        $this->quantity = $quantity;
+    }
+}

src/Entity/TaskList.php

@@ -3,10 +3,12 @@
 namespace AppBundle\Entity;
 
 use AppBundle\Action\MyTasks as MyTasksController;
+use AppBundle\Action\MyTasks2 as MyTasksController2;
 use AppBundle\Action\TaskList\Create as CreateTaskListController;
 use AppBundle\Action\TaskList\Optimize as OptimizeController;
 use AppBundle\Action\TaskList\SetItems as SetTaskListItemsController;
 use AppBundle\Entity\Task\CollectionInterface as TaskCollectionInterface;
+use AppBundle\Api\Dto\MyTaskListDto;
 use ApiPlatform\Core\Annotation\ApiFilter;
 use ApiPlatform\Core\Annotation\ApiResource;
 use AppBundle\Api\Filter\DateFilter;
@@ -82,6 +84,26 @@
  *         }}
  *       }
  *     },
+ *     "my_tasks_v2"={
+ *        "method"="GET",
+ *        "path"="/me/tasks/v2/{date}",
+ *        "controller"=MyTasksController2::class,
+ *        "access_control"="is_granted('ROLE_ADMIN') or is_granted('ROLE_COURIER')",
+ *        "output"=MyTaskListDto::class,
+ *        "read"=false,
+ *        "write"=false,
+ *        "normalization_context"={"groups"={"task_list", "task", "delivery", "address"}},
+ *        "openapi_context"={
+ *          "summary"="Retrieves the collection of Task resources assigned to the authenticated token.",
+ *          "parameters"={{
+ *            "in"="path",
+ *            "name"="date",
+ *            "required"=true,
+ *            "type"="string",
+ *            "format"="date"
+ *          }}
+ *        }
+ *      },
  *     "optimize"={
  *        "method"="GET",
  *        "path"="/task_lists/{id}/optimize",