jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proper typing and bundle first ordering

Browse Source
This commit is contained in:
Josh Burman
2022-04-27 15:46:23 +00:00
parent c7da2862b2
commit a919530cab
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/service_helper.py
View File

@ -105,6 +105,8 @@ def key_to_uuid(key):
def solution_items(variables: list, solver_run: SolverRun) -> Tuple[list]:
form_items = []
form_bundles = []
final_items = []
solver_variables = []
for v in variables:
@ -120,9 +122,14 @@ def solution_items(variables: list, solver_run: SolverRun) -> Tuple[list]:
bundle_id = v.name.replace('Bundle_', '')
bundle = solver_run.get_bundle(int(bundle_id))
if bundle:
for item in bundle.items:
if item: form_items.append(item)
if bundle: form_bundles.append(bundle)
for bundle in form_bundles:
for item in bundle.ordered_items:
final_items.append(item)
for item in form_items:
final_items.append(item)
return form_items, solver_variables