Merge pull request #94 in RMS/api-main-service from red-develop to RMSv2

* commit '1ff80f8e':
  added search on master company and department, management account, applications, company, department, module
  untrack changes

app/applicationlayer/management/account/serializer.py

@@ -11,14 +11,6 @@ class UserSerializer(serializers.ModelSerializer):
 
     def to_representation(self, instance):
 
-        # department = Department.objects.filter(
-        #     id=instance.company.id
-        # ).values().first()
-
-        # company_name = Department.objects.filter(
-        #     id=instance.company.id
-        # ).values().first()
-
         ret = super().to_representation(instance)
         ret['department'] = model_to_dict(instance.department)
         ret['company'] = model_to_dict(instance.department.company)

app/applicationlayer/management/account/views.py

@@ -33,7 +33,12 @@ class UserViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = UserFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = (
+        'name', 'code',
+        'department__company__name',
+        'department__name',
+        'email', 'contact_no'
+    )
 
     @rms.user_create
     @transaction.atomic

app/applicationlayer/management/application/views.py

@@ -22,7 +22,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = ApplicationFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = ('name', 'code')
 
     @transaction.atomic
     def create(self, request, *args, **kwargs):

app/applicationlayer/management/company/views.py

@@ -22,7 +22,7 @@ class CompanyViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = CompanyFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = ('name', 'contact_details', 'modified')
 
     @decorators.rms.company_crate
     @transaction.atomic

app/applicationlayer/management/department/views.py

@@ -22,7 +22,7 @@ class DepartmentViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = DepartmentFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = ('name', 'company__name', 'code')
 
     @decorators.rms.department_crate
     @transaction.atomic

app/applicationlayer/management/module/views.py

@@ -24,7 +24,10 @@ class ModuleViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = ModuleFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = (
+        'name', 'application__name',
+        'code', 'component', 'sort_number'
+    )
 
     @transaction.atomic
     def create(self, request, *args, **kwargs):

app/applicationlayer/master/company/views.py

@@ -18,7 +18,7 @@ class AdminCompanyViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = CompanyFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = ('name', 'name', 'contact_details')
     http_method_names = ['get']
 
     @rms.company_list

app/applicationlayer/master/department/serializer.py

 from rest_framework import serializers
 from app.entities.models import Department
+from django.forms.models import model_to_dict
 
 
 class AdminDepartmentSerializer(serializers.ModelSerializer):
+
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        ret['company'] = model_to_dict(instance.company)
+        return ret
+
     class Meta:
         model = Department
         fields = '__all__'

app/applicationlayer/master/department/views.py

@@ -21,7 +21,7 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filterset_class = DepartmentFilterSet
     ordering_fields = '__all__'
-    search_fields = ('name',)
+    search_fields = ('name', 'company__name', 'code')
 
     @rms.department_list
     def list(self, request, *args, **kwargs):

app/entities/models.py

@@ -669,7 +669,7 @@ class ChangeRequestFormHeader(BaseHeader):
         on_delete=models.DO_NOTHING,
         to_field='template_no')
     status = models.CharField(max_length=50)
-    
+
     company_desc = models.CharField(
         max_length=255,
         null=True,