Merge branch 'hotfix/3.6.2' into 'master'

hotfix/3.6.2 - master

See merge request bevillingsplatform/bevillingsplatform!1167

Author: Søren Howe Gersager

NEWS.rst

@@ -1,3 +1,15 @@
+Version 3.6.2, 2021-11-30
+-------------------------
+
+Hotfix release
+
+Bug fixes
+^^^^^^^^^
+
+* Correct end modified activities with no end date.
+* Correct setting main activities for an appropriation.
+
+
 Version 3.6.1, 2021-11-25
 -------------------------
 

VERSION

@@ -1 +1 @@
-3.6.1
+3.6.2

backend/core/models.py

@@ -1904,12 +1904,14 @@ def grant(self, approval_level, approval_note, approval_user):
                     self.save()
                     old_activity.delete()
                     # "Merge" by ending current activity the day before the new
-                    # start_date if end_date overlaps with the new start_date.
-                    #
-                if (
-                    self.modifies
-                    and self.modifies.end_date
-                    and self.modifies.end_date >= self.start_date
+                    # start_date if end_date overlaps with the new start_date
+                    # or it has no end_date.
+                if self.modifies and (
+                    not self.modifies.end_date
+                    or (
+                        self.modifies.end_date
+                        and self.modifies.end_date >= self.start_date
+                    )
                 ):
                     self.modifies.end_date = self.start_date - timedelta(
                         days=1

backend/core/tests/test_models.py

@@ -676,6 +676,88 @@ def test_appropriation_grant_on_already_granted_daily(self):
             [start_date + timedelta(days=x) for x in range(25)],
         )
 
+    def test_appropriation_grant_on_already_granted_daily_no_end_date(self):
+        approval_level = ApprovalLevel.objects.create(name="egenkompetence")
+
+        case = create_case(self.case_worker, self.municipality, self.district)
+        section = create_section()
+        appropriation = create_appropriation(case=case, section=section)
+        now = timezone.now().date()
+        start_date = now - timedelta(days=6)
+        # create an already granted activity with no end_date.
+        activity = create_activity(
+            case=case,
+            appropriation=appropriation,
+            activity_type=MAIN_ACTIVITY,
+            status=STATUS_GRANTED,
+            start_date=start_date,
+            end_date=None,
+        )
+        create_payment_schedule(
+            payment_amount=Decimal("500.0"),
+            payment_frequency=PaymentSchedule.DAILY,
+            activity=activity,
+        )
+        activity.details.main_activity_for.add(section)
+
+        modified_start_date = now + timedelta(days=3)
+        modified_end_date = now + timedelta(days=6)
+        # let the granted activity be modified by another expected activity.
+        modifies_activity = create_activity(
+            case=case,
+            appropriation=appropriation,
+            activity_type=MAIN_ACTIVITY,
+            start_date=modified_start_date,
+            status=STATUS_EXPECTED,
+            end_date=modified_end_date,
+            modifies=activity,
+        )
+        create_payment_schedule(
+            payment_amount=Decimal("600.0"),
+            payment_frequency=PaymentSchedule.DAILY,
+            activity=modifies_activity,
+        )
+        user = get_user_model().objects.create(username="Anders And")
+        appropriation.grant(
+            Activity.objects.filter(pk=modifies_activity.pk),
+            approval_level.id,
+            "note til bevillingsgodkendelse",
+            user,
+        )
+        activity.refresh_from_db()
+        modifies_activity.refresh_from_db()
+        # the old activity with no end_date should expire the day before
+        # the start_date of the new one.
+        self.assertEqual(
+            activity.end_date, modified_start_date - timedelta(days=1)
+        )
+        # expected status should be granted with the
+        # start_date of the new activity.
+        self.assertEqual(modifies_activity.status, STATUS_GRANTED)
+        self.assertEqual(modifies_activity.start_date, modified_start_date)
+        # the payments of the old activity should expire
+        # before the new end_date.
+        activity_payments = activity.payment_plan.payments
+        self.assertTrue(
+            activity_payments.order_by("date").first().date
+            < modified_start_date
+        )
+        # the payments of the new activity should start after today.
+        modifies_payments = modifies_activity.payment_plan.payments
+
+        self.assertTrue(
+            modifies_payments.order_by("date").first().date
+            >= modified_start_date
+        )
+        # assert payments are generated correctly.
+        self.assertCountEqual(
+            [
+                x.date
+                for x in (activity_payments.all() | modifies_payments.all())
+            ],
+            [start_date + timedelta(days=x) for x in range(13)],
+        )
+
     def test_appropriation_grant_on_already_granted_weekly(self):
         approval_level = ApprovalLevel.objects.create(name="egenkompetence")
 

frontend/src/components/activities/edittypes/Activity.vue

@@ -102,6 +102,7 @@ export default {
                     actList = `main_activity_for=${ this.appropriation.section }`
                 } else {
                     actList = `supplementary_activity_for=${ this.appropriation.section }`
+                    // this.appr_main_acts, which maps to a store property, will not have been populated if user enters the path /activity/create directly in their browser. It will only populate when the user creates a new activity from within an appropriation.
                     if (this.appr_main_acts) {
                         actList += `&main_activities=${ this.appr_main_acts.activities[0].details }`
                     }

frontend/src/components/appropriations/Appropriation.vue

@@ -226,6 +226,12 @@
                                 edges {
                                     node {
                                         pk,
+                                        activityType,
+                                        startDate,
+                                        endDate,
+                                        details {
+                                            pk
+                                        },
                                         modifies {
                                             pk
                                         }
@@ -250,6 +256,10 @@
                         activities: [...a.activities.edges.map(e => {
                             return {
                                 id: Number(e.node.pk),
+                                activity_type: e.node.activityType,
+                                start_date: e.node.startDate,
+                                end_date: e.node.endDate,
+                                details: Number(e.node.details.pk),
                                 modifies: e.node.modifies ? e.node.modifies.pk : null
                             }
                         })],
@@ -265,6 +275,7 @@
                         paying_municipality: a.case.payingMunicipality.name,
                         acting_municipality: a.case.actingMunicipality.name
                     }
+                    this.$store.dispatch("fetchMainActivities", new_appr.activities)
                     this.$store.commit('setAppropriation', new_appr)
                     this.$store.commit('setCase', new_case)
                     this.updateBreadCrumb(new_appr, new_case)