Refactor admin controllers and services

1 files changed, 2 insertions, 20 deletions

diff --git a/app/Http/Controllers/Admin/ModuleController.php b/app/Http/Controllers/Admin/ModuleController.php
index 6cce5537f2..767665de91 100644
--- a/app/Http/Controllers/Admin/ModuleController.php
+++ b/app/Http/Controllers/Admin/ModuleController.php
@@ -24,7 +24,6 @@ use Fisharebest\Webtrees\Module\ModuleBlockInterface;
 use Fisharebest\Webtrees\Module\ModuleChartInterface;
 use Fisharebest\Webtrees\Module\ModuleFooterInterface;
 use Fisharebest\Webtrees\Module\ModuleHistoricEventsInterface;
-use Fisharebest\Webtrees\Module\ModuleInterface;
 use Fisharebest\Webtrees\Module\ModuleLanguageInterface;
 use Fisharebest\Webtrees\Module\ModuleMenuInterface;
 use Fisharebest\Webtrees\Module\ModuleReportInterface;
@@ -59,7 +58,7 @@ class ModuleController extends AbstractAdminController
         'sidebar',
         'tab',
     ];
-    
+
     /**
      * @var ModuleService
      */
@@ -85,28 +84,11 @@ class ModuleController extends AbstractAdminController
         return $this->viewResponse('admin/modules', [
             'title'           => I18N::translate('Module administration'),
             'modules'         => $this->module_service->all(),
-            'deleted_modules' => $this->deletedModuleNames(),
+            'deleted_modules' => $this->module_service->deletedModules(),
         ]);
     }
 
     /**
-     * Generate a list of module names which exist in the database but not on disk.
-     *
-     * @return Collection|string[]
-     */
-    public function deletedModuleNames(): Collection
-    {
-        $database_modules = DB::table('module')->pluck('module_name');
-
-        $disk_modules = $this->module_service->all()
-            ->map(function (ModuleInterface $module): string {
-                return $module->name();
-            });
-
-        return $database_modules->diff($disk_modules);
-    }
-
-    /**
      * @return Response
      */
     public function listAnalytics(): Response