From 4a8952fae3d42c0e5b2438ad8e9def30e374f04a Mon Sep 17 00:00:00 2001
From: Josh Burman <jburman@yas.getyardstick.com>
Date: Wed, 8 Sep 2021 11:25:55 -0400
Subject: [PATCH] change tif/tcc targets to be more variable

---
 app/main.py                      | 7 ++++++-
 app/models/form.py               | 2 +-
 app/models/objective_function.py | 8 ++++----
 app/models/targets.py            | 8 --------
 4 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 app/models/targets.py

diff --git a/app/main.py b/app/main.py
index 082beb3..436bb93 100644
--- a/app/main.py
+++ b/app/main.py
@@ -30,5 +30,10 @@ async def ready():
 
 @app.post('/solve/')
 async def solve(solve_request: SolveRequest):
-  response = SolveResponse(response_id=randint(100,5000), forms=[Form(items=solve_request.items)])
+  response = SolveResponse(
+    response_id=randint(100,5000),
+    forms=[Form(
+      items=[item.id for item in solve_request.items]
+    )]
+  )
   return response
diff --git a/app/models/form.py b/app/models/form.py
index 4963daa..5ff5414 100644
--- a/app/models/form.py
+++ b/app/models/form.py
@@ -4,4 +4,4 @@ from typing import List
 from models.item import Item
 
 class Form(BaseModel):
-  items: List[Item]
+  items: List[int]
diff --git a/app/models/objective_function.py b/app/models/objective_function.py
index 75b1d88..05fa461 100644
--- a/app/models/objective_function.py
+++ b/app/models/objective_function.py
@@ -1,12 +1,12 @@
 from pydantic import BaseModel
-from typing import Dict
+from typing import Dict, List
 
-from models.targets import Targets
+from models.target import Target
 
 class ObjectiveFunction(BaseModel):
   # minimizing tif/tcc target value is only option currently
   # as we add more we can build this out to be more dynamic
   # likely with models representing each objective function type
-  tif_targets: Targets
-  tcc_targets: Targets
+  tif_targets: List[Target]
+  tcc_targets: List[Target]
   weight: Dict = {'tif': 1, 'tcc': 1}
diff --git a/app/models/targets.py b/app/models/targets.py
deleted file mode 100644
index 7b56132..0000000
--- a/app/models/targets.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from pydantic import BaseModel
-
-class Targets(BaseModel):
-  n_2_5: int
-  n_1_5: int
-  n_0_5: int
-  p_0_5: int
-  p_1: int