making actions more robust

flipboxfactory · Nov 18, 2019 · b595d40 · b595d40
1 parent c5e17bf
commit b595d40
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 30 deletions.
diff --git a/src/actions/organizations/AssociateUserToOrganization.php b/src/actions/organizations/AssociateUserToOrganization.php
@@ -13,6 +13,7 @@
 use flipbox\organizations\records\UserAssociation;
 use yii\base\Action;
 use yii\db\ActiveRecord;
+use yii\web\HttpException;
 
 /**
  * @author Flipbox Factory <hello@flipboxfactory.com>
@@ -30,6 +31,30 @@ class AssociateUserToOrganization extends Action
         'state'
     ];
 
+    /**
+     * @param string $user
+     * @param string $organization
+     * @return null|\yii\base\Model|\yii\web\Response
+     * @throws HttpException
+     */
+    public function run(
+        string $user,
+        string $organization
+    )
+    {
+        if (null === ($user = $this->findUser($user))) {
+            return $this->handleNotFoundResponse();
+        }
+
+        if (null === ($organization = $this->findOrganization($organization))) {
+            return $this->handleNotFoundResponse();
+        }
+
+        return $this->runInternal(
+            $organization->getUsers()->findOrCreate($user)
+        );
+    }
+
     /**
      * @inheritdoc
      * @param UserAssociation $record

diff --git a/src/actions/organizations/DissociateUserFromOrganization.php b/src/actions/organizations/DissociateUserFromOrganization.php
@@ -11,6 +11,7 @@
 use flipbox\craft\ember\actions\records\DeleteRecordTrait;
 use flipbox\organizations\records\UserAssociation;
 use yii\base\Action;
+use yii\web\HttpException;
 
 /**
  * @author Flipbox Factory <hello@flipboxfactory.com>
@@ -20,6 +21,30 @@ class DissociateUserFromOrganization extends Action
 {
     use DeleteRecordTrait, LookupAssociationTrait;
 
+    /**
+     * @param string $user
+     * @param string $organization
+     * @return null|\yii\base\Model|\yii\web\Response
+     * @throws HttpException
+     */
+    public function run(
+        string $user,
+        string $organization
+    )
+    {
+        if (null === ($user = $this->findUser($user))) {
+            return $this->handleNotFoundResponse();
+        }
+
+        if (null === ($organization = $this->findOrganization($organization))) {
+            return $this->handleNotFoundResponse();
+        }
+
+        return $this->runInternal(
+            $organization->getUsers()->findOrCreate($user)
+        );
+    }
+
     /**
      * @inheritdoc
      * @param UserAssociation $record

diff --git a/src/actions/organizations/LookupAssociationTrait.php b/src/actions/organizations/LookupAssociationTrait.php
@@ -11,7 +11,6 @@
 use Craft;
 use craft\elements\User;
 use flipbox\organizations\elements\Organization;
-use flipbox\organizations\records\UserAssociation;
 use yii\db\ActiveRecord;
 use yii\web\HttpException;
 
@@ -23,35 +22,6 @@
  */
 trait LookupAssociationTrait
 {
-    /**
-     * @param ActiveRecord|UserAssociation $record
-     * @return UserAssociation
-     */
-    abstract protected function runInternal(ActiveRecord $record);
-
-    /**
-     * @param string $user
-     * @param string $organization
-     * @return null|\yii\base\Model|\yii\web\Response
-     * @throws HttpException
-     */
-    public function run(
-        string $user,
-        string $organization
-    ) {
-        if (null === ($user = $this->findUser($user))) {
-            return $this->handleNotFoundResponse();
-        }
-
-        if (null === ($organization = Organization::findOne($organization))) {
-            return $this->handleNotFoundResponse();
-        }
-
-        return $this->runInternal(
-            $organization->getUsers()->findOrCreate($user)
-        );
-    }
-
     /**
      * HTTP not found response code
      *
@@ -82,6 +52,14 @@ protected function handleNotFoundResponse()
         );
     }
 
+    /**
+     * @param string|int $identifier
+     * @return ORganization|null
+     */
+    protected function findOrganization($identifier)
+    {
+        return Organization::findOne($identifier);
+    }
 
     /**
      * @param string|int $identifier