Cleanup old ResponseSet model

Author: Themitchell

lung_cancer_screening/questions/migrations/0020_responseset_user_and_more.py

@@ -28,6 +28,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='responseset',
             name='respiratory_conditions',
-            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(choices=[('P', 'Pneumonia'), ('E', 'Emphysema'), ('B', 'Bronchitis'), ('T', 'Tuberculosis (TB)'), ('C', 'Chronic obstructive pulmonary disease (COPD)'), ('N', 'No, I have not had any of these respiratory conditions')], max_length=1), blank=True, null=True, size=None, validators=[lung_cancer_screening.questions.models.response_set.validate_singleton_option]),
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(choices=[('P', 'Pneumonia'), ('E', 'Emphysema'), ('B', 'Bronchitis'), ('T', 'Tuberculosis (TB)'), ('C', 'Chronic obstructive pulmonary disease (COPD)'), ('N', 'No, I have not had any of these respiratory conditions')], max_length=1), blank=True, null=True, size=None, validators=[lung_cancer_screening.questions.models.respiratory_conditions_response.validate_singleton_option]),
         ),
     ]

lung_cancer_screening/questions/models/base.py

@@ -1,13 +1,33 @@
 from django.db import models
 
 
+class BaseQuerySet(models.QuerySet):
+    def get_or_build(self, **kwargs):
+        """
+        Get an existing object matching the kwargs, or build a new unsaved instance.
+        Returns a tuple of (object, created) where created is True if a new instance was built.
+        """
+        # Check if any kwargs are unsaved model instances
+        for key, value in kwargs.items():
+            if isinstance(value, models.Model) and value.pk is None:
+                # If we have an unsaved instance, just build a new one
+                return (self.model(**kwargs), True)
+
+        try:
+            return (self.get(**kwargs), False)
+        except self.model.DoesNotExist:
+            return (self.model(**kwargs), True)
+
+
 class BaseModel(models.Model):
     class Meta:
         abstract = True
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    objects = BaseQuerySet.as_manager()
+
     def save(self, *args, **kwargs):
         self.full_clean()  # Validate before saving
         super().save(*args, **kwargs)

lung_cancer_screening/questions/models/response_set.py

@@ -1,55 +1,12 @@
 from django.db import models
-from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ValidationError
-from django.core.validators import MaxValueValidator, MinValueValidator
 from dateutil.relativedelta import relativedelta
 from django.utils import timezone
-from decimal import Decimal
 
-from .base import BaseModel
+from .base import BaseModel, BaseQuerySet
 from .user import User
 
-class HaveYouEverSmokedValues(models.IntegerChoices):
-    YES_I_CURRENTLY_SMOKE = 0, 'Yes, I currently smoke'
-    YES_I_USED_TO_SMOKE_REGULARLY = 1, 'Yes, I used to smoke'
-    YES_BUT_ONLY_A_FEW_TIMES = 2, 'Yes, but I have smoked fewer than 100 cigarettes in my lifetime'
-    NO_I_HAVE_NEVER_SMOKED = 3, 'No, I have never smoked'
-
-class SexAtBirthValues(models.TextChoices):
-    FEMALE = "F", 'Female'
-    MALE = "M", 'Male'
-
-class GenderValues(models.TextChoices):
-    FEMALE = "F", 'Female'
-    MALE = "M", 'Male'
-    NON_BINARY = "N", 'Non-binary'
-    PREFER_NOT_TO_SAY = "P", 'Prefer not to say'
-    GP = "G", 'How I describe myself may not match my GP record'
-
-class EthnicityValues(models.TextChoices):
-    ASIAN = "A", "Asian or Asian British"
-    BLACK = "B", "Black, African, Caribbean or Black British"
-    MIXED = "M", "Mixed or multiple ethnic groups"
-    WHITE = "W", "White"
-    OTHER = "O", "Other ethnic group"
-    PREFER_NOT_TO_SAY = "N", "I'd prefer not to say"
-
-class RespiratoryConditionValues(models.TextChoices):
-    PNEUMONIA = "P", "Pneumonia"
-    EMPHYSEMA = "E", "Emphysema"
-    BRONCHITIS = "B", "Bronchitis"
-    TUBERCULOSIS = "T", "Tuberculosis (TB)"
-    COPD = "C", "Chronic obstructive pulmonary disease (COPD)"
-    NONE = "N", "No, I have not had any of these respiratory conditions"
-
-def validate_singleton_option(value):
-    if value and "N" in value and len(value) > 1:
-        raise ValidationError(
-            "Cannot have singleton value and other values selected",
-            code="singleton_option",
-        )
-
-class ResponseSetQuerySet(models.QuerySet):
+class ResponseSetQuerySet(BaseQuerySet):
     def unsubmitted(self):
         return self.filter(submitted_at=None)
 
