From bcd2ab6113f7660a53cde94c28f69e8ae10bb240 Mon Sep 17 00:00:00 2001
From: Edwin Eames <eddwinn@gmail.com>
Date: Fri, 27 Sep 2024 14:13:23 -0400
Subject: [PATCH] fixed bugs

---
 Dockerfile             |  1 +
 Dockerfile.prod        |  2 +-
 app/models/delivery.py | 16 ++++++++--------
 app/models/money.py    | 22 +++++++++++-----------
 app/models/pricing.py  | 14 +++++++-------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e2b0834..eff3ece 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN mkdir -p /app
 COPY requirements.txt /app
 
 WORKDIR /app
+RUN pip3 install setuptools
 RUN pip3 install fastapi
 RUN pip3 install  sqlalchemy
 RUN pip3 install -r requirements.txt
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 3b0bcf9..5e3458d 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -9,7 +9,7 @@ RUN mkdir -p /app
 COPY requirements.txt /app
 
 WORKDIR /app
-
+RUN pip3 install setuptools
 RUN pip3 install -r requirements.txt
 
 EXPOSE 8001
diff --git a/app/models/delivery.py b/app/models/delivery.py
index a6f16ec..9f0c85d 100644
--- a/app/models/delivery.py
+++ b/app/models/delivery.py
@@ -22,7 +22,7 @@ class Delivery(Base):
  
     gallons_ordered = Column(INTEGER)
     customer_asked_for_fill = Column(INTEGER)
-    gallons_delivered = Column(DECIMAL(50, 2))
+    gallons_delivered = Column(DECIMAL(6, 2))
     customer_filled = Column(INTEGER)
   
     delivery_status = Column(INTEGER)
@@ -32,20 +32,20 @@ class Delivery(Base):
     automatic = Column(INTEGER)
     automatic_id = Column(INTEGER)
     oil_id = Column(INTEGER)
-    supplier_price = Column(DECIMAL(50, 2))
-    customer_price = Column(DECIMAL(50, 2))
-    customer_temperature = Column(DECIMAL(50, 2))
+    supplier_price = Column(DECIMAL(6, 2))
+    customer_price = Column(DECIMAL(6, 2))
+    customer_temperature = Column(DECIMAL(6, 2))
     dispatcher_notes = Column(TEXT())
     prime = Column(INTEGER)
     same_day = Column(INTEGER)
     payment_type = Column(INTEGER)
     payment_card_id = Column(INTEGER)
-    cash_recieved = Column(DECIMAL(50, 2))
+    cash_recieved = Column(DECIMAL(6, 2))
     
     driver_employee_id = Column(INTEGER)
     driver_first_name = Column(VARCHAR(140))
     driver_last_name = Column(VARCHAR(140))
 
-    pre_charge_amount = Column(DECIMAL(50, 2))
-    total_price = Column(DECIMAL(50, 2))
-    final_price = Column(DECIMAL(50, 2))
\ No newline at end of file
+    pre_charge_amount = Column(DECIMAL(6, 2))
+    total_price = Column(DECIMAL(6, 2))
+    final_price = Column(DECIMAL(6, 2))
\ No newline at end of file
diff --git a/app/models/money.py b/app/models/money.py
index 95520f2..f9cd8ad 100644
--- a/app/models/money.py
+++ b/app/models/money.py
@@ -15,14 +15,14 @@ class MoneyDelivery(Base):
 
     delivery_id = Column(Integer)
     time_added = Column(TIMESTAMP(), default=datetime.utcnow())
-    gallons_delivered = Column(DECIMAL(50, 2))
-    supplier_price = Column(DECIMAL(50, 2))
-    customer_price = Column(DECIMAL(50, 2))
-    total_amount_oil = Column(DECIMAL(50, 2))
-    total_amount_prime = Column(DECIMAL(50, 2))
-    total_amount_same_day = Column(DECIMAL(50, 2))
-    total_amount_fee = Column(DECIMAL(50, 2))
-    total_amount = Column(DECIMAL(50, 2))
-    taxes_paid = Column(DECIMAL(50, 2))
-    total_profit = Column(DECIMAL(50, 2))
-    total_profit_oil = Column(DECIMAL(50, 2))
\ No newline at end of file
+    gallons_delivered = Column(DECIMAL(6, 2))
+    supplier_price = Column(DECIMAL(6, 2))
+    customer_price = Column(DECIMAL(6, 2))
+    total_amount_oil = Column(DECIMAL(6, 2))
+    total_amount_prime = Column(DECIMAL(6, 2))
+    total_amount_same_day = Column(DECIMAL(6, 2))
+    total_amount_fee = Column(DECIMAL(6, 2))
+    total_amount = Column(DECIMAL(6, 2))
+    taxes_paid = Column(DECIMAL(6, 2))
+    total_profit = Column(DECIMAL(6, 2))
+    total_profit_oil = Column(DECIMAL(6, 2))
\ No newline at end of file
diff --git a/app/models/pricing.py b/app/models/pricing.py
index 33b744e..4fac899 100644
--- a/app/models/pricing.py
+++ b/app/models/pricing.py
@@ -12,11 +12,11 @@ class Pricing_Oil_Oil(Base):
                    autoincrement=True,
                    unique=False)
 
-    price_from_supplier = Column(DECIMAL(50, 2))
-    price_for_customer = Column(DECIMAL(50, 2))
-    price_for_employee = Column(DECIMAL(50, 2))
-    price_same_day = Column(DECIMAL(50, 2))
-    price_prime = Column(DECIMAL(50, 2))
+    price_from_supplier = Column(DECIMAL(6, 2))
+    price_for_customer = Column(DECIMAL(6, 2))
+    price_for_employee = Column(DECIMAL(6, 2))
+    price_same_day = Column(DECIMAL(6, 2))
+    price_prime = Column(DECIMAL(6, 2))
     date = Column(TIMESTAMP(), default=datetime.utcnow())
 
 
@@ -30,5 +30,5 @@ class Pricing_Taxes(Base):
                    autoincrement=True,
                    unique=False)
     state_id = Column(Integer)
-    taxes_oil = Column(DECIMAL(50, 2))
-    taxes_other = Column(DECIMAL(50, 2))
\ No newline at end of file
+    taxes_oil = Column(DECIMAL(6, 2))
+    taxes_other = Column(DECIMAL(6, 2))
\ No newline at end of file