하재연

Update views.py

......@@ -20,7 +20,7 @@ class UserViewSet(viewsets.ModelViewSet):
"""
API endpoint that allows users to be viewed or edited.
"""
queryset = User.objects.all().order_by('-id')
queryset = User.objects.all().order_by('-int_id')
serializer_class = UserSerializer
permission_classes = [permissions.IsAuthenticated]
......@@ -32,7 +32,7 @@ class UserViewSet(viewsets.ModelViewSet):
user = serializer.create(data=request.data)
return Response({
'message': 'user created',
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'name': user.name,
'total_size': user.total_size,
......@@ -59,12 +59,12 @@ class UserViewSet(viewsets.ModelViewSet):
return Response({'Error': "Invalid user_id/password"}, status=status.HTTP_400_BAD_REQUEST)
if user:
payload1 = {
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'exp': datetime.utcnow() + timedelta(seconds=300)
}
payload2 = {
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'exp': datetime.utcnow() + timedelta(days=5)
}
......@@ -92,12 +92,12 @@ class UserViewSet(viewsets.ModelViewSet):
def renew(self, request):
user = request.user
payload1 = {
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'exp': datetime.utcnow() + timedelta(seconds=300)
}
payload2 = {
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'exp': datetime.utcnow() + timedelta(days=5)
}
......@@ -119,7 +119,7 @@ class UserViewSet(viewsets.ModelViewSet):
if request.method == 'GET':
user = User.objects.get(id=pk)
data = {
'id': user.id,
'int_id': user.int_id,
'user_id': user.user_id,
'name': user.name,
'total_size': user.total_size,
......