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

Prod dev gladys

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

app/applicationlayer/ams/asset_group/serializers.py

@@ -9,16 +9,8 @@ class AssetGroupSerializerList(serializers.ModelSerializer):
     def to_representation(self, instance):
         ret = super().to_representation(instance)
 
-        asset_stocks = models.AMSAssetStock.objects.filter(asset_group=instance.code)
-        
-        asset_counter = 0
-        asset_type_counter = 0
-        for asset_stock in asset_stocks:
-            asset_counter = asset_counter + models.AMSAsset.objects.filter(code=asset_stock.asset.code).count()
-            asset_type_counter = asset_type_counter + 1
-        
-        ret['asset_type_count'] = asset_type_counter  # recheck
-        ret['asset_count'] = instance.ams_asset_to_assetgroup.count() # recheck
+        ret['asset_type_count'] = instance.ams_asset_to_assetgroup.values('asset__asset_type').distinct().count()
+        ret['asset_count'] = instance.ams_asset_to_assetgroup.values('asset').distinct().count()
         ret['asset_stock_count'] = instance.ams_asset_to_assetgroup.count()
         
         return ret
@@ -34,16 +26,8 @@ class AssetGroupSerializer(serializers.ModelSerializer):
     def to_representation(self, instance):
         ret = super().to_representation(instance)
 
-        asset_stocks = models.AMSAssetStock.objects.filter(asset_group=instance.code)
-        
-        asset_counter = 0
-        asset_type_counter = 0
-        for asset_stock in asset_stocks:
-            asset_counter = asset_counter + models.AMSAsset.objects.filter(code=asset_stock.asset.code).count()
-            asset_type_counter = asset_type_counter + 1
-        
-        ret['asset_type_count'] = asset_type_counter  # recheck
-        ret['asset_count'] = instance.ams_asset_to_assetgroup.count() # recheck
+        ret['asset_type_count'] = instance.ams_asset_to_assetgroup.values('asset__asset_type').distinct().count()
+        ret['asset_count'] = instance.ams_asset_to_assetgroup.values('asset').distinct().count()
         ret['asset_stock_count'] = instance.ams_asset_to_assetgroup.count()
         
         ret['own'] = instance.ams_asset_to_assetgroup.filter(acquisition_type='Owned').count()