EventSelectionContentType added; Clean up code

manuxi · Mar 28, 2021 · e57e208 · e57e208
1 parent d7ba660
commit e57e208
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 47 deletions.
diff --git a/src/Admin/EventAdmin.php b/src/Admin/EventAdmin.php
@@ -19,26 +19,18 @@
 class EventAdmin extends Admin
 {
     public const LIST_VIEW = 'app.event.list';
-
     public const ADD_FORM_VIEW = 'app.event.add_form';
-
     public const ADD_FORM_DETAILS_VIEW = 'app.event.add_form.details';
-
     public const EDIT_FORM_VIEW = 'app.event.edit_form';
-
     public const EDIT_FORM_DETAILS_VIEW = 'app.event.edit_form.details';
-
     public const SECURITY_CONTEXT = 'sulu.modules.events';
 
     //seo,excerpt, etc
     public const EDIT_FORM_VIEW_SEO = 'app.event.edit_form.seo';
-
     public const EDIT_FORM_VIEW_EXCERPT = 'app.event.edit_form.excerpt';
 
     private $viewBuilderFactory;
-
     private $securityChecker;
-
     private $webspaceManager;
 
     public function __construct(

diff --git a/src/Admin/LocationAdmin.php b/src/Admin/LocationAdmin.php
@@ -19,17 +19,12 @@
 class LocationAdmin extends Admin
 {
     public const LIST_VIEW = 'app.location.list';
-
     public const ADD_FORM_VIEW = 'app.location.add_form';
-
     public const ADD_FORM_DETAILS_VIEW = 'app.location.add_form.details';
-
     public const EDIT_FORM_VIEW = 'app.location.edit_form';
-
     public const EDIT_FORM_DETAILS_VIEW = 'app.location.edit_form.details';
 
     private $viewBuilderFactory;
-
     private $securityChecker;
 
     public function __construct(

diff --git a/src/Content/EventSelectionContentType.php b/src/Content/EventSelectionContentType.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Manuxi\SuluEventBundle\Content;
+
+use Manuxi\SuluEventBundle\Entity\Event;
+use Manuxi\SuluEventBundle\Repository\EventRepository;
+use Sulu\Component\Content\Compat\PropertyInterface;
+use Sulu\Component\Content\SimpleContentType;
+
+class EventSelectionContentType extends SimpleContentType
+{
+
+    private $eventRepository;
+
+    public function __construct(EventRepository $eventRepository)
+    {
+        parent::__construct('event_selection');
+
+        $this->eventRepository = $eventRepository;
+    }
+
+    /**
+     * @return Event[]
+     */
+    public function getContentData(PropertyInterface $property): array
+    {
+        $ids = $property->getValue();
+        $locale = $property->getStructure()->getLanguageCode();
+
+        $events = [];
+        foreach ($ids ?: [] as $id) {
+            $event = $this->eventRepository->findById((int) $id, $locale);
+            if ($event && $event->isEnabled()) {
+                $events[] = $event;
+            }
+        }
+
+        return $events;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getViewData(PropertyInterface $property): array
+    {
+        return $property->getValue();
+    }
+}
diff --git a/src/Repository/EventSeoRepository.php b/src/Repository/EventSeoRepository.php
@@ -20,9 +20,6 @@
  */
 class EventSeoRepository extends ServiceEntityRepository
 {
-//    use DataProviderRepositoryTrait {
-//        findByFilters as parentFindByFilters;
-//    }
 
     public function __construct(ManagerRegistry $registry)
     {
@@ -75,24 +72,4 @@ public function findById(int $id, string $locale): ?EventSeo
         return $eventSeo;
     }
 
-//    /**
-//     * @param mixed[] $filters
-//     */
-//    public function findByFilters($filters, $page, $pageSize, $limit, $locale, $options = [])
-//    {
-//        $entities = $this->parentFindByFilters($filters, $page, $pageSize, $limit, $locale, $options);
-//
-//        return array_map(
-//            function (EventSeo $entity) use ($locale) {
-//                return $entity->setLocale($locale);
-//            },
-//            $entities
-//        );
-//    }
-//
-//    protected function appendJoins(QueryBuilder $queryBuilder, string $alias, string $locale): void
-//    {
-//        $queryBuilder->innerJoin($alias . '.translations', 'translation', Join::WITH, 'translation.locale = :locale');
-//        $queryBuilder->setParameter('locale', $locale);
-//    }
 }
diff --git a/src/Resources/config/routes.yml b/src/Resources/config/routes.yml
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -57,19 +57,26 @@
             <tag name="sulu.content.type" alias="event_selection"/>
         </service>
 
-        <service id="sulu_event.event_data_provider" class="Manuxi\SuluEventBundle\Content\EventDataProvider">
+        <service id="sulu_event.country_code_select" class="Manuxi\SuluEventBundle\Service\CountryCodeSelect" public="true"/>
+
+        <service id="Manuxi\SuluEventBundle\Routing\EventRouteDefaultsProvider">
             <argument type="service" id="sulu_event.repository.event"/>
-            <argument type="service" id="sulu_core.array_serializer"/>
 
-            <tag name="sulu.smart_content.data_provider" alias="events"/>
+            <tag name="sulu_route.defaults_provider"/>
         </service>
 
-        <service id="sulu_event.country_code_select" class="Manuxi\SuluEventBundle\Service\CountryCodeSelect" public="true"/>
+        <service id="Manuxi\SuluEventBundle\Content\EventSelectionContentType">
+            <argument type="service" id="sulu_event.repository.event"/>
 
-        <service id="Manuxi\SuluEventBundle\Routing\EventRouteDefaultsProvider">
+            <tag name="sulu.content.type" alias="event_selection"/>
+        </service>
+
+        <service id="sulu_event.event_data_provider" class="Manuxi\SuluEventBundle\Content\EventDataProvider">
             <argument type="service" id="sulu_event.repository.event"/>
+            <argument type="service" id="sulu_core.array_serializer"/>
 
-            <tag name="sulu_route.defaults_provider"/>
+            <tag name="sulu.smart_content.data_provider" alias="events"/>
         </service>
+
     </services>
 </container>