{devbugfix} report serializer fix, asset_type restore, archived

app/applicationlayer/ams/asset_type/views.py

@@ -12,6 +12,9 @@ from app.applicationlayer.utils import (
 from app.helper import decorators
 from django.db import transaction
 from rest_framework.decorators import action
+from app.applicationlayer.utils import model_to_dict
+from app.applicationlayer.utils import log_save
+from app.entities import enums
 
 
 class AssetTypeViewset(viewsets.ModelViewSet):
@@ -31,6 +34,15 @@ class AssetTypeViewset(viewsets.ModelViewSet):
 
         serializer = self.get_serializer(data=request.data)
         # serializer.is_valid(raise_exception=True)
+        
+        # if requestor == poc:
+        #     message = {
+        #         'code': 400,
+        #         'status': 'failed',
+        #         'message': 'Cannot assign same user on point of contact and requestor',
+        #     }
+        #     return Response(message, status=status.HTTP_400_BAD_REQUEST)
+
         if serializer.is_valid(raise_exception=True):
             serializer.save(created_by=self.request.user)
             self.perform_create(serializer)
@@ -86,9 +98,19 @@ class AssetTypeViewset(viewsets.ModelViewSet):
 
     @transaction.atomic
     def destroy(self, request, *args, **kwargs):
-
+        
         instance = self.get_object()
-        self.perform_destroy(instance)
+        instance.is_active = False
+        instance.save()
+        # new_instance = model_to_dict(instance)
+        
+        # log_save(
+        #     enums.LogEnum.DELETED.value,
+        #     enums.LogEntitiesEnum.,
+        #     new_instance['id'],
+        #     new_instance,
+        #     ''
+        # )
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -120,4 +142,29 @@ class AssetTypeViewset(viewsets.ModelViewSet):
         return Response(
             serializer.data,
             status=status.HTTP_200_OK
-        )
+        )
\ No newline at end of file
+    
+    #restore archived asset_type
+    def partial_update(self, request, *args, **kwargs):
+        try:
+            kwargs['partial'] = True
+            code = self.kwargs['code']
+            instance = models.AMSAssetType.objects.filter(
+                code=code
+            )
+            instance.update(is_active=True)
+            message = status_message_response(
+                200, 'success',
+                'Archived Asset Type restored',
+                ''
+            )
+
+            return Response(message, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            message = status_message_response(
+                            500, 'failed',
+                            'Request was not able to process' + str(e), []
+                        )
+            return Response(message,
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
\ No newline at end of file

app/applicationlayer/ams/report/serializers.py

@@ -7,13 +7,13 @@ class AMSReportSerializer(serializers.ModelSerializer):
 
     def to_representation(self, instance):
         ret = super().to_representation(instance)
-        ret['added_by'] = instance.created_by.name
+        ret['created_by'] = instance.created_by.name
         ret['report_type'] = instance.report_type.name
         ret['unique_identifier'] = instance.asset_stock.unique_identifier
         ret['asset'] = instance.asset_stock.asset.name
         ret['asset_type'] = instance.asset_stock.asset.asset_type.name
         del ret['asset_stock']
-        del ret['created_by']
+        
         return ret
 
     class Meta:

app/applicationlayer/ams/report/views.py

@@ -172,7 +172,6 @@ class AMSReportViewset(viewsets.ModelViewSet):
         instance.save()
         new_instance = model_to_dict(instance)
         
-
         log_save(
             enums.LogEnum.UPDATE.value,
             enums.LogEntitiesEnum.AMSReport.value,

app/applicationlayer/ams/report_type/serializers.py

@@ -7,7 +7,7 @@ class AMSReportTypeSerializer(serializers.ModelSerializer):
 
     def to_representation(self, instance):
         ret = super().to_representation(instance)
-        ret['added_by'] = instance.created_by.name
+        ret['created_by'] = instance.created_by.name
         return ret
 
     class Meta:

app/applicationlayer/ams/report_type/views.py

@@ -81,11 +81,10 @@ class AMSReportTypeViewset(viewsets.ModelViewSet):
                 status=status.HTTP_400_BAD_REQUEST
             )
 
-
     def list(self, request, *args, **kwargs):
 
-        queryset = self.filter_queryset(self.get_queryset()).filter(is_active=True)
- 
+        queryset = self.filter_queryset(self.queryset).filter(is_active=True)
+        
         page = self.paginate_queryset(queryset)
 
         if page is not None:

app/entities/enums.py

@@ -81,6 +81,9 @@ class LogEntitiesEnum(Enum):
     AMSAsset = 'AMSAsset'
     AMSAssetStock = 'AMSAssetStock'
     AMSAssetStockSupport = 'AMSAssetStockSupport'
+    AMSAssetType = 'AMSAssetType'
+    AMSAssetGroup = 'AMSAssetGroup'
+    
 
 '''
 *********

app/entities/migrations/0009_auto_20200318_1724.py

+# Generated by Django 2.2 on 2020-03-18 17:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0008_auto_20200318_1545'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='entitylog',
+            name='entity',
+            field=models.CharField(choices=[('USER', 'USER'), ('APPLICATION', 'APPLICATION'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('MODULE', 'MODULE'), ('DELEGATION', 'DELEGATION'), ('ChangeRequestTemplateHeader', 'ChangeRequestTemplateHeader'), ('ChangeRequestTemplateApprovers', 'ChangeRequestTemplateApprovers'), ('ChangeRequestTemplateStakeHolders', 'ChangeRequestTemplateStakeHolders'), ('ChangeRequestTemplateAttachments', 'ChangeRequestTemplateAttachments'), ('ChangeRequestTemplateDetails', 'ChangeRequestTemplateDetails'), ('ChangeRequestFormHeader', 'ChangeRequestFormHeader'), ('ChangeRequestFormApprovers', 'ChangeRequestFormApprovers'), ('ChangeRequestFormStakeHolders', 'ChangeRequestFormStakeHolders'), ('ChangeRequestFormAttachments', 'ChangeRequestFormAttachments'), ('ChangeRequestFormDetails', 'ChangeRequestFormDetails'), ('ChangeRequestSettings', 'ChangeRequestSettings'), ('AMSReportType', 'AMSReportType'), ('AMSReport', 'AMSReport'), ('AMSAsset', 'AMSAsset'), ('AMSAssetStock', 'AMSAssetStock'), ('AMSAssetStockSupport', 'AMSAssetStockSupport'), ('AMSAssetType', 'AMSAssetType'), ('AMSAssetGroup', 'AMSAssetGroup')], default='Add', max_length=50),
+        ),
+    ]