Merge pull request #3664 from unicef/staging

Staging

Author: robertavram

Pipfile

@@ -64,6 +64,7 @@ etools-validator = "==0.5.0"
 flower = "==1.2.0"  # issue when locking
 GDAL = "==3.0.2"
 gunicorn = "<20.0"
+jsonschema = "*"
 newrelic = "*"
 Pillow = "==9.3.0"
 psycopg2-binary = "==2.9.1"
@@ -87,4 +88,4 @@ pyyaml = "==5.3.1"
 reportlab = "==3.6.6"  # freeze: getStringIO from 'reportlab.lib.utils'
 
 [requires]
-python_version = "3.9"
+python_version = "3.9"

Pipfile.lock

@@ -36,3 +36,13 @@ def __init__(self, user):
 
     def is_satisfied(self):
         return self.user.is_unicef_user()
+
+
+class EngagementUnicefCommentsReceivedCondition(SimpleCondition):
+    predicate = 'audit_engagement.date_of_comments_by_unicef'
+
+    def __init__(self, engagement):
+        self.engagement = engagement
+
+    def is_satisfied(self):
+        return self.engagement.date_of_comments_by_unicef is not None

src/etools/applications/audit/conditions.py

@@ -11,6 +11,7 @@
     AuditModuleCondition,
     AuditStaffMemberCondition,
     EngagementStaffMemberCondition,
+    EngagementUnicefCommentsReceivedCondition,
     IsUnicefUserCondition,
 )
 from etools.applications.audit.models import (
@@ -133,7 +134,7 @@ class Command(BaseCommand):
     follow_up_page = follow_up_editable_page + [
         'audit.spotcheck.total_amount_tested',
         'audit.spotcheck.total_amount_of_ineligible_expenditure',
-    ] + action_points_block
+    ]
 
     engagement_overview_editable_page = (engagement_overview_editable_block + special_audit_block +
                                          partner_block + staff_members_block + users_notified_block)
@@ -231,6 +232,9 @@ def engagement_status(self, status):
         obj = get_model_target(Engagement)
         return [ObjectStatusCondition.predicate_template.format(obj=obj, status=status)]
 
+    def engagement_comments_received_by_unicef(self):
+        return [EngagementUnicefCommentsReceivedCondition.predicate]
+
     def new_engagement(self):
         model = get_model_target(Engagement)
         return [NewObjectCondition.predicate_template.format(model=model)]
@@ -391,6 +395,11 @@ def assign_permissions(self):
             self.follow_up_page,
             condition=final_engagement_condition
         )
+        self.add_permissions(
+            self.all_unicef_users, 'view',
+            self.action_points_block,
+            condition=self.engagement_comments_received_by_unicef()
+        )
         self.add_permissions(
             self.focal_point, 'edit',
             self.follow_up_editable_page,
@@ -404,13 +413,13 @@ def assign_permissions(self):
             self.all_unicef_users,
             'edit',
             'audit.engagement.action_points',
-            condition=final_engagement_condition
+            condition=self.engagement_comments_received_by_unicef()
         )
         self.add_permissions(
             self.all_unicef_users,
             'edit',
             'audit.engagementactionpoint.*',
-            condition=final_engagement_condition + self.new_action_point(),
+            condition=self.engagement_comments_received_by_unicef() + self.new_action_point(),
         )
         self.add_permissions(
             self.action_points_editors, 'edit',

src/etools/applications/audit/management/commands/update_audit_permissions.py

@@ -20,6 +20,7 @@
 from etools.applications.action_points.models import ActionPoint
 from etools.applications.audit.purchase_order.models import PurchaseOrder, PurchaseOrderItem
 from etools.applications.audit.transitions.conditions import (
+    ActionPointsProvidedForHighPriorityFindingsCheck,
     AuditSubmitReportRequiredFieldsCheck,
     EngagementHasReportAttachmentsCheck,
     EngagementSubmitReportRequiredFieldsCheck,
@@ -468,6 +469,9 @@ def submit(self, *args, **kwargs):
         return super().submit(*args, **kwargs)
 
     @transition('status', source=Engagement.STATUSES.report_submitted, target=Engagement.STATUSES.final,
+                conditions=[
+                    ActionPointsProvidedForHighPriorityFindingsCheck.as_condition(),
+                ],
                 permission=has_action_permission(action='finalize'))
     def finalize(self, *args, **kwargs):
         return super().finalize(*args, **kwargs)

src/etools/applications/audit/models.py

@@ -7,10 +7,12 @@
 from rest_framework import status
 from unicef_attachments.models import Attachment
 
-from etools.applications.audit.models import SpecificProcedure
+from etools.applications.action_points.tests.factories import ActionPointFactory
+from etools.applications.audit.models import Finding, SpecificProcedure
 from etools.applications.audit.tests.base import EngagementTransitionsTestCaseMixin
 from etools.applications.audit.tests.factories import (
     AuditFactory,
+    FindingFactory,
     KeyInternalControlFactory,
     MicroAssessmentFactory,
     SpecialAuditFactory,
@@ -221,6 +223,11 @@ def test_finalize_auditor(self):
         self._init_submitted_engagement()
         self._test_finalize(self.auditor, status.HTTP_403_FORBIDDEN)
 
+    def test_finalize_focal_point_high_priority_findings(self):
+        self._init_submitted_engagement()
+        FindingFactory(spot_check=self.engagement, priority=Finding.PRIORITIES.high)
+        self._test_finalize(self.unicef_focal_point, status.HTTP_400_BAD_REQUEST)
+
     def test_finalize_focal_point(self):
         self._init_submitted_engagement()
         content_type = ContentType.objects.get_for_model(self.engagement)
@@ -230,6 +237,8 @@ def test_finalize_focal_point(self):
             content_type=content_type,
             object_id=self.engagement.pk,
         )
+        FindingFactory(spot_check=self.engagement, priority=Finding.PRIORITIES.high)
+        ActionPointFactory(engagement=self.engagement, high_priority=True)
         with patch(self.filepath, self.mock_filepath):
             self._test_finalize(self.unicef_focal_point, status.HTTP_200_OK)
         self.assertTrue(attachment_qs.exists())

src/etools/applications/audit/tests/test_transitions.py

@@ -180,3 +180,20 @@ def get_categories_to_validate_before_submit(self, instance):
         categories = self.VALIDATE_CATEGORIES_BEFORE_SUBMIT
         categories[MicroAssessment.get_subject_areas_code(instance.questionnaire_version)] = 'test_subject_areas'
         return categories
+
+
+class ActionPointsProvidedForHighPriorityFindingsCheck(BaseTransitionCheck):
+    def get_errors(self, instance, *args, **kwargs):
+        from etools.applications.audit.models import EngagementActionPoint, Finding
+
+        errors = super().get_errors(instance, *args, **kwargs)
+
+        if (
+                instance.findings.filter(priority=Finding.PRIORITIES.high).exists() and
+                not EngagementActionPoint.objects.filter(engagement=instance, high_priority=True).exists()
+        ):
+            errors['action_points'] = _(
+                'Action Points with High Priority to be opened if High Priority findings provided.'
+            )
+
+        return errors