Merge branch 'RMSv2' of...

Merge branch 'RMSv2' of http://54.169.104.100:27015/rms/Backend/api-main-service into core-dev-gladys

app/accesslayer/views.py

@@ -38,8 +38,6 @@ class Login(ObtainAuthToken):
 
             return Response({
                 'token': token.key,
-                # 'user_id': user.pk,
-                # 'email': user.email
             })
         except Exception as e:
             return Response(
@@ -108,7 +106,6 @@ class CurrentUser(APIView):
 class ForgotPassword(APIView):
     permission_classes = (AllowAny,)
 
-    # @decorators.error_safe
     @transaction.atomic
     def post(self, request, *args, **kwargs):
         email = request.data['email']

app/applicationlayer/management/account/table_filters.py

 from django_filters import rest_framework as filters
-from django.db.models import Count
 from app.entities.models import User
-from django.db.models import Q
 
 
 class AccountFilterset(filters.FilterSet):
-    # search = filters.CharFilter(method='search_bar', label='search')
-    # def search_bar(self, queryset, name, value):
-    #     return queryset.filter(
-    #         Q(username__icontains=value) |
-    #         Q(first_name__icontains=value) |
-    #         Q(last_name__icontains=value))
-
     class Meta:
         model = User
         fields = '__all__'

app/applicationlayer/management/account/views.py

@@ -2,14 +2,14 @@ import copy
 import threading
 import pandas as pd
 import csv
-import io, os
+from django.db.models import Q
 from app.entities import enums
 from django.db import transaction
 from app.helper import decorators
-from rest_framework.views import APIView
+from rest_framework.decorators import action
+from app.helper.decorators import rms, error_safe
 from app.helper.email_service import sender
 from rest_framework import viewsets, status
-from rest_framework.decorators import action
 from django.contrib.auth import authenticate
 from django.contrib.auth.hashers import check_password
 from rest_framework.response import Response
@@ -19,7 +19,7 @@ from app.entities.models import (
     ChangeRequestFormHeader, ChangeRequestTemplateHeader,
     AllowedCompany, Company, Department, UserHistory
 )
-from app.helper.decorators import rms, error_safe
+
 from django.contrib.auth.hashers import make_password
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
@@ -32,8 +32,6 @@ from app.applicationlayer.utils import (
     CustomPagination, status_message_response, log_save,
     main_threading
 )
-from rest_framework.exceptions import ParseError
-from django.db.models import Q
 
 
 class UserViewSet(viewsets.ModelViewSet):
@@ -199,10 +197,6 @@ class UserViewSet(viewsets.ModelViewSet):
 
             if cms_form.count() > 0 or cms_template.count() > 0:
 
-                # raise ParseError(
-                #     'Cannot update this record the user has a record on change request it might cause a data error'
-                # )
-
                 error = 'Cannot update this record the user has a record on change request it might cause a data error'
                 message = {
                     'code': 400,
@@ -225,10 +219,6 @@ class UserViewSet(viewsets.ModelViewSet):
         if request.data['user_type'] != 'USR':
             rms = Application.objects.filter(id=1).values('code').first()
             app.append(rms['code'])
-        # else:
-        #     app = request.data['application']
-
-
 
         app = Application.objects.filter(
             code__in=app
@@ -295,7 +285,6 @@ class UserViewSet(viewsets.ModelViewSet):
 
         else:
 
-            # raise Exception('User not found')
             error = 'User not found'
             message = {
                 'code': 400,
@@ -314,7 +303,6 @@ class UserViewSet(viewsets.ModelViewSet):
             methods=['put'],
             url_path='change-password',
             name="Change Password of User")
-    # @decorators.error_safe
     @transaction.atomic
     def ChangePassword(self, request, code=None):
 
@@ -323,11 +311,9 @@ class UserViewSet(viewsets.ModelViewSet):
 
         if serialized.is_valid():
 
-            # form = copy.deepcopy(serialized.validated_data)
             form = request.data
 
             if form['new_password'] != form['new_password_confirm']:
-                # raise Exception('Passwords must match')
                 error = 'Passwords must match'
                 message = {
                     'code': 400,
@@ -362,7 +348,6 @@ class UserViewSet(viewsets.ModelViewSet):
                     status=status.HTTP_200_OK
                 )
             else:
-                # raise Exception('User not found')
                 error = 'User not found'
                 message = {
                     'code': 400,
@@ -392,18 +377,11 @@ class UserViewSet(viewsets.ModelViewSet):
 
         if serialized.is_valid():
 
-            # form = copy.deepcopy(serialized.validated_data)
-            # form = request.data
-
-            # if form['new_password'] != form['new_password_confirm']:
-            #     raise Exception('Passwords must match')
-
             existingUser = User.objects.filter(code=code)
             pk = self.get_object()
 
             if existingUser:
 
-                # existingUser.first().set_password(form['new_password_confirm'])
                 fromObj = copy.copy(existingUser.first())
                 existingUser.first().save()
                 toObj = copy.copy(existingUser.first())
@@ -421,7 +399,6 @@ class UserViewSet(viewsets.ModelViewSet):
                     status=status.HTTP_200_OK
                 )
             else:
-                # raise Exception('User not found')
                 error = 'User not found'
                 message = {
                     'code': 400,
@@ -443,7 +420,6 @@ class UserViewSet(viewsets.ModelViewSet):
             methods=['put'],
             url_path='picture',
             name="Uploads Profile Picture of User")
-    # @decorators.error_safe
     @transaction.atomic
     def UploadProfilePicture(self, request, code=None):
         existingUser = User.objects.filter(code=code).first()
@@ -454,10 +430,8 @@ class UserViewSet(viewsets.ModelViewSet):
             if (eximages):
                 for item in eximages:
                     item.delete()
-                    # DELETE FROM PHYSICAL
                     FileHelper.DeleteFile(path=item.image.path)
 
-            # self.serializer_class = serializer.UserImageSerializer
 
             data = serializer.UserImageSerializer(data=request.data)
             data.is_valid(raise_exception=True)
@@ -468,7 +442,6 @@ class UserViewSet(viewsets.ModelViewSet):
                             status=status.HTTP_201_CREATED,
                             headers=headers)
         else:
-            # raise ParseError('User not found')
             error = 'User not found'
             message = {
                 'code': 400,

app/applicationlayer/management/application/serializer.py

 from rest_framework import serializers
 from app.entities.models import Application
-import ast
 
 
 class ApplicationSerializer(serializers.ModelSerializer):

app/applicationlayer/management/application/table_filters.py

 from django_filters import rest_framework as filters
-from django.db.models import Count
 from app.entities.models import Application
-from django.db.models import Q
 
 
 class ApplicationFilterSet(filters.FilterSet):
-    # search = filters.CharFilter(method='search_bar', label='search')
-    # def search_bar(self, queryset, name, value):
-    #     return queryset.filter(
-    #         Q(username__icontains=value) |
-    #         Q(first_name__icontains=value) |
-    #         Q(last_name__icontains=value))
-
     class Meta:
         model = Application
         fields = '__all__'

app/applicationlayer/management/application/views.py

@@ -6,7 +6,7 @@ from rest_framework.response import Response
 from app.applicationlayer.utils import model_to_dict
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
-from app.entities.models import Application, EntityLog
+from app.entities.models import Application
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response, log_save
 )

app/applicationlayer/management/batchupload/views.py

 import os
 import sys
-import os
-import zipfile
-import shutil
 import datetime
 import threading
 import configparser
@@ -29,7 +26,6 @@ from app.applicationlayer.utils import (
     main_threading, PaginationForETL
 )
 from django.db.models import Q
-from rest_framework.exceptions import ParseError
 from rest_framework.decorators import action
 from django.contrib.auth.hashers import make_password
 from django_filters.rest_framework import DjangoFilterBackend
@@ -38,11 +34,6 @@ from app.applicationlayer.management.batchupload.table_filters import ExtractTra
 from django.db.models import F, Value
 from django.core.files.base import ContentFile
 from django.conf import settings
-from io import BytesIO
-from django.http import HttpResponse
-from django.template.loader import get_template
-from xhtml2pdf import pisa
-from django.core.files.storage import FileSystemStorage
 from django.core.exceptions import ObjectDoesNotExist
 from reportlab.platypus import SimpleDocTemplate, Spacer, Paragraph
 from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
@@ -225,16 +216,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             'Privilege_Department_Code'
         )
         
-        # if departments.count() > 0:
-        #     company = [departments[0]['Privilege_Company']]
-        #     department = [departments[0]['Privilege_Department']]
-        #     department_code = [departments[0]['Privilege_Department_Code']]
-        # else:
-        #     company = "Oneberry Technologies"
-        #     department = "Sample Department"
-        #     department_code = "DEPARTMENT-20190101-0000000"
-        #     departments = {"Privilege_Company": ['No Department Data']}
-        
         data = {
             'Username': ["ob-john"],
             'Name': ["John Doe"],
@@ -292,9 +273,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
         
         return self.get_paginated_response(message)
 
-    # @transaction.atomic
     def create(self, request, **kwargs):
-        # sp1 = transaction.savepoint()  # nothing will save to db
         csv_file = request.FILES['file']
         extension_file = str(csv_file).split('.')[1]
 
@@ -343,26 +322,19 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                     )
                     if not request_department:
                         etl2.delete()
-                        # transaction.savepoint_rollback(sp1)
                         return Response(
                             {"message": company_error},
-                            # {"message": str(e)},
                             status=status.HTTP_400_BAD_REQUEST
                         )
 
                 elif request.user.user_type == enums_department:
                     if keys['Department_Code'] != request.user.department.code:
                         etl2.delete()
-                        # transaction.savepoint_rollback(sp1)
                         return Response(
                             {"message": department_error},
                             # {"message": str(e)},
                             status=status.HTTP_400_BAD_REQUEST
                         )
-                        # raise ParseError(
-                        #     department_error
-                        # )
-
                 # user type authorization and user type per user
                 else:
                     user_department = Department.objects.filter(
@@ -414,8 +386,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                     users['file_name'] = etl2
 
                     users['password'] = password
-                    # users['admin'] = logged_user_email
-
                     UserHistory.objects.create(
                         **users
                     )
@@ -439,7 +409,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                     view_all = True if str(keys['View_All_CR']).lower() == 'yes' else False
                     approve_cr = True if str(keys['Approve_CR']).lower() == 'yes' else False
 
-
                     privilege_object = {
                         "id_number": current_user,
                         "company_pivot": privilege_department_code.company,
@@ -454,16 +423,13 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
 
                 except IntegrityError as e:
                     etl2.delete()
-                    # transaction.savepoint_rollback(sp1)
                     return Response(
                         {"message": f"Duplicate user privilege at row {data + 2}"},
-                        # {"message": str(e)},
                         status=status.HTTP_400_BAD_REQUEST
                     )
 
                 except ObjectDoesNotExist as e:
                     etl2.delete()
-                    # transaction.savepoint_rollback(sp1)
                     return Response(
                         {"message": f"Department Does not Exist at Privilege row {data + 2}"},
                         status=status.HTTP_400_BAD_REQUEST
@@ -471,7 +437,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
 
             except IntegrityError as e:
                 etl2.delete()
-                # transaction.savepoint_rollback(sp1)
                 return Response(
                     {"message": f"Record already exist at row {data + 2}"},
                     status=status.HTTP_400_BAD_REQUEST
@@ -479,7 +444,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
 
             except KeyError as e:
                 etl2.delete()
-                # transaction.savepoint_rollback(sp1)
                 return Response(
                     {"message": f"Missing column {e.args[0]}"},
                     status=status.HTTP_400_BAD_REQUEST
@@ -487,18 +451,11 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             
             except ObjectDoesNotExist as e:
                 etl2.delete()
-                # transaction.savepoint_rollback(sp1)
                 return Response(
                     {"message": f"Department Does not Exist at row {data + 2}"},
                     status=status.HTTP_400_BAD_REQUEST
                 )
 
-            # except ValueError as e:
-            #     return Response(
-            #         {"message": f"Invalid department code. Please check at line {data + 2}"},
-            #         status=status.HTTP_400_BAD_REQUEST
-            #     )
-
         send_mail = UserHistory.objects.filter(sent=False).values(
             'name', 'username', 'email', 'password'
         )

app/applicationlayer/management/company/table_filters.py

 from django_filters import rest_framework as filters
-from django.db.models import Count
 from app.entities.models import Company
-from django.db.models import Q
 
 
 class CompanyFilterSet(filters.FilterSet):
-#     search = filters.CharFilter(method='search_bar', label='search')
-#     def search_bar(self, queryset, name, value):
-#         return queryset.filter(
-#             Q(username__icontains=value) |
-#             Q(first_name__icontains=value) |
-#             Q(last_name__icontains=value))
-
     class Meta:
         model = Company
         fields = '__all__'

app/applicationlayer/management/delegation/views.py

@@ -5,7 +5,7 @@ from rest_framework.response import Response
 from app.applicationlayer.utils import model_to_dict
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
-from app.entities.models import Delegation, Department
+from app.entities.models import Delegation
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response, log_save
 )

app/applicationlayer/management/department/serializer.py

@@ -9,7 +9,6 @@ class DepartmentSerializer(serializers.ModelSerializer):
         ).values().first()
         ret = super().to_representation(instance)
         ret['company'] = company_name
-        # ret['application'] = application_name
 
         return ret
         

app/applicationlayer/management/department/table_filters.py

 from django_filters import rest_framework as filters
-from django.db.models import Count
 from app.entities.models import Department
-from django.db.models import Q
 
 
 class DepartmentFilterSet(filters.FilterSet):
-#     search = filters.CharFilter(method='search_bar', label='search')
-#     def search_bar(self, queryset, name, value):
-#         return queryset.filter(
-#             Q(username__icontains=value) |
-#             Q(first_name__icontains=value) |
-#             Q(last_name__icontains=value))
-
     class Meta:
         model = Department
         fields = '__all__'

app/applicationlayer/management/department/views.py

@@ -5,7 +5,7 @@ from rest_framework.response import Response
 from app.applicationlayer.utils import model_to_dict
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
-from app.entities.models import Department, EntityLog
+from app.entities.models import Department
 from app.applicationlayer.utils import (
     CustomPagination, status_message_response, log_save
 )

app/applicationlayer/management/module/serializer.py

 from rest_framework import serializers
 from app.entities.models import Module, Application
-# from app.applicationlayer.management.application import ApplicationSerializer
 
 
 class SubModuleField(serializers.Field):