Merge pull request #73 in RMS/api-main-service from red-develop to RMSv2

* commit '47fddd2e':
  add company and department object at current user

app/applicationlayer/management/user/serializers.py

@@ -39,8 +39,10 @@ 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')
+    # department_name = serializers.ReadOnlyField(source='department.name')
+    # department_id = serializers.ReadOnlyField(source='department.id')
+    department = serializers.SerializerMethodField()
+    company = serializers.SerializerMethodField()
     # role = UserManagementRoleSerializer()
     # special_permissions = serializers.SlugRelatedField(many=True,
                                                     #    read_only=True,
@@ -49,19 +51,33 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.User
         fields = (
-            'id', 'image', 'applications',
+            'id', 'image', 'company', 'department', 'applications',
             'last_login', 'is_superuser',
             'first_name', 'last_name',
             'is_staff', 'is_active',
             'date_joined', 'user_type',
             'code', 'name',
             'username', 'contact_no',
-            'email', 'department_name',
-            'doa', 'department_id',
+            'email', 'doa',
             'default_app',
         )
         # 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')
 
@@ -102,7 +118,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
                     #     list_mod.append(body)
 
                 app_body = {}
-                app_body['app_code'] = data.app_code
+                app_body['app_code'] = data.app_code.lower()
                 app_body['name'] = data.name
                 app_body['modules'] = mod
                 list_app.append(app_body)