Allow using KojiBuildTargetModel with OpenScanHub

... related events.

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

Author: siteshwar

packit_service/events/openscanhub/abstract.py

@@ -2,14 +2,15 @@
 # SPDX-License-Identifier: MIT
 
 from logging import getLogger
-from typing import Optional
+from typing import Optional, Union
 
 from ogr.abstract import GitProject
 
 from packit_service.config import ServiceConfig
 from packit_service.models import (
     AbstractProjectObjectDbType,
     CoprBuildTargetModel,
+    KojiBuildTargetModel,
     OSHScanModel,
     ProjectEventModel,
 )
@@ -33,14 +34,16 @@ def __init__(
         self.commit_sha = commit_sha
 
         self.scan = OSHScanModel.get_by_task_id(task_id)
-        self.build: Optional[CoprBuildTargetModel] = None
+        self.build: Optional[Union[CoprBuildTargetModel, KojiBuildTargetModel]] = None
         if not self.scan:
             logger.warning(
                 f"Scan with id {task_id} not found in the database."
                 " It should have been created when receiving the CoprBuildEndEvent"
                 " and should have been associated with the copr build.",
             )
             return
+
+        # TODO: How to handle koji builds here?
         self.build = self.scan.copr_build_target
         if not self.build:
             logger.warning(
@@ -54,7 +57,9 @@ 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
+        self.identifier = identifier
+        if not self.identifier and isinstance(self.build, CoprBuildTargetModel):
+            self.identifier = self.build.identifier
 
     def get_db_project_object(self) -> Optional[AbstractProjectObjectDbType]:
         return self.build.get_project_event_object()

packit_service/worker/handlers/open_scan_hub.py

@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: MIT
 import json
 import logging
-from typing import Optional, Union
+from typing import Optional, Union, cast
 
 import requests
 from packit.config import (
     JobType,
 )
 
 from packit_service.events import openscanhub
-from packit_service.models import OSHScanStatus
+from packit_service.models import CoprBuildTargetModel, KojiBuildTargetModel, OSHScanStatus
 from packit_service.service.urls import get_openscanhub_info_url
 from packit_service.worker.checker.abstract import Checker
 from packit_service.worker.checker.open_scan_hub import IsEventForJob, RawhideX86Target
@@ -87,7 +87,7 @@ def get_helper(self) -> CoprOpenScanHubHelper:
 
         return CoprOpenScanHubHelper(
             copr_build_helper=build_helper,
-            build=self.event.build,
+            build=cast(CoprBuildTargetModel, self.event.build),
         )
 
     def check_scan_and_build(self):
@@ -247,7 +247,7 @@ def get_helper(self) -> KojiOpenScanHubHelper:
 
         return KojiOpenScanHubHelper(
             koji_build_helper=build_helper,
-            build=self.event.build,
+            build=cast(KojiBuildTargetModel, self.event.build),
         )
 
     def check_scan_and_build(self):