From 300fe9829e42a2dd1f489f9fc5960f1b642efc47 Mon Sep 17 00:00:00 2001 From: TBS093A Date: Fri, 28 Aug 2020 15:31:28 +0200 Subject: [PATCH] refactor getOne in abstract (User) --- generalApp/models.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/generalApp/models.py b/generalApp/models.py index 1ac84b4..dc16755 100755 --- a/generalApp/models.py +++ b/generalApp/models.py @@ -77,10 +77,10 @@ class ObjectAbstract(models.Model): return 'comment' in objectDict @classmethod - def getObject(self, request, objectID, privilige): - return self.getObjectNormal(self, objectID) + def getObject(self, request, objectID, privilige): # request, privilige is unnecessary + return self.__getObjectNormal(self, objectID) - def getObjectNormal(model, objectID): + def __getObjectNormal(model, objectID): object = model.objects.get(pk = objectID).toDict() return HttpResponse(json.dumps(object)) @@ -159,12 +159,24 @@ class Users(ObjectAbstract): "email": self.email, "privilige": self.privilige} + # Get One User + + def __getObjectNormal(objectID): + oneUser = User.objects.get(pk = objectID).toDict() + return HttpResponse(json.dumps(oneUser)) + + # Get All Users + + + + # Create User + def addObject(self, request, parentID, privilige): newUser = jsonLoad(request) newUser['privilige'] = 1 newUser['password'] = createPassHash(object['password']) - if self.validateUnique(self, parentID, newUser): - return self.saveObject(self, parentID, newUser) + if self.__validateUnique(self, parentID, newUser): + return self.__saveObject(self, parentID, newUser) else: return HttpResponse("User Is Already Exist") @@ -181,6 +193,10 @@ class Users(ObjectAbstract): newUser.save() return HttpResponse(f"Add new User: {newUser.toDict()}") + # Update User + + # Delete User + class Threads(ObjectAbstract): name = models.CharField(max_length=30)