Create V2 mapper, Service and management commands

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/Cron/Updater.php b/lib/Cron/UpdaterJob.php
index 3d9336df7..d2dbde149 100644
--- a/lib/Cron/Updater.php
+++ b/lib/Cron/UpdaterJob.php
@@ -15,10 +15,10 @@ use OC\BackgroundJob\TimedJob;
 
 use OCA\News\AppInfo\Application;
 use OCA\News\Service\StatusService;
-use OCA\News\Utility\Updater as UpdaterService;
+use OCA\News\Service\UpdaterService;
 use OCP\IConfig;
 
-class Updater extends TimedJob
+class UpdaterJob extends TimedJob
 {
 
     /**
@@ -28,7 +28,7 @@ class Updater extends TimedJob
     /**
      * @var StatusService
      */
-    private $status;
+    private $statusService;
     /**
      * @var UpdaterService
      */
@@ -40,7 +40,7 @@ class Updater extends TimedJob
         UpdaterService $updaterService
     ) {
         $this->config = $config;
-        $this->status = $status;
+        $this->statusService = $status;
         $this->updaterService = $updaterService;
 
         $interval = $this->config->getAppValue(
@@ -60,10 +60,12 @@ class Updater extends TimedJob
             Application::DEFAULT_SETTINGS['useCronUpdates']
         );
 
-        if ($uses_cron && $this->status->isProperlyConfigured()) {
-            $this->updaterService->beforeUpdate();
-            $this->updaterService->update();
-            $this->updaterService->afterUpdate();
+        if (!$uses_cron || !$this->statusService->isProperlyConfigured()) {
+            return;
         }
+
+        $this->updaterService->beforeUpdate();
+        $this->updaterService->update();
+        $this->updaterService->afterUpdate();
     }
 }