Fix content type cache issue in test

apps/notification/dataloaders.py

@@ -1,4 +1,5 @@
 from django.utils.functional import cached_property
+from django.db import models
 
 from promise import Promise
 
@@ -9,6 +10,10 @@
 from utils.graphene.dataloaders import DataLoaderWithContext, WithContextMixin
 
 
+def get_model_name(model: models.Model) -> str:
+    return model._meta.model_name
+
+
 class AssignmentLoader(DataLoaderWithContext):
     def batch_load_fn(self, keys):
         assignment_qs = list(
@@ -21,10 +26,9 @@ def batch_load_fn(self, keys):
         entry_review_comment_id = []
 
         for _, content_type, object_id in assignment_qs:
-            # TODO use dict map function
-            if content_type == Lead._meta.model_name:
+            if content_type == get_model_name(Lead):
                 leads_id.append(object_id)
-            elif content_type == EntryReviewComment._meta.model_name:
+            elif content_type == get_model_name(EntryReviewComment):
                 entry_review_comment_id.append(object_id)
 
         _lead_id_map = {}
@@ -37,31 +41,33 @@ def batch_load_fn(self, keys):
 
         _entry_review_comment_id_map = {}
 
-        for _id, text, entry_id, entry_excerpt, lead_id in EntryReviewComment.objects.filter(
+        for _id, entry_id, lead_id in EntryReviewComment.objects.filter(
             id__in=entry_review_comment_id).values_list(
                 'id',
-                'comment_texts__text',
                 'entry__id',
-                'entry__excerpt',
                 'entry__lead_id'
         ):
             _entry_review_comment_id_map[_id] = dict(
                 id=_id,
-                text=text,
                 entry_id=entry_id,
-                entry_excerpt=entry_excerpt,
                 lead_id=lead_id
             )
 
         _result = {
             _id: {
                 'content_type': content_type,
-                'lead': _lead_id_map.get(object_id) if content_type == Lead._meta.model else None,
-                'entry_review_comment':
-                _entry_review_comment_id_map.get(object_id) if content_type == EntryReviewComment._meta.model else None,
+                'lead': (
+                    _lead_id_map.get(object_id)
+                    if content_type == get_model_name(Lead) else None
+                ),
+                'entry_review_comment': (
+                    _entry_review_comment_id_map.get(object_id)
+                    if content_type == get_model_name(EntryReviewComment) else None
+                ),
             }
             for _id, content_type, object_id in assignment_qs
         }
+
         return Promise.resolve([_result[key] for key in keys])
 
 

apps/notification/models.py

@@ -88,6 +88,9 @@ class Meta:
 
     @staticmethod
     def get_for(user):
+        from entry.models import EntryComment
         return Assignment.objects.filter(
             created_for=user,
-        ).distinct()
+        ).exclude(
+            content_type__model=EntryComment._meta.model_name
+        )  # The EntryComment assignment are excluded need to remove later

apps/notification/schema.py

@@ -76,6 +76,7 @@ class Meta:
     project = graphene.Field(AssignmentProjectDetailType)
     content_data = graphene.Field(AssignmentContentDataType)
 
+    @staticmethod
     def resolve_content_data(root, info):
         return info.context.dl.notification.assignment.load(root.pk)
 

apps/notification/tests/test_apis.py

@@ -506,13 +506,15 @@ def test_assignment_create_on_entry_comment_assignee_change(self):
         assert data['count'] == 1  # assignment for user2
 
     def test_assignment_is_done(self):
+        # XXX: To avoid using content type cache from pre-tests
+        ContentType.objects.clear_cache()
+
         project = self.create(Project)
         user1 = self.create(User)
         user2 = self.create(User)
         lead = self.create(Lead, project=project)
         kwargs = {
-            'object_id': lead.id,
-            'content_type': ContentType.objects.get_for_model(Lead),
+            'content_object': lead,
             'project': project,
             'created_for': user1,
             'created_by': user2,

apps/notification/tests/test_mutation.py

@@ -94,7 +94,7 @@ def test_individual_assignment_update_status(self):
                     ok
                     errors
                     result{
-                        id,
+                        id
                         isDone
                     }
                 }

apps/notification/tests/test_schemas.py

@@ -2,16 +2,16 @@
 import pytz
 
 from django.contrib.contenttypes.models import ContentType
+
 from utils.graphene.tests import GraphQLTestCase
-from lead.models import Lead
-from notification.models import Assignment, Notification
-from quality_assurance.models import EntryReviewComment
+from notification.models import Notification
 
 from user.factories import UserFactory
 from project.factories import ProjectFactory
 from notification.factories import AssignmentFactory, NotificationFactory
 from lead.factories import LeadFactory
-from entry.factories import EntryCommentFactory, EntryFactory
+from entry.factories import EntryFactory
+from quality_assurance.factories import EntryReviewCommentFactory
 from analysis_framework.factories import AnalysisFrameworkFactory
 
 
@@ -230,7 +230,11 @@ def test_assignments_query(self):
               totalCount
             }
           }
