added environment for statung cors, fixed current user

app/applicationlayer/management/user/serializers.py

@@ -115,17 +115,23 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         if user.user_type.upper() == enums.UserTypeEnum.USER.value:
             app = user.application.exclude(id=1)
         else:
+            rms = models.Application.objects.filter(id=1)
             app = user.application.all()
+            app = app.union(app, rms)
         list_app = []
 
-        for data in app:
+        for data in app.order_by('id'):
+            if data.id != 1:
                 mod = data.modules.all()
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
                 if user.user_type.upper() != enums.UserTypeEnum.USER.value:
                     user_module = models.Module.objects.filter(
                         name__icontains="user"
                     )
+                    if data.id != 1:
                         mod = mod.union(mod, user_module)
+                    else:
+                        mod = user_module
             mod = mod.order_by("parent", "sort_id")
 
             mod = ModuleSerializer(data=mod, many=True)

config/settings/base.py

@@ -128,7 +128,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static")
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = '/media/'
 
-CORS_ORIGIN_ALLOW_ALL = True
+# CORS_ORIGIN_ALLOW_ALL = True
 
 REST_SESSION_LOGIN = True
 

config/settings/dev.py

@@ -4,6 +4,7 @@ import configparser
 DEBUG = True
 
 ALLOWED_HOSTS = ['*']
+# CORS_ORIGIN_ALLOW_ALL = True
 
 config = configparser.ConfigParser()
 config_file = os.path.join('./', 'env.ini')
@@ -52,3 +53,5 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 CATCH_EMAIL = config['DEV']['CATCH_EMAIL']
 
 CR_FRONT_LINK = config['DEV']['CR_LINK']
+
+CORS_ORIGIN_ALLOW_ALL = True

config/settings/local.py

@@ -50,3 +50,5 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 CATCH_EMAIL = config['LOCAL']['CATCH_EMAIL']
 
 CR_FRONT_LINK = config['LOCAL']['CR_LINK']
+
+CORS_ORIGIN_ALLOW_ALL = True
\ No newline at end of file

config/settings/production.py

@@ -4,6 +4,7 @@ import configparser
 DEBUG = False
 
 ALLOWED_HOSTS = ['*']
+CORS_ORIGIN_ALLOW_ALL = True
 
 config = configparser.ConfigParser()
 config_file = os.path.join('./', 'env.ini')
@@ -52,3 +53,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 CATCH_EMAIL = config['PRODUCTION']['CATCH_EMAIL']
 
 CR_FRONT_LINK = config['PRODUCTION']['CR_LINK']
+CORS_ORIGIN_ALLOW_ALL = config['PRODUCTION']['CORS_ORIGIN_ALLOW_ALL']

config/settings/staging.py

@@ -52,3 +52,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 CATCH_EMAIL = config['STAGING']['CATCH_EMAIL']
 
 CR_FRONT_LINK = config['STAGING']['CR_LINK']
+CORS_ORIGIN_ALLOW_ALL = config['STAGING']['CORS_ORIGIN_ALLOW_ALL']

env.template.ini

@@ -12,6 +12,7 @@ USER_DEFAULT_PASSWORD =
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+CORS_ORIGIN_ALLOW_ALL = False
 
 [UAT]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -27,6 +28,7 @@ USER_DEFAULT_PASSWORD =
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+CORS_ORIGIN_ALLOW_ALL = False
 
 [DEV]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -42,6 +44,7 @@ USER_DEFAULT_PASSWORD =
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://devweb.rmsv2.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+CORS_ORIGIN_ALLOW_ALL = True
 
 
 [STAGING]
@@ -58,6 +61,7 @@ USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+CORS_ORIGIN_ALLOW_ALL = False
 
 
 [LOCAL]
@@ -74,6 +78,7 @@ USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://localhost:8000/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+CORS_ORIGIN_ALLOW_ALL = True
 
 [SETTINGS]
 CONFIG = config.settings.staging