refactor getOne in abstract (User)
parent
7ddfa6deb2
commit
300fe9829e
|
|
@ -77,10 +77,10 @@ class ObjectAbstract(models.Model):
|
||||||
return 'comment' in objectDict
|
return 'comment' in objectDict
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def getObject(self, request, objectID, privilige):
|
def getObject(self, request, objectID, privilige): # request, privilige is unnecessary
|
||||||
return self.getObjectNormal(self, objectID)
|
return self.__getObjectNormal(self, objectID)
|
||||||
|
|
||||||
def getObjectNormal(model, objectID):
|
def __getObjectNormal(model, objectID):
|
||||||
object = model.objects.get(pk = objectID).toDict()
|
object = model.objects.get(pk = objectID).toDict()
|
||||||
return HttpResponse(json.dumps(object))
|
return HttpResponse(json.dumps(object))
|
||||||
|
|
||||||
|
|
@ -159,12 +159,24 @@ class Users(ObjectAbstract):
|
||||||
"email": self.email,
|
"email": self.email,
|
||||||
"privilige": self.privilige}
|
"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):
|
def addObject(self, request, parentID, privilige):
|
||||||
newUser = jsonLoad(request)
|
newUser = jsonLoad(request)
|
||||||
newUser['privilige'] = 1
|
newUser['privilige'] = 1
|
||||||
newUser['password'] = createPassHash(object['password'])
|
newUser['password'] = createPassHash(object['password'])
|
||||||
if self.validateUnique(self, parentID, newUser):
|
if self.__validateUnique(self, parentID, newUser):
|
||||||
return self.saveObject(self, parentID, newUser)
|
return self.__saveObject(self, parentID, newUser)
|
||||||
else:
|
else:
|
||||||
return HttpResponse("User Is Already Exist")
|
return HttpResponse("User Is Already Exist")
|
||||||
|
|
||||||
|
|
@ -181,6 +193,10 @@ class Users(ObjectAbstract):
|
||||||
newUser.save()
|
newUser.save()
|
||||||
return HttpResponse(f"Add new User: {newUser.toDict()}")
|
return HttpResponse(f"Add new User: {newUser.toDict()}")
|
||||||
|
|
||||||
|
# Update User
|
||||||
|
|
||||||
|
# Delete User
|
||||||
|
|
||||||
|
|
||||||
class Threads(ObjectAbstract):
|
class Threads(ObjectAbstract):
|
||||||
name = models.CharField(max_length=30)
|
name = models.CharField(max_length=30)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue