Update Application Folder to fit with new Doctrine Entities

Author: Marco Rieger

module/Application/src/Application/Controller/IndexController.php

@@ -4,25 +4,27 @@
 
 use Zend\Feed\Writer\Feed;
 use Zend\Mvc\Controller\AbstractActionController;
+use Zend\Paginator;
 use Zend\View\Model\FeedModel;
 use Zend\View\Model\ViewModel;
-use ZfModule\Mapper;
+use ZfModule\Mapper\ModuleToFeed;
+use ZfModule\Service;
 
 class IndexController extends AbstractActionController
 {
     const MODULES_PER_PAGE = 15;
 
     /**
-     * @var Mapper\Module
+     * @var Service\Module
      */
-    private $moduleMapper;
+    private $moduleService;
 
     /**
-     * @param Mapper\Module $moduleMapper
+     * @param Service\Module $moduleService
      */
-    public function __construct(Mapper\Module $moduleMapper)
+    public function __construct(Service\Module $moduleService)
     {
-        $this->moduleMapper = $moduleMapper;
+        $this->moduleService = $moduleService;
     }
 
     /**
@@ -33,7 +35,7 @@ public function indexAction()
         $query =  $this->params()->fromQuery('query', null);
         $page = (int) $this->params()->fromQuery('page', 1);
 
-        $repositories = $this->moduleMapper->pagination($page, self::MODULES_PER_PAGE, $query, 'created_at', 'DESC');
+        $repositories = $this->moduleService->findModules($query, ['m.created_at DESC'], $page, self::MODULES_PER_PAGE);
 
         return new ViewModel([
             'repositories' => $repositories,
@@ -57,10 +59,10 @@ public function feedAction()
 
         // Get the recent modules
         $page = 1;
-        $modules = $this->moduleMapper->pagination($page, self::MODULES_PER_PAGE, null, 'created_at', 'DESC');
+        $modules = $this->moduleService->findModules(null, ['m.created_at DESC'], $page, self::MODULES_PER_PAGE);
 
         // Load them into the feed
-        $mapper = new Mapper\ModuleToFeed($feed, $url);
+        $mapper = new ModuleToFeed($feed, $url);
         $mapper->addModules($modules);
 
         // Render the feed

module/Application/src/Application/Controller/IndexControllerFactory.php

@@ -5,7 +5,7 @@
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use ZfModule\Mapper;
+use ZfModule\Service;
 
 class IndexControllerFactory implements FactoryInterface
 {
@@ -19,9 +19,9 @@ public function createService(ServiceLocatorInterface $controllerManager)
         /* @var ControllerManager $controllerManager */
         $serviceManager = $controllerManager->getServiceLocator();
 
-        /* @var Mapper\Module $moduleMapper */
-        $moduleMapper = $serviceManager->get(Mapper\Module::class);
+        /* @var Service\Module $moduleService */
+        $moduleService = $serviceManager->get(Service\Module::class);
 
-        return new IndexController($moduleMapper);
+        return new IndexController($moduleService);
     }
 }

module/Application/src/Application/Controller/SearchController.php

