search user history

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/notification/views.py

@@ -116,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/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()