Refactor support application and update tests

support/models.py

@@ -17,16 +17,6 @@ class Contact(models.Model):
     def __str__(self):
         return self.subject
 
-    @property
-    def is_new(self):
-        threshold_days = 1
-        return (timezone.now() - self.created_at) < timedelta(days=threshold_days)
-
-    @property
-    def is_expired(self):
-        threshold_days = 90
-        return (timezone.now() - self.created_at) > timedelta(days=threshold_days)
-
     class Meta:
         ordering = ['-created_at']
         verbose_name = 'Contact'
@@ -43,11 +33,6 @@ class Report(models.Model):
     def __str__(self):
         return self.description
 
-    @property
-    def is_new(self):
-        threshold_days = 1
-        return (timezone.now() - self.created_at) < timedelta(days=threshold_days)
-
     class Meta:
         ordering = ['-created_at']
         verbose_name = 'Report'

support/serializers.py

@@ -1,21 +1,15 @@
-from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
 
 from .models import Contact, Report
 
 
 class ContactSerializer(ModelSerializer):
-    is_new = serializers.ReadOnlyField()
-    is_expired = serializers.ReadOnlyField()
-
     class Meta:
         model = Contact
         fields = "__all__"
 
 
 class ReportSerializer(ModelSerializer):
-    is_new = serializers.ReadOnlyField()
-
     class Meta:
         model = Report
         fields = "__all__"

tests/test_support/test_models.py

@@ -16,8 +16,6 @@ def test_create_contact_success():
     assert contact.message == "Test test"
     assert contact.email == "[email protected]"
     assert contact.reviewed == False
-    assert contact.is_new == True
-    assert contact.is_expired == False
 
 
 @pytest.mark.django_db
@@ -33,4 +31,3 @@ def test_create_report_success(user_data):
     assert report.user == user_data
     assert report.offer == joboffer
     assert report.description == "dasdasda"
-    assert report.is_new == True