@@ -4,28 +4,28 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
-use ZfModule\Mapper;
+use ZfModule\Service;
 
 class SearchController extends AbstractActionController
 {
     /**
-     * @var Mapper\Module
+     * @var Service\Module
      */
-    private $moduleMapper;
+    private $moduleService;
 
     /**
-     * @param Mapper\Module $moduleMapper
+     * @param Service\Module $moduleService
      */
-    public function __construct(Mapper\Module $moduleMapper)
+    public function __construct(Service\Module $moduleService)
     {
-        $this->moduleMapper = $moduleMapper;
+        $this->moduleService = $moduleService;
     }
 
     public function indexAction()
     {
         $query =  $this->params()->fromQuery('query', null);
 
-        $results = $this->moduleMapper->findByLike($query);
+        $results = $this->moduleService->findModules($query, ['m.name']);
 
         $viewModel = new ViewModel([
             'results' => $results,

module/Application/src/Application/Controller/SearchControllerFactory.php

@@ -5,7 +5,7 @@
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use ZfModule\Mapper;
+use ZfModule\Service;
 
 class SearchControllerFactory implements FactoryInterface
 {
@@ -19,9 +19,9 @@ public function createService(ServiceLocatorInterface $controllerManager)
         /* @var ControllerManager $controllerManager */
         $serviceManager = $controllerManager->getServiceLocator();
 
-        /* @var Mapper\Module $moduleMapper */
-        $moduleMapper = $serviceManager->get(Mapper\Module::class);
+        /* @var Service\Module $moduleService */
+        $moduleService = $serviceManager->get(Service\Module::class);
 
-        return new SearchController($moduleMapper);
+        return new SearchController($moduleService);
     }
 }

module/Application/view/application/index/index.phtml

@@ -29,7 +29,7 @@
                                     <strong><?php echo $this->escapeHtml($module->getIdentifier()); ?></strong>
                                 </a>
                             </p>
-                            <p><span class="zf-green">Created:</span> <?php echo $this->dateFormat($module->getCreatedAtDateTime(), IntlDateFormatter::SHORT, IntlDateFormatter::SHORT); ?></p>
+                            <p><span class="zf-green">Created:</span> <?php echo $this->dateFormat($module->getCreatedAt(), IntlDateFormatter::SHORT, IntlDateFormatter::SHORT); ?></p>
                         </div>
                         <div class="col-xs-4">
                             <a target="_blank" href="<?php echo $this->escapeHtmlAttr($module->getUrl()) ?>">Show module on GitHub</a>
@@ -55,6 +55,6 @@
                 </div>
             </div>
         </div>
-        <?php echo $this->newUsers(); ?>
+        <?php #echo $this->newUsers(); ?>
     </div>
 </div>

module/ZfModule/src/ZfModule/Mapper/ModuleToFeed.php

@@ -65,7 +65,7 @@ public function addModule(ModuleEntity $module)
         $entry->setDescription($moduleDescription);
         $entry->setLink($this->urlPlugin->fromRoute('view-module', $urlParams, ['force_canonical' => true]));
         $entry->addAuthor(['name' => $module->getOwner()]);
-        $entry->setDateCreated($module->getCreatedAtDateTime());
+        $entry->setDateCreated($module->getCreatedAt());
 
         $this->feed->addEntry($entry);
 

module/ZfModule/src/ZfModule/View/Helper/TotalModules.php

@@ -3,26 +3,26 @@
 namespace ZfModule\View\Helper;
 
 use Zend\View\Helper\AbstractHelper;
-use ZfModule\Mapper;
+use ZfModule\Service;
 
 class TotalModules extends AbstractHelper
 {
     /**
-     * @var Mapper\Module
+     * @var Service\Module
      */
-    private $moduleMapper;
+    private $moduleService;
 
     /**
      * @var int
      */
     private $total;
 
     /**
-     * @param Mapper\Module $moduleMapper
+     * @param Service\Module $moduleService
      */
-    public function __construct(Mapper\Module $moduleMapper)
+    public function __construct(Service\Module $moduleService)
     {
-        $this->moduleMapper = $moduleMapper;
+        $this->moduleService = $moduleService;
     }
 
     /**
@@ -31,7 +31,7 @@ public function __construct(Mapper\Module $moduleMapper)
     public function __invoke()
     {
         if ($this->total === null) {
-            $this->total = $this->moduleMapper->getTotal();
+            $this->total = $this->moduleService->getTotalModuleCount();
         }
 
         return $this->total;

module/ZfModule/src/ZfModule/View/Helper/TotalModulesFactory.php

@@ -2,10 +2,11 @@
 
 namespace ZfModule\View\Helper;
 
+use Doctrine\ORM\EntityManager;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\HelperPluginManager;
-use ZfModule\Mapper;
+use ZfModule\Service;
 
 class TotalModulesFactory implements FactoryInterface
 {
@@ -17,11 +18,11 @@ class TotalModulesFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $helperPluginManager)
     {
         /* @var HelperPluginManager $helperPluginManager */
-        $serviceManager = $helperPluginManager->getServiceLocator();
+        $serviceLocator = $helperPluginManager->getServiceLocator();
 
-        /* @var Mapper\Module $moduleMapper */
-        $moduleMapper = $serviceManager->get(Mapper\Module::class);
+        /* @var Module $moduleService */
+        $moduleService = $serviceLocator->get(Service\Module::class);
 
-        return new TotalModules($moduleMapper);
+        return new TotalModules($moduleService);
     }
 }