Extend organization analytics contract and fix test warnings
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Failing after 1m42s
CI/CD Pipeline / Run Tests (push) Successful in 1m45s
CI/CD Pipeline / Build Docker Images (push) Has been skipped
CI/CD Pipeline / Push to Gitea Registry (push) Has been skipped
CI/CD Pipeline / Deploy to Server (push) Has been skipped
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Failing after 1m42s
CI/CD Pipeline / Run Tests (push) Successful in 1m45s
CI/CD Pipeline / Build Docker Images (push) Has been skipped
CI/CD Pipeline / Push to Gitea Registry (push) Has been skipped
CI/CD Pipeline / Deploy to Server (push) Has been skipped
This commit is contained in:
@@ -4,6 +4,18 @@ from apps.organization.models import CorporationScope
|
||||
from rest_framework import serializers
|
||||
|
||||
|
||||
class AliasChoiceField(serializers.ChoiceField):
|
||||
def __init__(self, *args, aliases: dict[str, str] | None = None, **kwargs):
|
||||
self.aliases = aliases or {}
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def to_internal_value(self, data):
|
||||
normalized = str(data).strip().lower()
|
||||
if normalized in self.aliases:
|
||||
data = self.aliases[normalized]
|
||||
return super().to_internal_value(data)
|
||||
|
||||
|
||||
class DashboardQuerySerializer(serializers.Serializer):
|
||||
corporation_scope = serializers.ChoiceField(
|
||||
choices=CorporationScope.choices, required=False
|
||||
@@ -51,8 +63,22 @@ class EquipmentQuerySerializer(serializers.Serializer):
|
||||
|
||||
class ProductsQuerySerializer(serializers.Serializer):
|
||||
report_year = serializers.IntegerField(min_value=2000)
|
||||
frequency = serializers.ChoiceField(
|
||||
choices=(("quarterly", "quarterly"), ("annual", "annual"))
|
||||
frequency = AliasChoiceField(
|
||||
choices=(
|
||||
("quarterly", "quarterly"),
|
||||
("annual", "annual"),
|
||||
("semiannual", "semiannual"),
|
||||
("monthly", "monthly"),
|
||||
),
|
||||
aliases={
|
||||
"semi-annual": "semiannual",
|
||||
"half-year": "semiannual",
|
||||
"half_year": "semiannual",
|
||||
"halfyear": "semiannual",
|
||||
"halfyearly": "semiannual",
|
||||
"half_yearly": "semiannual",
|
||||
"month": "monthly",
|
||||
},
|
||||
)
|
||||
price_mode = serializers.ChoiceField(
|
||||
choices=(("actual", "actual"), ("fixed", "fixed"))
|
||||
|
||||
Reference in New Issue
Block a user