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

* commit '28a5cdec':
  delegation maintenance

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

@@ -31,17 +31,17 @@ class ChangeRequestFormApproversSerializer(
             
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
@@ -61,13 +61,13 @@ class ChangeRequestFormApproversSerializer(
             
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['editable_user'] = False
                     else:
                         ret['user'] = None
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['company'] = {
                            "id": instance.tmp_approver.company.id,
                            "code": instance.tmp_approver.company.code,
@@ -79,7 +79,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['company'] = None
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
+                    if instance.tmp_approver.department  or instance.tmp_approver.delegation.name.lower() == 'requestor':
                         ret['department'] = {
                             "id": instance.tmp_approver.department.id,
                             "code": instance.tmp_approver.department.code,

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

@@ -48,18 +48,31 @@ class ChangeRequestTemplateApproversSerializer(
             else:
                 ret['editable_user'] = True
 
-            if instance.delegation.lower() == 'requestor':
+            if instance.delegation:
+                
+                ret['delegation'] = {
+                    "id": instance.delegation.id,
+                    "code": instance.delegation.code,
+                    "name": instance.delegation.name
+                }
+                ret['editable_deleg'] = False
+            else:
+                ret['editable_deleg'] = True
 
+            if instance.delegation.name.lower() == 'requestor':
+                
                 ret['editable_user'] = False
                 ret['editable_comp'] = False
                 ret['editable_dept'] = False
+                ret['editable_deleg'] = False
 
             return ret
         except Exception as e:
-
+            
             ret['editable_user'] = True
             ret['editable_comp'] = True
             ret['editable_dept'] = True
+            ret['editable_deleg'] = True
             
             return ret
 

app/applicationlayer/management/application/views.py

@@ -29,7 +29,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     @decorators.rms.application_crate
     @transaction.atomic
     def create(self, request, *args, **kwargs):
-
+        
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)

app/applicationlayer/management/delegation/serializer.py

+from rest_framework import serializers
+from app.entities.models import Delegation
+
+
+class DelegationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Delegation
+        fields = '__all__'
+        read_only_fields = (
+            'created', 'createdby', 'modified', 'modifiedby', 'code',
+        )

app/applicationlayer/management/delegation/table_filters.py

+from django_filters import rest_framework as filters
+from app.entities.models import Delegation
+
+
+class DelegationFilterSet(filters.FilterSet):
+
+    class Meta:
+        model = Delegation
+        fields = '__all__'

app/applicationlayer/management/delegation/views.py

+from app.entities import enums
+from django.db import transaction
+from rest_framework import viewsets, status
+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
+from app.applicationlayer.utils import (
+    CustomPagination, status_message_response, log_save
+)
+from django_filters.rest_framework import DjangoFilterBackend
+from app.applicationlayer.management.delegation import serializer
+from app.applicationlayer.management.delegation.table_filters import DelegationFilterSet
+from app.helper import decorators
+
+
+class DelegationViewSet(viewsets.ModelViewSet):
+    queryset = Delegation.objects.all().order_by('-created')
+    serializer_class = serializer.DelegationSerializer
+    pagination_class = CustomPagination
+    lookup_field = 'code'
+    filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
+    filterset_class = DelegationFilterSet
+    ordering_fields = '__all__'
+    search_fields = ('name')
+
+    @transaction.atomic
+    def create(self, request, *args, **kwargs):
+
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+
+        message = status_message_response(
+            201, 'success',
+            'New Delegation created', serializer.data
+        )
+
+        return Response(
+            message
+        )
+
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        page = self.paginate_queryset(queryset)
+
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'list of Delegation found',
+                serializer.data
+            )
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
+    @decorators.error_safe
+    @transaction.atomic
+    def destroy(self, request, *args, **kwargs):
+
+        instance = self.get_object()
+        new_instance = model_to_dict(instance)
+        self.perform_destroy(instance)
+        
+        log_save(
+            enums.LogEnum.DELETED.value,
+            enums.LogEntitiesEnum.DELEGATION.value,
+            new_instance['id'],
+            new_instance,
+            ''
+        )
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    @transaction.atomic
+    def update(self, request, *args, **kwargs):
+
+        partial = kwargs.pop('partial', False)
+        instance = self.get_object()
+        serializer = self.get_serializer(instance, data=request.data, partial=partial)
+        serializer.is_valid(raise_exception=True)
+
+        old_instance = model_to_dict(instance)
+        self.perform_update(serializer)
+        new_instance = serializer.data
+        
+        log_save(
+            enums.LogEnum.DELETED.value,
+            enums.LogEntitiesEnum.DELEGATION.value,
+            old_instance['id'],
+            old_instance,
+            new_instance
+        )
+
+        return Response(serializer.data)

app/applicationlayer/management/module/serializer.py

@@ -16,7 +16,7 @@ class SubModuleField(serializers.Field):
 
 class ModuleSerializer(serializers.ModelSerializer):
     sub_module = SubModuleField(source='*', read_only=True)
-
+    
     def to_representation(self, instance):
         application_name = Application.objects.filter(
             id=instance.application.id

app/applicationlayer/management/user/views.py

@@ -93,7 +93,7 @@ class UsersManagementViewSet(viewsets.ModelViewSet):
         createdUser = models.User.objects.filter(id=pk).first()
         createdUser.set_password(settings.USER_DEFAULT_PASSWORD)
         createdUser.save()
-
+        
         # LOG ADD
         log_save.log_save(
             enums.LogEnum.ADD.value,

app/applicationlayer/urls.py

@@ -9,6 +9,7 @@ from app.applicationlayer.management.module.views import ModuleViewSet
 from app.applicationlayer.management.account.views import UserViewSet
 from app.businesslayer.company.views import AdminCompanyViewSet
 from app.applicationlayer.management.notification.views import NotificationsViewset
+from app.applicationlayer.management.delegation.views import DelegationViewSet
 
 from app.applicationlayer.download.accounts.views import UserDownloadRequest
 from app.applicationlayer.download.department.views import DepartmentDownloadRequest
@@ -26,6 +27,7 @@ router.register(r'notifications', NotificationsViewset)
 router.register(r'user-download', UserDownloadRequest)
 router.register(r'department-download', DepartmentDownloadRequest)
 router.register(r'company-download', CompanyDownloadRequest)
+router.register(r'delegations', DelegationViewSet)
 
 urlpatterns = (
     path('', include(router.urls)),

app/entities/enums.py

@@ -29,6 +29,7 @@ class GenerateCode(Enum):
     COMPANY = 'COMPANY'
     DEPARTMENT = 'DEPARTMENT'
     USER = 'USER'
+    DELEGATION = 'DELEGATION'
     NOTIFICATION = 'NOTIF'
     TEMPLATE = 'TMP'
     TMP_APPROVER = 'TMPAPR'
@@ -62,6 +63,7 @@ class LogEntitiesEnum(Enum):
     COMPANY = "COMPANY"
     DEPARTMENT = "DEPARTMENT"
     MODULE = "MODULE"
+    DELEGATION = "DELEGATION"
     ChangeRequestTemplateHeader = "ChangeRequestTemplateHeader"
     ChangeRequestTemplateApprovers = "ChangeRequestTemplateApprovers"
     ChangeRequestTemplateStakeHolders = "ChangeRequestTemplateStakeHolders"

app/entities/migrations/0031_auto_20191107_1239.py

+# Generated by Django 2.2 on 2019-11-07 12:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0030_auto_20191104_1507'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Delegation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('createdby', models.CharField(max_length=255)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('modifiedby', models.CharField(max_length=255)),
+                ('code', models.CharField(max_length=255, unique=True)),
+                ('name', models.CharField(max_length=255, unique=True)),
+            ],
+            options={
+                'db_table': 'delegations',
+            },
+        ),
+        migrations.AlterField(
+            model_name='changerequestformapprovers',
+            name='delegation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Delegation', to_field='code'),
+        ),
+        migrations.AlterField(
+            model_name='changerequesttemplateapprovers',
+            name='delegation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.Delegation', to_field='code'),
+        ),
+        migrations.AddField(
+            model_name='department',
+            name='delegation',
+            field=models.ManyToManyField(to='entities.Delegation'),
+        ),
+    ]

app/entities/models.py

@@ -84,6 +84,26 @@ class Module(AuditClass):
             Module.objects.filter(id=self.id).update(code=code)
 
 
+class Delegation(AuditClass):
+    code = models.CharField(
+        unique=True,
+        max_length=255
+    )
+    name = models.CharField(unique=True, max_length=255)
+
+    class Meta:
+        db_table = 'delegations'
+
+    def __str__(self):
+        return f'{self.name}'
+
+    def save(self, *args, **kwargs):
+        super(Delegation, self).save(*args, **kwargs)
+        code = enums.GenerateCode.DELEGATION.value
+        code = number_generator(enums.GenerateCode.DELEGATION.value, self.id)
+        Delegation.objects.filter(id=self.id).update(code=code)
+
+
 class Company(AuditClass):
     code = models.CharField(
         unique=True,
@@ -127,6 +147,9 @@ class Department(AuditClass):
         default='dept'
     )
     name = models.CharField(max_length=255)
+    delegation = models.ManyToManyField(
+        Delegation
+    )
 
     class Meta:
         db_table = 'departments'
@@ -414,7 +437,13 @@ class BaseApprover(models.Model):
         on_delete=models.PROTECT,
         to_field='code')
 
-    delegation = models.CharField(max_length=50, blank=True, null=True)
+    # delegation = models.CharField(max_length=50, blank=True, null=True)
+    delegation = models.ForeignKey(
+        Delegation,
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+        to_field='code')
     created = models.DateTimeField(
         blank=True,
         null=True)