opening hours entity is now created with factory

Author: grossmannmartin

src/Model/Store/OpeningHours/OpeningHours.php

@@ -66,6 +66,14 @@ public function __construct(OpeningHoursData $openingHourData)
         $this->setData($openingHourData);
     }
 
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData $openingHourData
+     */
+    public function edit(OpeningHoursData $openingHourData): void
+    {
+        $this->setData($openingHourData);
+    }
+
     /**
      * @return int
      */

src/Model/Store/OpeningHours/OpeningHoursFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrameworkBundle\Model\Store\OpeningHours;
+
+use Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver;
+
+class OpeningHoursFactory
+{
+    /**
+     * @param \Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver $entityNameResolver
+     */
+    public function __construct(
+        protected readonly EntityNameResolver $entityNameResolver,
+    ) {
+    }
+
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData $data
+     * @return \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours
+     */
+    public function create(OpeningHoursData $data): OpeningHours
+    {
+        $classData = $this->entityNameResolver->resolve(OpeningHours::class);
+
+        return new $classData($data);
+    }
+}

src/Model/Store/Store.php

@@ -16,7 +16,6 @@
 use Shopsys\FrameworkBundle\Model\Store\Exception\StoreDomainNotFoundException;
 use Shopsys\FrameworkBundle\Model\Store\OpeningHours\Exception\OpeningHoursNotFoundException;
 use Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours;
-use Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData;
 
 /**
  * @ORM\Table(name="stores")
@@ -104,7 +103,7 @@ class Store implements OrderableEntityInterface
 
     /**
      * @var \Doctrine\Common\Collections\Collection<int,\Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours>
-     * @ORM\OneToMany(targetEntity="\Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours", mappedBy="store", cascade={"persist", "remove"}, orphanRemoval=true, fetch="EAGER")
+     * @ORM\OneToMany(targetEntity="\Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours", mappedBy="store", cascade={"persist", "remove"}, orphanRemoval=true)
      * @ORM\OrderBy({"dayOfWeek" = "ASC"})
      */
     protected $openingHours;
@@ -160,6 +159,18 @@ public function edit(StoreData $storeData)
     {
         $this->setDomains($storeData);
         $this->setData($storeData);
+
+        foreach ($this->openingHours as $index => $openingHours) {
+            $openingHours->edit($storeData->openingHours[$index]);
+        }
+    }
+
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours[] $openingHours
+     */
+    public function setOpeningHours(array $openingHours): void
+    {
+        $this->openingHours = new ArrayCollection($openingHours);
     }
 
     /**
@@ -176,7 +187,6 @@ public function setData(StoreData $storeData): void
         $this->city = $storeData->city;
         $this->postcode = $storeData->postcode;
         $this->country = $storeData->country;
-        $this->openingHours = $this->createOpeningHours($storeData->openingHours);
         $this->contactInfo = $storeData->contactInfo;
         $this->specialMessage = $storeData->specialMessage;
         $this->locationLatitude = $storeData->locationLatitude;
@@ -443,20 +453,4 @@ public function setDefault(): void
     {
         $this->isDefault = true;
     }
-
-    /**
-     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData[] $openingHours
-     * @return \Doctrine\Common\Collections\ArrayCollection
-     */
-    protected function createOpeningHours(array $openingHours): ArrayCollection
-    {
-        $openingHours = array_map(function (OpeningHoursData $openingHourData): OpeningHours {
-            $openingHours = new OpeningHours($openingHourData);
-            $openingHours->setStore($this);
-
-            return $openingHours;
-        }, $openingHours);
-
-        return new ArrayCollection($openingHours);
-    }
 }

src/Model/Store/StoreFactory.php

@@ -5,14 +5,19 @@
 namespace Shopsys\FrameworkBundle\Model\Store;
 
 use Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver;
+use Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours;
+use Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData;
+use Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursFactory;
 
 class StoreFactory
 {
     /**
      * @param \Shopsys\FrameworkBundle\Component\EntityExtension\EntityNameResolver $entityNameResolver
+     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursFactory $openingHoursFactory
      */
     public function __construct(
         protected readonly EntityNameResolver $entityNameResolver,
+        protected readonly OpeningHoursFactory $openingHoursFactory,
     ) {
     }
 
@@ -24,6 +29,31 @@ public function create(StoreData $storeData): Store
     {
         $classData = $this->entityNameResolver->resolve(Store::class);
 
-        return new $classData($storeData);
+        /** @var \Shopsys\FrameworkBundle\Model\Store\Store $store */
+        $store = new $classData($storeData);
+
+        $store->setOpeningHours(
+            $this->createOpeningHours($storeData->openingHours, $store),
+        );
+
+        return $store;
+    }
+
+    /**
+     * @param \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHoursData[] $openingHoursData
+     * @param \Shopsys\FrameworkBundle\Model\Store\Store $store
+     * @return \Shopsys\FrameworkBundle\Model\Store\OpeningHours\OpeningHours[]
+     */
+    protected function createOpeningHours(array $openingHoursData, Store $store): array
+    {
+        return array_map(
+            function (OpeningHoursData $openingHourData) use ($store): OpeningHours {
+                $openingHours = $this->openingHoursFactory->create($openingHourData);
+                $openingHours->setStore($store);
+
+                return $openingHours;
+            },
+            $openingHoursData,
+        );
     }
 }