From 6a32881c6a1bd96226da4918f877f004c7a8f288 Mon Sep 17 00:00:00 2001 From: TBS093A Date: Sun, 30 Aug 2020 10:26:00 +0200 Subject: [PATCH] refactor fix -> models.py / AbstractCRUD.py --- generalApp/methods.py | 14 +++++++------- generalApp/models.py | 6 +----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/generalApp/methods.py b/generalApp/methods.py index 2399957..ecf5bf2 100755 --- a/generalApp/methods.py +++ b/generalApp/methods.py @@ -33,25 +33,25 @@ def getExchangeGraph(request, time): return ExchangeVO.getGraphView(request, time) def getTrigger(request, id): - return Triggers.getObject(request, id, 1) + return Triggers.getObject(id) def getTransaction(request, id): - return Transactions.getObject(request, id, 1) + return Transactions.getObject(id) def getUserTriggers(request, userID): - return Triggers.getObjectsByParentID(request, userID, 1) + return Triggers.getObjectsByParentID(userID) def getUserTransactions(request, userID): - return Transactions.getObjectByParentID(request, userID, 1) + return Transactions.getObjectsByParentID(userID) def getTriggersAll(request): - return Triggers.getAllObjects(request, 2) + return Triggers.getAllObjects() def getTransactionsAll(request): - return Transactions.getAllObjects(request, 2) + return Transactions.getAllObjects() def getUserNotifications(request, userID): - return Notifications.getObjectsByParentID(request, userID, 1) + return Notifications.getObjectsByParentID(userID) # Exchange PUT Methods diff --git a/generalApp/models.py b/generalApp/models.py index 6feb250..79e0195 100755 --- a/generalApp/models.py +++ b/generalApp/models.py @@ -267,10 +267,6 @@ class Subjects(AbstractCRUD): newComment.fromDict(objectDict['comment']) newComment.save() - # Update Subject - - # Delete Subject - class Comments(AbstractCRUD): text = models.CharField(max_length=1000) @@ -409,7 +405,7 @@ class Triggers(AbstractCRUD): self.date_of_trigger = str(datetime.now().strftime("%Y-%d-%m %H:%M")) -class Notifications(ObjectAbstract): +class Notifications(AbstractCRUD): message = models.CharField(max_length=255) user = models.ForeignKey(Users, on_delete = models.CASCADE)