From 4aa1ea3ba2653ee07c0c511e6a49735209f20cea Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Thu, 28 May 2020 17:41:58 +0530 Subject: [PATCH 01/12] store items branch committed --- app/store/delete_item.py | 6 ++++++ app/store/get_item.py | 7 +++++++ app/store/post_item.py | 7 +++++++ app/store/put_item.py | 7 +++++++ app/store/store_routes.py | 13 +++++++++++++ app/user/user_routes.py | 5 +++++ 6 files changed, 45 insertions(+) create mode 100644 app/store/delete_item.py create mode 100644 app/store/get_item.py create mode 100644 app/store/post_item.py create mode 100644 app/store/put_item.py create mode 100644 app/store/store_routes.py diff --git a/app/store/delete_item.py b/app/store/delete_item.py new file mode 100644 index 0000000..1dca28a --- /dev/null +++ b/app/store/delete_item.py @@ -0,0 +1,6 @@ +from utils import database +def dltItem(ItemID): + db=database.Db + query=("DELETE FROM ItemRateChart WHERE ItemID=%s") + params=(ItemID) + return db.select(query,params) \ No newline at end of file diff --git a/app/store/get_item.py b/app/store/get_item.py new file mode 100644 index 0000000..e6155b9 --- /dev/null +++ b/app/store/get_item.py @@ -0,0 +1,7 @@ +from utils import database + +def findItem(ItemID): + db= database.Db() + query=("SELECT * FROM ItemRateChart WHERE ItemName=%s") + params=(ItemID,) + return db.select(query,params) diff --git a/app/store/post_item.py b/app/store/post_item.py new file mode 100644 index 0000000..74b3c68 --- /dev/null +++ b/app/store/post_item.py @@ -0,0 +1,7 @@ +from utils import database + +def addItem(ItemName,ItemUnit,CurrentRate): + db=database.Db + query=("INSERT INTO ItemRateChart(ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s)") + params=(ItemName,ItemUnit,CurrentRate) + return db.select(query,params) \ No newline at end of file diff --git a/app/store/put_item.py b/app/store/put_item.py new file mode 100644 index 0000000..45dd901 --- /dev/null +++ b/app/store/put_item.py @@ -0,0 +1,7 @@ +from utils import database + +def updateInfo(ItemId,ItemName,ItemUnit,CurrentRate): + db= database.Db + query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") + params=(ItemName,ItemUnit,CurrentRate) + return db.select(query,params) \ No newline at end of file diff --git a/app/store/store_routes.py b/app/store/store_routes.py new file mode 100644 index 0000000..e2c4b6c --- /dev/null +++ b/app/store/store_routes.py @@ -0,0 +1,13 @@ +from flask_restful import Resource +from utils import response +from store import store_item +class Item(Resource): + def get(self,ItemID): + + + def post(): + + def put(): + + def delete(): + diff --git a/app/user/user_routes.py b/app/user/user_routes.py index f6287b9..672560a 100644 --- a/app/user/user_routes.py +++ b/app/user/user_routes.py @@ -1,9 +1,14 @@ from flask_restful import Resource from utils import response +<<<<<<< HEAD from user import add_user,get_user from flask import request class User(Resource): +======= +from user import get_user +class GetUser(Resource): +>>>>>>> store items branch committed def get(self,mobile_num): key, data = get_user.findUserByMob(mobile_num) if len(data) == 0: From 46d7a5e334cc62869fcaee1a7226db3d0ed7e5ba Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Thu, 28 May 2020 17:59:36 +0530 Subject: [PATCH 02/12] storeitem committed --- app/store/store_routes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/store/store_routes.py b/app/store/store_routes.py index e2c4b6c..61dd024 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -5,7 +5,14 @@ class Item(Resource): def get(self,ItemID): - def post(): + def post(self,ItemId): + ItemN=request.form["Name"] + email=request.form["Email"] + account_type=request.form["account_type"] + err=add_user.addUser(mobile_num,name,email,account_type) + if err != True: + return response.styler(204) + return response.styler(400) def put(): From 2e868aaba9968133fb12516c7c5a8296b341dca9 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Fri, 29 May 2020 12:20:50 +0530 Subject: [PATCH 03/12] modified --- app/store/delete_item.py | 2 +- app/store/post_item.py | 2 +- app/store/put_item.py | 2 +- app/store/store_routes.py | 24 +++++++++++++++++------- app/user/user_routes.py | 5 ----- routes.py | 1 + utils/database.py | 21 ++++++++++++++++++++- 7 files changed, 41 insertions(+), 16 deletions(-) diff --git a/app/store/delete_item.py b/app/store/delete_item.py index 1dca28a..51a8644 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -3,4 +3,4 @@ def dltItem(ItemID): db=database.Db query=("DELETE FROM ItemRateChart WHERE ItemID=%s") params=(ItemID) - return db.select(query,params) \ No newline at end of file + return db.delete(query,params) \ No newline at end of file diff --git a/app/store/post_item.py b/app/store/post_item.py index 74b3c68..ed544cd 100644 --- a/app/store/post_item.py +++ b/app/store/post_item.py @@ -4,4 +4,4 @@ def addItem(ItemName,ItemUnit,CurrentRate): db=database.Db query=("INSERT INTO ItemRateChart(ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s)") params=(ItemName,ItemUnit,CurrentRate) - return db.select(query,params) \ No newline at end of file + return db.insert(query,params) \ No newline at end of file diff --git a/app/store/put_item.py b/app/store/put_item.py index 45dd901..6742041 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -4,4 +4,4 @@ def updateInfo(ItemId,ItemName,ItemUnit,CurrentRate): db= database.Db query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") params=(ItemName,ItemUnit,CurrentRate) - return db.select(query,params) \ No newline at end of file + return db.update(query,params) \ No newline at end of file diff --git a/app/store/store_routes.py b/app/store/store_routes.py index 61dd024..006cbda 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -1,20 +1,30 @@ from flask_restful import Resource from utils import response -from store import store_item +from store import get_item,post_item,put_item,delete_item class Item(Resource): def get(self,ItemID): - + key, data = get_item.findItem(ItemID) + if len(data) == 0: + return response.styler(404) + itemdetails = dict(zip(key,data[0])) + return response.styler(200, itemdetails) def post(self,ItemId): - ItemN=request.form["Name"] - email=request.form["Email"] - account_type=request.form["account_type"] - err=add_user.addUser(mobile_num,name,email,account_type) + ItemName=request.form["ItemName"] + ItemUnit=request.form["ItemUnit"] + CurrentRate=request.form["CurrentRate"] + err=post_item.addItem(ItemName,ItemUnit,CurrentRate) if err != True: return response.styler(204) return response.styler(400) def put(): + - def delete(): + def delete(self,ItemID): + err=delete_item.dltItem(ItemID) + if err!= True: + return response.styler(204) + return response.styler(404) + diff --git a/app/user/user_routes.py b/app/user/user_routes.py index 672560a..f6287b9 100644 --- a/app/user/user_routes.py +++ b/app/user/user_routes.py @@ -1,14 +1,9 @@ from flask_restful import Resource from utils import response -<<<<<<< HEAD from user import add_user,get_user from flask import request class User(Resource): -======= -from user import get_user -class GetUser(Resource): ->>>>>>> store items branch committed def get(self,mobile_num): key, data = get_user.findUserByMob(mobile_num) if len(data) == 0: diff --git a/routes.py b/routes.py index 36e5cb0..82db349 100644 --- a/routes.py +++ b/routes.py @@ -1,6 +1,7 @@ from flask import Flask from flask_restful import Resource, Api from user import user_routes +from app = Flask(__name__) api = Api(app) diff --git a/utils/database.py b/utils/database.py index 9c52895..86b7d21 100644 --- a/utils/database.py +++ b/utils/database.py @@ -29,4 +29,23 @@ def insert(self,query,params): return True self.mariadb_connection.commit() return self.cursor.lastrowid - \ No newline at end of file + + def update(self,query,params): + try: + self.cursor.execute(query,params) + print(self.cursor.rowcount, "record updated") + except mariadb.Error as error: + print("Error: {}".format(error)) + return True + self.mariadb_connection.commit() + return ............ + + def delete(self,query,params): + try: + self.cursor.execute(query,params) + print(self.cursor.rowcount, "row deleted") + except mariadb.Error as error: + print("Error: {}".format(error)) + return True + self.mariadb_connection.commit() + return ............ \ No newline at end of file From 766f812d71e1d066bda4fbe52d3fcdae796ed2ff Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Fri, 29 May 2020 12:31:05 +0530 Subject: [PATCH 04/12] itemdetail modified --- app/store/put_item.py | 2 +- app/store/store_routes.py | 12 +++++++++--- routes.py | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/store/put_item.py b/app/store/put_item.py index 6742041..ccdf2b8 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -1,6 +1,6 @@ from utils import database -def updateInfo(ItemId,ItemName,ItemUnit,CurrentRate): +def updateInfo(ItemID,ItemName,ItemUnit,CurrentRate): db= database.Db query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") params=(ItemName,ItemUnit,CurrentRate) diff --git a/app/store/store_routes.py b/app/store/store_routes.py index 006cbda..d6bc5e8 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -9,7 +9,7 @@ def get(self,ItemID): itemdetails = dict(zip(key,data[0])) return response.styler(200, itemdetails) - def post(self,ItemId): + def post(self,ItemID): ItemName=request.form["ItemName"] ItemUnit=request.form["ItemUnit"] CurrentRate=request.form["CurrentRate"] @@ -18,8 +18,14 @@ def post(self,ItemId): return response.styler(204) return response.styler(400) - def put(): - + def put(self,IteemID): + ItemName=request.form["ItemName"] + ItemUnit=request.form["ItemUnit"] + CurrentRate=request.form["CurrentRate"] + err=put_item.updateInfo(ItemID,ItemName,ItemUnit,CurrentRate) + if err!=True: + return response.styler(204) + return response.styler(400) def delete(self,ItemID): err=delete_item.dltItem(ItemID) diff --git a/routes.py b/routes.py index 82db349..46d667a 100644 --- a/routes.py +++ b/routes.py @@ -1,9 +1,11 @@ from flask import Flask from flask_restful import Resource, Api from user import user_routes -from +from store import store_routes app = Flask(__name__) api = Api(app) api.add_resource(user_routes.User, '/user/') + +api.add_resource(store_routes.Item,'/store/') \ No newline at end of file From f535a9e6421088fb03f4c2ba37559d4d24c42098 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Sat, 30 May 2020 00:03:47 +0530 Subject: [PATCH 05/12] storeitem committed --- app/store/store_routes.py | 11 ++++++----- utils/database.py | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/store/store_routes.py b/app/store/store_routes.py index d6bc5e8..cdfb771 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -1,18 +1,19 @@ from flask_restful import Resource from utils import response from store import get_item,post_item,put_item,delete_item +from flask import request class Item(Resource): def get(self,ItemID): key, data = get_item.findItem(ItemID) if len(data) == 0: return response.styler(404) - itemdetails = dict(zip(key,data[0])) + itemdetails = dict(zip(key,data)) return response.styler(200, itemdetails) - def post(self,ItemID): - ItemName=request.form["ItemName"] - ItemUnit=request.form["ItemUnit"] - CurrentRate=request.form["CurrentRate"] + def post(self,ItemID): + ItemName= request.form["ItemName"] + ItemUnit= request.form["ItemUnit"] + CurrentRate= request.form["CurrentRate"] err=post_item.addItem(ItemName,ItemUnit,CurrentRate) if err != True: return response.styler(204) diff --git a/utils/database.py b/utils/database.py index 86b7d21..6713109 100644 --- a/utils/database.py +++ b/utils/database.py @@ -38,9 +38,9 @@ def update(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return ............ + return self.cursor.lastrowid - def delete(self,query,params): + def delete(self,query,params): try: self.cursor.execute(query,params) print(self.cursor.rowcount, "row deleted") @@ -48,4 +48,4 @@ def delete(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return ............ \ No newline at end of file + return self.cursor.lastrowid \ No newline at end of file From 10cc2a8180fea1b5909d3cf189f44fdeb6e0a9bf Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Sat, 30 May 2020 03:04:38 +0530 Subject: [PATCH 06/12] storeitem committed --- app/store/delete_item.py | 4 +++- app/store/post_item.py | 8 ++++---- app/store/put_item.py | 4 +++- app/store/store_routes.py | 6 +++--- utils/database.py | 4 +++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/store/delete_item.py b/app/store/delete_item.py index 51a8644..bf88e6c 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -3,4 +3,6 @@ def dltItem(ItemID): db=database.Db query=("DELETE FROM ItemRateChart WHERE ItemID=%s") params=(ItemID) - return db.delete(query,params) \ No newline at end of file + return db.delete(query,params) + + \ No newline at end of file diff --git a/app/store/post_item.py b/app/store/post_item.py index ed544cd..6c4a3c3 100644 --- a/app/store/post_item.py +++ b/app/store/post_item.py @@ -1,7 +1,7 @@ from utils import database -def addItem(ItemName,ItemUnit,CurrentRate): +def addItem(ItemID,ItemName,ItemUnit,CurrentRate): db=database.Db - query=("INSERT INTO ItemRateChart(ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s)") - params=(ItemName,ItemUnit,CurrentRate) - return db.insert(query,params) \ No newline at end of file + query=("INSERT INTO ItemRateChart (ItemID,ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s,%s)") + params=(ItemID,ItemName,ItemUnit,CurrentRate) + return db.insert(query, params) diff --git a/app/store/put_item.py b/app/store/put_item.py index ccdf2b8..267c593 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -4,4 +4,6 @@ def updateInfo(ItemID,ItemName,ItemUnit,CurrentRate): db= database.Db query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") params=(ItemName,ItemUnit,CurrentRate) - return db.update(query,params) \ No newline at end of file + return db.update(query,params) + + \ No newline at end of file diff --git a/app/store/store_routes.py b/app/store/store_routes.py index cdfb771..7201af7 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -7,19 +7,19 @@ def get(self,ItemID): key, data = get_item.findItem(ItemID) if len(data) == 0: return response.styler(404) - itemdetails = dict(zip(key,data)) + itemdetails = dict(zip(key,data[0])) return response.styler(200, itemdetails) def post(self,ItemID): ItemName= request.form["ItemName"] ItemUnit= request.form["ItemUnit"] CurrentRate= request.form["CurrentRate"] - err=post_item.addItem(ItemName,ItemUnit,CurrentRate) + err=post_item.addItem(ItemID,ItemName,ItemUnit,CurrentRate) if err != True: return response.styler(204) return response.styler(400) - def put(self,IteemID): + def put(self,ItemID): ItemName=request.form["ItemName"] ItemUnit=request.form["ItemUnit"] CurrentRate=request.form["CurrentRate"] diff --git a/utils/database.py b/utils/database.py index 6713109..1d4e6be 100644 --- a/utils/database.py +++ b/utils/database.py @@ -48,4 +48,6 @@ def delete(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return self.cursor.lastrowid \ No newline at end of file + return self.cursor.lastrowid + + \ No newline at end of file From 11bcf925268d0a6d3d634bfc78d8c1f54a7a44d8 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Sun, 31 May 2020 01:58:07 +0530 Subject: [PATCH 07/12] store item --- app/store/delete_item.py | 2 +- app/store/get_item.py | 5 +++-- app/store/post_item.py | 2 +- app/store/put_item.py | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/store/delete_item.py b/app/store/delete_item.py index bf88e6c..d3fa412 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -1,6 +1,6 @@ from utils import database def dltItem(ItemID): - db=database.Db + db=database.Db() query=("DELETE FROM ItemRateChart WHERE ItemID=%s") params=(ItemID) return db.delete(query,params) diff --git a/app/store/get_item.py b/app/store/get_item.py index e6155b9..a351ebb 100644 --- a/app/store/get_item.py +++ b/app/store/get_item.py @@ -2,6 +2,7 @@ def findItem(ItemID): db= database.Db() - query=("SELECT * FROM ItemRateChart WHERE ItemName=%s") - params=(ItemID,) + print("the details is : ") + query=("SELECT * FROM ItemRateChart WHERE ItemID=%s") + params=(ItemID) return db.select(query,params) diff --git a/app/store/post_item.py b/app/store/post_item.py index 6c4a3c3..43d4cc4 100644 --- a/app/store/post_item.py +++ b/app/store/post_item.py @@ -1,7 +1,7 @@ from utils import database def addItem(ItemID,ItemName,ItemUnit,CurrentRate): - db=database.Db + db=database.Db() query=("INSERT INTO ItemRateChart (ItemID,ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s,%s)") params=(ItemID,ItemName,ItemUnit,CurrentRate) return db.insert(query, params) diff --git a/app/store/put_item.py b/app/store/put_item.py index 267c593..ce43801 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -1,9 +1,8 @@ from utils import database def updateInfo(ItemID,ItemName,ItemUnit,CurrentRate): - db= database.Db + db= database.Db() query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") params=(ItemName,ItemUnit,CurrentRate) return db.update(query,params) - \ No newline at end of file From c3cc83a9956b510acf5f6da23d7ef89f85bc6b69 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Sun, 31 May 2020 10:07:29 +0530 Subject: [PATCH 08/12] store item committed --- app/store/delete_item.py | 4 +++- app/store/get_item.py | 3 +-- app/store/put_item.py | 8 +++++--- app/store/store_routes.py | 2 +- utils/database.py | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/store/delete_item.py b/app/store/delete_item.py index d3fa412..33b9545 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -1,8 +1,10 @@ from utils import database def dltItem(ItemID): db=database.Db() + print("You are deleting data for item id : ") + print(ItemID) query=("DELETE FROM ItemRateChart WHERE ItemID=%s") - params=(ItemID) + params=(ItemID, ) return db.delete(query,params) \ No newline at end of file diff --git a/app/store/get_item.py b/app/store/get_item.py index a351ebb..cbf1884 100644 --- a/app/store/get_item.py +++ b/app/store/get_item.py @@ -2,7 +2,6 @@ def findItem(ItemID): db= database.Db() - print("the details is : ") query=("SELECT * FROM ItemRateChart WHERE ItemID=%s") - params=(ItemID) + params=(ItemID, ) return db.select(query,params) diff --git a/app/store/put_item.py b/app/store/put_item.py index ce43801..3787b16 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -1,8 +1,10 @@ from utils import database -def updateInfo(ItemID,ItemName,ItemUnit,CurrentRate): +def updateInfo(ItemName,ItemUnit,CurrentRate,ItemID): db= database.Db() - query=("UPDATE ItemRateChart SET ItemName=%s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") - params=(ItemName,ItemUnit,CurrentRate) + print("you are updating data for itemid : ") + print(ItemID) + query=("UPDATE ItemRateChart set ItemName= %s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") + params=(ItemName,ItemUnit,CurrentRate,ItemID) return db.update(query,params) diff --git a/app/store/store_routes.py b/app/store/store_routes.py index 7201af7..de3039d 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -23,7 +23,7 @@ def put(self,ItemID): ItemName=request.form["ItemName"] ItemUnit=request.form["ItemUnit"] CurrentRate=request.form["CurrentRate"] - err=put_item.updateInfo(ItemID,ItemName,ItemUnit,CurrentRate) + err=put_item.updateInfo(ItemName,ItemUnit,CurrentRate,ItemID) if err!=True: return response.styler(204) return response.styler(400) diff --git a/utils/database.py b/utils/database.py index 1d4e6be..d2d3bca 100644 --- a/utils/database.py +++ b/utils/database.py @@ -38,7 +38,7 @@ def update(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return self.cursor.lastrowid + return ("successful") def delete(self,query,params): try: @@ -48,6 +48,6 @@ def delete(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return self.cursor.lastrowid + return ("successful") \ No newline at end of file From 980f9c63b5ff525c5c04d0c3584a3067a6b533f6 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Tue, 2 Jun 2020 01:49:26 +0530 Subject: [PATCH 09/12] committed --- app/store/post_item.py | 6 +++--- app/store/put_item.py | 13 ++++++++++--- app/store/store_routes.py | 16 ++++++++++------ routes.py | 3 ++- utils/logging.py | 4 ++++ 5 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 utils/logging.py diff --git a/app/store/post_item.py b/app/store/post_item.py index 43d4cc4..201334f 100644 --- a/app/store/post_item.py +++ b/app/store/post_item.py @@ -1,7 +1,7 @@ from utils import database -def addItem(ItemID,ItemName,ItemUnit,CurrentRate): +def addItem(ItemName,ItemUnit,CurrentRate): db=database.Db() - query=("INSERT INTO ItemRateChart (ItemID,ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s,%s)") - params=(ItemID,ItemName,ItemUnit,CurrentRate) + query=("INSERT INTO ItemRateChart (ItemName,ItemUnit,CurrentRate) VALUES(%s,%s,%s)") + params=(ItemName,ItemUnit,CurrentRate) return db.insert(query, params) diff --git a/app/store/put_item.py b/app/store/put_item.py index 3787b16..7c7ed1e 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -3,8 +3,15 @@ def updateInfo(ItemName,ItemUnit,CurrentRate,ItemID): db= database.Db() print("you are updating data for itemid : ") - print(ItemID) - query=("UPDATE ItemRateChart set ItemName= %s,ItemUnit=%s,CurrentRate=%s WHERE ItemID=%s") - params=(ItemName,ItemUnit,CurrentRate,ItemID) + print(ItemID,ItemName,ItemUnit,CurrentRate) + params={"ItemName" : ItemName,"ItemUnit" : ItemUnit,"CurrentRate": CurrentRate} + d="UPDATE ItemRateChart set " + for key in params: + print(key) + if params[key]!= None: + d+=key+"="+str(params[key])+" " + d+="WHERE ItemID = {}".format(ItemID) + query='("'+d+'")' + print(query) return db.update(query,params) diff --git a/app/store/store_routes.py b/app/store/store_routes.py index de3039d..043022e 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -3,26 +3,30 @@ from store import get_item,post_item,put_item,delete_item from flask import request class Item(Resource): + def get(self,ItemID): + endpoint="store" key, data = get_item.findItem(ItemID) + print(endpoint) if len(data) == 0: return response.styler(404) itemdetails = dict(zip(key,data[0])) + return response.styler(200, itemdetails) - def post(self,ItemID): + def post(self): ItemName= request.form["ItemName"] ItemUnit= request.form["ItemUnit"] CurrentRate= request.form["CurrentRate"] - err=post_item.addItem(ItemID,ItemName,ItemUnit,CurrentRate) + err=post_item.addItem(ItemName,ItemUnit,CurrentRate) if err != True: - return response.styler(204) + return response.styler(200,{"ItemID": err}) return response.styler(400) def put(self,ItemID): - ItemName=request.form["ItemName"] - ItemUnit=request.form["ItemUnit"] - CurrentRate=request.form["CurrentRate"] + ItemName=request.args.get ('ItemName') + ItemUnit=request.args.get('ItemUnit') + CurrentRate=request.args.get("CurrentRate") err=put_item.updateInfo(ItemName,ItemUnit,CurrentRate,ItemID) if err!=True: return response.styler(204) diff --git a/routes.py b/routes.py index 46d667a..ecba1dd 100644 --- a/routes.py +++ b/routes.py @@ -8,4 +8,5 @@ api.add_resource(user_routes.User, '/user/') -api.add_resource(store_routes.Item,'/store/') \ No newline at end of file +api.add_resource(store_routes.Item,'/store/',endpoint= "Item") +api.add_resource(store_routes.Item,'/store', endpoint="addItem") \ No newline at end of file diff --git a/utils/logging.py b/utils/logging.py new file mode 100644 index 0000000..bae90cd --- /dev/null +++ b/utils/logging.py @@ -0,0 +1,4 @@ + + +# def printlog(status,endpoint,method): + \ No newline at end of file From aa746581af3ae46e4efcf9339b8fc35752725c14 Mon Sep 17 00:00:00 2001 From: say-paul Date: Wed, 3 Jun 2020 11:05:56 +0530 Subject: [PATCH 10/12] updating put and minor logging --- app/store/delete_item.py | 7 ++----- app/store/put_item.py | 26 +++++++++++++------------- app/store/store_routes.py | 18 +++++++++++------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/app/store/delete_item.py b/app/store/delete_item.py index 33b9545..e6d90a0 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -1,10 +1,7 @@ from utils import database def dltItem(ItemID): db=database.Db() - print("You are deleting data for item id : ") - print(ItemID) - query=("DELETE FROM ItemRateChart WHERE ItemID=%s") + print("You are deleting data for item id : {}".format(ItemID)) + query = ("DELETE FROM ItemRateChart WHERE ItemID=%s") params=(ItemID, ) return db.delete(query,params) - - \ No newline at end of file diff --git a/app/store/put_item.py b/app/store/put_item.py index 7c7ed1e..020d192 100644 --- a/app/store/put_item.py +++ b/app/store/put_item.py @@ -1,17 +1,17 @@ from utils import database -def updateInfo(ItemName,ItemUnit,CurrentRate,ItemID): + +def updateInfo(ItemID,ItemName=None, ItemUnit=None, CurrentRate=None): db= database.Db() - print("you are updating data for itemid : ") - print(ItemID,ItemName,ItemUnit,CurrentRate) - params={"ItemName" : ItemName,"ItemUnit" : ItemUnit,"CurrentRate": CurrentRate} - d="UPDATE ItemRateChart set " - for key in params: - print(key) - if params[key]!= None: - d+=key+"="+str(params[key])+" " - d+="WHERE ItemID = {}".format(ItemID) - query='("'+d+'")' - print(query) + print("you are updating data for id : {}".format(ItemID)) + print(ItemName,ItemUnit,CurrentRate) + args={"ItemName" : ItemName,"ItemUnit" : ItemUnit,"CurrentRate": CurrentRate} + query="UPDATE ItemRateChart set " + params = () + for key in args: + if args[key]!= None: + query += key + "=" + "%s " + params += (args[key], ) + query += "WHERE ItemID=%s" + params += (ItemID,) return db.update(query,params) - diff --git a/app/store/store_routes.py b/app/store/store_routes.py index 043022e..cd1f831 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -3,7 +3,7 @@ from store import get_item,post_item,put_item,delete_item from flask import request class Item(Resource): - + def get(self,ItemID): endpoint="store" key, data = get_item.findItem(ItemID) @@ -24,10 +24,16 @@ def post(self): return response.styler(400) def put(self,ItemID): - ItemName=request.args.get ('ItemName') - ItemUnit=request.args.get('ItemUnit') - CurrentRate=request.args.get("CurrentRate") - err=put_item.updateInfo(ItemName,ItemUnit,CurrentRate,ItemID) + ItemName, ItemUnit, CurrentRate = None, None, None + if request.form.get('ItemName', None): + ItemName = request.form['ItemName'] + if request.form.get('ItemUnit', None): + ItemUnit = request.form['ItemUnit'] + if request.form.get('CurrentRate', None): + CurrentRate = request.form["CurrentRate"] + print("The values are , {} , {} , {}".format(ItemName, ItemUnit, + CurrentRate)) + err = put_item.updateInfo(ItemID,ItemName, ItemUnit, CurrentRate) if err!=True: return response.styler(204) return response.styler(400) @@ -37,5 +43,3 @@ def delete(self,ItemID): if err!= True: return response.styler(204) return response.styler(404) - - From dda91353c38be7f5b07ddda04909168a5bd1a401 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Thu, 4 Jun 2020 20:10:25 +0530 Subject: [PATCH 11/12] get table --- app/store/get_table.py | 8 ++++++++ app/store/store_routes.py | 10 ++++++++++ routes.py | 3 ++- utils/database.py | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 app/store/get_table.py diff --git a/app/store/get_table.py b/app/store/get_table.py new file mode 100644 index 0000000..47e1af6 --- /dev/null +++ b/app/store/get_table.py @@ -0,0 +1,8 @@ +from utils import database + +def getTable(): + db= database.Db() + print("Request for table") + query=("SELECT * from ItemRateChart") + params=() + return db.select(query,params) \ No newline at end of file diff --git a/app/store/store_routes.py b/app/store/store_routes.py index cd1f831..44f141b 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -39,7 +39,17 @@ def put(self,ItemID): return response.styler(400) def delete(self,ItemID): + err=delete_item.dltItem(ItemID) + print(err) if err!= True: return response.styler(204) return response.styler(404) + +class Table(Resource): + def get(self): + key,data= get_table.getTable() + if len(data)==0: + return response.styler(404) + dictionary=dict(zip(key,data)) + return response.styler(200,dictionary) \ No newline at end of file diff --git a/routes.py b/routes.py index ecba1dd..84131a3 100644 --- a/routes.py +++ b/routes.py @@ -9,4 +9,5 @@ api.add_resource(user_routes.User, '/user/') api.add_resource(store_routes.Item,'/store/',endpoint= "Item") -api.add_resource(store_routes.Item,'/store', endpoint="addItem") \ No newline at end of file +api.add_resource(store_routes.Item,'/store', endpoint="addItem") +api.add_resource(store_routes.Table,'/store',endpoint= "getTable") \ No newline at end of file diff --git a/utils/database.py b/utils/database.py index d2d3bca..dc3a0a4 100644 --- a/utils/database.py +++ b/utils/database.py @@ -48,6 +48,6 @@ def delete(self,query,params): print("Error: {}".format(error)) return True self.mariadb_connection.commit() - return ("successful") + return (self.cursor.rowcount) \ No newline at end of file From 48aa807024c61b0709aee00b7222b059de91b083 Mon Sep 17 00:00:00 2001 From: jhilikkundu Date: Fri, 5 Jun 2020 04:11:00 +0530 Subject: [PATCH 12/12] get table and delete modified --- app/store/delete_item.py | 3 ++- app/store/get_table.py | 3 +-- app/store/store_routes.py | 26 ++++++++++++++------------ routes.py | 2 +- utils/database.py | 12 +++++++++--- utils/logging.py | 4 ---- utils/response.py | 10 +++++----- 7 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 utils/logging.py diff --git a/app/store/delete_item.py b/app/store/delete_item.py index e6d90a0..36fb8c7 100644 --- a/app/store/delete_item.py +++ b/app/store/delete_item.py @@ -4,4 +4,5 @@ def dltItem(ItemID): print("You are deleting data for item id : {}".format(ItemID)) query = ("DELETE FROM ItemRateChart WHERE ItemID=%s") params=(ItemID, ) - return db.delete(query,params) + return db.dlt(query,params) + \ No newline at end of file diff --git a/app/store/get_table.py b/app/store/get_table.py index 47e1af6..b929b3d 100644 --- a/app/store/get_table.py +++ b/app/store/get_table.py @@ -4,5 +4,4 @@ def getTable(): db= database.Db() print("Request for table") query=("SELECT * from ItemRateChart") - params=() - return db.select(query,params) \ No newline at end of file + return db.getall(query) \ No newline at end of file diff --git a/app/store/store_routes.py b/app/store/store_routes.py index 44f141b..9458b1b 100644 --- a/app/store/store_routes.py +++ b/app/store/store_routes.py @@ -1,18 +1,15 @@ from flask_restful import Resource from utils import response -from store import get_item,post_item,put_item,delete_item +from store import get_item,post_item,put_item,delete_item,get_table from flask import request class Item(Resource): def get(self,ItemID): - endpoint="store" key, data = get_item.findItem(ItemID) - print(endpoint) if len(data) == 0: - return response.styler(404) + return response.styler(404) itemdetails = dict(zip(key,data[0])) - - return response.styler(200, itemdetails) + return itemdetails def post(self): ItemName= request.form["ItemName"] @@ -35,21 +32,26 @@ def put(self,ItemID): CurrentRate)) err = put_item.updateInfo(ItemID,ItemName, ItemUnit, CurrentRate) if err!=True: - return response.styler(204) + return response.styler(203) return response.styler(400) def delete(self,ItemID): err=delete_item.dltItem(ItemID) print(err) - if err!= True: - return response.styler(204) - return response.styler(404) + if err!= "failed" and err!=0: + return response.styler(203) + + return response.styler(400) + class Table(Resource): def get(self): key,data= get_table.getTable() if len(data)==0: return response.styler(404) - dictionary=dict(zip(key,data)) - return response.styler(200,dictionary) \ No newline at end of file + a=[] + for i in range(len(data)): + d= dict(zip(key,data[i])) + a.append(d) + return (a) \ No newline at end of file diff --git a/routes.py b/routes.py index 84131a3..1dab5f5 100644 --- a/routes.py +++ b/routes.py @@ -7,7 +7,7 @@ api = Api(app) api.add_resource(user_routes.User, '/user/') +api.add_resource(store_routes.Table,'/store', endpoint="Table") api.add_resource(store_routes.Item,'/store/',endpoint= "Item") api.add_resource(store_routes.Item,'/store', endpoint="addItem") -api.add_resource(store_routes.Table,'/store',endpoint= "getTable") \ No newline at end of file diff --git a/utils/database.py b/utils/database.py index dc3a0a4..e512971 100644 --- a/utils/database.py +++ b/utils/database.py @@ -40,14 +40,20 @@ def update(self,query,params): self.mariadb_connection.commit() return ("successful") - def delete(self,query,params): + def dlt(self,query,params): try: self.cursor.execute(query,params) print(self.cursor.rowcount, "row deleted") except mariadb.Error as error: print("Error: {}".format(error)) - return True + return ("failed") self.mariadb_connection.commit() return (self.cursor.rowcount) - \ No newline at end of file + def getall(self,query): + try: + self.cursor.execute(query) + except mariadb.Error as error: + print("Error: {}".format(error)) + return "" + return self.cursor.column_names, self.cursor.fetchall() diff --git a/utils/logging.py b/utils/logging.py deleted file mode 100644 index bae90cd..0000000 --- a/utils/logging.py +++ /dev/null @@ -1,4 +0,0 @@ - - -# def printlog(status,endpoint,method): - \ No newline at end of file diff --git a/utils/response.py b/utils/response.py index 628a75e..ad11298 100644 --- a/utils/response.py +++ b/utils/response.py @@ -1,13 +1,13 @@ from flask import jsonify, make_response -msg = {404 : "Not Found", - 401 : "Unauthorized", - 400:"Bad Request", - 204:"Request Successful"} +msg = {401 : "Unauthorized", + 203 : "Request Successful", + 400 : "Bad Request", + 404 : "Not Found"} def styler (status,body = None): if (status in msg.keys()): - body = {"body" : msg[status]} + body = {"body": msg[status]} return make_response(jsonify(body),status) body = {"body": body} return make_response(jsonify(body), status)