Merge branch 'export-corpus-id' into 'master'

Add corpus_id in workflow environment

Closes #702

See merge request !1300

arkindex/dataimport/models.py

@@ -323,6 +323,9 @@ class DataImport(IndexableModel):
         elif settings.IMPORTS_WORKER_VERSION and self.mode in (DataImportMode.Images, DataImportMode.PDF):
             recipe['env']['WORKER_VERSION_ID'] = str(settings.IMPORTS_WORKER_VERSION)
 
+        if self.corpus:
+            recipe['env']['ARKINDEX_CORPUS_ID'] = str(self.corpus.id)
+
         # Use the default Ponos farm if no farm is specified
         farm_id = farm and farm.id or get_default_farm_id()
 

arkindex/dataimport/tests/test_imports.py

@@ -1098,6 +1098,7 @@ class TestImports(FixtureAPITestCase):
             'env': {
                 'ARKINDEX_API_TOKEN': 'testToken',
                 'ARKINDEX_PROCESS_ID': str(dataimport.id),
+                'ARKINDEX_CORPUS_ID': str(self.corpus.id),
                 'WORKER_VERSION_ID': str(settings.IMPORTS_WORKER_VERSION)
             },
             'tasks': {

arkindex/dataimport/tests/test_transkribus_import.py

@@ -108,6 +108,7 @@ class TestTranskribusImport(FixtureAPITestCase):
         self.assertDictEqual(recipe, {
             'env': {
                 'ARKINDEX_PROCESS_ID': str(dataimport.id),
+                'ARKINDEX_CORPUS_ID': str(corpus.id),
                 'TRANSKRIBUS_EMAIL': settings.TRANSKRIBUS_EMAIL,
                 'TRANSKRIBUS_PASSWORD': settings.TRANSKRIBUS_PASSWORD,
                 'TRANSKRIBUS_WORKER_VERSION': settings.TRANSKRIBUS_WORKER_VERSION
@@ -166,6 +167,7 @@ class TestTranskribusImport(FixtureAPITestCase):
         self.assertDictEqual(recipe, {
             'env': {
                 'ARKINDEX_PROCESS_ID': str(dataimport.id),
+                'ARKINDEX_CORPUS_ID': str(corpus.id),
                 'TRANSKRIBUS_EMAIL': settings.TRANSKRIBUS_EMAIL,
                 'TRANSKRIBUS_PASSWORD': settings.TRANSKRIBUS_PASSWORD,
                 'TRANSKRIBUS_WORKER_VERSION': settings.TRANSKRIBUS_WORKER_VERSION