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

RMS-PRD-66 - AMS User Privilege Section + DB Schema - change ams usertype to key value format

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

app/applicationlayer/ams/ams_user_type/views.py

@@ -15,18 +15,30 @@ class AMSUserTypeViewSet(APIView):
         user_client_key = str(enums.AMSUserTypeEnum.USER_CLIENT.name).replace('_', '/').title()
         support_key = str(enums.AMSUserTypeEnum.SUPPORT.name).capitalize()
         viewer_key = str(enums.AMSUserTypeEnum.VIEWER.name).capitalize()
-        
+
         data = {
             "code": "200",
             "status": "success",
             "message": "list of ams user types",
             "results":
-                {
-                    manager_key : manager_value,
-                    user_client_key : user_client_value,
-                    support_key : support_value,
-                    viewer_key : viewer_value
-                }
+                [
+                    {
+                        "name": manager_key,
+                        "value": manager_value,
+                    },
+                    {
+                        "name": user_client_key,
+                        "value": user_client_value
+                    },
+                    {
+                        "name": support_key,
+                        "value": support_value
+                    },
+                    {
+                        "name": viewer_key,
+                        "value": viewer_value
+                    }
+                ]
         }
 
         return Response(data)
\ No newline at end of file

app/entities/models.py

@@ -1303,3 +1303,26 @@ class AMSPrivilege(models.Model):
         unique_together = ['department', 'id_number']
 
 
+# class AMSAssetType(models.Model):
+
+#     code = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     name = models.CharField(
+#         unique=True,
+#         max_length=255)
+#     dynamic_field = models.TextField(
+#         blank=True,
+#         null=True
+#     )
+#     created_by = models.ForeignKey(
+#         User,
+#         on_delete=models.CASCADE,
+#         to_field='code',
+#         related_name='ams_asset_type_created_by'
+#     )
+#     created_at = models.DateTimeField(auto_now_add=True)
+#     deleted_at = models.DateTimeField(null=True, blank=True)
+    
+#     class Meta:
+#         db_table = 'ams_asset_types'