fix: fix enterprise issues

Author: GeekMasher

src/ghastoolkit/octokit/enterprise.py

@@ -29,7 +29,7 @@ def getRepositories(self) -> List[Repository]:
             return []
 
         for repository in result:
-            repositories.append(repository.parseRepository(repository.get("full_name")))
+            repositories.append(Repository.parseRepository(repository.get("full_name")))
 
         return repositories
 
@@ -63,6 +63,10 @@ def enableSecurityProduct(self, security_product: str) -> bool:
 
         return True
 
+    def __str__(self) -> str:
+        """Return string representation."""
+        return f"Organization('{self.name}')"
+
 
 class Enterprise:
     """Enterprise API."""
@@ -109,7 +113,13 @@ def getOrganizations(self, include_github: bool = False) -> List[Organization]:
 
             if len(result) < 100:
                 break
+
+            if len(organizations) == 0:
+                logger.error("Error getting last org in organizations")
+                logger.error("Only GitHub orgs might be returned")
+                break
+
             # set last org ID
-            last_org_id = organizations[-1].id
+            last_org_id = organizations[-1].identifier
 
         return organizations

src/ghastoolkit/octokit/octokit.py

@@ -259,7 +259,11 @@ def postJson(
         return response.json()
 
     def patchJson(
-        self, path: str, data: dict, expected: int = 200, parameters={}
+        self,
+        path: str,
+        data: dict,
+        expected: Optional[Union[int, list[int]]] = 200,
+        parameters={},
     ) -> dict:
         repo = self.repository or GitHub.repository
         if not repo:
@@ -270,13 +274,16 @@ def patchJson(
 
         response = self.session.patch(url, json=data)
 
-        if response.status_code != expected:
-            logger.error(f"Error code from server :: {response.status_code}")
-            logger.error(f"{response.content}")
-            known_error = __OCTOKIT_ERRORS__.get(response.status_code)
-            if known_error:
-                raise Exception(known_error)
-            raise Exception("Failed to patch data")
+        if expected:
+            if (isinstance(expected, int) and response.status_code != expected) or (
+                isinstance(expected, list) and response.status_code not in expected
+            ):
+                logger.error(f"Error code from server :: {response.status_code}")
+                logger.error(f"{response.content}")
+                known_error = __OCTOKIT_ERRORS__.get(response.status_code)
+                if known_error:
+                    raise Exception(known_error)
+                raise Exception("Failed to patch data")
 
         return response.json()