Fix migration issues

marius-wieschollek · Jun 6, 2018 · 48183b1 · 48183b1
1 parent 31658f1
commit 48183b1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 20 deletions.
diff --git a/src/appinfo/info.xml b/src/appinfo/info.xml
@@ -40,7 +40,7 @@ Sie können auch einzelne Passwörter mit anderen Nutzern teilen.
  * ... und vieles mehr
 ]]>
     </description>
-    <version>2018.6.2-BUILD</version>
+    <version>2018.6.3-BUILD</version>
     <licence>agpl</licence>
     <author mail="[email protected]" homepage="https://git.mdns.eu/nextcloud/passwords">Marius David Wieschollek</author>
     <namespace>Passwords</namespace>

diff --git a/src/lib/Controller/Api/AbstractObjectApiController.php b/src/lib/Controller/Api/AbstractObjectApiController.php
@@ -11,7 +11,7 @@
 use OCA\Passwords\Db\AbstractRevisionEntity;
 use OCA\Passwords\Exception\ApiException;
 use OCA\Passwords\Helper\ApiObjects\AbstractObjectHelper;
-use OCA\Passwords\Services\Object\UpdatedAbstractModelService;
+use OCA\Passwords\Services\Object\AbstractModelService;
 use OCA\Passwords\Services\Object\AbstractRevisionService;
 use OCA\Passwords\Services\ValidationService;
 use OCP\AppFramework\Http\JSONResponse;
@@ -25,7 +25,7 @@
 abstract class AbstractObjectApiController extends AbstractApiController {
 
     /**
-     * @var UpdatedAbstractModelService
+     * @var AbstractModelService
      */
     protected $modelService;
 
@@ -52,15 +52,15 @@ abstract class AbstractObjectApiController extends AbstractApiController {
     /**
      * AbstractObjectApiController constructor.
      *
-     * @param IRequest                    $request
-     * @param UpdatedAbstractModelService $modelService
-     * @param AbstractObjectHelper        $objectHelper
-     * @param ValidationService           $validationService
-     * @param AbstractRevisionService     $revisionService
+     * @param IRequest                $request
+     * @param AbstractModelService    $modelService
+     * @param AbstractObjectHelper    $objectHelper
+     * @param ValidationService       $validationService
+     * @param AbstractRevisionService $revisionService
      */
     public function __construct(
         IRequest $request,
-        UpdatedAbstractModelService $modelService,
+        AbstractModelService $modelService,
         AbstractObjectHelper $objectHelper,
         ValidationService $validationService,
         AbstractRevisionService $revisionService

diff --git a/src/lib/Helper/User/DeleteUserDataHelper.php b/src/lib/Helper/User/DeleteUserDataHelper.php
@@ -10,7 +10,7 @@
 use OCA\Passwords\Db\EntityInterface;
 use OCA\Passwords\Helper\Settings\UserSettingsHelper;
 use OCA\Passwords\Services\ConfigurationService;
-use OCA\Passwords\Services\Object\UpdatedAbstractModelService;
+use OCA\Passwords\Services\Object\AbstractModelService;
 use OCA\Passwords\Services\Object\AbstractService;
 use OCA\Passwords\Services\Object\FolderService;
 use OCA\Passwords\Services\Object\PasswordService;
@@ -116,8 +116,8 @@ public function deleteUserData(string $userId): void {
     }
 
     /**
-     * @param UpdatedAbstractModelService|ShareService|AbstractService $service
-     * @param string                                                   $userId
+     * @param AbstractModelService|ShareService|AbstractService $service
+     * @param string                                            $userId
      *
      * @throws \Exception
      */

diff --git a/...es/Object/UpdatedAbstractModelService.php → .../Services/Object/AbstractModelService.php b/...es/Object/UpdatedAbstractModelService.php → .../Services/Object/AbstractModelService.php
@@ -16,15 +16,14 @@
 use OCP\AppFramework\Db\Entity;
 
 /**
- * Class UpdatedAbstractModelService
+ * Class AbstractModelService
  *
  * @package OCA\AbstractParentEntitys\Services\Object
- * @TODO The Updated* is supposed to fix an ugly issue in the Nextcloud updater. Rename to AbstractModelService in 2019.1.0
  */
-abstract class UpdatedAbstractModelService extends AbstractService {
+abstract class AbstractModelService extends AbstractService {
 
     /**
-     * UpdatedAbstractModelService constructor.
+     * AbstractModelService constructor.
      *
      * @param HookManager        $hookManager
      * @param AbstractMapper     $mapper

diff --git a/src/lib/Services/Object/FolderService.php b/src/lib/Services/Object/FolderService.php
@@ -20,7 +20,7 @@
  *
  * @package OCA\Passwords\Services
  */
-class FolderService extends UpdatedAbstractModelService {
+class FolderService extends AbstractModelService {
 
     const BASE_FOLDER_UUID = '00000000-0000-0000-0000-000000000000';
 

diff --git a/src/lib/Services/Object/PasswordService.php b/src/lib/Services/Object/PasswordService.php
@@ -18,7 +18,7 @@
  *
  * @package OCA\Passwords\Services
  */
-class PasswordService extends UpdatedAbstractModelService {
+class PasswordService extends AbstractModelService {
 
     /**
      * @var PasswordMapper

diff --git a/src/lib/Services/Object/TagService.php b/src/lib/Services/Object/TagService.php
@@ -17,7 +17,7 @@
  *
  * @package OCA\Passwords\Services\Object
  */
-class TagService extends UpdatedAbstractModelService {
+class TagService extends AbstractModelService {
 
     /**
      * @var TagMapper
@@ -29,6 +29,7 @@ class TagService extends UpdatedAbstractModelService {
      */
     protected $class = Tag::class;
 
+    /** @noinspection PhpMissingParentConstructorInspection */
     /**
      * TagService constructor.
      *
@@ -37,7 +38,13 @@ class TagService extends UpdatedAbstractModelService {
      * @param EnvironmentService $environment
      */
     public function __construct(HookManager $hookManager, TagMapper $mapper, EnvironmentService $environment) {
-        parent::__construct($hookManager, $mapper, $environment);
+        /**
+         * This fixes the update issue 2018.5.2 => 2018.6.0
+         * @TODO remove in 2019.1.0
+         */
+        $this->userId      = $environment->getUserId();
+        $this->hookManager = $hookManager;
+        $this->mapper      = $mapper;
     }
 
     /**