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

{devbugfix} change body_data to form

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

app/applicationlayer/ams/ams_privilege/views.py

@@ -60,11 +60,11 @@ class AMSPrivilegeViewSet(viewsets.ModelViewSet):
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         try:
-            body_data = request.data['body_data']
-            id_number = body_data[0]['id_number']
+            form = request.data['form']
+            id_number = form[0]['id_number']
             AMSPrivilege.objects.filter(id_number=id_number).delete()
             serializer = AMSPrivilegeSerializer(
-                data=body_data, many=True
+                data=form, many=True
             )
             if serializer.is_valid(raise_exception=True):
                 serializer.save()
@@ -96,6 +96,7 @@ class AMSPrivilegeViewSet(viewsets.ModelViewSet):
                             status=status.HTTP_400_BAD_REQUEST)
 
         except Exception as e:
+            
             message = {
                 'code': 500,
                 'status': 'failed',

app/entities/enums.py

@@ -31,8 +31,13 @@ class GenerateCode(Enum):
     FORM_DETAIL = 'FRMDETAIL'
     ETL = 'ETL'
 
-    ASSET_GROUP = 'AMSGRP'
+    # ASSET_GROUP = 'AMSGRP'
     CMS_SETTINGS = "CMSSET"
+
+    ASSET_TYPE = 'ASSTTYPE'
+    ASSET = 'ASST'
+    ASSET_STOCK = 'ASSTSTOCK'
+    ASSET_GROUP = 'ASSTGRP'
     
 '''
 *********
@@ -127,3 +132,17 @@ class AMSUserTypeEnum(Enum):
     USER_CLIENT = "USER_CLIENT"
     SUPPORT = "SUPPORT"
     VIEWER = "VIEWER"
+
+
+class AMSAssetStatus(Enum):
+    INSTORE = 'In-Store'
+    DEPLOYED = 'Deployed'
+    RETURNED = 'Returned'
+    WRITTENOFF = 'Written Off'
+    FAULTY = 'Faulty'
+
+
+class AMSAssetAquisitionType(Enum):
+    OWN = 'Owned'
+    LOAN = 'Loan'
+

app/entities/models.py

@@ -1303,6 +1303,39 @@ class AMSPrivilege(models.Model):
         unique_together = ['department', 'id_number']
 
 
+# class AMSAssetGroup(models.Model):
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_group_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_asset_groups'
+#         ordering = ['-created']
+    
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSAssetGroup, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.ASSET_GROUP.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
 # class AMSAssetType(models.Model):
 
 #     code = models.CharField(
@@ -1321,8 +1354,134 @@ class AMSPrivilege(models.Model):
 #         to_field='code',
 #         related_name='ams_asset_type_created_by'
 #     )
-#     created_at = models.DateTimeField(auto_now_add=True)
+#     created = models.DateTimeField(auto_now_add=True)
 #     deleted_at = models.DateTimeField(null=True, blank=True)
     
 #     class Meta:
 #         db_table = 'ams_asset_types'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSAssetType, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.ASSET_TYPE.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class AMSAsset(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     asset_type = models.ForeignKey(
+#         AMSAssetType,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_type'
+#     )
+#     description = models.CharField(
+#         blank=True,
+#         null=True,
+#         max_length=255)
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_created_by'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_assets'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSAsset, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.ASSET.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+
+# class AMSAssetStock(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     unique_identifier = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     status = models.CharField(
+#         choices=[(tag.value, tag.value) for tag in enums.AMSAssetStatus],
+#         default=enums.AMSAssetStatus.INSTORE.value,
+#         max_length=100
+#     )
+#     acquisition_type = models.CharField(
+#         choices=[(tag.value, tag.value) for tag in enums.AMSAssetAquisitionType],
+#         default=enums.AMSAssetAquisitionType.OWN.value,
+#         max_length=100
+#     )
+#     location = models.CharField(
+#         max_length=255
+#     )
+#     user_client = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_user_client'
+#     )
+#     manager = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_manager'
+#     )
+#     dynamic_field = models.TextField(
+#         blank=True,
+#         null=True
+#     )
+#     asset = models.ForeignKey(
+#         AMSAsset,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     asset_type = models.ForeignKey(
+#         AMSAssetType,
+#         on_delete=models.CASCADE,
+#         to_field='code'
+#     )
+#     created = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_asset_stocks'
+#         ordering = ['-created']
+
+#     def __str__(self):
+#         return f'{self.code}'
+
+#     def save(self, *args, **kwargs):
+#         super(AMSAssetStock, self).save(*args, **kwargs)
+#         code = number_generator(enums.GenerateCode.ASSET_STOCK.value, self.id)
+        
+#         if self.code == '':
+#             self.code = code
+#             self.created = datetime.now()
+#             self.save()
+
+