Merge pull request '249_Last_modified_created' (#250) from 249_Last_modified_created into master

Reviewed-on: SGD-Nord/konova#250

api/utils/serializer/v1/compensation.py

@@ -64,6 +64,7 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
         obj = Compensation()
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 

api/utils/serializer/v1/ecoaccount.py

@@ -103,6 +103,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
         obj.legal = Legal()
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 

api/utils/serializer/v1/ema.py

@@ -85,6 +85,7 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
         )
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 

api/utils/serializer/v1/intervention.py

@@ -76,6 +76,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
         created = create_action
         obj.legal = legal
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         obj.responsible = resp
         return obj

compensation/forms/compensation.py

@@ -156,6 +156,7 @@ class NewCompensationForm(AbstractCompensationForm,
             title=title,
             intervention=intervention,
             created=action,
+            modified=action,
             is_cef=is_cef,
             is_coherence_keeping=is_coherence_keeping,
             is_pik=is_pik,

compensation/forms/eco_account.py

@@ -117,6 +117,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 responsible=responsible,
                 deductable_surface=surface,
                 created=action,
+                modified=action,
                 comment=comment,
                 is_pik=is_pik,
                 legal=legal

compensation/tests/compensation/test_workflow.py

@@ -71,6 +71,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(new_compensation.title, test_title)
         self.assert_equal_geometries(new_compensation.geometry.geom, test_geom)
         self.assertEqual(new_compensation.log.count(), 1)
+        self.assertEqual(new_compensation.created, new_compensation.modified)
 
         # Expect logs to be set
         self.assertEqual(pre_creation_intervention_log_count + 1, self.intervention.log.count())

compensation/tests/ecoaccount/test_workflow.py

@@ -65,6 +65,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(acc.deductable_rest, test_deductable_surface)
         self.assert_equal_geometries(acc.geometry.geom, test_geom)
         self.assertEqual(acc.log.count(), 1)
+        self.assertEqual(acc.created, acc.modified)
 
         # Expect logs to be set
         self.assertEqual(acc.log.count(), 1)

compensation/views/compensation/compensation.py

@@ -46,6 +46,8 @@ def index_view(request: HttpRequest):
     compensations = Compensation.objects.filter(
         deleted=None,  # only show those which are not deleted individually
         intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+    ).order_by(
+        "-modified__timestamp"
     )
     table = CompensationTable(
         request=request,

compensation/views/eco_account/eco_account.py

@@ -41,6 +41,8 @@ def index_view(request: HttpRequest):
     template = "generic_index.html"
     eco_accounts = EcoAccount.objects.filter(
         deleted=None,
+    ).order_by(
+        "-modified__timestamp"
     )
     table = EcoAccountTable(
         request=request,

ema/forms.py

@@ -81,6 +81,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
                 title=title,
                 responsible=responsible,
                 created=action,
+                modified=action,
                 comment=comment,
                 is_pik=is_pik,
             )

ema/tests/test_workflow.py

@@ -62,6 +62,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(ema.title, test_title)
         self.assert_equal_geometries(ema.geometry.geom, test_geom)
         self.assertEqual(ema.log.count(), 1)
+        self.assertEqual(ema.created, ema.modified)
 
         # Expect logs to be set
         self.assertEqual(ema.log.count(), 1)

ema/views/ema.py

@@ -39,6 +39,8 @@ def index_view(request: HttpRequest):
     template = "generic_index.html"
     emas = Ema.objects.filter(
         deleted=None,
+    ).order_by(
+        "-modified__timestamp"
     )
 
     table = EmaTable(

intervention/forms/intervention.py

@@ -270,6 +270,7 @@ class NewInterventionForm(BaseForm):
                 responsible=responsibility_data,
                 legal=legal_data,
                 created=action,
+                modified=action,
                 comment=comment,
             )
 

intervention/tests/test_workflow.py

@@ -78,6 +78,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
             self.assertEqual(1, obj.log.count())
             self.assertEqual(obj.log.first().action, UserAction.CREATED)
             self.assertEqual(obj.log.first().user, self.superuser)
+            self.assertEqual(obj.created, obj.modified)
         except ObjectDoesNotExist:
             # Fail if there is no such object
             self.fail()

intervention/views/intervention.py

@@ -45,6 +45,8 @@ def index_view(request: HttpRequest):
         deleted=None,  # not deleted
     ).select_related(
         "legal"
+    ).order_by(
+        "-modified__timestamp"
     )
     table = InterventionTable(
         request=request,