From 47929828d0ae18b3a3e160f4b352d6653db3b54e Mon Sep 17 00:00:00 2001
From: Lubos Mjachky <lmjachky@redhat.com>
Date: Tue, 29 Aug 2023 11:59:42 +0200
Subject: [PATCH] Download existing refs to the workdir when generating
 summaries

closes #277
---
 CHANGES/277.bugfix                 |  1 +
 pulp_ostree/app/tasks/importing.py | 34 +++++++++++++++++++++++++++---
 requirements.txt                   |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 CHANGES/277.bugfix

diff --git a/CHANGES/277.bugfix b/CHANGES/277.bugfix
new file mode 100644
index 00000000..c75ccf7e
--- /dev/null
+++ b/CHANGES/277.bugfix
@@ -0,0 +1 @@
+Fixed a bug that led to ignoring already imported refs in a repository when generating a summary.
diff --git a/pulp_ostree/app/tasks/importing.py b/pulp_ostree/app/tasks/importing.py
index fad830aa..7accbc65 100644
--- a/pulp_ostree/app/tasks/importing.py
+++ b/pulp_ostree/app/tasks/importing.py
@@ -3,6 +3,8 @@
 
 from gettext import gettext
 
+from asgiref.sync import sync_to_async
+
 from pulpcore.plugin.models import Artifact, Repository, ProgressReport
 from pulpcore.plugin.stages import (
     ArtifactSaver,
@@ -16,7 +18,9 @@
 
 from pulp_ostree.app.models import (
     OstreeCommit,
+    OstreeRef,
     OstreeConfig,
+    OstreeObject,
     OstreeObjectType,
     OstreeSummary,
 )
@@ -44,7 +48,9 @@ def import_all_refs_and_commits(artifact_pk, repository_pk, repository_name):
     tarball_artifact = Artifact.objects.get(pk=artifact_pk)
     repository = Repository.objects.get(pk=repository_pk)
     compute_delta = repository.cast().compute_delta
-    first_stage = OstreeImportAllRefsFirstStage(tarball_artifact, repository_name, compute_delta)
+    first_stage = OstreeImportAllRefsFirstStage(
+        tarball_artifact, repository_name, compute_delta, repository
+    )
     dv = OstreeImportDeclarativeVersion(first_stage, repository)
     return dv.create()
 
@@ -224,9 +230,19 @@ async def run(self):
                 _, refs = self.repo.list_refs()
                 for name, ref_commit_checksum in refs.items():
                     if self.ref == name:
-                        parent_checksum, last_commit_dc = await self.parse_ref(
+                        parsed_result = await self.parse_ref(
                             name, ref_commit_checksum, has_referenced_parent=True
                         )
+                        if parsed_result is None:
+                            raise ValueError(
+                                gettext(
+                                    "The provided ref does not exist in the repository yet. "
+                                    "Try importing first the whole repository, then additional "
+                                    "commits."
+                                )
+                            )
+
+                        parent_checksum, last_commit_dc = parsed_result
                         break
 
                 if last_commit_dc is None:
@@ -277,11 +293,12 @@ class OstreeImportAllRefsFirstStage(
 ):
     """A first stage of the OSTree importing pipeline that handles creation of content units."""
 
-    def __init__(self, tarball_artifact, repo_name, compute_delta):
+    def __init__(self, tarball_artifact, repo_name, compute_delta, repository):
         """Initialize class variables used for parsing OSTree objects."""
         super().__init__(repo_name)
         self.tarball_artifact = tarball_artifact
         self.compute_delta = compute_delta
+        self.repository = repository
 
         self.create_object_dc_func = self.create_dc
 
@@ -326,6 +343,17 @@ async def run(self):
 
             await self.submit_ref_objects()
 
+            latest_version = await self.repository.alatest_version()
+            refs = await sync_to_async(latest_version.get_content)(OstreeRef.objects)
+            async for ref in refs:
+                # consider already uploaded refs to correctly regenerate the summary
+                file_path = os.path.join(self.repo_path, "refs", "heads", ref.name)
+                ref_file = await ref._artifacts.aget()
+                copy_to_local_storage(ref_file.file, file_path)
+
+                commit = await OstreeCommit.objects.aget(refs_commit=ref)
+                await self.copy_from_storage_to_tmp(commit, OstreeObject.objects.none())
+
             self.repo.regenerate_summary()
             await self.submit_metafile_object("summary", OstreeSummary())
 
diff --git a/requirements.txt b/requirements.txt
index f70c9139..d1e52595 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-pulpcore>=3.25.0,<3.40
+pulpcore>=3.29.0,<3.40
 PyGObject~=3.40.1