Price recalculation

app/config/services.yml

@@ -1295,7 +1295,10 @@ services:
  arguments:
  $fleetKey: '%tile38_fleet_key%'
 
- AppBundle\Pricing\PricingManager: ~
+
+ AppBundle\Pricing\PricingManager:
+ arguments:
+ $eventBus: '@event_bus'
 
  AppBundle\Form\BusinessAccountRegistrationFlow:
  autoconfigure: true
@@ -1329,4 +1332,4 @@ services:
  arguments:
  $pixabayApiKey: '%env(PIXABAY_API_KEY)%'
 
- AppBundle\Utils\RestaurantDecorator: ~
+ AppBundle\Utils\RestaurantDecorator: ~

src/Doctrine/EventSubscriber/TaskSubscriber.php

@@ -6,8 +6,8 @@
 use AppBundle\Domain\EventStore;
 use AppBundle\Domain\Task\Event\TaskCreated;
 use AppBundle\Entity\Address;
-use AppBundle\Entity\Delivery;
 use AppBundle\Entity\Task;
+use AppBundle\Pricing\PricingManager;
 use AppBundle\Service\Geocoder;
 use AppBundle\Service\OrderManager;
 use AppBundle\Sylius\Order\OrderInterface;
@@ -19,7 +19,7 @@
 use Doctrine\ORM\UnitOfWork;
 use Psr\Log\LoggerInterface;
 use SimpleBus\Message\Bus\MessageBus;
-use Symfony\Component\Messenger\MessageBusInterface;
+use Sylius\Component\Order\Model\OrderInterface;
 
 class TaskSubscriber implements EventSubscriber
 {
@@ -34,12 +34,13 @@
  private $createdAddresses;
 
  public function __construct(
- MessageBus $eventBus,
- EventStore $eventStore,
+ MessageBus  $eventBus,
+ EventStore  $eventStore,
  EntityChangeSetProcessor $processor,
- LoggerInterface $logger,
- Geocoder $geocoder,
- private OrderManager $orderManager
+ LoggerInterface $logger,
+ Geocoder $geocoder,
+ private OrderManager $orderManager,
+ private PricingManager $pricingManager
  )
  {
  $this->eventBus = $eventBus;
@@ -239,5 +240,19 @@
  }
  }
  }
+
+ // Update pricing in a different loop to avoid race condition on cancelled orders
+ foreach ($tasksToUpdate as $taskToUpdate) {
+ $delivery = $taskToUpdate->getDelivery();
+ if (
+ $delivery !== null &&
+ ($order = $delivery->getOrder()) !== null &&
+ $order->getState() !== OrderInterface::STATE_CANCELLED
+ ) {
+ $this->pricingManager->updateOrder($delivery, $taskToUpdate);
+ $em->flush();
+ }
+ }
  }
+
 }

src/Domain/Order/Event/OrderPriceRecalculated.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace AppBundle\Domain\Order\Event;
+
+use AppBundle\Domain\DomainEvent;
+use AppBundle\Domain\HasIconInterface;
+use AppBundle\Domain\Order\Event;
+use AppBundle\Sylius\Order\OrderInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class OrderPriceRecalculated extends Event implements DomainEvent, HasIconInterface
+{
+
+ public function __construct(
+ OrderInterface $order,
+ private int $new_price,
+ private int $old_price,
+ private ?string $caused_by = null
+ )
+ {
+ parent::__construct($order);
+ }
+
+ public function getNewPrice(): int
+ {
+ return $this->new_price;
+ }
+
+ public function getOldPrice(): int
+ {
+ return $this->old_price;
+ }
+
+ public function getCausedby(): ?string
+ {
+ return $this->caused_by;
+ }
+
+ public function toPayload()
+ {
+ return [
+ 'price' => $this->getNewPrice(),
+ 'old_price' => $this->getOldPrice(),
+ 'caused_by' => $this->getCausedby()
+ ];
+ }
+
+ public function normalize(NormalizerInterface $serializer)
+ {
+ return array_merge(
+ parent::normalize($serializer),
+ ['caused_by' => $this->getCausedby()]
+ );
+ }
+
+ public static function iconName()
+ {
+ return 'calculator';
+ }
+
+ public static function messageName(): string
+ {
+ return 'order:price_recalculated';
+ }
+}

