notification bar validity now includes time for more narrow settings (#3805)

Author: JanMolcik

src/Component/DateTimeHelper/DateTimeHelper.php

@@ -72,4 +72,17 @@ public function getCurrentDayOfWeek(int $domainId): int
             $this->displayTimeZoneProvider->getDisplayTimeZoneByDomainId($domainId),
         ))->format('N');
     }
+
+    /**
+     * @param string $dateTimeString
+     * @param \DateTimeZone $dateTimeZone
+     * @return \DateTime
+     */
+    public function createUtcDateTimeByTimeZoneAndString(string $dateTimeString, DateTimeZone $dateTimeZone): DateTime
+    {
+        $dateTime = new DateTime($dateTimeString, $dateTimeZone);
+        $dateTime->setTimezone(new DateTimeZone('UTC'));
+
+        return $dateTime;
+    }
 }

src/Component/Redis/CleanStorefrontCacheFacade.php

@@ -14,6 +14,7 @@ class CleanStorefrontCacheFacade
     public const string ARTICLES_QUERY_KEY_PART = 'ArticlesQuery';
     public const string SETTINGS_QUERY_KEY_PART = 'SettingsQuery';
     public const string SLIDER_ITEMS_QUERY_KEY_PART = 'SliderItemsQuery';
+    public const string NOTIFICATION_BARS_QUERY_KEY_PART = 'NotificationBars';
 
     /**
      * @param \Redis $storefrontGraphqlQueryClient

src/Form/Admin/NotificationBar/NotificationBarFormType.php

@@ -8,7 +8,7 @@
 use Shopsys\FormTypesBundle\ActionBarType;
 use Shopsys\FormTypesBundle\YesNoType;
 use Shopsys\FrameworkBundle\Form\ColorPickerType;
-use Shopsys\FrameworkBundle\Form\DatePickerType;
+use Shopsys\FrameworkBundle\Form\DateTimeType;
 use Shopsys\FrameworkBundle\Form\DomainType;
 use Shopsys\FrameworkBundle\Form\GroupType;
 use Shopsys\FrameworkBundle\Form\ImageUploadType;
@@ -66,14 +66,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     ]),
                 ],
             ])
-            ->add('validityFrom', DatePickerType::class, [
+            ->add('validityFrom', DateTimeType::class, [
                 'required' => false,
                 'label' => t('Valid from'),
                 'attr' => [
                     'autocomplete' => 'off',
                 ],
             ])
-            ->add('validityTo', DatePickerType::class, [
+            ->add('validityTo', DateTimeType::class, [
                 'required' => false,
                 'label' => t('Valid to'),
                 'attr' => [

src/Model/NotificationBar/NotificationBarFacade.php

@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Shopsys\FrameworkBundle\Component\Image\ImageFacade;
+use Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade;
 
 class NotificationBarFacade
 {
@@ -15,12 +16,14 @@ class NotificationBarFacade
      * @param \Shopsys\FrameworkBundle\Model\NotificationBar\NotificationBarRepository $notificationBarRepository
      * @param \Shopsys\FrameworkBundle\Component\Image\ImageFacade $imageFacade
      * @param \Shopsys\FrameworkBundle\Model\NotificationBar\NotificationBarFactory $notificationBarFactory
+     * @param \Shopsys\FrameworkBundle\Component\Redis\CleanStorefrontCacheFacade $cleanStorefrontCacheFacade
      */
     public function __construct(
         protected readonly EntityManagerInterface $em,
         protected readonly NotificationBarRepository $notificationBarRepository,
         protected readonly ImageFacade $imageFacade,
         protected readonly NotificationBarFactory $notificationBarFactory,
+        protected readonly CleanStorefrontCacheFacade $cleanStorefrontCacheFacade,
     ) {
     }
 
@@ -35,6 +38,8 @@ public function create(NotificationBarData $notificationBarData): void
         $this->em->flush();
 
         $this->imageFacade->manageImages($notificationBar, $notificationBarData->image);
+
+        $this->cleanStorefrontCacheFacade->cleanStorefrontGraphqlQueryCache(CleanStorefrontCacheFacade::NOTIFICATION_BARS_QUERY_KEY_PART);
     }
 
     /**
@@ -50,6 +55,8 @@ public function edit(NotificationBar $notificationBar, NotificationBarData $noti
 
         $this->imageFacade->manageImages($notificationBar, $notificationBarData->image);
 
+        $this->cleanStorefrontCacheFacade->cleanStorefrontGraphqlQueryCache(CleanStorefrontCacheFacade::NOTIFICATION_BARS_QUERY_KEY_PART);
+
         return $notificationBar;
     }
 
@@ -62,6 +69,8 @@ public function delete(int $notificationBarId): void
 
         $this->em->remove($notificationBar);
         $this->em->flush();
+
+        $this->cleanStorefrontCacheFacade->cleanStorefrontGraphqlQueryCache(CleanStorefrontCacheFacade::NOTIFICATION_BARS_QUERY_KEY_PART);
     }
 
     /**

src/Model/NotificationBar/NotificationBarRepository.php

@@ -50,16 +50,13 @@ public function getById(int $notificationBarId): NotificationBar
      */
     public function findVisibleAndValidByDomainId(int $domainId): ?array
     {
-        $dateTodayMidnight = new DateTime();
-        $dateTodayMidnight = $dateTodayMidnight->format('Y-m-d 00:00:00');
-
         return $this->getAllByDomainIdQueryBuilder($domainId)
             ->andWhere('nb.validityFrom IS NULL OR nb.validityFrom <= :now')
             ->andWhere('nb.validityTo IS NULL OR nb.validityTo >= :now')
             ->andWhere('nb.hidden = FALSE')
             ->setParameters([
                 'domainId' => $domainId,
-                'now' => $dateTodayMidnight,
+                'now' => new DateTime(),
             ])
             ->getQuery()->execute();
     }

src/Resources/views/Admin/Content/NotificationBar/listGrid.html.twig

@@ -10,15 +10,15 @@
 
 {% block grid_value_cell_id_validityFrom %}
     {% if value is not null %}
-        {{ value|formatDate }}
+        {{ value|formatDateTime }}
     {% else %}
         {{ 'Unlimited'|trans }}
     {% endif %}
 {% endblock %}
 
 {% block grid_value_cell_id_validityTo %}
     {% if value is not null %}
-        {{ value|formatDate }}
+        {{ value|formatDateTime }}
     {% else %}
         {{ 'Unlimited'|trans }}
     {% endif %}