refactor: use super().get_id()

TimKnight-DWP · TimKnight-DWP · commit 8273450f68c5 · 2024-05-08T10:54:10.000+01:00
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/gitlab/v4/objects/job_token_scope.py b/gitlab/v4/objects/job_token_scope.py
@@ -44,10 +44,10 @@ def get_id(self) -> int:
         """Returns the id of the resource. This override deals with
         the fact that either an `id` or a `target_project_id` attribute
         is returned by the server depending on the endpoint called."""
-        try:
-            return cast(int, getattr(self, self._id_attr))
-        except AttributeError:
-            return cast(int, self.id)
+        project_id = cast(int, super().get_id())
+        if project_id is not None:
+            return project_id
+        return cast(int, self.id)
 
 
 class AllowlistProjectManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
@@ -64,10 +64,10 @@ def get_id(self) -> int:
         """Returns the id of the resource. This override deals with
         the fact that either an `id` or a `target_group_id` attribute
         is returned by the server depending on the endpoint called."""
-        try:
-            return cast(int, getattr(self, self._id_attr))
-        except AttributeError:
-            return cast(int, self.id)
+        group_id = cast(int, super().get_id())
+        if group_id is not None:
+            return group_id
+        return cast(int, self.id)
 
 
 class AllowlistGroupManager(ListMixin, CreateMixin, DeleteMixin, RESTManager):
