typed: minor update

Author: freemindcore

easy/domain/orm.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Tuple
+from typing import Any, Tuple, Type
 
 from django.db import models
 from django.db.models.query import QuerySet
@@ -12,7 +12,7 @@
 
 
 class CrudModel(object):
-    def __init__(self, model: models.Model):
+    def __init__(self, model: Type[models.Model]):
         self.model = model
 
     def __get_fields(self, payload: dict) -> Tuple[dict, dict]:

easy/services/base.py

@@ -1,9 +1,8 @@
 import logging
-from typing import Optional, Type
+from typing import Type
 
 from django.db import models
 
-from easy.domain import BaseDomain
 from easy.services.crud import CrudService
 from easy.services.permission import PermissionService
 
@@ -13,12 +12,7 @@
 class BaseService(CrudService, PermissionService):
     def __init__(
         self,
-        model: models.Model,
-        biz: Optional[Type[BaseDomain]] = None,
+        model: Type[models.Model],
     ):
-        self.biz = biz
-        if self.biz:
-            self.model = self.biz.model
-        else:
-            self.model = model
+        self.model = model
         super().__init__(model=self.model)

easy/services/crud.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any
+from typing import Any, Type
 
 from asgiref.sync import sync_to_async
 from django.db import models
@@ -10,7 +10,7 @@
 
 
 class CrudService(CrudModel):
-    def __init__(self, model: models.Model):
+    def __init__(self, model: Type[models.Model]):
         super().__init__(model)
         self.model = model