fixed bug for POST new shipcalls
This commit is contained in:
parent
a845135650
commit
ac2ad3bc18
@ -84,6 +84,10 @@ def PostShipcalls(schemaModel):
|
||||
if key == "evaluation":
|
||||
continue
|
||||
if key == "evaluation_message":
|
||||
continue
|
||||
if key == "type_value":
|
||||
continue
|
||||
if key == "evaluation_value":
|
||||
continue
|
||||
if isNotFirst:
|
||||
query += ","
|
||||
@ -104,6 +108,14 @@ def PostShipcalls(schemaModel):
|
||||
continue
|
||||
if key == "evaluation_message":
|
||||
continue
|
||||
if key == "type":
|
||||
param_key = "type_value"
|
||||
if key == "type_value":
|
||||
continue
|
||||
if key == "evaluation":
|
||||
param_key = "evaluation_value"
|
||||
if key == "evaluation_value":
|
||||
continue
|
||||
if isNotFirst:
|
||||
query += ","
|
||||
isNotFirst = True
|
||||
|
||||
@ -172,7 +172,7 @@ class ShipcallSchema(Schema):
|
||||
anchored = fields.Bool(Required = False, allow_none=True)
|
||||
moored_lock = fields.Bool(Required = False, allow_none=True)
|
||||
canceled = fields.Bool(Required = False, allow_none=True)
|
||||
evaluation = fields.Enum(EvaluationType, required=False, allow_none=True)
|
||||
evaluation = fields.Enum(EvaluationType, required=False, allow_none=True, default=EvaluationType.undefined)
|
||||
evaluation_message = fields.Str(allow_none=True, metadata={'Required':False}) # Solving: RemovedInMarshmallow4Warning: Passing field metadata as keyword arguments is deprecated. Use the explicit `metadata=...` argument instead. Additional metadata: {'Required': False}
|
||||
evaluation_time = fields.DateTime(Required = False, allow_none=True)
|
||||
evaluation_notifications_sent = fields.Bool(Required = False, allow_none=True)
|
||||
@ -184,7 +184,10 @@ class ShipcallSchema(Schema):
|
||||
@post_load
|
||||
def make_shipcall(self, data, **kwargs):
|
||||
data['type_value'] = data['type'].value
|
||||
data['evaluation_value'] = data['evaluation'].value
|
||||
if 'evaluation' in data:
|
||||
data['evaluation_value'] = data['evaluation'].value
|
||||
else:
|
||||
data['evaluation_value'] = EvaluationType.undefined
|
||||
return data
|
||||
|
||||
@dataclass
|
||||
|
||||
Loading…
Reference in New Issue
Block a user