import_lookup_values | only queue populate indexes job when created

OpenConceptLab · Aug 21, 2020 · 8aaed24 · 8aaed24
1 parent 1c20c9f
commit 8aaed24
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/core/common/management/commands/import_lookup_values.py b/core/common/management/commands/import_lookup_values.py
@@ -19,45 +19,45 @@ def handle(self, *args, **options):
         settings.ELASTICSEARCH_DSL_AUTO_REFRESH = False
         settings.ELASTICSEARCH_DSL_AUTOSYNC = False
         settings.ES_SYNC = False
-        try:
-            user = UserProfile.objects.filter(username='ocladmin').get()
-            org = Organization.objects.get(mnemonic='OCL')
-            sources = self.create_sources(org, user)
+        user = UserProfile.objects.filter(username='ocladmin').get()
+        org = Organization.objects.get(mnemonic='OCL')
+        sources = self.create_sources(org, user)
+        created = False
 
-            current_path = os.path.dirname(__file__)
-            importer_confs = [
-                dict(
-                    source=sources['Classes'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/concept_classes.json")
-                ),
-                dict(
-                    source=sources['Locales'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/locales.json")
-                ),
-                dict(
-                    source=sources['Datatypes'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/datatypes_fixed.json")
-                ),
-                dict(
-                    source=sources['NameTypes'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/nametypes_fixed.json")
-                ),
-                dict(
-                    source=sources['DescriptionTypes'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/description_types.json")
-                ),
-                dict(
-                    source=sources['MapTypes'],
-                    file=os.path.join(current_path, "../../../lookup_fixtures/maptypes_fixed.json")
-                ),
-            ]
+        current_path = os.path.dirname(__file__)
+        importer_confs = [
+            dict(
+                source=sources['Classes'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/concept_classes.json")
+            ),
+            dict(
+                source=sources['Locales'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/locales.json")
+            ),
+            dict(
+                source=sources['Datatypes'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/datatypes_fixed.json")
+            ),
+            dict(
+                source=sources['NameTypes'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/nametypes_fixed.json")
+            ),
+            dict(
+                source=sources['DescriptionTypes'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/description_types.json")
+            ),
+            dict(
+                source=sources['MapTypes'],
+                file=os.path.join(current_path, "../../../lookup_fixtures/maptypes_fixed.json")
+            ),
+        ]
 
-            for conf in importer_confs:
-                source = conf['source']
-                self.create_concepts(source, conf['file'], user)
-        except:  # pylint: disable=bare-except
-            pass
-        finally:
+        results = []
+        for conf in importer_confs:
+            source = conf['source']
+            results.append(self.create_concepts(source, conf['file'], user))
+
+        if any(results):
             populate_indexes.delay(['sources', 'concepts'])
 
     @staticmethod
@@ -94,3 +94,4 @@ def create_concepts(source, file, user):
                 data['name'] = mnemonic
                 data['parent'] = source
                 Concept.persist_new(data, user, False)
+                return True