src/Entity/Delivery.php

@@ -187,7 +187,7 @@ public function setOrder(OrderInterface $order)
  public function getWeight()
  {
  $totalWeight = null;
- foreach ($this->getTasks() as $task) {
+ foreach ($this->getTasks('not task.isCancelled()') as $task) {
  if (null !== $task->getWeight()) {
  $totalWeight += $task->getWeight();
  }
@@ -372,6 +372,7 @@ public function isAssigned()
 
  public function isCompleted()
  {
+ //TODO: Should we check if all tasks are completed or only active ones?
  foreach ($this->getTasks() as $task) {
  if (!$task->isCompleted()) {
 
@@ -388,7 +389,7 @@ public function getPackages()
 
  $hash = new \SplObjectStorage();
 
- foreach ($this->getTasks() as $task) {
+ foreach ($this->getTasks('not task.isCancelled()') as $task) {
  if ($task->hasPackages()) {
  foreach ($task->getPackages() as $package) {
  $object = $package->getPackage();
@@ -433,7 +434,6 @@ private static function createTaskObject(?Task $task)
  {
  $taskObject = new \stdClass();
  if ($task) {
-
  return $task->toExpressionLanguageObject();
  }
 

src/Entity/Sylius/Order.php

@@ -744,6 +744,17 @@ public function hasPayments(): bool
  return !$this->payments->isEmpty();
  }
 
+ /**
+ * @return bool
+ */
+ public function isPaid(): bool
+ {
+ return $this->getPayments()->filter(function (PaymentInterface $payment) {
+ //TODO: Check if payment is completed only in this state (e.g. PaymentInterface::STATE_PROCESSING)
+ return PaymentInterface::STATE_COMPLETED === $payment->getState();
+ })->count() > 0;
+ }
+
  /**
  * {@inheritdoc}
  */

src/Pricing/PricingManager.php

@@ -2,25 +2,29 @@
 
 namespace AppBundle\Pricing;
 
+use ApiPlatform\Core\Api\IriConverterInterface;
+use AppBundle\Domain\Order\Event\OrderPriceRecalculated;
 use AppBundle\Entity\Delivery;
 use AppBundle\Exception\Pricing\NoRuleMatchedException;
 use AppBundle\Service\DeliveryManager;
 use AppBundle\Service\OrderManager;
-use AppBundle\Sylius\Customer\CustomerInterface;
 use AppBundle\Sylius\Order\OrderFactory;
 use AppBundle\Sylius\Order\OrderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Request;
+use SimpleBus\Message\Bus\MessageBus;
 
 class PricingManager
 {
  public function __construct(
- private DeliveryManager $deliveryManager,
- private OrderManager $orderManager,
- private OrderFactory $orderFactory,
+ private DeliveryManager  $deliveryManager,
+ private OrderManager  $orderManager,
+ private OrderFactory  $orderFactory,
  private EntityManagerInterface $entityManager,
- private LoggerInterface $logger)
+ private LoggerInterface $logger,
+ private MessageBus $eventBus,
+ private IriConverterInterface $iriConverter
+ )
  {}
 
  /**
@@ -63,4 +67,81 @@ public function createOrder(Delivery $delivery, bool $throwException = false): ?
 
  return null;
  }
+
+ public function updateOrder(Delivery $delivery, ?object $triggered_by = null): ?OrderInterface
+ {
+ /** @var ?OrderInterface $order */
+ $order = $delivery->getOrder();
+ if (is_null($order)) {
+ $this->logger->info("No order set to this delivery, skipping");
+ return null;
+ }
+
+ if ($order->isPaid()) {
+ $this->logger->info("Order is already payed, skipping");
+ return null;
+ }
+
+ $store = $delivery->getStore();
+ if (is_null($store)) {
+ $this->logger->info("No store set to this delivery, skipping");
+ return null;
+ }
+
+ if ($order->getItems()->count() > 1) {
+ $this->logger->info("Order has more than one item, skipping");
+ return null;
+ }
+
+ $delivery->setDistance(ceil($this->deliveryManager->calculateDistance(
+ $delivery,
+ $delivery->getTasks('not task.isCancelled()')
+ )));
+
+ if ($order->getItems()->first()->isImmutable()) {
+ $this->logger->info("Order item is immutable, skipping");
+ return null;
+ }
+
+ $old_price = $order->getItems()->first()->getUnitPrice();
+
+ $price = $this->deliveryManager->getPrice($delivery, $store->getPricingRuleSet());
+ if (is_null($price)) {
+ $this->logger->error('Price could not be calculated');
+ return null;
+ }
+
+ // Early exit if price didn't change
+ if ($old_price === $price) {
+ $this->logger->info("Price didn't change, skipping");
+ return $order;
+ }
+
+ $order->getItems()->map(function ($item) use ($price) {
+ $item->setUnitPrice((int)$price);
+ });
+
+ $order->recalculateItemsTotal();
+ $order->recalculateAdjustmentsTotal();
+
+ // If everything is fine, remove the payment
+ // TODO: See if other behavior is needed
+ // TODO: Move payments logic changes to a listener of OrderPriceRecalculated
+ $order->getPayments()->map(function ($payment) use (&$order) {
+ $order->removePayment($payment);
+ });
+
+ $this->entityManager->persist($order);
+
+ $this->eventBus->handle(new OrderPriceRecalculated(
+ $order,
+ $price,
+ $old_price,
+ $this->iriConverter->getIriFromItem($triggered_by),
+ )
+ );
+
+ $this->entityManager->flush();
+ return $order;
+ }
 }

src/Service/DeliveryManager.php

@@ -65,7 +65,7 @@ public function getPrice(Delivery $delivery, PricingRuleSet $ruleSet)
  $matchedAtLeastOne = false;
 
  if (count($delivery->getTasks()) > 2 || $ruleSet->hasOption(PricingRuleSet::OPTION_MAP_ALL_TASKS)) {
- foreach ($delivery->getTasks() as $task) {
+ foreach ($delivery->getTasks('not task.isCancelled()') as $task) {
  foreach ($ruleSet->getRules() as $rule) {
  if ($task->matchesPricingRule($rule, $this->expressionLanguage)) {
 
@@ -190,9 +190,22 @@ public function setDefaults(Delivery $delivery)
  }
  }
 
- $coords = array_map(fn ($task) => $task->getAddress()->getGeo(), $delivery->getTasks());
- $distance = $this->routing->getDistance(...$coords);
+ $distance = $this->calculateDistance($delivery);
 
  $delivery->setDistance(ceil($distance));
  }
+
+ /**
+ * @param Delivery $delivery
+ * @param ?Task[] $tasks
+ * @return float
+ */
+ public function calculateDistance(Delivery $delivery, ?array $tasks = null): float
+ {
+ if (is_null($tasks)) {
+ $tasks = $delivery->getTasks();
+ }
+ $coords = array_map(fn($task) => $task->getAddress()->getGeo(), $tasks);
+ return $this->routing->getDistance(...$coords);
+ }
 }

src/Utils/OrderEventCollection.php

@@ -14,6 +14,7 @@ class OrderEventCollection extends ArrayCollection
  'order:picked',
  'order:dropped',
  'order:cancelled',
+ 'order:price_recalculated'
  ];
 
  public function __construct(OrderInterface $order)