-'''
+        '''
+
+        # XXX: To avoid using content type cache from pre-tests
+        ContentType.objects.clear_cache()
+
         project = ProjectFactory.create()
         user = UserFactory.create()
         another = UserFactory.create()
@@ -240,17 +244,16 @@ def test_assignments_query(self):
             analysis_framework=af,
             lead=lead
         )
-        entry_comment = EntryCommentFactory.create(
+        entry_comment = EntryReviewCommentFactory.create(
             entry=entry,
             created_by=user
         )
-        Assignment.objects.all().delete()
+
         AssignmentFactory.create_batch(
             3,
             project=project,
-            object_id=lead.id,
-            content_type=ContentType.objects.get_for_model(Lead),
-            created_for=user
+            content_object=lead,
+            created_for=user,
         )
 
         def _query_check(**kwargs):
@@ -271,28 +274,27 @@ def _query_check(**kwargs):
         AssignmentFactory.create_batch(
             3,
             project=project,
-            object_id=entry_comment.id,
-            content_type=ContentType.objects.get_for_model(EntryReviewComment),
+            content_object=entry_comment,
             created_for=user
         )
         content = _query_check()
         self.assertEqual(content['data']['assignments']['totalCount'], 6)
 
     def test_assignments_with_filter_query(self):
         query = '''
-            query MyQuery (
-            $isDone : Boolean,
-        ){
-         assignments(
-            isDone: $isDone,
-        ){
-          totalCount
-          results{
-            id
-        }
-        }
+        query MyQuery($isDone: Boolean) {
+          assignments(isDone: $isDone) {
+            totalCount
+            results {
+              id
+            }
+          }
         }
         '''
+
+        # XXX: To avoid using content type cache from pre-tests
+        ContentType.objects.clear_cache()
+
         project = ProjectFactory.create()
         user = UserFactory.create()
         lead = LeadFactory.create()
@@ -301,24 +303,22 @@ def test_assignments_with_filter_query(self):
             analysis_framework=af,
             lead=lead
         )
-        entry_comment = EntryCommentFactory.create(
+        entry_comment = EntryReviewCommentFactory.create(
             entry=entry,
             created_by=user
         )
-        Assignment.objects.all().delete()
+
         AssignmentFactory.create_batch(
             3,
             project=project,
-            object_id=lead.id,
-            content_type=ContentType.objects.get_for_model(Lead),
+            content_object=lead,
             created_for=user,
             is_done=False
         )
         AssignmentFactory.create_batch(
             5,
             project=project,
-            object_id=entry_comment.id,
-            content_type=ContentType.objects.get_for_model(EntryReviewComment),
+            content_object=entry_comment,
             created_for=user,
             is_done=True
         )