can't add dataclass cuz of importerrors((((

Author: sh1nkey

project_rates/constants.py

@@ -1,31 +1,21 @@
 from typing import Literal
 from dataclasses import dataclass
 
-from django.db.models import QuerySet
 from rest_framework.generics import ListAPIView
 
-from project_rates.models import Criteria, ProjectScore
-from projects.models import Project
 from users.models import CustomUser
 
+NumericTypes: list[str] = ["int", "float"]
+
+ValidatableTypesNames = Literal[*NumericTypes, "bool", "str"]
+
 VERBOSE_TYPES = (
     ("str", "Текст"),
     ("int", "Целочисленное число"),
     ("float", "Число с плавающей точкой"),
     ("bool", "Да или нет"),
 )
 
-NumericTypes: list[str] = ["int", "float"]
-
-ValidatableTypesNames = Literal[*NumericTypes, "bool", "str"]
-
-
-@dataclass(frozen=True)
-class RatesQuerySets:
-    criterias_queryset: QuerySet[Criteria]
-    scores_queryset: QuerySet[ProjectScore]
-    projects_queryset: QuerySet[Project]
-
 
 @dataclass
 class RatesRequestData:

project_rates/models.py

@@ -1,9 +1,9 @@
 from django.contrib.auth import get_user_model
 from django.db import models
+from .constants import VERBOSE_TYPES
 
 from partner_programs.models import PartnerProgram
 from projects.models import Project
-from .constants import VERBOSE_TYPES
 from .validators import ProjectScoreValidator
 
 User = get_user_model()

project_rates/services.py

@@ -1,6 +1,5 @@
-from django.db.models import Count, Q
+from django.db.models import Count, Q, QuerySet
 
-from project_rates.constants import RatesQuerySets
 from project_rates.models import Criteria, ProjectScore
 from project_rates.serializers import (
     CriteriaSerializer,
@@ -10,7 +9,7 @@
 from projects.models import Project
 
 
-def get_querysets(RatesRequestData) -> RatesQuerySets:
+def get_querysets(RatesRequestData) -> dict[str, QuerySet]:
     program_id = RatesRequestData.program_id
     project_id = RatesRequestData.project_id
     user = RatesRequestData.user
@@ -38,17 +37,19 @@ def get_querysets(RatesRequestData) -> RatesQuerySets:
     if not project_id:
         projects = RatesRequestData.view.paginate_queryset(projects)
 
-    return RatesQuerySets(
-        criterias_queryset=criterias, scores_queryset=scores, projects_queryset=projects
-    )
+    return {
+        "criterias_queryset": criterias,
+        "scores_queryset": scores,
+        "projects_queryset": projects,
+    }
 
 
-def serialize_project_criterias(querysets: RatesQuerySets) -> list[dict]:
-    criteria_serializer = CriteriaSerializer(querysets.criterias_queryset, many=True)
-    scores_serializer = ProjectScoreSerializer(querysets.scores_queryset, many=True)
+def serialize_project_criterias(querysets: dict[str, QuerySet]) -> list[dict]:
+    criteria_serializer = CriteriaSerializer(querysets["criterias_queryset"], many=True)
+    scores_serializer = ProjectScoreSerializer(querysets["scores_queryset"], many=True)
 
     projects_serializer = ProjectScoreGetSerializer(
-        querysets.projects_queryset,
+        querysets["projects_queryset"],
         context={
             "data_criterias": criteria_serializer.data,
             "data_scores": scores_serializer.data,

project_rates/views.py

@@ -1,9 +1,10 @@
 from django.contrib.auth import get_user_model
+from django.db.models import QuerySet
 
 from rest_framework import generics, status
 from rest_framework.response import Response
 
-from project_rates.constants import RatesQuerySets, RatesRequestData
+from project_rates.constants import RatesRequestData
 from project_rates.services import (
     get_querysets,
     serialize_project_criterias,
@@ -76,7 +77,7 @@ def get_request_data(self) -> RatesRequestData:
             scored=scored,
         )
 
-    def get_querysets_dict(self) -> RatesQuerySets:
+    def get_querysets_dict(self) -> dict[str, QuerySet]:
         return get_querysets(self.get_request_data())
 
     def serialize_querysets(self) -> list[dict]: