dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug for POST new shipcalls

Browse Source
This commit is contained in:
Daniel Schick 2024-03-30 19:48:53 +01:00
parent a845135650
commit ac2ad3bc18
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/BreCal/impl/shipcalls.py
View File

@ -84,6 +84,10 @@ def PostShipcalls(schemaModel):
if key == "evaluation": if key == "evaluation":
continue continue
if key == "evaluation_message": if key == "evaluation_message":
continue
if key == "type_value":
continue
if key == "evaluation_value":
continue continue
if isNotFirst: if isNotFirst:
query += "," query += ","
@ -104,6 +108,14 @@ def PostShipcalls(schemaModel):
continue continue
if key == "evaluation_message": if key == "evaluation_message":
continue 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: if isNotFirst:
query += "," query += ","
isNotFirst = True isNotFirst = True

7
src/server/BreCal/schemas/model.py
View File

@ -172,7 +172,7 @@ class ShipcallSchema(Schema):
anchored = fields.Bool(Required = False, allow_none=True) anchored = fields.Bool(Required = False, allow_none=True)
moored_lock = fields.Bool(Required = False, allow_none=True) moored_lock = fields.Bool(Required = False, allow_none=True)
canceled = 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_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_time = fields.DateTime(Required = False, allow_none=True)
evaluation_notifications_sent = fields.Bool(Required = False, allow_none=True) evaluation_notifications_sent = fields.Bool(Required = False, allow_none=True)
@ -184,7 +184,10 @@ class ShipcallSchema(Schema):
@post_load @post_load
def make_shipcall(self, data, **kwargs): def make_shipcall(self, data, **kwargs):
data['type_value'] = data['type'].value 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 return data
@dataclass @dataclass