Merge pull request #1910 from SEED-platform/ft-GBR-create-state-certi…

…ficates

minor issues with PropertyStateWritableSerializer and GreenAssessment…

seed/serializers/certification.py

@@ -144,7 +144,7 @@ class GreenAssessmentPropertySerializer(OrgValidateMixin, serializers.ModelSeria
     metric = serializers.FloatField(required=False, allow_null=True)
     rating = serializers.CharField(
         required=False, allow_null=True, max_length=100)
-    expiration_date = serializers.DateField()
+    expiration_date = serializers.DateField(allow_null=True, required=False)
     # ensure reuqest.users org matches that of view and assessment
     org_validators = [ASSESSMENT_VALIDATOR, PROPERTY_VIEW_VALIDATOR]
 

seed/serializers/properties.py

@@ -378,8 +378,8 @@ def to_internal_value(self, data):
                 state = PropertyStateWritableSerializer(
                     instance=state_obj
                 ).data
-            except ValueError:
-                state = json.loads(state)
+            except TypeError:
+                pass  # already a PropertyStateWritableSerializer object
             required = True if self.context['request'].method in ['PUT', 'POST'] else False
             org = state.get('organization')
             org_id = org if org else org_id
@@ -413,8 +413,9 @@ def _validate(self, data):
                     missing.append(field)
         # type validation
         for field in required_fields:
-            if data.get(field) and not isinstance(data[field], (basestring, int)):
-                wrong_type.append((field, type(field)))
+            if field != 'state':  # state is a writeable serializer field
+                if data.get(field) and not isinstance(data[field], (basestring, int)):
+                    wrong_type.append((field, type(field)))
         for fields in unique_together:
             field_vals = {}
             for field in fields: