Skip to content

Commit

Permalink
Remove duplicated code
Browse files Browse the repository at this point in the history
Signed-off-by: Nikola Forró <[email protected]>
  • Loading branch information
nforro committed Jul 31, 2024
1 parent 1051a3e commit 04237d7
Showing 1 changed file with 22 additions and 34 deletions.
56 changes: 22 additions & 34 deletions packit_service/worker/handlers/mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,31 +235,33 @@ class GetKojiBuildDataFromKojiService(Config, GetKojiBuildData):
_koji_helper: Optional[KojiHelper] = None

@property
def koji_helper(self):
def koji_helper(self) -> KojiHelper:
if not self._koji_helper:
self._koji_helper = KojiHelper()
return self._koji_helper

def _get_latest_build(self) -> dict:
if not (
candidate_tag := self.koji_helper.get_candidate_tag(self._dist_git_branch)
):
raise PackitException(
f"Failed to get candidate tag for {self._dist_git_branch}"
)
build = self.koji_helper.get_latest_build_in_tag(
package=self.project.repo,
tag=candidate_tag,
)
if not build:
raise PackitException(
f"No build found for package={self.project.repo} "
f"and branch={self._dist_git_branch}"
)
return build

@property
def build(self):
def build(self) -> dict:
if not self._build:
if not (
candidate_tag := self.koji_helper.get_candidate_tag(
self._dist_git_branch
)
):
raise PackitException(
f"Failed to get candidate tag for {self._dist_git_branch}"
)
self._build = self.koji_helper.get_latest_build_in_tag(
package=self.project.repo,
tag=candidate_tag,
)
if not self._build:
raise PackitException(
f"No build found for package={self.project.repo} "
f"and tag={self._dist_git_branch}"
)
self._build = self._get_latest_build()
return self._build

@property
Expand Down Expand Up @@ -301,21 +303,7 @@ def _dist_git_branch(self) -> str:
@property
def build(self):
# call it every time since dist_git_branch reference can change
if not (
candidate_tag := self.koji_helper.get_candidate_tag(self._dist_git_branch)
):
raise PackitException(
f"Failed to get candidate tag for {self._dist_git_branch}"
)
build = self.koji_helper.get_latest_build_in_tag(
package=self.project.repo,
tag=candidate_tag,
)
if not build:
raise PackitException(
f"No build found for package={self.project.repo} and tag={self._dist_git_branch}"
)
return build
return self._get_latest_build()

@property
def num_of_branches(self):
Expand Down

0 comments on commit 04237d7

Please sign in to comment.