Merge pull request #677 from awf-dbca/renewal-fix

Apiary Schema Fix

Author: xzzy

disturbance/components/proposals/api.py

@@ -95,6 +95,7 @@
     ProposalTypeSerializer,
     ProposalSerializer,
     InternalProposalSerializer,
+    CreateProposalSerializer,
     SaveProposalSerializer,
     ProposalUserActionSerializer,
     ProposalLogEntrySerializer,
@@ -2545,10 +2546,10 @@ def create(self, request, *args, **kwargs):
                     proxy_applicant = request.user.id
                 else:
                     applicant = request.data.get('behalf_of')
-
+                
                 data = {
                     #'schema': qs_proposal_type.order_by('-version').first().schema,
-                    'schema': proposal_type.schema,
+                    'schema': proposal_type.schema if not application_type.name in ['Apiary', 'Temporary Use', 'Site Transfer'] else '[{}]',
                     'submitter': request.user.id,
                     'applicant': applicant,
                     'proxy_applicant': proxy_applicant,
@@ -2563,7 +2564,7 @@ def create(self, request, *args, **kwargs):
                     'data': [
                     ],
                 }
-                serializer = SaveProposalSerializer(data=data)
+                serializer = CreateProposalSerializer(data=data)
                 serializer.is_valid(raise_exception=True)
                 proposal_obj = serializer.save()
 

disturbance/components/proposals/serializers.py

@@ -332,7 +332,7 @@ def get_is_internal_user(self, obj):
         except:
             return False
 
-class SaveProposalSerializer(BaseProposalSerializer):
+class CreateProposalSerializer(BaseProposalSerializer):
     assessor_data = serializers.JSONField(required=False)
 
     class Meta:
@@ -381,6 +381,55 @@ class Meta:
                 )
         read_only_fields=('documents','requirements')
 
+class SaveProposalSerializer(BaseProposalSerializer):
+    assessor_data = serializers.JSONField(required=False)
+
+    class Meta:
+        model = Proposal
+        fields = (
+                'id',
+                'application_type',
+                'activity',
+                'approval_level',
+                'title',
+                'region',
+                'district',
+                'tenure',
+                'data',
+                'assessor_data',
+                'comment_data',
+                'add_info_applicant',
+                'add_info_assessor',
+                'history_add_info_assessor',
+                'refresh_timestamp',
+                'prefill_timestamp',
+                #'schema',
+                'customer_status',
+                'processing_status',
+                'review_status',
+                #'hard_copy',
+                'applicant',
+                'proxy_applicant',
+                'submitter',
+                'assigned_officer',
+                'previous_application',
+                'lodgement_date',
+                'documents',
+                'requirements',
+                'readonly',
+                'can_user_edit',
+                'can_user_view',
+                'has_prefilled_once',
+                'reference',
+                'lodgement_number',
+                'lodgement_sequence',
+                'can_officer_process',
+                'sub_activity_level1',
+                'sub_activity_level2',
+                'management_area',
+                )
+        read_only_fields=('documents','requirements')
+
 class SaveProposalRegionSerializer(BaseProposalSerializer):
 
     class Meta: