Merge branch 'feature/RMS.v2.1-AMS' into 'product-dev'

Feature/rms.v2.1 ams

See merge request rms/Backend/api-main-service!989

app/applicationlayer/ams/asset_group/serializers.py

@@ -5,7 +5,15 @@ from app.applicationlayer.utils import model_to_dict
 
 class AssetGroupSerializer(serializers.ModelSerializer):
 
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        ret['asset_type_count'] = 0
+        ret['asset_count'] = 0
+        ret['asset_stock_count'] = instance.ams_asset_to_assetgroup.count()
+        
+        return ret
+
     class Meta:
         model = models.AMSAssetGroup
         fields = '__all__'
-        read_only_fields = ['created', 'code']
+        read_only_fields = ['created', 'created_by', 'code']
\ No newline at end of file

app/applicationlayer/ams/asset_group/views.py

@@ -29,17 +29,21 @@ class AssetGroupViewset(viewsets.ModelViewSet):
     def create(self, request, *args, **kwargs):
 
         serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
+        # serializer.is_valid(raise_exception=True)
 
-        message = status_message_response(
-            201, 'success',
-            'New Asset Group created', serializer.data
-        )
+        if serializer.is_valid(raise_exception=True):
+            serializer.save(created_by=self.request.user)
 
-        return Response(
-            message
-        )
+            self.perform_create(serializer)
+            
+            message = status_message_response(
+                201, 'success',
+                'New Asset Group created', serializer.data
+            )
+
+            return Response(
+                message
+            )
 
     def list(self, request, *args, **kwargs):
 

app/applicationlayer/ams/asset_type/serializers.py

@@ -5,6 +5,13 @@ from app.applicationlayer.utils import model_to_dict
 
 class AssetTypeSerializer(serializers.ModelSerializer):
 
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        ret['asset_count'] = instance.ams_asset_type.count()
+        ret['asset_stock_count'] = 0
+        
+        return ret
+
     class Meta:
         model = models.AMSAssetType
         fields = '__all__'

app/applicationlayer/ams/asset_type/views.py

@@ -46,7 +46,17 @@ class AssetTypeViewset(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
 
         queryset = self.filter_queryset(self.get_queryset())
-
+        # queryset = models.AMSAssetType.objects.annotate(
+        #             view_count=Sum(
+        #                 When(relations_item__has_viewed=True, then=1),
+        #                 output_field=IntegerField(),
+        #             ),
+        #             love_count=Sum(
+        #                 When(relations_item__has_loved=True, then=1),
+        #                 output_field=IntegerField(),
+        #             ),
+        #         )
+ 
         page = self.paginate_queryset(queryset)
 
         if page is not None: