fix: type hints

ocadotechnology · Jan 15, 2025 · 6efdffa · 6efdffa
1 parent cc0dd32
commit 6efdffa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/codeforlife/serializers/model_list.py b/codeforlife/serializers/model_list.py
@@ -68,14 +68,10 @@ def non_none_instance(self):
         """Casts the instance to not None."""
         return t.cast(t.List[AnyModel], self.instance)
 
-    @classmethod
-    def get_model_class(cls) -> t.Type[AnyModel]:
-        """Get the model view set's class.
-
-        Returns:
-            The model view set's class.
-        """
-        return get_arg(cls, 0)
+    @property
+    def model_class(self) -> t.Type[AnyModel]:
+        """Shorthand to model class."""
+        return self.view.model_class
 
     def __init__(self, *args, **kwargs):
         instance = args[0] if args else kwargs.pop("instance", None)
@@ -95,9 +91,8 @@ def create(self, validated_data: t.List[DataDict]) -> t.List[AnyModel]:
         Returns:
             The models.
         """
-        model_class = self.get_model_class()
-        return model_class.objects.bulk_create(  # type: ignore[attr-defined]
-            objs=[model_class(**data) for data in validated_data],
+        return self.model_class.objects.bulk_create(  # type: ignore[attr-defined]
+            objs=[self.model_class(**data) for data in validated_data],
             batch_size=self.batch_size,
         )
 
@@ -122,8 +117,7 @@ def update(
             for field, value in data.items():
                 setattr(model, field, value)
 
-        model_class = self.get_model_class()
-        model_class.objects.bulk_update(  # type: ignore[attr-defined]
+        self.model_class.objects.bulk_update(  # type: ignore[attr-defined]
             objs=instance,
             fields={field for data in validated_data for field in data.keys()},
             batch_size=self.batch_size,

diff --git a/codeforlife/tests/model_view_set.py b/codeforlife/tests/model_view_set.py
@@ -54,7 +54,7 @@ class BaseModelViewSetTestCase(
 
     @property
     def model_class(self) -> t.Type[AnyModel]:
-        """Shorthand to request-user class."""
+        """Shorthand to model class."""
         return self.model_view_set_class.model_class
 
     @property

diff --git a/codeforlife/views/model.py b/codeforlife/views/model.py
@@ -98,18 +98,16 @@ class Meta:
                 # pylint: disable-next=import-outside-toplevel
                 from ..serializers import ModelListSerializer
 
-                model_class = self.get_model_class()
-
-                # pylint: disable-next=too-few-public-methods
-                class _ModelListSerializer(
-                    ModelListSerializer[
-                        RequestUser, model_class  # type: ignore[valid-type]
-                    ]
-                ):
-                    pass
-
+                # TODO: delete this
+                # # pylint: disable-next=too-few-public-methods
+                # class _ModelListSerializer(
+                #     ModelListSerializer[
+                #         RequestUser, self.model_class  # type: ignore[valid-type]
+                #     ]
+                # ):
+                #     pass
                 # Set list_serializer_class to default if not set.
-                setattr(meta, "list_serializer_class", _ModelListSerializer)
+                setattr(meta, "list_serializer_class", ModelListSerializer)
 
                 # Get default list_serializer_class.
                 serializer = super().get_serializer(*args, **kwargs)