chore: removed DataService and use one in common

dvsa · Feb 7, 2024 · 12898f1 · 12898f1
1 parent 17ff486
commit 12898f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 57 deletions.
diff --git a/module/Olcs/config/module.config.php b/module/Olcs/config/module.config.php
@@ -11,7 +11,6 @@
 use Common\Data\Object\Search\Publication;
 use Common\Data\Object\Search\User;
 use Common\Data\Object\Search\Vehicle;
-use Common\Form\Elements\Validators\TableRequiredValidator;
 use Common\Service\Data as CommonDataService;
 use Laminas\Cache\Service\StorageCacheAbstractServiceFactory;
 use Olcs\Auth;
@@ -42,6 +41,7 @@
 use Olcs\Controller\Factory\SearchControllerFactory;
 use Olcs\Controller\Factory\SplitScreenControllerFactory;
 use Olcs\Controller\Factory\TaskControllerFactory;
+use Olcs\Controller\Factory\TransportManager as TransportManagerControllerFactories;
 use Olcs\Controller\Factory\TransportManager\Details\TransportManagerDetailsPreviousHistoryControllerFactory;
 use Olcs\Controller\Factory\TransportManager\Processing\TransportManagerProcessingTaskControllerFactory;
 use Olcs\Controller\Factory\TransportManager\TransportManagerDocumentControllerFactory;
@@ -81,6 +81,7 @@
 use Olcs\Controller\Sla\LicenceDocumentSlaTargetDateController;
 use Olcs\Controller\TaskController;
 use Olcs\Controller\TransportManager as TmCntr;
+use Olcs\Controller\TransportManager as TransportManagerControllers;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsDetailController;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsDetailControllerFactory;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsPreviousHistoryController;
@@ -124,8 +125,6 @@
 use Olcs\View\Helper\SlaIndicator;
 use Olcs\View\Helper\SubmissionSectionMultipleTablesFactory;
 use Olcs\View\Helper\SubmissionSectionTableFactory;
-use Olcs\Controller\TransportManager as TransportManagerControllers;
-use Olcs\Controller\Factory\TransportManager as TransportManagerControllerFactories;
 
 return array(
     'router' => [
@@ -919,7 +918,6 @@
             DataService\PublicInquiryDefinition::class => DataService\AbstractPublicInquiryDataFactory::class,
             DataService\PublicInquiryReason::class => DataService\AbstractPublicInquiryDataFactory::class,
             DataService\SubmissionLegislation::class => DataService\AbstractPublicInquiryDataFactory::class,
-            DataService\MessagingSubject::class => CommonDataService\AbstractListDataServiceFactory::class,
         ]
     ],
     'form_service_manager' => [

diff --git a/module/Olcs/src/Form/Model/Fieldset/Conversation.php b/module/Olcs/src/Form/Model/Fieldset/Conversation.php
@@ -14,7 +14,7 @@ class Conversation
      * @Form\Attributes({"id":"subject","placeholder":""})
      * @Form\Options({
      *     "label": "messaging.create-conversation.subject",
-     *     "service_name": "Olcs\Service\Data\MessagingSubject",
+     *     "service_name": Common\Service\Data\MessagingSubject::class,
      *     "empty_option": "Please Select"
      * })
      * @Form\Type("DynamicSelect")

diff --git a/module/Olcs/src/Service/Data/MessagingSubject.php b/module/Olcs/src/Service/Data/MessagingSubject.php