@@ -66,78 +23,6 @@ class ResponseSet(BaseModel):
     # Attributes
     user = models.ForeignKey(User, on_delete=models.CASCADE)
 
-    have_you_ever_smoked = models.IntegerField(
-        choices=HaveYouEverSmokedValues.choices,
-        null=True,
-        blank=True
-    )
-    date_of_birth = models.DateField(null=True, blank=True)
-
-    MAX_HEIGHT_METRIC = 2438
-    MIN_HEIGHT_METRIC = 1397
-    MAX_HEIGHT_IMPERIAL = 96
-    MIN_HEIGHT_IMPERIAL = 55
-    height_metric = models.PositiveIntegerField(null=True, blank=True, validators=[
-        MinValueValidator(MIN_HEIGHT_METRIC, message="Height must be between 139.7cm and 243.8 cm"),
-        MaxValueValidator(MAX_HEIGHT_METRIC, message="Height must be between 139.7cm and 243.8 cm"),
-    ])
-    height_imperial = models.PositiveIntegerField(null=True, blank=True, validators=[
-        MinValueValidator(
-            MIN_HEIGHT_IMPERIAL, message="Height must be between 4 feet 7 inches and 8 feet"),
-        MaxValueValidator(
-            MAX_HEIGHT_IMPERIAL, message="Height must be between 4 feet 7 inches and 8 feet"),
-    ])
-
-    MIN_WEIGHT_METRIC = 254
-    MAX_WEIGHT_METRIC = 3175
-    MAX_WEIGHT_IMPERIAL = 700
-    MIN_WEIGHT_IMPERIAL = 56
-
-    weight_metric = models.PositiveIntegerField(null=True, blank=True, validators=[
-        MinValueValidator(MIN_WEIGHT_METRIC, message="Weight must be between 25.4kg and 317.5kg"),
-        MaxValueValidator(MAX_WEIGHT_METRIC, message="Weight must be between 25.4kg and 317.5kg"),
-    ])
-    weight_imperial = models.PositiveIntegerField(null=True, blank=True, validators=[
-        MinValueValidator(
-            MIN_WEIGHT_IMPERIAL, message="Weight must be between 4 stone and 50 stone"),
-        MaxValueValidator(
-            MAX_WEIGHT_IMPERIAL, message="Weight must be between 4 stone and 50 stone"),
-    ])
-
-    sex_at_birth = models.CharField(
-        max_length=1,
-        choices=SexAtBirthValues.choices,
-        null=True,
-        blank=True
-    )
-
-    gender = models.CharField(
-        max_length=1,
-        choices=GenderValues.choices,
-        null=True,
-        blank=True
-    )
-
-    ethnicity = models.CharField(
-        max_length=1,
-        choices=EthnicityValues.choices,
-        null=True,
-        blank=True
-    )
-
-
-    respiratory_conditions = ArrayField(
-        models.CharField(max_length=1, choices=RespiratoryConditionValues.choices),
-        null=True,
-        blank=True,
-        validators=[validate_singleton_option]
-    )
-
-    asbestos_exposure = models.BooleanField(
-        null=True,
-        blank=True
-    )
-
     submitted_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:
@@ -161,30 +46,4 @@ def clean(self):
                 "Responses have already been submitted for this user"
             )
 
-    @property
-    def formatted_height(self):
-        if self.height_metric:
-            return f"{Decimal(self.height_metric) / 10}cm"
-        elif self.height_imperial:
-            value = Decimal(self.height_imperial)
-            return f"{value // 12} feet {value % 12} inches"
-
-    @property
-    def formatted_weight(self):
-        if self.weight_metric:
-            return f"{Decimal(self.weight_metric) / 10}kg"
-        elif self.weight_imperial:
-            value = Decimal(self.weight_imperial)
-            return f"{value // 14} stone {value % 14} pounds"
-
-    @property
-    def formatted_respiratory_conditions(self):
-        if not self.respiratory_conditions:
-            return None
-        # Get the display values for each code
-        display_values = [
-            RespiratoryConditionValues(code).label
-            for code in self.respiratory_conditions
-        ]
-        return ", ".join(display_values)