Merge pull request #40 in RMS/api-main-service from risty-develop to dev

* commit '25c3b2ec':
  Moved auto-generated number create from serializers to viewsets
  Modified Application, Endpoint and Service retrieve method

api/serializers.py

 from rest_framework import serializers
 from .models import APIService, APIEndpoint, Application
-from api.utils import BadRequestException, number_generator
+from api.utils import BadRequestException
 from rest_framework.exceptions import ValidationError
-from django.utils.crypto import get_random_string
 
 
 class GroupDependentSerializer(serializers.ModelSerializer):
@@ -63,15 +62,6 @@ class ApplicationSerializer(serializers.ModelSerializer):
 
         return not bool(self._errors)
 
-    def create(self, validated_data):
-
-        new_application = Application.objects.create(**validated_data)
-        new_application.application_no = number_generator(
-                                            'APP', new_application.id
-                                        )
-        new_application.save()
-        return new_application
-
 
 class APIServiceSerializer(serializers.ModelSerializer):
     class Meta:
@@ -126,13 +116,6 @@ class APIServiceSerializer(serializers.ModelSerializer):
 
         return not bool(self._errors)
 
-    def create(self, validated_data):
-        new_service = APIService.objects.create(**validated_data)
-        new_service.api_service_no = number_generator('SVC', new_service.id)
-        new_service.service_token = get_random_string(length=16)
-        new_service.save()
-        return new_service
-
 
 class APIEndpointSerializer(serializers.ModelSerializer):
     service_name = serializers.ReadOnlyField(source='service.name')
@@ -187,9 +170,3 @@ class APIEndpointSerializer(serializers.ModelSerializer):
             raise BadRequestException(error_message)
 
         return not bool(self._errors)
-
-    def create(self, validated_data):
-        new_endpoint = APIEndpoint.objects.create(**validated_data)
-        new_endpoint.api_endpoint_no = number_generator('ENP', new_endpoint.id)
-        new_endpoint.save()
-        return new_endpoint

api/viewsets/applications.py

@@ -5,8 +5,10 @@ from rest_framework.decorators import action
 from rest_framework.response import Response
 from api.models import Application
 from api.serializers import ApplicationSerializer, GroupDependentSerializer
-from api.utils import (CustomPagination, BadRequestException,
-                       status_message_response)
+from api.utils import (
+            CustomPagination, BadRequestException,
+            status_message_response, number_generator
+        )
 
 
 AUTHENTICATOR_GROUP = settings.AUTHENTICATOR_GROUP
@@ -26,7 +28,14 @@ class ApplicationViewSet(viewsets.ModelViewSet):
         try:
             serializer = self.get_serializer(data=request.data)
             serializer.is_valid(raise_exception=True)
