Improvements round 1

Author: namespacebrian

src/Commands/Tag/TagCommand.php

@@ -18,7 +18,7 @@ abstract class TagCommand extends TerminusCommand
     protected function getModels($site_id, $org_id)
     {
         $organization = $this->session()->getUser()->getOrganizationMemberships()->get($org_id)->getOrganization();
-        $membership = $organization->getSiteMemberships()->get($site_id);
+        $membership = $organization->getSiteMembership($site_id);
         return [$organization, $membership->getSite(), $membership->getTags(),];
     }
 }

src/Models/Organization.php

@@ -8,6 +8,7 @@
 use Pantheon\Terminus\Collections\OrganizationUpstreams;
 use Pantheon\Terminus\Collections\OrganizationUserMemberships;
 use Pantheon\Terminus\Collections\Workflows;
+use Pantheon\Terminus\Models\OrganizationSiteMembership;
 use Pantheon\Terminus\Friends\ProfileInterface;
 use Pantheon\Terminus\Friends\ProfileTrait;
 use Pantheon\Terminus\Friends\SitesInterface;
@@ -140,6 +141,39 @@ public function getSiteMemberships()
         return $this->site_memberships;
     }
 
+    /**
+     * Fetch a single site membership directly by site ID or name
+     * 
+     * @param string $site_identifier The site ID or name to fetch membership for
+     * @return OrganizationSiteMembership
+     * @throws \Pantheon\Terminus\Exceptions\TerminusNotFoundException
+     */
+    public function getSiteMembership($site_identifier)
+    {
+        $site_uuid = $site_identifier;
+        
+        // If the identifier is not a UUID, resolve the name to UUID
+        if (!preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i', $site_identifier)) {
+            $response = $this->request->request("site-names/{$site_identifier}");
+            if (!isset($response['data']->id)) {
+                throw new \Pantheon\Terminus\Exceptions\TerminusNotFoundException(
+                    "Could not find a site identified by {$site_identifier}."
+                );
+            }
+            $site_uuid = $response['data']->id;
+        }
+        
+        $response = $this->request->request(
+            "organizations/{$this->id}/memberships/sites/{$site_uuid}"
+        );
+        
+        $nickname = \uniqid(__FUNCTION__ . '-');
+        $this->getContainer()->add($nickname, OrganizationSiteMembership::class)
+            ->addArgument($response['data'])
+            ->addArgument(['organization' => $this]);
+        return $this->getContainer()->get($nickname);
+    }
+
     /**
      * @return OrganizationUpstreams
      */