From a3ca2339538eb08c82e2c57ebc1e179da947bb6e Mon Sep 17 00:00:00 2001
From: Josh Burman <jburman@yas.getyardstick.com>
Date: Wed, 27 Apr 2022 15:54:59 +0000
Subject: [PATCH] enforce bundle first ordering if bundles ordering is true

---
 app/helpers/service_helper.py | 3 ++-
 app/models/solver_run.py      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/service_helper.py b/app/helpers/service_helper.py
index 3617025..8acd664 100644
--- a/app/helpers/service_helper.py
+++ b/app/helpers/service_helper.py
@@ -125,7 +125,8 @@ def solution_items(variables: list, solver_run: SolverRun) -> Tuple[list]:
                 if bundle: form_bundles.append(bundle)
 
     for bundle in form_bundles:
-        for item in bundle.ordered_items:
+        items = bundle.ordered_items if solver_run.bundle_first_ordering else bundle.items
+        for item in items:
             final_items.append(item)
 
     for item in form_items:
diff --git a/app/models/solver_run.py b/app/models/solver_run.py
index 69550d0..79eb9ed 100644
--- a/app/models/solver_run.py
+++ b/app/models/solver_run.py
@@ -15,6 +15,7 @@ from models.advanced_options import AdvancedOptions
 class SolverRun(BaseModel):
     items: List[Item] = []
     bundles: List[Bundle] = []
+    bundle_first_ordering: bool = True
     constraints: List[Constraint]
     irt_model: IRTModel
     objective_function: ObjectiveFunction