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

* commit '45fca878':
  reconstruct the env.ini, try to load all the configuration on base.py
  {dev bugfix} code refactor on checking of account and applications

app/helper/decorators.py

@@ -107,16 +107,13 @@ class rms:
         @wraps(function)
         def wrapper(self, request, *args, **kwargs):
             payload = request.data
-            if not 'excel_code' in payload:
+            if ('excel_code' not in payload or
+                    payload['excel_code'].strip() == ''
+                ):
                 return error_message(
                     '400', "Excel code is required",
                     'failed', status.HTTP_400_BAD_REQUEST
                 )
-            elif len(payload['excel_code'].strip()) == 0:
-                return error_message(
-                    '400', "Excel code is may not be blank",
-                    'failed', status.HTTP_400_BAD_REQUEST
-                )
             is_excel_code_exist = self.queryset.filter(
                 excel_code=payload['excel_code']
             )
@@ -138,6 +135,13 @@ class rms:
         @wraps(function)
         def wrapper(self, request, *args, **kwargs):
             payload = request.data
+            if 'username' not in payload or payload['username'].strip() == '':
+                return error_message(
+                    '400',
+                    f"username is required",
+                    'failed',
+                    status.HTTP_400_BAD_REQUEST
+                )
             username = self.queryset.filter(
                 username=payload['username']
             )

config/settings/base.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/2.2/ref/settings/
 """
 
 import os
+import configparser
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(
@@ -25,9 +26,9 @@ BASE_DIR = os.path.dirname(
 SECRET_KEY = 'w!dkk7gc*dk#4!6ow3s1wc32%_yp$=osgybm=n0vw6k1j^sqo&'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition
@@ -158,19 +159,6 @@ REST_FRAMEWORK = {
     'PAGE_SIZE': 10
 }
 
-# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
-# EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
-# EMAIL_PORT = 587
-# EMAIL_HOST_USER = 'AKIAIPRWQKYV6N5SMLUA'
-# EMAIL_HOST_PASSWORD = 'ApK1dtH2qpT/oMl9MEauFvyN9XZDQ1fjzd8TumIs71NG'
-# EMAIL_USE_SSL = False
-# EMAIL_USE_TLS = True
-# EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# EMAIL_DEFAULT_SENDER = 'rms.noreply@oneberrysystem.com'
-
-# EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
-
-
 EMAIL_TEMPLATES_ROOT = os.path.join(BASE_DIR, "app/helper/email_service/templates")
 
 EMAIL_HOST = 'email-smtp.us-west-2.amazonaws.com'
@@ -181,3 +169,67 @@ EMAIL_USE_SSL = False
 EMAIL_USE_TLS = True
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_DEFAULT_SENDER = 'noreply@rms-hub.com'
+
+
+###########################################################################
+# config
+#########################################################################
+
+DEBUG = False
+
+ALLOWED_HOSTS = ['*']
+# CORS_ORIGIN_ALLOW_ALL = True
+
+config = configparser.ConfigParser()
+config_file = os.path.join('./', 'env.ini')
+config.read(config_file)
+
+CHANNEL_LAYERS = {
+    'default': {
+        'BACKEND': 'channels_redis.core.RedisChannelLayer',
+        'CONFIG': {
+            "hosts": [('172.17.0.1', 6379)],
+            # "hosts": [('127.0.0.1', 6379)],
+        },
+    },
+}
+
+DATABASES = {
+    'default': {
+        'ENGINE': config['SETTINGS']['DATABASE_ENGINE'],
+        'NAME': config['SETTINGS']['DATABASE_NAME'],
+        'USER': config['SETTINGS']['DATABASE_USER'],
+        'PASSWORD': config['SETTINGS']['DATABASE_PASSWORD'],
+        'HOST': config['SETTINGS']['DATABASE_HOST'],
+        'PORT': config['SETTINGS']['DATABASE_PORT'],
+    }
+}
+
+# ****************
+# PROGRAM SETTINGS
+# ****************
+SESSION_TIMEOUT = config['SETTINGS']['SESSION_TIMEOUT']
+FRONT_END_URL = config['SETTINGS']['FRONT_END_URL']
+AUTH_ACCESSS_TOKEN_TIMEOUT = config['SETTINGS']['AUTH_ACCESSS_TOKEN_TIMEOUT']
+USER_DEFAULT_PASSWORD = config['SETTINGS']['USER_DEFAULT_PASSWORD']
+REALTIMESERVER_IP = config['SETTINGS']['REALTIMESERVER_IP']
+
+# Notification Messages
+APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']
+REQUESTOR_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_MESSAGE']
+REQUESTOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_REJECT_MESSAGE']
+VENDOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACKNOWLEDGE_MESSAGE']
+REQUESTOR_ACKNOWLEDGE_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_ACKNOWLEDGE_MESSAGE']
+REQUESTOR_COMPLETION_MESSAGE = config['NOTIFICATION_EMAIL']['REQUESTOR_COMPLETION_MESSAGE']
+VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESSAGE']
+VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
+REVISED_MESSAGE = config['NOTIFICATION_EMAIL']['REVISED_MESSAGE']
+CANCEL_MESSAGE = config['NOTIFICATION_EMAIL']['CANCEL_MESSAGE']
+APPROVER_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_REJECT_MESSAGE']
+
+#ADMIN PROFILE
+CATCH_EMAIL = config['SETTINGS']['CATCH_EMAIL']
+
+CR_FRONT_LINK = config['SETTINGS']['CR_LINK']
+
+CORS_ORIGIN_ALLOW_ALL = True

env.new_template.ini

+[SETTINGS]
+BATCH_UPLOAD_FORMAT_FILENAME = instruction.pdf
+SSL = 1
+DATABASE_ENGINE = django.db.backends.mysql
+DATABASE_NAME = rms_db
+DATABASE_USER = red_database
+DATABASE_PASSWORD = password123
+DATABASE_HOST = 10.0.75.1
+DATABASE_PORT = 3306
+SESSION_TIMEOUT = 30
+FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
+AUTH_ACCESSS_TOKEN_TIMEOUT = 3600
+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
+
+
+[NOTIFICATION_EMAIL]
+APPROVER_MESSAGE = has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
+REQUESTOR_MESSAGE = has APPROVED the change request;RMS-CRAPPROVED
+REQUESTOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED
+VENDOR_ACKNOWLEDGE_MESSAGE = has sent you an ACKNOWLEDGEMENT REQUEST for change request;RMS-ACTIONREQUIRED-VENDOR
+REQUESTOR_ACKNOWLEDGE_MESSAGE = has ACKNOWLEDGED the change request;RMS-CRACKNOWLEDGE
+REQUESTOR_COMPLETION_MESSAGE = has COMPLETED the change request;RMS-CRCOMPLETED
+VENDOR_ACCEPTANCE_MESSAGE = has ACCEPTED the change request;RMS-CRACCEPTED
+VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR
+REVISED_MESSAGE = has REJECTED the change request for your revision;RMS-CRREVISED
+CANCEL_MESSAGE = has CANCELLED the change request;RMS-CRCANCELLED-USERTRIGGER
+APPROVER_REJECT_MESSAGE = has REJECTED the change request for your approval;RMS-CRREJECTED-APPROVER

manage.py

@@ -10,7 +10,7 @@ config.read(config_file)
 if __name__ == "__main__":
 
     os.environ.setdefault('DJANGO_SETTINGS_MODULE',
-                          config['SETTINGS']['CONFIG'])
+                          'config.settings.base')
     # os.system('start chrome.exe --kiosk --kiosk-printing
     # http://localhost:8000/')
     try: