refactored processing steps

open-contracting · Aug 12, 2021 · d7a984b · d7a984b
1 parent ae307ba
commit d7a984b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/process/management/commands/compiler.py b/process/management/commands/compiler.py
@@ -113,9 +113,10 @@ def _publish_releases(self, connection, channel, collection):
                 message = {
                     "ocid": item["ocid"],
                     "collection_id": collection.id,
+                    "compiled_collection_id": compiled_collection.id,
                 }
 
-                self._createStep(ProcessingStep.Types.COMPILE, collection_id=collection.id, ocid=item["ocid"])
+                self._createStep(ProcessingStep.Types.COMPILE, collection_id=compiled_collection.id, ocid=item["ocid"])
                 self._publish_async(connection, channel, json.dumps(message), "compiler_release")
         except Collection.DoesNotExist:
             self._warning(
@@ -148,9 +149,10 @@ def _publish_records(self, connection, channel, collection_file):
             message = {
                 "ocid": item["ocid"],
                 "collection_id": collection_file.collection.id,
+                "compiled_collection_id": compiled_collection.id,
             }
 
             self._createStep(ProcessingStep.Types.COMPILE,
-                             collection_id=collection_file.collection.id,
+                             collection_id=compiled_collection.id,
                              ocid=item["ocid"])
             self._publish_async(connection, channel, json.dumps(message), "compiler_record")
diff --git a/process/management/commands/finisher.py b/process/management/commands/finisher.py
@@ -43,7 +43,7 @@ def process(self, connection, channel, delivery_tag, body):
                     collection.save()
                     self._debug("Processing of collection_id: {} finished. Set as completed.".format(collection_id))
                 else:
-                    self._debug("Processing of collection_id: {} not finished yet".format(collection_id))
+                    self._debug("Processing of collection_id: {} not completable".format(collection_id))
 
         except Exception:
             self._exception("Something went wrong when processing {}".format(body))

diff --git a/process/management/commands/record_compiler.py b/process/management/commands/record_compiler.py
@@ -34,14 +34,13 @@ def process(self, connection, channel, delivery_tag, body):
 
             ocid = input_message["ocid"]
             collection_id = input_message["collection_id"]
+            compiled_collection_id = input_message["compiled_collection_id"]
 
             with transaction.atomic():
                 self._info("Compiling record collection_id: {} ocid: {}".format(collection_id, ocid))
                 release = compile_record(collection_id, ocid)
 
-            self._deleteStep(ProcessingStep.Types.COMPILE, collection_id=collection_id, ocid=ocid)
-
-            compiled_collection = Collection.objects.get(id=input_message["collection_id"]).get_compiled_collection()
+            self._deleteStep(ProcessingStep.Types.COMPILE, collection_id=compiled_collection_id, ocid=ocid)
 
             release_id = None
 
@@ -52,7 +51,7 @@ def process(self, connection, channel, delivery_tag, body):
             message = {
                 "ocid": ocid,
                 "compiled_release_id": release_id,
-                "collection_id": compiled_collection.id,
+                "collection_id": compiled_collection_id,
             }
 
             self._publish_async(connection, channel, json.dumps(message))

diff --git a/process/management/commands/release_compiler.py b/process/management/commands/release_compiler.py
@@ -33,18 +33,19 @@ def process(self, connection, channel, delivery_tag, body):
 
             ocid = input_message["ocid"]
             collection_id = input_message["collection_id"]
+            compiled_collection_id = input_message["compiled_collection_id"]
 
             with transaction.atomic():
                 self._info("Compiling release collection_id: {} ocid: {}".format(collection_id, ocid))
                 release = compile_release(collection_id, ocid)
 
-            self._deleteStep(ProcessingStep.Types.COMPILE, collection_id=collection_id, ocid=ocid)
+            self._deleteStep(ProcessingStep.Types.COMPILE, collection_id=compiled_collection_id, ocid=ocid)
 
             # publish message about processed item
             message = {
                 "ocid": ocid,
                 "compiled_release_id": release.pk,
-                "collection_id": release.collection.id,
+                "collection_id": compiled_collection_id,
             }
 
             self._publish_async(connection, channel, json.dumps(message))