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

* commit '00bf648d':
  Modified Service and Endpoint fk - object

api/serializers.py

@@ -118,12 +118,11 @@ class APIServiceSerializer(serializers.ModelSerializer):
 
 
 class APIEndpointSerializer(serializers.ModelSerializer):
-    service_name = serializers.ReadOnlyField(source='service.name')
 
     class Meta:
         model = APIEndpoint
         fields = (
-            'id', 'api_endpoint_no', 'service', 'service_name', 'name',
+            'id', 'api_endpoint_no', 'service', 'name',
             'description', 'http_method', 'endpoint_url', 'is_need_auth',
             'is_active', 'created_at', 'updated_at', 'deleted_at'
         )

api/viewsets/endpoints.py

 from rest_framework import viewsets, status
 from rest_framework.decorators import action
 from rest_framework.response import Response
-from api.models import APIEndpoint
+from api.models import APIEndpoint, APIService
 from api.serializers import APIEndpointSerializer
 from api.utils import (
             CustomPagination, BadRequestException,
@@ -78,6 +78,12 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
             page = self.paginate_queryset(queryset)
             if page is not None:
                 serializer = self.get_serializer(page, many=True)
+                enp_data = serializer.data
+                for service in enp_data:
+                    svc_values = APIService.objects.filter(
+                                        id=service['service']).values()
+                    service['service'] = svc_values[0]
+
                 message = {
                     'code': 200,
                     'status': 'success',

api/viewsets/services.py

 from rest_framework import viewsets, status
 from rest_framework.decorators import action
 from rest_framework.response import Response
-from api.models import APIService
+from api.models import APIService, Application
 from api.serializers import APIServiceSerializer
 from api.utils import (
             CustomPagination, BadRequestException,
@@ -80,6 +80,12 @@ class APIServiceViewSet(viewsets.ModelViewSet):
             page = self.paginate_queryset(queryset)
             if page is not None:
                 serializer = self.get_serializer(page, many=True)
+                svc_data = serializer.data
+                for application in svc_data:
+                    app_values = Application.objects.filter(
+                                        id=application['application']).values()
+                    application['application'] = app_values[0]
+
                 message = {
                     'code': 200,
                     'status': 'success',