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

solving the concatenation issue of a list and a None-type.

Browse Source
This commit is contained in:
Max Metz 2024-08-27 20:52:10 +02:00
parent 8082100b7e
commit e1d9570268
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/BreCal/database/enums.py
View File

@ -62,3 +62,7 @@ class ParticipantFlag(IntFlag):
""" """
undefined = 0 undefined = 0
BSMD = 1 BSMD = 1
@classmethod
def _missing_(cls, value):
return cls.undefined

15
src/server/BreCal/validators/input_validation_times.py
View File

@ -27,8 +27,8 @@ def build_post_data_type_dependent_required_fields_dict()->dict[ShipcallType,dic
""" """
post_data_type_dependent_required_fields_dict = { post_data_type_dependent_required_fields_dict = {
ShipcallType.arrival:{ ShipcallType.arrival:{
ParticipantType.undefined:None, # should not be set in POST requests ParticipantType.undefined:[], # should not be set in POST requests
ParticipantType.BSMD:None, # should not be set in POST requests ParticipantType.BSMD:[], # should not be set in POST requests
ParticipantType.TERMINAL:["operations_start"], ParticipantType.TERMINAL:["operations_start"],
ParticipantType.AGENCY:["eta_berth"], ParticipantType.AGENCY:["eta_berth"],
ParticipantType.MOORING:["eta_berth"], ParticipantType.MOORING:["eta_berth"],
@ -37,8 +37,8 @@ def build_post_data_type_dependent_required_fields_dict()->dict[ShipcallType,dic
ParticipantType.TUG:["eta_berth"], ParticipantType.TUG:["eta_berth"],
}, },
ShipcallType.departure:{ ShipcallType.departure:{
ParticipantType.undefined:None, # should not be set in POST requests ParticipantType.undefined:[], # should not be set in POST requests
ParticipantType.BSMD:None, # should not be set in POST requests ParticipantType.BSMD:[], # should not be set in POST requests
ParticipantType.TERMINAL:["operations_end"], ParticipantType.TERMINAL:["operations_end"],
ParticipantType.AGENCY:["etd_berth"], ParticipantType.AGENCY:["etd_berth"],
ParticipantType.MOORING:["etd_berth"], ParticipantType.MOORING:["etd_berth"],
@ -47,8 +47,8 @@ def build_post_data_type_dependent_required_fields_dict()->dict[ShipcallType,dic
ParticipantType.TUG:["etd_berth"], ParticipantType.TUG:["etd_berth"],
}, },
ShipcallType.shifting:{ ShipcallType.shifting:{
ParticipantType.undefined:None, # should not be set in POST requests ParticipantType.undefined:[], # should not be set in POST requests
ParticipantType.BSMD:None, # should not be set in POST requests ParticipantType.BSMD:[], # should not be set in POST requests
ParticipantType.TERMINAL:["operations_start", "operations_end"], ParticipantType.TERMINAL:["operations_start", "operations_end"],
ParticipantType.AGENCY:["eta_berth", "etd_berth"], ParticipantType.AGENCY:["eta_berth", "etd_berth"],
ParticipantType.MOORING:["eta_berth", "etd_berth"], ParticipantType.MOORING:["eta_berth", "etd_berth"],
@ -270,7 +270,8 @@ class InputValidationTimes():
dependent_required_fields_dict = build_post_data_type_dependent_required_fields_dict() dependent_required_fields_dict = build_post_data_type_dependent_required_fields_dict()
# select shipcall type & participant type # select shipcall type & participant type
dependent_required_fields = dependent_required_fields_dict.get(shipcall_type,{}).get(participant_type,None) dependent_required_fields = dependent_required_fields_dict.get(shipcall_type,{}).get(participant_type,[])
dependent_required_fields = dependent_required_fields if dependent_required_fields is not None else []
return dependent_required_fields return dependent_required_fields
@staticmethod @staticmethod