Abstract BuildTargetModel from CoprBuildTargetModel

... and KojiBuildTargetModel.

Signed-off-by: Siteshwar Vashisht <[email protected]>

Author: siteshwar

packit_service/events/openscanhub/abstract.py

@@ -9,7 +9,7 @@
 from packit_service.config import ServiceConfig
 from packit_service.models import (
     AbstractProjectObjectDbType,
-    CoprBuildTargetModel,
+    BuildTargetModel,
     OSHScanModel,
     ProjectEventModel,
 )
@@ -33,7 +33,7 @@ def __init__(
         self.commit_sha = commit_sha
 
         self.scan = OSHScanModel.get_by_task_id(task_id)
-        self.build: Optional[CoprBuildTargetModel] = None
+        self.build: Optional[BuildTargetModel] = None
         if not self.scan:
             logger.warning(
                 f"Scan with id {task_id} not found in the database."
@@ -54,7 +54,11 @@ def __init__(
         # and have to be serialized to be later found in the
         # event metadata
         self.commit_sha = project_event.commit_sha if not self.commit_sha else self.commit_sha
-        self.identifier = identifier or self.build.identifier
+        # Shall we check if `self.build` is type of `CoprBuildTargetModel` and assign this?
+        self.identifier = identifier
+
+        if not self.identifier and hasattr(self.build, "identifier"):
+            self.identifier = self.build.identifier
 
     def get_db_project_object(self) -> Optional[AbstractProjectObjectDbType]:
         return self.build.get_project_event_object()

packit_service/models.py

@@ -2045,7 +2045,11 @@ def is_final_state(status: "BuildStatus"):
         return status in {BuildStatus.success, BuildStatus.failure, BuildStatus.error}
 
 
-class CoprBuildTargetModel(GroupAndTargetModelConnector, Base):
+class BuildTargetModel(GroupAndTargetModelConnector, Base):
+    __tablename__ = ""
+
+
+class CoprBuildTargetModel(BuildTargetModel):
     """
     Representation of Copr build for one target.
     """
@@ -2606,7 +2610,7 @@ def create(cls, run_model: "PipelineModel") -> "BodhiUpdateGroupModel":
             return update_group
 
 
-class KojiBuildTargetModel(GroupAndTargetModelConnector, Base):
+class KojiBuildTargetModel(BuildTargetModel):
     """we create an entry for every target"""
 
     __tablename__ = "koji_build_targets"

packit_service/worker/helpers/open_scan_hub.py

@@ -24,8 +24,8 @@
 )
 from packit_service.models import (
     BuildStatus,
+    BuildTargetModel,
     CoprBuildTargetModel,
-    KojiBuildTargetModel,
     OSHScanStatus,
     SRPMBuildModel,
 )
@@ -106,7 +106,7 @@ class CoprOpenScanHubHelper(OpenScanHubHelper):
     def __init__(
         self,
         copr_build_helper: CoprBuildJobHelper,
-        build: CoprBuildTargetModel,
+        build: BuildTargetModel,
     ):
         self.build = build
         self.copr_build_helper = copr_build_helper
@@ -291,7 +291,7 @@ class KojiOpenScanHubHelper(OpenScanHubHelper):
     def __init__(
         self,
         koji_build_helper: KojiBuildJobHelper,
-        build: KojiBuildTargetModel,
+        build: BuildTargetModel,
     ):
         self.build = build
         self.koji_build_helper = koji_build_helper