-            self.perform_create(serializer)
+            app_create = serializer.save()
+
+        # for application_no
+            app_id = app_create.pk
+            app_create.application_no = number_generator(
+                                            'APP', app_id
+                                        )
+            app_create.save()
 
             message = status_message_response(
                 201, 'success',
@@ -99,19 +108,19 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     def retrieve(self, request, *args, **kwargs):
         try:
             id = self.kwargs['pk']
-            queryset = Application.objects.filter(id=id)
-            serializer = self.get_serializer(queryset, many=True)
+            instance = Application.objects.get(id=id)
+            serializer = self.get_serializer(instance)
 
-            if not queryset.exists():
-                message = status_message_response(404, 'failed',
-                                                  'No record found', [])
-                return Response(message, status=status.HTTP_404_NOT_FOUND)
-            else:
-                message = status_message_response(
+            message = status_message_response(
                             200, 'success',
                             'Application retrieved', serializer.data
                           )
-                return Response(message, status=status.HTTP_200_OK)
+            return Response(message, status=status.HTTP_200_OK)
+
+        except Application.DoesNotExist:
+            message = status_message_response(404, 'failed',
+                                              'No record found', [])
+            return Response(message, status=status.HTTP_404_NOT_FOUND)
 
         except Exception as e:
             message = status_message_response(

api/viewsets/endpoints.py

@@ -4,9 +4,9 @@ from rest_framework.response import Response
 from api.models import APIEndpoint
 from api.serializers import APIEndpointSerializer
 from api.utils import (
-    APIEndpointFilter, CustomPagination,
-    BadRequestException, status_message_response
-)
+            APIEndpointFilter, CustomPagination,
+            BadRequestException, status_message_response, number_generator
+        )
 from django_filters.rest_framework import DjangoFilterBackend
 
 
@@ -26,7 +26,14 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
         try:
             serializer = self.get_serializer(data=request.data)
             serializer.is_valid(raise_exception=True)
-            self.perform_create(serializer)
+            endpoint_create = serializer.save()
+
+            # for endpoint_no
+            endpoint_id = endpoint_create.pk
+            endpoint_create.api_endpoint_no = number_generator(
+                                            'ENP', endpoint_id
+                                        )
+            endpoint_create.save()
 
             message = status_message_response(
                             201, 'success',
@@ -80,20 +87,19 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
     def retrieve(self, request, *args, **kwargs):
         try:
             id = self.kwargs['pk']
-            queryset = APIEndpoint.objects.filter(id=id)
-            serializer = self.get_serializer(queryset, many=True)
+            instance = APIEndpoint.objects.get(id=id)
+            serializer = self.get_serializer(instance)
 
-            if not queryset.exists():
-                message = status_message_response(
-                                404, 'failed', 'No record found', []
-                            )
-                return Response(message, status=status.HTTP_404_NOT_FOUND)
-            else:
-                message = status_message_response(
-                                200, 'success',
-                                'Endpoint retrieved', serializer.data
-                            )
-                return Response(message, status=status.HTTP_200_OK)
+            message = status_message_response(
+                            200, 'success',
+                            'Endpoint retrieved', serializer.data
+                          )
+            return Response(message, status=status.HTTP_200_OK)
+
+        except APIEndpoint.DoesNotExist:
+            message = status_message_response(404, 'failed',
+                                              'No record found', [])
+            return Response(message, status=status.HTTP_404_NOT_FOUND)
 
         except Exception as e:
             message = status_message_response(

api/viewsets/services.py

@@ -4,8 +4,10 @@ from rest_framework.response import Response
 from api.models import APIService
 from api.serializers import APIServiceSerializer
 from api.utils import (
-            CustomPagination, BadRequestException, status_message_response
+            CustomPagination, BadRequestException,
+            status_message_response, number_generator
         )
+from django.utils.crypto import get_random_string
 
 
 class APIServiceViewSet(viewsets.ModelViewSet):
@@ -22,7 +24,15 @@ class APIServiceViewSet(viewsets.ModelViewSet):
         try:
             serializer = self.get_serializer(data=request.data)
             serializer.is_valid(raise_exception=True)
-            self.perform_create(serializer)
+            service_create = serializer.save()
+
+            # for service_no
+            service_id = service_create.pk
+            service_create.api_service_no = number_generator(
+                                            'SVC', service_id
+                                        )
+            service_create.service_token = get_random_string(length=16)
+            service_create.save()
 
             message = status_message_response(
                             201, 'success',
@@ -76,20 +86,19 @@ class APIServiceViewSet(viewsets.ModelViewSet):
     def retrieve(self, request, *args, **kwargs):
         try:
             id = self.kwargs['pk']
-            queryset = APIService.objects.filter(id=id)
-            serializer = self.get_serializer(queryset, many=True)
+            instance = APIService.objects.get(id=id)
+            serializer = self.get_serializer(instance)
 
-            if not queryset.exists():
-                message = status_message_response(
-                                404, 'failed', 'No record found', []
-                            )
-                return Response(message, status=status.HTTP_404_NOT_FOUND)
-            else:
-                message = status_message_response(
-                                200, 'success',
-                                'Service retrieved', serializer.data
-                            )
-                return Response(message, status=status.HTTP_200_OK)
+            message = status_message_response(
+                            200, 'success',
+                            'Service retrieved', serializer.data
+                          )
+            return Response(message, status=status.HTTP_200_OK)
+
+        except APIService.DoesNotExist:
+            message = status_message_response(404, 'failed',
+                                              'No record found', [])
+            return Response(message, status=status.HTTP_404_NOT_FOUND)
 
         except Exception as e:
             message = status_message_response(