Merge pull request #332 from leszczuu/fix/published_at

Added published at to page

Author: leszczuu

src/Entity/Page.php

@@ -34,6 +34,9 @@ class Page implements PageInterface
     /** @var string */
     protected $code;
 
+    /** @var \DateTimeImmutable|null */
+    protected $publishAt;
+
     public function __construct()
     {
         $this->initializeProductsCollection();
@@ -177,4 +180,14 @@ protected function createTranslation(): PageTranslationInterface
     {
         return new PageTranslation();
     }
+
+    public function getPublishAt(): ?\DateTimeImmutable
+    {
+        return $this->publishAt;
+    }
+
+    public function setPublishAt(?\DateTimeImmutable $publishAt): void
+    {
+        $this->publishAt = $publishAt;
+    }
 }

src/Form/Type/PageType.php

@@ -18,6 +18,7 @@
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Sylius\Bundle\ResourceBundle\Form\Type\ResourceTranslationsType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -51,6 +52,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'multiple' => true,
                 'expanded' => true,
             ])
+            ->add('publishAt', DateTimeType::class, [
+                'input' => 'datetime_immutable',
+                'label' => 'bitbag_sylius_cms_plugin.ui.publish_at',
+                'date_widget' => 'single_text',
+                'time_widget' => 'single_text',
+                'required' => false,
+            ])
         ;
     }
 

src/Repository/PageRepository.php

@@ -103,16 +103,23 @@ public function findBySectionCode(string $sectionCode, ?string $localeCode): arr
         ;
     }
 
-    public function findByProduct(ProductInterface $product, string $channelCode): array
+    public function findByProduct(ProductInterface $product, string $channelCode, ?\DateTimeInterface $date = null): array
     {
-        return $this->createQueryBuilder('o')
+        $qb = $this->createQueryBuilder('o')
             ->innerJoin('o.products', 'product')
             ->innerJoin('o.channels', 'channel')
             ->where('o.enabled = true')
             ->andWhere('product = :product')
             ->andWhere('channel.code = :channelCode')
             ->setParameter('product', $product)
             ->setParameter('channelCode', $channelCode)
+        ;
+
+        if (!empty($date)) {
+            $this->addDateFilter($qb);
+        }
+
+        return $qb
             ->getQuery()
             ->getResult()
         ;
@@ -121,9 +128,10 @@ public function findByProduct(ProductInterface $product, string $channelCode): a
     public function findByProductAndSectionCode(
         ProductInterface $product,
         string $sectionCode,
-        string $channelCode
+        string $channelCode,
+        ?\DateTimeInterface $date = null
     ): array {
-        return $this->createQueryBuilder('o')
+        $qb = $this->createQueryBuilder('o')
             ->innerJoin('o.products', 'product')
             ->innerJoin('o.sections', 'section')
             ->innerJoin('o.channels', 'channel')
@@ -134,8 +142,26 @@ public function findByProductAndSectionCode(
             ->setParameter('product', $product)
             ->setParameter('sectionCode', $sectionCode)
             ->setParameter('channelCode', $channelCode)
-            ->getQuery()
+        ;
+
+        if (!empty($date)) {
+            $this->addDateFilter($qb, $date);
+        }
+
+        return $qb->getQuery()
             ->getResult()
         ;
     }
+
+    private function addDateFilter(QueryBuilder $qb, \DateTimeInterface $date): void
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->orX(
+                    'o.publishAt is NULL',
+                    'o.publishAt <= :date'
+                )
+            )
+            ->setParameter('date', $date);
+    }
 }

src/Repository/PageRepositoryInterface.php

@@ -35,7 +35,12 @@ public function createShopListQueryBuilder(string $sectionCode, string $channelC
 
     public function findBySectionCode(string $sectionCode, ?string $localeCode): array;
 
-    public function findByProduct(ProductInterface $product, string $channelCode): array;
-
-    public function findByProductAndSectionCode(ProductInterface $product, string $sectionCode, string $channelCode): array;
+    public function findByProduct(ProductInterface $product, string $channelCode, ?\DateTimeInterface $date): array;
+
+    public function findByProductAndSectionCode(
+        ProductInterface $product,
+        string $sectionCode,
+        string $channelCode,
+        ?\DateTimeInterface $date
+    ): array;
 }

src/Resources/config/doctrine/Page.orm.yml

@@ -30,6 +30,11 @@ BitBag\SyliusCmsPlugin\Entity\Page:
             gedmo:
                 timestampable:
                     on: update
+        publishAt:
+            column: publish_at
+            type: date_immutable
+            nullable: true
+
     manyToMany:
         products:
             targetEntity: Sylius\Component\Product\Model\ProductInterface

src/Twig/Extension/RenderProductPagesExtension.php

@@ -24,4 +24,46 @@ public function getFunctions(): array
             new TwigFunction('bitbag_cms_render_product_pages', [RenderProductPagesRuntime::class, 'renderProductPages'], ['is_safe' => ['html']]),
         ];
     }
+
+    public function renderProductPages(ProductInterface $product, ?string $sectionCode = null, ?string $date = null): string
+    {
+        $channelCode = $this->channelContext->getChannel()->getCode();
+
+        $parsedDate = null;
+        if (!empty($date)) {
+            $parsedDate = new \DateTimeImmutable($date);
+        }
+
+        if (null !== $sectionCode) {
+            $pages = $this->pageRepository->findByProductAndSectionCode($product, $sectionCode, $channelCode, $parsedDate);
+        } else {
+            $pages = $this->pageRepository->findByProduct($product, $channelCode, $parsedDate);
+        }
+
+        $data = $this->sortBySections($pages);
+
+        return $this->templatingEngine->render('@BitBagSyliusCmsPlugin/Shop/Product/_pagesBySection.html.twig', [
+            'data' => $data,
+        ]);
+    }
+
+    private function sortBySections(array $pages): array
+    {
+        $result = [];
+
+        /** @var PageInterface $page */
+        foreach ($pages as $page) {
+            foreach ($page->getSections() as $section) {
+                $sectionCode = $section->getCode();
+                if (!array_key_exists($sectionCode, $result)) {
+                    $result[$sectionCode] = [];
+                    $result[$sectionCode]['section'] = $section;
+                }
+
+                $result[$sectionCode][] = $page;
+            }
+        }
+
+        return $result;
+    }
 }