하재연

Update views.py

...@@ -20,7 +20,7 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -20,7 +20,7 @@ class UserViewSet(viewsets.ModelViewSet):
20 """ 20 """
21 API endpoint that allows users to be viewed or edited. 21 API endpoint that allows users to be viewed or edited.
22 """ 22 """
23 - queryset = User.objects.all().order_by('-id') 23 + queryset = User.objects.all().order_by('-int_id')
24 serializer_class = UserSerializer 24 serializer_class = UserSerializer
25 permission_classes = [permissions.IsAuthenticated] 25 permission_classes = [permissions.IsAuthenticated]
26 26
...@@ -32,7 +32,7 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -32,7 +32,7 @@ class UserViewSet(viewsets.ModelViewSet):
32 user = serializer.create(data=request.data) 32 user = serializer.create(data=request.data)
33 return Response({ 33 return Response({
34 'message': 'user created', 34 'message': 'user created',
35 - 'id': user.id, 35 + 'int_id': user.int_id,
36 'user_id': user.user_id, 36 'user_id': user.user_id,
37 'name': user.name, 37 'name': user.name,
38 'total_size': user.total_size, 38 'total_size': user.total_size,
...@@ -59,12 +59,12 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -59,12 +59,12 @@ class UserViewSet(viewsets.ModelViewSet):
59 return Response({'Error': "Invalid user_id/password"}, status=status.HTTP_400_BAD_REQUEST) 59 return Response({'Error': "Invalid user_id/password"}, status=status.HTTP_400_BAD_REQUEST)
60 if user: 60 if user:
61 payload1 = { 61 payload1 = {
62 - 'id': user.id, 62 + 'int_id': user.int_id,
63 'user_id': user.user_id, 63 'user_id': user.user_id,
64 'exp': datetime.utcnow() + timedelta(seconds=300) 64 'exp': datetime.utcnow() + timedelta(seconds=300)
65 } 65 }
66 payload2 = { 66 payload2 = {
67 - 'id': user.id, 67 + 'int_id': user.int_id,
68 'user_id': user.user_id, 68 'user_id': user.user_id,
69 'exp': datetime.utcnow() + timedelta(days=5) 69 'exp': datetime.utcnow() + timedelta(days=5)
70 } 70 }
...@@ -92,12 +92,12 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -92,12 +92,12 @@ class UserViewSet(viewsets.ModelViewSet):
92 def renew(self, request): 92 def renew(self, request):
93 user = request.user 93 user = request.user
94 payload1 = { 94 payload1 = {
95 - 'id': user.id, 95 + 'int_id': user.int_id,
96 'user_id': user.user_id, 96 'user_id': user.user_id,
97 'exp': datetime.utcnow() + timedelta(seconds=300) 97 'exp': datetime.utcnow() + timedelta(seconds=300)
98 } 98 }
99 payload2 = { 99 payload2 = {
100 - 'id': user.id, 100 + 'int_id': user.int_id,
101 'user_id': user.user_id, 101 'user_id': user.user_id,
102 'exp': datetime.utcnow() + timedelta(days=5) 102 'exp': datetime.utcnow() + timedelta(days=5)
103 } 103 }
...@@ -119,7 +119,7 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -119,7 +119,7 @@ class UserViewSet(viewsets.ModelViewSet):
119 if request.method == 'GET': 119 if request.method == 'GET':
120 user = User.objects.get(id=pk) 120 user = User.objects.get(id=pk)
121 data = { 121 data = {
122 - 'id': user.id, 122 + 'int_id': user.int_id,
123 'user_id': user.user_id, 123 'user_id': user.user_id,
124 'name': user.name, 124 'name': user.name,
125 'total_size': user.total_size, 125 'total_size': user.total_size,
......