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

* commit '9b27b1b7':
  adjust model of account

api/models.py

@@ -3,7 +3,7 @@ from django.utils import timezone
 
 
 class Application(models.Model):
-    application_no = models.CharField(max_length=250) 
+    application_no = models.CharField(max_length=250)
     name = models.CharField(max_length=200, unique=True)
     theme = models.IntegerField()
     code = models.CharField(max_length=300)
@@ -14,7 +14,7 @@ class Application(models.Model):
     def delete(self):
         self.deleted_at = timezone.now()
         self.save()
-    
+
     def __str__(self):
         return self.name
 
@@ -60,7 +60,7 @@ class APIEndpoint(models.Model):
     def delete(self):
         self.deleted_at = timezone.now()
         self.save()
-        
+
     def __str__(self):
         return self.name
 

api/serializers.py

@@ -3,9 +3,12 @@ from .models import APIService, APIEndpoint, Application
 from api.utils import BadRequestException, number_generator
 from rest_framework.exceptions import ValidationError
 from django.utils.crypto import get_random_string
-from django.conf import settings
 
-ACCOUNT_GROUP = settings.ACCOUNT_GROUP
+
+class GroupDependentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Application
+        fields = ('id', 'name', 'code')
 
 
 class ApplicationSerializer(serializers.ModelSerializer):

api/urls.py

-from api.viewsets.applications import ApplicationViewSet
+from api.viewsets.applications import ApplicationViewSet, GroupDependentViewSet
 from api.viewsets.services import  APIServiceViewSet
 from api.viewsets.endpoints import  APIEndpointViewSet
 from django.urls import path, include
@@ -11,6 +11,7 @@ router = DefaultRouter()
 router.register(r'applications', ApplicationViewSet)
 router.register(r'services', APIServiceViewSet)
 router.register(r'endpoint', APIEndpointViewSet)
+router.register(r'group-dependent', GroupDependentViewSet)
 
 urlpatterns = [
     path('', include(router.urls)),

api/utils.py

@@ -13,9 +13,11 @@ import datetime
 
 VALIDATE_TOKEN_URL = settings.VALIDATE_TOKEN_URL
 
+
 class BadRequestException(Exception):
-    pass 
-    
+    pass
+
+
 class APIEndpointFilter(FilterSet):
     service = filters.CharFilter('service__name')
 
@@ -123,9 +125,10 @@ class Helper:
                                        status.HTTP_500_INTERNAL_SERVER_ERROR,
                                        self._headers)
 
+
 class CustomPagination(PageNumberPagination):
-    page_size = 5 # Set number of result to display per page
-    max_page_size = 50  # Sets max page size that user may request
+    page_size = 5
+    max_page_size = 50
     page_query_param = 'page'
     page_size_query_param = 'page_size'
 
@@ -141,6 +144,7 @@ class CustomPagination(PageNumberPagination):
             'results': data['results']
         })
 
+
 # autogenerated number
 def number_generator(prefix, id):
     date = '{:%Y%m%d}'.format(datetime.datetime.now())
@@ -149,13 +153,14 @@ def number_generator(prefix, id):
 
     return autogenerated_no
 
+
 # status message
 def status_message_response(code, status, message, results):
+    print('ddd')
     message = {
-            'code': code,
-            'status': status,
-            'message': message,
-            'results': results
-        }
+        'code': code,
+        'status': status,
+        'message': message,
+        'results': results
+    }
     return message
-

api/viewsets/applications.py

 import requests
-# from django.db.models import F
-# from django.db.models import OuterRef, Subquery
 from django.conf import settings
 from rest_framework import viewsets, status
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from api.models import Application
-from api.serializers import ApplicationSerializer
+from api.serializers import ApplicationSerializer, GroupDependentSerializer
 from api.utils import (CustomPagination, BadRequestException,
                        status_message_response)
 
@@ -29,12 +27,11 @@ class ApplicationViewSet(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 application created', serializer.data
-                        )
+                201, 'success',
+                'New application created', serializer.data
+            )
             return Response(message)
 
         except BadRequestException as e:
@@ -43,9 +40,9 @@ class ApplicationViewSet(viewsets.ModelViewSet):
 
         except Exception as e:
             message = status_message_response(
-                            500, 'failed',
-                            'Request was not able to process' + str(e), []
-                        )
+                500, 'failed',
+                'Request was not able to process' + str(e), []
+            )
             return Response(message,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
@@ -238,3 +235,17 @@ class ApplicationViewSet(viewsets.ModelViewSet):
                         )
             return Response(message,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+
+class GroupDependentViewSet(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

docker-compose.yml

@@ -18,6 +18,10 @@ networks:
     driver: bridge
     ipam:
       config:
+<<<<<<< HEAD
+        - subnet: 172.168.70.0/16
+=======
         - subnet: 172.168.70.0/16
 
 
+>>>>>>> e6c001b78c8f9c9e6279ba90d72e5f86f7eea858