From c65e41b2d6333798f48869e9c1e678a66f11732a Mon Sep 17 00:00:00 2001
From: Hope Tambala <hopetambala@outlook.com>
Date: Fri, 10 Apr 2020 19:29:02 -0400
Subject: [PATCH] fix: purchase history

---
 app.py                        |   2 +-
 db/database.py                |   4 +---
 db/pineapplestore.db          | Bin 57344 -> 57344 bytes
 endpoints/purchase_history.py |  23 +++++++++++++++++------
 models/purchase_history.py    |  29 ++++++++++++++++++-----------
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/app.py b/app.py
index 2fdffd6..c4e9553 100644
--- a/app.py
+++ b/app.py
@@ -33,7 +33,7 @@ def home():
 api.add_resource(UserRegister, '/user/register')
 api.add_resource(Inventory, '/product/<string:productId>')
 api.add_resource(InventoryProductList, '/products')
-api.add_resource(PurchaseHistory, '/history/<string:name>')
+api.add_resource(PurchaseHistory, '/history/purchase/<string:user_id>')
 api.add_resource(ScanHistory, '/history/scan/<string:user_id>')
 api.add_resource(ScanHistoryRegister, '/history/scan')
 api.add_resource(Shopping, '/shopping')
diff --git a/db/database.py b/db/database.py
index afb0a64..34baa46 100644
--- a/db/database.py
+++ b/db/database.py
@@ -15,7 +15,7 @@
 create_history_table ='{}{}{}{}{}{}'.format(
     'CREATE TABLE IF NOT EXISTS',
     ' purchase_history(id INTEGER PRIMARY KEY,',
-    ' product text, user_id INTEGER NOT NULL,',
+    ' user_id INTEGER NOT NULL,',
     ' product_id INTEGER NOT NULL,',
     ' FOREIGN KEY (user_id) REFERENCES user(id),', 
     ' FOREIGN KEY (product_id) REFERENCES inventory(id));'
@@ -79,8 +79,6 @@
         query = "INSERT OR REPLACE INTO inventory VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
         cursor.execute(query, row)
 
-cursor.execute('INSERT OR REPLACE INTO purchase_history VALUES(1, "tshirt", 1, 1);')
-
 create_shipping_address_table = '{}{}{}{}{}'.format(
     'CREATE TABLE IF NOT EXISTS',
     ' shipping_address(id INTEGER PRIMARY KEY, user_id INTEGER NOT NULL,',
diff --git a/db/pineapplestore.db b/db/pineapplestore.db
index 6f4dada3a2185e4f901e409067c6371deb6bf2b2..5890cf3a0ad987f8e7be2e0ad4a9c5c488663c51 100644
GIT binary patch
delta 286
zcmZoTz}#?vd4e<}_e2?Id2R+hnGL)Q3=EtcI~e%B@-60F$#aUwk$VN#dd^K8J2oo{
zSaED##qp7atFfG!U0hd}u~~8QQr?)!yqr>-HTiBcig55nG4P+`pT(cfZ^ZYX?<n6K
zz9^tJCq5?!4sHf{c~M42MnOT_g2d9C_{6-DjKs9!l(a-3_D#%56%!RTG&VOdG%{3h
z%FM~kO9xS4+NCJ7EOql7xeP`&M*eRM{NFYU8a(2k7{DdQ!N@GiSX!J~!~t?Q6aOa$
u{$Ko`pwcXSY)mW+jEqc7EQ~A+oSd5+SOl0D1R$~#B-lV&aB>$lBme-(BTJM3

delta 416
zcmZoTz}#?vd4e>f*hCp;c`*h(nGL)Q3=Etcs~Gsc@-60_&9jHcn0pr2Le3=|t2Q?3
zaBSYe@sWkAiItgMTvwN|*>>_~-WZ;OqWqN7<PwFF)QXbLynNpoh1mJ#Fz}z_pT(cf
zZ^ZYX?<n7#&4LPTe4FRUWiWCu@jqeU|Hl6WD0G8gO@N76m9aQEF)uzNv$!O`sFH(&
zky(_nv^ceh9pn~9{?82jpEnBzyyWNQW@KfM<m4<V&d4k(+2p_?Ai}|afPw!9{|EjT
z{15nV@L%9R!G8c~?h1Y%HVzh`US>l!b|}pTrj6KGp)?DaHfCdn(o9gA5kiCPX5!z^
zz<-~AKhVU@{JwHP6^@)n21W+D1}3_O1|fzPR;CtK#s+!@re+2PhVnq2j*O`CMut{~
zW_o58#s(%9Ob{a<Gw^@ne+)G8I=?J06DtEFD<cyF!@aB5)R=gH{$ph2WMN=Zv45(#
Hs38FWe92zA

diff --git a/endpoints/purchase_history.py b/endpoints/purchase_history.py
index e1d0303..c3d3123 100644
--- a/endpoints/purchase_history.py
+++ b/endpoints/purchase_history.py
@@ -4,16 +4,27 @@
 
 class PurchaseHistory(Resource):
 
-    def get(self, name):
-        list_of_products = PurchaseHistoryModel.find_products_related_with_user_name(name)
+    def get(self, user_id):
+        # list_of_products = PurchaseHistoryModel.find_products_related_with_user_name(name)
+        list_of_products = PurchaseHistoryModel.find_history_product_by_userId(user_id)
         if list_of_products:
             return {
-            'product_history': [product.json() for product in list_of_products]
+            'purchase_history': [product.json() for product in list_of_products]
             }, 200
         else:
             return {
-            'message': 'User and related prducts not found in database!'
+            'message': 'User and purchased products not found in database!'
             }, 404
 
-    def post(self, name, product):
-        pass
\ No newline at end of file
+    def post(self, user_id):
+        parser = reqparse.RequestParser()
+        parser.add_argument('product_id',
+                            type=str,
+                            required=True,
+                            help='This field is mandatory!')
+
+        data_payload = parser.parse_args()
+
+        PurchaseHistoryModel.add_purchase(user_id,
+                                data_payload['product_id'])
+        return {'message': 'Purchase successfully added to database!'}, 201
\ No newline at end of file
diff --git a/models/purchase_history.py b/models/purchase_history.py
index 7f4c06d..2b05ea4 100644
--- a/models/purchase_history.py
+++ b/models/purchase_history.py
@@ -6,25 +6,24 @@ class PurchaseHistoryModel:
 
     db_path = './db/pineapplestore.db'
 
-    def __init__(self, id, product, user_id, product_id):
+    def __init__(self, id, user_id, product_id):
         self.id = id
-        self.product = product
         self.user_id = user_id
         self.product_id = product_id
 
     @classmethod
-    def find_history_product_by_name(cls, name):
+    def find_history_product_by_userId(cls, userid):
 
         history_products = list()
 
         connection = sqlite3.connect(cls.db_path)
         cursor = connection.cursor()
-        query = 'SELECT * FROM purchase_history WHERE product=?;'
-        resluts = cursor.execute(query, (name,))
+        query = 'SELECT * FROM purchase_history WHERE user_id=?;'
+        resluts = cursor.execute(query, (userid,))
         rows = resluts.fetchall()
         if rows:
             for row in rows:
-                product = PurchaseHistoryModel(row[0], row[1], row[2], row[3])
+                product = PurchaseHistoryModel(row[0], row[1], row[2])
                 history_products.append(product)
             connection.close()
             return history_products
@@ -43,15 +42,23 @@ def find_products_related_with_user_name(cls, name):
             rows = result.fetchall()
             if rows:
                 for row in rows:
-                    products = PurchaseHistoryModel(row[0], row[1], row[2], row[3])
+                    products = PurchaseHistoryModel(row[0], row[1], row[2])
                     products_history_list.append(products)
                 connection.close()
                 return products_history_list
 
+    @classmethod
+    def add_purchase(self, user_id, product_id):
+        connection = sqlite3.connect('./db/pineapplestore.db')
+        cursor = connection.cursor()
+        query = 'INSERT INTO purchase_history VALUES(NULL, ?, ?);'
+        cursor.execute(query, (user_id, product_id,))
+        connection.commit()
+        connection.close()
+
     def json(self):
         return {
-            'user': self.user_id,
-            'product history id': self.id,
-            'product name': self.product,
-            'product store number': self.product_id
+            'purchase_id': self.id,
+            'user_id': self.user_id,
+            'product_id': self.product_id,
         }
\ No newline at end of file