Merge pull request #1396 from the-deep/fix/test-fail

Mock DeepL in assisted_tagging test
the-deep · Dec 21, 2023 · e4b60d0 · e4b60d0
2 parents d98368a + 04fda4e
commit e4b60d0
Show file tree

Hide file tree

Showing 5 changed files with 370 additions and 61 deletions.
diff --git a/apps/analysis/dataloaders.py b/apps/analysis/dataloaders.py
@@ -138,7 +138,7 @@ class AnalysisTopicModelClusterEntryLoader(DataLoaderWithContext):
     def batch_load_fn(self, keys):
         qs = TopicModelCluster.entries.through.objects.filter(
             topicmodelcluster__in=keys,
-        ).select_related('entry').order_by('topicmodelcluster', 'entry')
+        ).select_related('entry').order_by('topicmodelcluster', 'entry_id')
         _map = defaultdict(list)
         for cluster_entry in qs:
             _map[cluster_entry.topicmodelcluster_id].append(cluster_entry.entry)

diff --git a/apps/assisted_tagging/tasks.py b/apps/assisted_tagging/tasks.py
@@ -41,7 +41,7 @@ def _get_existing_tags_by_tagid():
         assisted_tag.group = tag_meta.get('group')
         assisted_tag.is_category = tag_meta['is_category']
         assisted_tag.hide_in_analysis_framework_mapping = tag_meta['hide_in_analysis_framework_mapping']
-        if assisted_tag.id:
+        if assisted_tag.pk:
             updated_tags.append(assisted_tag)
         else:
             assisted_tag.tag_id = tag_id
@@ -54,8 +54,8 @@ def _get_existing_tags_by_tagid():
             updated_tags,
             fields=(
                 'name',
-                'is_category',
                 'group',
+                'is_category',
                 'hide_in_analysis_framework_mapping',
             )
         )