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

* commit '50dbc1f4':
  search user history
  mr. clean

app/applicationlayer/cms/allowed_company/views.py

@@ -85,7 +85,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
             return Response(message, status=status.HTTP_400_BAD_REQUEST)
 
         except IntegrityError as e:
-            print(str(e))
             error = 'Adding the same Department under the same Company is not allowed'
             message = {
                 'code': 400,
@@ -96,8 +95,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
                             status=status.HTTP_400_BAD_REQUEST)
 
         except Exception as e:
-            # print(str(e))
-            # error = 'adding the same departments under same Company is not allowed'
             message = {
                 'code': 500,
                 'status': 'failed',

app/applicationlayer/cms/auto_email/reminder.py

@@ -26,7 +26,7 @@ class ReminderTriggerAPIView(views.APIView):
             Q(date_to__lte=date_now.strftime('%Y-%m-%d 00:00:00.000')) &
             Q(date_to_send=date_now.strftime('%Y-%m-%d 00:00:00.000'))
         )
-        # print(today_mail)
+        
         list_of_emails = []
         for data in today_mail:
             if data.frm_approver.is_action == True and data.form_code.status == 'Pending':

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

@@ -38,7 +38,6 @@ class headers(serializers.ModelSerializer):
         ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S')
         ret['action'] = approver
         # ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
-        print(ret)
         return ret
         # except Exception as e:
         #     ret['action_required'] = "No"

app/applicationlayer/cms/form/header/views.py

@@ -693,8 +693,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             self.perform_update(serializer)
 
         new_instance = serializer.data
-        print(serializer.errors)
-
+        
         # save history in form header
         crhistory_save(
             batchno,
@@ -818,9 +817,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                                         pk=instance.id)
         
         new_instance = model_to_dict(form_header)
-
-        # print(serializer.errors)
-
+        
         # save history in form header
         crhistory_create_save(
                     batchno,

app/applicationlayer/cms/form/views.py

@@ -688,8 +688,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         old_instance = model_to_dict(instance)
         self.perform_update(serializer)
         new_instance = serializer.data
-        print(serializer.errors)
-
+        
         # save history in form header
         crhistory_save(
             batchno,
@@ -802,9 +801,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                                         pk=instance.id)
         
         new_instance = model_to_dict(form_header)
-
-        print(serializer.errors)
-
+        
         # save history in form header
         crhistory_create_save(
                     batchno,

app/applicationlayer/cms/master/form/account/views.py

@@ -17,16 +17,10 @@ class UserListForm(APIView):
         try:
             serializer = ChangeRequestList
             dept = self.request.query_params['department_code']
-            # company = self.request.query_params['company_code']
-            # allowed = models.AllowedCompany.objects.filter(
-            #     Q(group_pivots=dept) &
-            #     Q()
-            # )
             user_list = models.User.objects.filter(
                 department=dept
             ).exclude(id=1)
-            # user_list = user_list.exclude(id=request.user.id)
-            print(user_list.query)
+            
             page = self.paginate_queryset(user_list)
 
             if page is not None:

app/applicationlayer/cms/master/form/company/views.py

@@ -72,9 +72,7 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet):
             Q(requested_by_user=id_number) |
             Q(frm_stakes__user__code=id_number)
         ).values()
-        # print(id_number)
-        # print(forms)
-
+        
         allowed = AllowedCompany.objects.filter(
             id_number=id_number
         ).values().distinct()

app/applicationlayer/cms/utils_cr.py

@@ -30,7 +30,6 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
 
 def entity_log_bulk(queryset, entity, tbl):
     try:
