Merge pull request #153 from sharpeez/wc_sprint

Wc sprint #2

wildlifecompliance/components/applications/api.py

@@ -94,6 +94,7 @@
 from wildlifecompliance.management.permissions_manager import PermissionUser
 
 logger = logging.getLogger(__name__)
+# logger = logging
 
 
 def application_refund_callback(invoice_ref, bpoint_tid):
@@ -1530,24 +1531,32 @@ def get_proposed_decisions(self, request, *args, **kwargs):
     @detail_route(methods=['post'])
     @renderer_classes((JSONRenderer,))
     def assessment_data(self, request, *args, **kwargs):
+        logger.debug('assessment_data()')
         try:
             instance = self.get_object()
+            assess = request.data.pop('__assess', False)
             with transaction.atomic():
+                is_initial_assess = instance.get_property_cache_assess()
+                if assess or is_initial_assess:
 
-                checkbox = CheckboxAndRadioButtonVisitor(
-                    instance, request.data
-                )
-                # Set StandardCondition Fields.
-                for_condition_fields = StandardConditionFieldElement()
-                for_condition_fields.accept(checkbox)
+                    checkbox = CheckboxAndRadioButtonVisitor(
+                        instance, request.data
+                    )
+                    # Set StandardCondition Fields.
+                    for_condition_fields = StandardConditionFieldElement()
+                    for_condition_fields.accept(checkbox)
 
-                # Set PromptInspection Fields.
-                for_inspection_fields = PromptInspectionFieldElement()
-                for_inspection_fields.accept(checkbox)
+                    # Set PromptInspection Fields.
+                    for_inspection_fields = PromptInspectionFieldElement()
+                    for_inspection_fields.accept(checkbox)
 
-                instance.save()
+                    if is_initial_assess:
+                        instance.set_property_cache_assess(False)
+                        instance.save()
 
+            logger.debug('assessment_data() - response success')
             return Response({'success': True})
+
         except MissingFieldsException as e:
             return Response({
                 'missing': e.error_list},
@@ -1677,6 +1686,7 @@ def officer_comments(self, request, *args, **kwargs):
     @detail_route(methods=['post'])
     @renderer_classes((JSONRenderer,))
     def form_data(self, request, *args, **kwargs):
+        logger.debug('form_data()')
         try:
             instance = self.get_object()
             with transaction.atomic():
@@ -1687,13 +1697,14 @@ def form_data(self, request, *args, **kwargs):
                     action=ApplicationFormDataRecord.ACTION_TYPE_ASSIGN_VALUE
                 )
 
-                # Log save action for internal officer.
-                if request.user.is_staff:
-                    instance.log_user_action(
-                        ApplicationUserAction.ACTION_SAVE_APPLICATION.format(
-                            instance.id), request)
+                instance.log_user_action(
+                    ApplicationUserAction.ACTION_SAVE_APPLICATION.format(
+                        instance.lodgement_number
+                    ), request)
 
+            logger.debug('form_data() - successful response')
             return Response({'success': True})
+
         except MissingFieldsException as e:
             return Response({
                 'missing': e.error_list},