Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings from drf where min/max values of DecimalField were not instances of Decimal #2476

Merged
merged 1 commit into from
Sep 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions care/facility/models/daily_round.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from decimal import Decimal

from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
from django.db.models import JSONField
Expand Down Expand Up @@ -158,7 +160,7 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(95), MaxValueValidator(106)],
validators=[MinValueValidator(Decimal(95)), MaxValueValidator(Decimal(106))],
)
spo2 = models.DecimalField(
max_digits=4, decimal_places=2, blank=True, null=True, default=None
Expand Down Expand Up @@ -324,7 +326,7 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(0), MaxValueValidator(30)],
validators=[MinValueValidator(Decimal(0)), MaxValueValidator(Decimal(30))],
)
ventilator_pip = models.IntegerField(
default=None,
Expand Down Expand Up @@ -395,7 +397,7 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(0), MaxValueValidator(10)],
validators=[MinValueValidator(Decimal(0)), MaxValueValidator(Decimal(10))],
)
pco2 = models.IntegerField(
default=None,
Expand All @@ -413,7 +415,7 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(5), MaxValueValidator(80)],
validators=[MinValueValidator(Decimal(5)), MaxValueValidator(Decimal(80))],
)
base_excess = models.IntegerField(
default=None,
Expand All @@ -426,23 +428,23 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(0), MaxValueValidator(20)],
validators=[MinValueValidator(Decimal(0)), MaxValueValidator(Decimal(20))],
)
sodium = models.DecimalField(
decimal_places=2,
max_digits=5,
blank=True,
default=None,
null=True,
validators=[MinValueValidator(100), MaxValueValidator(170)],
validators=[MinValueValidator(Decimal(100)), MaxValueValidator(Decimal(170))],
)
potassium = models.DecimalField(
decimal_places=2,
max_digits=4,
blank=True,
default=None,
null=True,
validators=[MinValueValidator(1), MaxValueValidator(10)],
validators=[MinValueValidator(Decimal(1)), MaxValueValidator(Decimal(10))],
)
blood_sugar_level = models.IntegerField(
default=None,
Expand All @@ -455,7 +457,7 @@ class InsulinIntakeFrequencyType(models.IntegerChoices):
blank=True,
default=None,
null=True,
validators=[MinValueValidator(0), MaxValueValidator(100)],
validators=[MinValueValidator(Decimal(0)), MaxValueValidator(Decimal(100))],
)
insulin_intake_frequency = models.IntegerField(
choices=InsulinIntakeFrequencyType.choices,
Expand Down