Merge pull request #531 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '0e4f8c53':
  select_related

app/applicationlayer/cms/allowed_company/views.py

@@ -20,7 +20,10 @@ from django.db import IntegrityError
 
 
 class AllowedCompanyViewSet(viewsets.ModelViewSet):
-    queryset = AllowedCompany.objects.all()
+    # queryset = AllowedCompany.objects.all()
+    queryset = AllowedCompany.objects.select_related(
+        'id_number', 'company_pivot', 'group_pivots'
+    ).all()
     serializer_class = AllowedCompanySerializer
     pagination_class = CustomPagination
     lookup_field = 'code'

app/applicationlayer/cms/form/approver/serializers.py

@@ -8,6 +8,7 @@ class ChangeRequestFormApproversSerializer(
 ):
     def to_representation(self, instance):
         ret = super().to_representation(instance)
+        print(instance)
         try:
             ret['company'] = {
                 "id": instance.user.department.company.id,

app/applicationlayer/download/company/serializers.py

@@ -11,7 +11,6 @@ class headers(serializers.ModelSerializer):
 
         return ret
     
-
     class Meta:
         model = models.Company
         fields = (

config/urls.py

@@ -22,8 +22,6 @@ from django.conf import settings
 from django.conf.urls.static import static
 
 
-
-
 urlpatterns = [
     # path('admin/', admin.site.urls),
     path('api-auth/', include('rest_framework.urls')),