fixup! test(resources): add testcase for resource queries

Author: sudip-khanal

apps/resources/graphql/types.py

@@ -1,19 +1,7 @@
 import strawberry
 import strawberry_django
 
-<<<<<<< HEAD
-from apps.resources.models import (
-    CaseStudy,
-    ContactRequest,
-)
-||||||| parent of e5fc916 (test(resources): add testcase for resource queries)
-from apps.resources.models import (
-    ContactRequest,
-    CaseStudy,
-)
-=======
 from apps.resources.models import CaseStudy, ContactRequest
->>>>>>> e5fc916 (test(resources): add testcase for resource queries)
 from utils.graphql.types import DjangoFileType
 
 

apps/resources/tests.py

@@ -40,7 +40,7 @@ def setUpClass(cls):
         super().setUpClass()
         cls.user = UserFactory.create(email="test@gmail.com")
 
-    def _create_contact_request_mutation(self, data: dict[str, str], **kwargs):
+    def _create_contact_request_mutation(self, data: dict[str, str], **kwargs: typing.Any):
         return self.query_check(
             query=self.Mutation.CREATE_CONTACT_REQUEST,
             variables={

apps/resources/tests/__init__.py

@@ -1,37 +1,32 @@
-import factory
+# pyright: reportRedeclaration=false
+# pyright: reportIncompatibleVariableOverride=false
+# pyright: reportMissingTypeArgument=false
+import typing
+
+from factory.declarations import SubFactory
 from factory.django import DjangoModelFactory
+
+from apps.tool_picker.models import Catalog, Tool
 from apps.user.factories import UserFactory
-from django.core.files.uploadedfile import SimpleUploadedFile
-from .models import Catalog, Tool
 
-class CatalogFactory(DjangoModelFactory[Catalog]):
-    class Meta:
-        model = Catalog
 
-    name = factory.Sequence(lambda n: f"Catalog {n}")
-    description = factory.Faker("paragraph")
-    show_in_help_me_choose = False
+class CatalogFactory(DjangoModelFactory):
+    class Meta:
+        model: type[Catalog] = Catalog
 
-    created_by = factory.SubFactory(UserFactory)
-    modified_by = factory.SubFactory(UserFactory)
+    created_by = SubFactory(UserFactory)
+    modified_by = SubFactory(UserFactory)
 
 
-class ToolFactory(DjangoModelFactory[Tool]):
+class ToolFactory(DjangoModelFactory):
     class Meta:
-        model = Tool
-
-    catalog = factory.SubFactory(CatalogFactory)
-
-    name = factory.Sequence(lambda n: f"Tool {n}")
-    tagline = factory.Faker("catch_phrase")
-    description = factory.Faker("paragraph")
-
-    video_link = factory.Faker("url")
-    tool_link = factory.Faker("url")
-    logo = SimpleUploadedFile(
-        "logo.png",
-        b"fake-image-content",
-        content_type="image/png",
-    )
-    created_by = factory.SubFactory(UserFactory)
-    modified_by = factory.SubFactory(UserFactory)
+        model: type[Tool] = Tool
+
+    catalog = SubFactory(CatalogFactory)
+    created_by = SubFactory(UserFactory)
+    modified_by = SubFactory(UserFactory)
+
+
+if typing.TYPE_CHECKING:
+    ToolFactory: type[DjangoModelFactory[Tool]]
+    CatalogFactory: type[DjangoModelFactory[Catalog]]

apps/resources/tests/mutation_test.py

@@ -138,6 +138,19 @@ type DjangoFileType {
   url: String!
 }
 
+input IDBaseFilterLookup {
+  """Exact match. Filter will be skipped on `null` value"""
+  exact: ID
+
+  """Assignment test. Filter will be skipped on `null` value"""
+  isNull: Boolean
+
+  """
+  Exact match of items in a given list. Filter will be skipped on `null` value
+  """
+  inList: [ID!]
+}
+
 type Mutation {
   createContactRequest(data: ContactRequestInput!): CreateContactRequestPayload! @isAuthenticated
 }
@@ -279,8 +292,10 @@ type ToolTypeOffsetPaginated {
 
 """Custom user model with email as unique identifier."""
 type UserMeType {
-  email: String!
+  id: ID!
   firstName: String!
   lastName: String!
   displayName: String!
+  anonymizedEmail: String!
+  email: String!
 }