-        # print(entity)
         for data in queryset:
             test = model_to_dict(data)
             log_save(
@@ -461,7 +460,6 @@ def crhistory_save(batch_no, main_action,
 def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
                               batch_no, main_action):
     try:
-        # print(entity)
         for data in queryset:
             test = model_to_dict(data)
             crhistory_save(batch_no,

app/applicationlayer/download/accounts/serializers.py

@@ -5,7 +5,6 @@ from django.db.models import Q
 
 class headers(serializers.ModelSerializer):
 
-
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         ret['deparment'] = instance.department.name
@@ -13,8 +12,6 @@ class headers(serializers.ModelSerializer):
 
         return ret
 
-
-
     class Meta:
         model = models.User
         fields = (

app/applicationlayer/management/batchupload/serializer.py

 from rest_framework import serializers
 from app.entities.models import ExtractTransformLoad, UserHistory
-# import ast
 
 
 class ExtractTransformLoadSerializer(serializers.ModelSerializer):

app/applicationlayer/management/batchupload/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import UserHistory, ExtractTransformLoad
+
+
+class ExtractTransformLoadFilter(filters.FilterSet):
+
+    class Meta:
+        model = ExtractTransformLoad
+        fields = '__all__'

app/applicationlayer/management/batchupload/views.py

@@ -27,6 +27,9 @@ from django.db.models import Q
 from rest_framework.decorators import action
 from django.contrib.auth.hashers import make_password
 from app.entities import enums
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.filters import SearchFilter, OrderingFilter
+from app.applicationlayer.management.batchupload.table_filters import ExtractTransformLoadFilter
 
 
 class BatchUploadViewSet(viewsets.ModelViewSet):
@@ -34,8 +37,15 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
     serializer_class = ExtractTransformLoadSerializer
     pagination_class = CustomPagination
     lookup_field = 'code'
-
-
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = ExtractTransformLoadFilter
+    ordering_fields = (
+        'file_name', 'model_type', 'code'
+    )
+    search_fields = (
+        'file_name', 'model_type', 'code'
+    )
+    
     def list(self, request, *args, **kwargs):
         logged_user = request.user.username
         queryset = self.get_queryset().filter(createdby=logged_user)

app/applicationlayer/management/company/views.py

@@ -88,7 +88,6 @@ class CompanyViewSet(viewsets.ModelViewSet):
 
         partial = kwargs.pop('partial', False)
         instance = self.get_object()
-        print(request.data)
         serializer = self.get_serializer(instance, data=request.data, partial=partial)
         serializer.is_valid(raise_exception=True)
 

app/applicationlayer/management/notification/views.py

@@ -89,7 +89,6 @@ class NotificationsViewset(meviewsets.ModelViewSet):
     def seen(self, request, account_no=None, **kwargs):
         try:
             account_no = self.kwargs['account_no']
-            print(account_no)
             
             models.Notification.objects.filter(account_no=account_no,
                                                 id__in=request.data['ids']).update(
@@ -117,8 +116,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
     def seenall(self, request, account_no=None, **kwargs):
         try:
             account_no = self.kwargs['account_no']
-            print(account_no)
-
+            
             models.Notification.objects.filter(account_no=account_no).update(
                                                 is_read=True,
                                                 modified=datetime.now())

app/applicationlayer/management/user/serializers.py

@@ -19,7 +19,6 @@ class UserManagementSerializer(serializers.ModelSerializer):
 
         primayPic = user.user_images.filter(is_primary=True).first()
         if primayPic:
-            print(primayPic.image.url)
             return request.build_absolute_uri(primayPic.image.url)
         else:
             return request.build_absolute_uri('/media/no-user.png')
@@ -106,7 +105,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
         primayPic = user.user_images.filter(is_primary=True).first()
         if primayPic:
-            print(primayPic.image.url)
             return request.build_absolute_uri(primayPic.image.url)
         else:
             return request.build_absolute_uri('/media/no-user.png')

app/applicationlayer/management/user/views.py

@@ -68,9 +68,7 @@ class UsersManagementViewSet(viewsets.ModelViewSet):
 
     @decorators.error_safe
     def list(self, request, *args, **kwargs):
-        print(request.data['department__name'])
         self.serializer_class = serializers.UserManagementRetreiveSerializer
-        # self.queryset = QuerySetHelper.Sort(self)
         return super(UsersManagementViewSet, self).list(request)
 
     @decorators.error_safe

app/businesslayer/changerequest/change_request.py

@@ -413,9 +413,7 @@ def attachment_add_edit_delete(form_request_body,
 
                 self.perform_update(serializer)
                 new_instance = serializer.data
-                # 
                 
-                # print(new_instance)
                 crhistory_save(
                     batch_no,
                     main_action,

app/entities/modelcommon.py

@@ -32,7 +32,6 @@ class BaseAuditClass(models.Model):
     modifiedby = models.CharField(max_length=255)
 
     def save(self, *args, **kwargs):
-        # print('333')
         if self.createdby and self.modifiedby:
             # username = 'Anonymous User'
             # self.createdby = username

app/entities/models.py

@@ -452,33 +452,25 @@ class BaseHeader(models.Model):
         Company,
         on_delete=models.PROTECT,
         to_field='code')
-
     requested_to_department = models.ForeignKey(
         Department,
         on_delete=models.PROTECT,
         to_field='code')
-
     requested_to_user = models.ForeignKey(
         User,
         on_delete=models.PROTECT,
         to_field='code')
-
     requested_to_template_name = models.CharField(max_length=255)
-    
     requested_to_objective = models.CharField(
         max_length=255,
         blank=True,
         null=True)
-
     requested_to_priority = models.CharField(max_length=255)
-
     description = models.CharField(
         max_length=255,
         blank=True,
         null=True)
-
     created = models.DateTimeField(auto_now_add=True)
-    
     is_active = models.BooleanField(default=True)
 
     class Meta:
@@ -487,15 +479,12 @@ class BaseHeader(models.Model):
 
 class BaseApprover(models.Model):
     level = models.IntegerField()
-
     user = models.ForeignKey(
         User,
         blank=True,
         null=True,
         on_delete=models.PROTECT,
         to_field='code')
-
-    # delegation = models.CharField(max_length=50, blank=True, null=True)
     delegation = models.ForeignKey(
         Delegation,
         blank=True,
@@ -543,7 +532,6 @@ class MasterAttachment(models.Model):
 class BaseAttachment(models.Model):
     attachment_type = models.CharField(max_length=255)
     attachment_name = models.CharField(max_length=255)
-
     file_name = models.CharField(
         max_length=255,
         blank=True,
@@ -580,7 +568,6 @@ class BaseDetails(models.Model):
         blank=True,
         null=True
     )
-
     created = models.DateTimeField(
         blank=True,
         null=True)
@@ -599,23 +586,19 @@ class ChangeRequestTemplateHeader(BaseHeader):
     template_no = models.CharField(
         unique=True,
         max_length=255)
-    
     requested_to_template_id = models.CharField(
         max_length=255,
         unique=True)
-    
     created_by_user = models.ForeignKey(
         User,
         on_delete=models.PROTECT,
         to_field='code',
         related_name='created_by_user')
-    
     created_by_department = models.ForeignKey(
         Department,
         on_delete=models.PROTECT,
         to_field='code',
         related_name='created_by_department')
-    
     requested_to_target_date = models.IntegerField()
     
     class Meta:
@@ -788,7 +771,6 @@ class ChangeRequestFormHeader(BaseHeader):
         on_delete=models.PROTECT,
         to_field='template_no')
     status = models.CharField(max_length=50)
-
     company_desc = models.CharField(
         max_length=255,
         null=True,

app/helper/email_service/sender.py

@@ -9,7 +9,6 @@ from django.db import transaction
 
 @transaction.atomic
 def batch_email_users(args):
-    # print(args[0])
     connection = email_connection.get_connection()
     messages = []
     connection.open()