From c463e42009acf6e0e4aed2eedbfefd4184e75f60 Mon Sep 17 00:00:00 2001
From: TBS093A <zukkamil.44@gmail.com>
Date: Sat, 29 Aug 2020 17:17:43 +0200
Subject: [PATCH] big fix request statements && fix models.py && fix
 AbstractCRUD

---
 generalApp/AbstractCRUD.py                    |  11 ++-
 .../__pycache__/AbstractCRUD.cpython-36.pyc   | Bin 0 -> 7529 bytes
 generalApp/__pycache__/methods.cpython-36.pyc | Bin 6133 -> 6128 bytes
 generalApp/__pycache__/models.cpython-36.pyc  | Bin 14597 -> 14463 bytes
 generalApp/methods.py                         |  12 +--
 generalApp/models.py                          |  73 +++++++++++-------
 6 files changed, 58 insertions(+), 38 deletions(-)
 create mode 100644 generalApp/__pycache__/AbstractCRUD.cpython-36.pyc
 mode change 100755 => 100644 generalApp/__pycache__/methods.cpython-36.pyc
 mode change 100755 => 100644 generalApp/__pycache__/models.cpython-36.pyc

diff --git a/generalApp/AbstractCRUD.py b/generalApp/AbstractCRUD.py
index 959256a..ffb9d3e 100644
--- a/generalApp/AbstractCRUD.py
+++ b/generalApp/AbstractCRUD.py
@@ -1,4 +1,7 @@
 from django.db import models
+from django.http import HttpResponse
+from datetime import datetime
+from .utilities import *
 
 class ValidationUtils():
 
@@ -116,13 +119,13 @@ class AbstractCreate(AbstractUtilsCRUD):
         """
         save object without parent
         """
-        newObject = self._objectFactory()
+        newObject = self._objectFactory()()
         newObject.fromDict(objectDict)
         newObject.save()
         return HttpResponse(f"Add new Object: {newObject.toDict()}")
 
     @classmethod
-    def addObject(self, request, parentID, privilige):
+    def addObjectWithParent(self, request, parentID, privilige):
         """
         create object with parent
         """
@@ -139,7 +142,7 @@ class AbstractCreate(AbstractUtilsCRUD):
         """
         save object with parent & subject + comment & set trigger time
         """
-        newObject = self._objectFactory()
+        newObject = self._objectFactory()()
         newObject.fromDict(objectDict)
 
         self.__setParentID(parentID)
@@ -166,7 +169,7 @@ class AbstractUpdate(AbstractUtilsCRUD):
     @classmethod
     def putObject(self, request, objectID, privilige):
         object = jsonLoad(request) 
-        if checkSession(request, privilige) and checkUserPermission(object, request)
+        if checkSession(request, privilige) and checkUserPermission(object, request):
             return self._updateObject(object, objectID)
         else:
             return HttpResponse("No Permission")
diff --git a/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc b/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d7506b242a42df12b4f58169d751b5e933fbe377
GIT binary patch
literal 7529
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
H&G7d>9UMC2

literal 0
HcmV?d00001

diff --git a/generalApp/__pycache__/methods.cpython-36.pyc b/generalApp/__pycache__/methods.cpython-36.pyc
old mode 100755
new mode 100644
index c2b7c46929c297d42ca1f4527a74c1a466a4555e..9faf4e0b4a54e02f574b885316d1f4b4a37e07af
GIT binary patch
delta 435
zcmZ8byG{a85Zy~6D+tRzMPtN5V?v@?h>sOPMG$<%w?^y;DhU!_!R@dxT3~-_6X`5$
zjGcwn*qB%ut^5NmER2nFxAZ16ch1Z?bLQLpG(7`;zxVxUE`NFJDY~R_vvjy$H0`b9
zNNk{RcjiiZ4VNGYX^LYnC0i)76XBfU-M5OW*o{?x)p*kiJ3C8T<>I!T+qFx}g-Y?j
z#*2T1rLZCoAt|-6B<7_A%Q*N!@)B-HaW+HPL|zpU55)Rs$zYpN;*bA49P4H(xb?ZP
zCWP5y*i|ucC3c|^Xk&Bua`!=!Q+Sds)MSNCBHFCsMh+pPSSnvo>7Yca0I#Q<aj(+F
z7RY{B&Hg7$JA}FtVvC%Bh~9)>We{~WLbs-%YZhMB1ZtYa(s<N*aHIwCLnupV6nlCE
zr?N=81U{(Ft3F)oG2{#jZN>!K;9E%<)q5~zh`2X2mUDVprx$K*XPZd3KD$%=v<y0f
K>(tl}Ui<;Z2yc4;

