winzer/elwig-rest-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

elwig-backend: Fix JSON formatting

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-17 12:09:20 +02:00
parent 572a1fc51d
commit 3ac860fc5a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/elwig-backend
View File

@ -244,7 +244,7 @@ class ElwigApi(BaseHTTPRequestHandler):
lambda r: f'{{"year":{r[0]:4},"dsnr":{r[1]:2},"date":"{r[2]}",' lambda r: f'{{"year":{r[0]:4},"dsnr":{r[1]:2},"date":"{r[2]}",'
f'"branch":{{"zwstid":{jdmp(r[10])},"name":{jdmp(r[11]):20}}},' f'"branch":{{"zwstid":{jdmp(r[10])},"name":{jdmp(r[11]):20}}},'
f'"description":{jdmp(r[3]):50},' f'"description":{jdmp(r[3]):50},'
f'"max_weight":{jdmp(r[4]):6},' f'"max_weight":{jdmp(r[4]):>6},'
f'"is_cancelled":{jdmp(r[5], is_bool=True)},' f'"is_cancelled":{jdmp(r[5], is_bool=True)},'
f'"announced_weight":{r[6]:6},' f'"announced_weight":{r[6]:6},'
f'"delivered_weight":{days1.get((r[2], r[10], r[13]), days2.get((r[2], r[10], r[12]), r[7] or 0)):6},' f'"delivered_weight":{days1.get((r[2], r[10], r[13]), days2.get((r[2], r[10], r[12]), r[7] or 0)):6},'
@ -278,27 +278,27 @@ class ElwigApi(BaseHTTPRequestHandler):
if path == '/wine/varieties': if path == '/wine/varieties':
self.exec_collection( self.exec_collection(
"SELECT sortid, type, name, comment FROM wine_variety", "SELECT sortid, type, name, comment FROM wine_variety",
lambda r: f'{{"sortid":"{jdmp(r[0])}","type":"{jdmp(r[1])}","name":"{jdmp(r[2])}","comment":{jdmp(r[3])}}}', lambda r: f'{{"sortid":{jdmp(r[0])},"type":{jdmp(r[1])},"name":{jdmp(r[2])},"comment":{jdmp(r[3])}}}',
filters) filters)
elif path == '/wine/quality_levels': elif path == '/wine/quality_levels':
self.exec_collection( self.exec_collection(
"SELECT qualid, name, min_kmw, predicate FROM wine_quality_level", "SELECT qualid, name, min_kmw, predicate FROM wine_quality_level",
lambda r: f'{{"qualid":"{jdmp(r[0])}","name":"{jdmp(r[1])}","min_kmw":{jdmp(r[2])},"is_predicate":{jdmp(r[3], is_bool=True)}}}', lambda r: f'{{"qualid":{jdmp(r[0])},"name":{jdmp(r[1]):22},"min_kmw":{jdmp(r[2])},"is_predicate":{jdmp(r[3], is_bool=True)}}}',
filters) filters)
elif path == '/wine/attributes': elif path == '/wine/attributes':
self.exec_collection( self.exec_collection(
"SELECT attrid, name FROM wine_attribute", "SELECT attrid, name FROM wine_attribute",
lambda r: f'{{"attrid":"{jdmp(r[0])}","name":"{jdmp(r[1])}"}}', lambda r: f'{{"attrid":{jdmp(r[0]):4},"name":{jdmp(r[1])}}}',
filters) filters)
elif path == '/wine/cultivations': elif path == '/wine/cultivations':
self.exec_collection( self.exec_collection(
"SELECT cultid, name, description FROM wine_cultivation", "SELECT cultid, name, description FROM wine_cultivation",
lambda r: f'{{"cultid":"{jdmp(r[0])}","name":"{jdmp(r[1])}","description":{jdmp(r[2])}}}', lambda r: f'{{"cultid":{jdmp(r[0]):5},"name":{jdmp(r[1])},"description":{jdmp(r[2])}}}',
filters) filters)
elif path == '/modifiers': elif path == '/modifiers':
self.exec_collection( self.exec_collection(
"SELECT year, modid, name, ordering FROM modifier", "SELECT year, modid, name, ordering FROM modifier",
lambda r: f'{{"year":{jdmp(r[0])},"modid":"{jdmp(r[1])}","name":"{jdmp(r[2])}","ordering":{jdmp(r[3])}}}', lambda r: f'{{"year":{jdmp(r[0])},"modid":{jdmp(r[1]):5},"name":{jdmp(r[2]):18},"ordering":{jdmp(r[3])}}}',
filters) filters)
elif path == '/delivery_schedules': elif path == '/delivery_schedules':
self.do_GET_delivery_schedules(filters, offset, limit, order) self.do_GET_delivery_schedules(filters, offset, limit, order)