[ePD] 'Delete PD' not present in available_actions

src/etools/applications/partners/serializers/interventions_v3.py

@@ -24,6 +24,7 @@
 from etools.applications.partners.permissions import (
     InterventionPermissions,
     PARTNERSHIP_MANAGER_GROUP,
+    REPRESENTATIVE_OFFICE_GROUP,
     SENIOR_MANAGEMENT_GROUP,
 )
 from etools.applications.partners.serializers.interventions_v2 import (
@@ -354,6 +355,13 @@ def _is_partnership_manager(self):
             profile__country=self.context['request'].user.profile.country
         ).exists()
 
+    def _is_representative_office_manager(self):
+        return get_user_model().objects.filter(
+            pk=self.context['request'].user.pk,
+            groups__name__in=[REPRESENTATIVE_OFFICE_GROUP],
+            profile__country=self.context['request'].user.profile.country
+        ).exists()
+
     def _is_overall_approver(self, obj, user):
         if not obj.review:
             return False
@@ -386,6 +394,7 @@ def get_available_actions(self, obj):
             "export_pdf",
             "export_xls",
             "amendment_merge",
+            "delete",
         ]
         available_actions = [
             "download_comments",
@@ -395,6 +404,9 @@ def get_available_actions(self, obj):
         ]
         user = self.context['request'].user
 
+        if obj.status == obj.DRAFT and not obj.date_sent_to_partner:
+            if self._is_management() or self._is_partnership_manager() or self._is_representative_office_manager():
+                available_actions.append("delete")
         # focal point or budget owner
         if self._is_unicef_focal_point(obj, user) or obj.budget_owner == user:
             # amendments should be deleted instead of moving to cancelled/terminated

src/etools/applications/partners/tests/test_v3_interventions.py

@@ -759,6 +759,62 @@ def test_with_date_sent_to_partner_reset(self):
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
         self.assertFalse(self.intervention_qs.exists())
 
+    def test_with_date_sent_to_partner(self):
+        self.intervention.date_sent_to_partner = timezone.now().date()
+        self.intervention.save()
+
+        response = self.forced_auth_req(
+            "delete",
+            reverse('pmp_v3:intervention-delete', args=[self.intervention.pk]),
+            user=self.user,
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("PD has already been sent to Partner.", response.data[0])
+
+    def test_with_status_not_draft(self):
+        self.intervention.status = Intervention.ACTIVE
+        self.intervention.save()
+
+        response = self.forced_auth_req(
+            "delete",
+            reverse('pmp_v3:intervention-delete', args=[self.intervention.pk]),
+            user=self.user,
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Cannot delete a PD or SSFA that is not Draft", response.data[0])
+
+    def test_with_status_not_draft_in_history(self):
+        pre_save = create_dict_with_relations(self.intervention)
+        self.intervention.status = Intervention.ACTIVE
+        self.intervention.save()
+        create_snapshot(self.intervention, pre_save, self.user)
+        self.intervention.status = Intervention.DRAFT
+        self.intervention.save()
+
+        response = self.forced_auth_req(
+            "delete",
+            reverse('pmp_v3:intervention-delete', args=[self.intervention.pk]),
+            user=self.user,
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("Cannot delete a PD or SSFA that was manually moved back to Draft", response.data[0])
+
+    def test_with_status_sent_to_partner_in_history(self):
+        pre_save = create_dict_with_relations(self.intervention)
+        self.intervention.date_sent_to_partner = timezone.now().date()
+        self.intervention.save()
+        create_snapshot(self.intervention, pre_save, self.user)
+        self.intervention.date_sent_to_partner = None
+        self.intervention.save()
+
+        response = self.forced_auth_req(
+            "delete",
+            reverse('pmp_v3:intervention-delete', args=[self.intervention.pk]),
+            user=self.user,
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn("PD has already been sent to Partner.", response.data[0])
+
     def test_delete_partner(self):
         self.assertTrue(self.intervention_qs.exists())
         response = self.forced_auth_req(

src/etools/applications/partners/tests/test_v3_serializers_intervention.py

@@ -99,7 +99,7 @@ def test_available_actions_management(self):
         )
         self.assertEqual(pd.status, pd.DRAFT)
         available_actions = self.unicef_serializer.get_available_actions(pd)
-        expected_actions = self.default_actions
+        expected_actions = self.default_actions + ["delete"]
         self.assertEqual(sorted(available_actions), sorted(expected_actions))
 
     def test_available_actions_focal_point_cancel(self):

src/etools/applications/partners/views/interventions_v2.py

@@ -797,6 +797,9 @@ def delete(self, request, *args, **kwargs):
         if intervention.travel_activities.count():
             raise ValidationError("Cannot delete a PD or SSFA that has Planned Trips")
 
+        if intervention.date_sent_to_partner:
+            raise ValidationError("PD has already been sent to Partner.")
+
         else:
             # get the history of this PD and make sure it wasn't manually moved back to draft before allowing deletion
             act = Activity.objects.filter(target_object_id=intervention.id,