delta 405
zcmeyM|5cyUn3tDp=R3u?*&8`inM7RlGxBp&_48A6^<DC_OLJ56N-8(kFgb8do-8cP
zmco$2(9AsfB2N&E%LwFJ@wT%T@i8zkOuoiz!RR>IQP7m<7Kd|wE=YHA5#QthJ{v|C
zkTCZx_MpU)%)E4v=vh8%Mt7j7{$vY&2S$&{clmWEJMgkiUd(Sfxq@GC@>~8mMlYbe
znUFou>>_C(p~+Ol4`Mq^R^$|(yj(zTvbTV_kQ2JJ^W=$KB9oN_<t85mO1q*<yMcAj
z0ZKavnos^HXgPV8puyxQA*ab&LI#ry1lcEF7P6T<N64JfX|e#P%H(WeamGN9Ll|Ab
z{CmP;lbeLiCu@t?O#UJa(#bQKMNED2DG{N`=^_vlghlNq-w^?s(7>fKd7Y@#<RDRV
jM%PJVwv6GE?ZnP=JAz#00wUZe3yX&^a)BMyAYK3f0nl!)

diff --git a/generalApp/__pycache__/models.cpython-36.pyc b/generalApp/__pycache__/models.cpython-36.pyc
old mode 100755
new mode 100644
index 917c711698538b926157cd977ab0aecb0550160a..7218bef2d7eedcce06f1c806a3ee3902fd77b90a
GIT binary patch
literal 14463
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

literal 14597
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
Yp0oHvD_dQzE>@qc9;`l5tyRD9zi~%CQUCw|

diff --git a/generalApp/methods.py b/generalApp/methods.py
index ac70cda..2399957 100755
--- a/generalApp/methods.py
+++ b/generalApp/methods.py
@@ -89,19 +89,19 @@ def logoutUser(request):
     return deleteSession(request)
 
 def registerUser(request):
-    return Users.addObject(request, None, None)
+    return Users.addObject(request)
 
 def addThread(request):
-    return Threads.addObject(request, None, 2)
+    return Threads.addObject(request, 2)
 
 def addSubject(request, threadID):
-    return Subjects.addObject(request, threadID, 1)
+    return Subjects.addObjectWithParent(request, threadID, 1)
 
 def addComment(request, subjectID):
-    return Comments.addObject(request, subjectID, 1)
+    return Comments.addObjectWithParent(request, subjectID, 1)
 
 def addRating(request, commentID):
-    return Ratings.addObject(request, commentID, 1)
+    return Ratings.addObjectWithParent(request, commentID, 1)
 
 # Forum GET Methods
 
@@ -109,7 +109,7 @@ def getUser(request, id):
     return Users.getObject(request, id, 2)
 
 def getUsersAll(request):
-    return Users.getAllObjects(request, 2)
+    return Users.getAllObjects()
 
 def getThreadsAll(request):
     return Threads.getAllObjects(request, 1)
diff --git a/generalApp/models.py b/generalApp/models.py
index 206d8fb..6feb250 100755
--- a/generalApp/models.py
+++ b/generalApp/models.py
@@ -90,7 +90,7 @@ class ObjectAbstract(models.Model):
     @classmethod
     def putObject(self, request, objectID, privilige):
         object = jsonLoad(request) 
-        if checkSession(request, privilige) and checkUserPermission(object, request)
+        if checkSession(request, privilige) and checkUserPermission(object, request):
             return self.updateObject(request, object, objectID)
         else:
             return HttpResponse("No Permission")
@@ -142,35 +142,29 @@ class Users(AbstractCRUD):
 
     # Object Factory for abstract
 
-    def objectFactory():
-        return Users()
-
-    # Get One User
-
-    def __getObjectNormal(objectID):
-        oneUser = Users.objects.get(pk = objectID).toDict()
-        return HttpResponse(json.dumps(oneUser))
+    def _objectFactory():
+        return Users
 
     # Create User
 
     @classmethod
-    def addObject(request, privilige):
+    def addObject(self, request):
         newUser = jsonLoad(request)
         newUser['privilige'] = 1
-        newUser['password'] = createPassHash(object['password'])
-        if self.__validateUnique(newUser):
-                return self.__saveObject(newUser)
+        newUser['password'] = createPassHash(newUser['password'])
+        if self._validateUnique(newUser):
+                return self._saveObject(newUser)
         else:
             return HttpResponse("User Is Already Exist")
 
-    def __validateUnique(userDict):
-        usersAll = self.__allObjectsDict(User)
+    def _validateUnique(self, userDict):
+        usersAll = self._allObjectsDict()
         for user in usersAll:
             if user['login'].upper() == userDict['login'].upper():
                 return False
         return True
 
-    def __saveObject(objectDict):
+    def _saveObject(self, objectDict):
         newUser = Users()
         newUser.fromDict(objectDict)
         newUser.save()
@@ -178,11 +172,11 @@ class Users(AbstractCRUD):
 
     # Update User
 
-    def updateObject(self, userDict, objectID):
+    def _updateObject(self, userDict, objectID):
         putUser = Users.objects.get(pk = objectID)
         if checkPassHash(userDict['passwordOld'], putUser.password):
             if 'passwordNew' in userDict.keys():
-                userDict['password'] = createPassHash(objectDict['passwordNew'])
+                userDict['password'] = createPassHash(userDict['passwordNew'])
         else:
             return HttpResponse('Bad Password')
         putUser.fromDict(userDict)
@@ -192,10 +186,11 @@ class Users(AbstractCRUD):
     # Delete User
 
     @classmethod
-    def deleteObject(request, objectID, privilige):
+    def deleteObject(self, request, objectID, privilige):
+        checkPass = jsonLoad(request)
         objectDel = Users.objects.get(pk = objectID)
         if checkSession(request, privilige) and checkUserPermission(objectDel.toDict(), request):
-            if checkPassHash(objectDict['password'], objectDel.password):
+            if checkPassHash(checkPass['password'], objectDel.password):
                 pass
             else:
                 return HttpResponse("Bad Password")
@@ -225,12 +220,12 @@ class Threads(AbstractCRUD):
     # Object Factory for abstract
 
     def objectFactory():
-        return Threads()
+        return Threads
 
     # Create Thread (validation)
 
     def _validateUnique(self, objectDict):
-        objectsAll = Threads.__allObjectsDict(model)
+        objectsAll = Threads._allObjectsDict()
         for x in objectsAll:
             if x['name'].upper() == objectDict['name'].upper():
                 return False
@@ -263,11 +258,11 @@ class Subjects(AbstractCRUD):
     # Object Factory for abstract
 
     def objectFactory():
-        return Subjects()
+        return Subjects
 
     # Create Subject ( create new subject + comment ones )
 
-    def _createFirstComment(newSubject, objectDict):
+    def _createFirstComment(self,newSubject, objectDict):
         newComment = Comments(subject = newSubject)
         newComment.fromDict(objectDict['comment'])
         newComment.save()
@@ -307,7 +302,7 @@ class Comments(AbstractCRUD):
     # Object Factory for abstract
 
     def objectFactory():
-        return Comments()
+        return Comments
 
 
 class Ratings(AbstractCRUD):
@@ -332,11 +327,16 @@ class Ratings(AbstractCRUD):
                 "comment_id": self.comment.id,
                 "subject": self.comment.subject.name}
 
+    # Object Factory for abstract
+
+    def objectFactory():
+        return Ratings
+
     # Create Ratings (validate)
 
     @classmethod
-    def __validateUnique(model, parentID, objectDict):
-        objectsAll = model.__allObjectsDict(model)
+    def _validateUnique(self, parentID, objectDict):
+        objectsAll = Ratings._allObjectsDict(model)
         for x in objectsAll:
             if model == Ratings:
                 if int(x['user_id']) == int(objectDict['user_id']) and int(x['comment_id']) == parentID:
@@ -370,6 +370,11 @@ class Transactions(AbstractCRUD):
                 "author": self.user.login,
                 "exchange_id": self.exchange.id}
 
+    # Object Factory for abstract
+
+    def objectFactory():
+        return Transactions
+
 
 class Triggers(AbstractCRUD):
     course_values_for_trigger   = models.FloatField(default=255)
@@ -392,8 +397,15 @@ class Triggers(AbstractCRUD):
                 "status": self.status,
                 "user_id": self.user.id,
                 "author": self.user.login,}
+    
+    # Object Factory for abstract
 
-    def _setActualTimeTrigger(self)
+    def objectFactory():
+        return Triggers
+
+    # Create Trigger (set actual time)
+
+    def _setActualTimeTrigger(self):
         self.date_of_trigger = str(datetime.now().strftime("%Y-%d-%m %H:%M"))
 
 
@@ -413,3 +425,8 @@ class Notifications(ObjectAbstract):
         return {"id": self.id,
                 "message": self.message,
                 "user_id": self.user.id}
+
+    # Object Factory for abstract
+
+    def objectFactory():
+        return Notifications