Merge pull request #26 in RMS/api-main-service from red-develop to dev

* commit '61861cb9':
  removed unused codes
  added queryparams ids on application endpoints

api/urls.py

@@ -2,7 +2,7 @@ from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 from api.viewsets.services import APIServiceViewSet
 from api.viewsets.endpoints import APIEndpointViewSet
-from api.viewsets.applications import ApplicationViewSet, GroupDependentViewSet
+from api.viewsets.applications import ApplicationViewSet, MainApplicationViewSet
 from api.views import (
     APIGatewayList, APIGatewaySlugDetail, APIGatewaySlugModelDetail
 )
@@ -10,8 +10,8 @@ from api.views import (
 router = DefaultRouter()
 router.register(r'applications', ApplicationViewSet)
 router.register(r'services', APIServiceViewSet)
-router.register(r'endpoint', APIEndpointViewSet)
-router.register(r'group-dependent', GroupDependentViewSet)
+router.register(r'endpoints', APIEndpointViewSet)
+router.register(r'main-application', MainApplicationViewSet)
 
 urlpatterns = [
     path('', include(router.urls)),

api/utils.py

@@ -9,7 +9,6 @@ from .models import APIEndpoint
 from rest_framework.pagination import PageNumberPagination
 from rest_framework.response import Response
 import datetime
-from functools import wraps
 
 
 VALIDATE_TOKEN_URL = settings.VALIDATE_TOKEN_URL

api/viewsets/applications.py

@@ -50,11 +50,17 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         try:
             queryset = Application.objects.filter(deleted_at__exact=None)
+            ids = self.request.query_params.get(
+                'ids', None
+            )
             if not queryset.exists():
                 message = status_message_response(
                     200, 'success', 'No records found', []
                 )
                 return Response(message)
+            if ids is not None:
+                ids = ids.split(',')
+                queryset = queryset.filter(id__in=ids)
 
             page = self.paginate_queryset(queryset)
             if page is not None:
@@ -237,15 +243,6 @@ class ApplicationViewSet(viewsets.ModelViewSet):
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
 
-class GroupDependentViewSet(viewsets.ModelViewSet):
+class MainApplicationViewSet(viewsets.ModelViewSet):
     queryset = Application.objects.all()
     serializer_class = GroupDependentSerializer
-
-    # def get_queryset(self):
-    #     groups = self.request.query_params.get(
-    #         'groups', None
-    #     )
-    #     groups = groups.split(',')
-    #     # print()
-    #     app = Application.objects.filter(id__in=groups)
-    #     return app

api/viewsets/endpoints.py

@@ -3,7 +3,10 @@ from rest_framework.decorators import action
 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)
+from api.utils import (
+    APIEndpointFilter, CustomPagination,
+    BadRequestException, status_message_response
+)
 from django_filters.rest_framework import DjangoFilterBackend
 
 
@@ -24,7 +27,6 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
             serializer = self.get_serializer(data=request.data)
             serializer.is_valid(raise_exception=True)
             self.perform_create(serializer)
-            headers = self.get_success_headers(serializer.data)
 
             message = status_message_response(201, 'success', 'New endpoint created', serializer.data)
             return Response(message)

api/viewsets/services.py

@@ -21,7 +21,6 @@ class APIServiceViewSet(viewsets.ModelViewSet):
             serializer = self.get_serializer(data=request.data)
             serializer.is_valid(raise_exception=True)
             self.perform_create(serializer)
-            headers = self.get_success_headers(serializer.data)
 
             message = status_message_response(201, 'success', 'New service created', serializer.data)
             return Response(message)

config/settings/local.py

@@ -32,5 +32,5 @@ DATABASES = {
 AUTHENTICATOR_IP = config['SERVICE']['AUTHENTICATOR_IP']
 AUTHENTICATOR_PATH = '/api/v1/authenticator'
 
-VALIDATE_TOKEN_URL = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/validate-token/'
-ACCOUNT_GROUP = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/application-dependent'
+VALIDATE_TOKEN_URL = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-validate-token/'
+ACCOUNT_GROUP = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-group'