Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2

app/applicationlayer/management/user/serializers.py

@@ -39,29 +39,39 @@ class UserManagementRoleSerializer(serializers.ModelSerializer):
 class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     image = serializers.SerializerMethodField()
     applications = serializers.SerializerMethodField()
-    department_name = serializers.ReadOnlyField(source='department.name')
-    department_id = serializers.ReadOnlyField(source='department.id')
-    # role = UserManagementRoleSerializer()
-    # special_permissions = serializers.SlugRelatedField(many=True,
-                                                    #    read_only=True,
-                                                    #    slug_field='code')
+    department = serializers.SerializerMethodField()
+    company = serializers.SerializerMethodField()
 
     class Meta:
         model = models.User
         fields = (
-            'id', 'image', 'applications',
-            'last_login', 'is_superuser',
-            'first_name', 'last_name',
-            'is_staff', 'is_active',
-            'date_joined', 'user_type',
+            'id',
             'code', 'name',
             'username', 'contact_no',
-            'email', 'department_name',
-            'doa', 'department_id',
-            'default_app',
+            'image', 'company',
+            'department', 'applications',
+            'email', 'default_app',
+            'user_type', 'is_active',
+            'doa',
+            
         )
         # exclude = ['password', 'application', 'groups', 'user_permissions']
 
+
+    def get_department(self, user):
+        data = {
+            "id": user.department.id,
+            "name": user.department.name
+        }
+        return data
+
+    def get_company(self, user):
+        data = {
+            "id": user.department.company.id,
+            "name": user.department.company.name
+        }
+        return data
+
     def get_image(self, user):
         request = self.context.get('request')
 
@@ -76,7 +86,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         app = user.application.all()
         list_app = []
         for data in app:
-            if user.user_type.upper() == 'USR' and data.app_code.upper() == 'RMS':
+            if user.user_type.upper() == 'USR' and data.id == 1:
                 pass
             else:
                 remove = ['Modules', 'Companies', 'Department']
@@ -102,7 +112,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
                     #     list_mod.append(body)
 
                 app_body = {}
-                app_body['app_code'] = data.app_code
+                app_body['app_code'] = data.code
                 app_body['name'] = data.name
                 app_body['modules'] = mod
                 list_app.append(app_body)

app/entities/migrations/0002_remove_application_app_code.py

+# Generated by Django 2.2 on 2019-09-09 17:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='application',
+            name='app_code',
+        ),
+    ]

app/entities/models.py

@@ -26,7 +26,6 @@ class Application(AuditClass):
         max_length=255
     )
     name = models.CharField(unique=True, max_length=255)
-    app_code = models.CharField(max_length=255)
 
     class Meta:
         db_table = 'applications'