feat: upgrade to use marshmallow 3.0.0rc9

marshmallow 3.0.0 use strict: True by default for schem

also patch EnumField, revert it once justanr/marshmallow_enum#23 is resolved

app/models/enum_field.py

@@ -0,0 +1,7 @@
+from marshmallow_enum import EnumField as BaseEnumField
+
+
+# todo: revert it once https://github.com/justanr/marshmallow_enum/issues/23 is resolved
+class EnumField(BaseEnumField):
+    def _deserialize(self, value, attr, data, **kwargs):
+        super(EnumField, self)._deserialize(value, attr, data)

app/resources/auth/schemas.py

@@ -1,8 +1,8 @@
 from flask_marshmallow import Schema
 from marshmallow import fields
-from marshmallow_enum import EnumField
 
 from .models import EnumGender
+from app.models.enum_field import EnumField
 
 
 class CreateAuthClientParameters(Schema):

app/resources/complaints/schemas.py

@@ -1,11 +1,11 @@
 from flask_marshmallow.sqla import TableSchema
 from marshmallow import fields
 from marshmallow import Schema
-from marshmallow_enum import EnumField
 
 from .models import Complaint
 from .models import EnumComplaintState
 from .models import EnumComplaintType
+from app.models.enum_field import EnumField
 from app.resources.users.schemas import UserSchema
 
 
@@ -31,11 +31,9 @@ class ComplaintSchema(Schema):
     trade_info = fields.String(description='tradeInfo')
     relatedProducts = fields.String(description='relatedProducts')
     purchase_timestamp = fields.DateTime(description='purchase_timestamp')
-    invoice_files = fields.List(
-        fields.String(), description='uploaded invoice file list'
-    )
+    invoice_files = fields.List(fields.URL(), description='uploaded invoice file list')
     evidence_files = fields.List(
-        fields.String(), description='uploaded evidence file list'
+        fields.URL(), description='uploaded evidence file list'
     )
 
 

app/resources/uploads/schemas.py

@@ -1,9 +1,9 @@
 from flask_marshmallow import Schema
 from marshmallow import ValidationError
-from marshmallow_enum import EnumField
 
 from .models import EnumUploadFileType
 from .models import FileField
+from app.models.enum_field import EnumField
 
 
 def file_validate(file):
@@ -12,8 +12,6 @@ def file_validate(file):
 
 
 class FileUploadFormParameters(Schema):
-    class Meta:
-        strict = True
 
     upload_type = EnumField(
         EnumUploadFileType,

requirements.txt

@@ -33,7 +33,7 @@ jsonschema==3.0.2
 lazy-object-proxy==1.4.1
 Mako==1.1.0
 MarkupSafe==1.1.1
-marshmallow==2.19.5
+marshmallow==3.0.0rc9
 marshmallow-enum==1.4.1
 marshmallow-jsonschema==0.6.0
 marshmallow-sqlalchemy==0.17.0

requirements/base.txt

@@ -9,6 +9,7 @@ flask-migrate~=2.5.0
 flask-rest-api~=0.16.1
 flask-sqlalchemy~=2.4.0
 flask~=1.1.0
+marshmallow==3.0.0rc9
 marshmallow-enum~=1.4.1
 marshmallow-jsonschema~=0.6.0
 marshmallow-sqlalchemy~=0.17.0