Merge pull request #1691 from onaio/1690-fix-revoke-assignment-bug

Fix revoke assignments bug

src/containers/pages/PlanAssignment/helpers/JurisdictionAssignmentForm/helpers.ts

@@ -55,7 +55,7 @@ export const getPayload = (
   }
 
   // turns out if you put it in the loop it keeps subtracting a day for every iteration
-  const retireDate = now.format();
+  const retireDate = moment(new Date()).format();
 
   for (const retiredOrgId of initialOrgs.filter(orgId => !selectedOrgs.includes(orgId))) {
     if (!payload.map(obj => obj.organization).includes(retiredOrgId)) {

src/containers/pages/PlanAssignment/helpers/JurisdictionAssignmentForm/tests/helpers.test.ts

@@ -109,4 +109,34 @@ describe('PlanAssignment/helpers', () => {
     const payload = getPayload(selectedOrgs, plan, raZambiaNode);
     expect(payload).toEqual(customYearAssignments);
   });
+
+  it('Retires plans correctly - toDate dates should be set to current date', () => {
+    const envModule = require('../../../../../../configs/env');
+    envModule.PLAN_TEAM_ASSIGNMENT_EXPIRY_YEARS = 5;
+
+    if (!raZambiaNode) {
+      fail();
+    }
+
+    const plan = plans[0];
+    const selectedOrgs = ['2'];
+    const initialOrgs = ['1', '2', '3'];
+
+    const payload = getPayload(selectedOrgs, plan, raZambiaNode, initialOrgs);
+    // current date set to 30/12/2019
+    expect(payload).toEqual([
+      {
+        ...customYearAssignments[1],
+        toDate: '2024-12-30T00:00:00+00:00',
+      },
+      {
+        ...customYearAssignments[0],
+        toDate: '2019-12-30T00:00:00+00:00',
+      },
+      {
+        ...customYearAssignments[2],
+        toDate: '2019-12-30T00:00:00+00:00',
+      },
+    ]);
+  });
 });