21921 remove nro schema so reset functionality works consistently (#1552

) * Removed all calls reading the NRO_SCHEMA variable * Removed check for NRO_SCHEMA as this variable does not exist and will never be true * Removed last reading of NRO_SCHEMA * Bumped up version number
bcgov · Jun 20, 2024 · a9953c9 · a9953c9
1 parent 809ab3d
commit a9953c9
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 13 deletions.
diff --git a/api/config.py b/api/config.py
@@ -74,7 +74,6 @@ class Config(object):
 
     # ORACLE - LEGACY NRO NAMESDB
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('ORACLE_HOST', '')

diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py
@@ -1,2 +1,2 @@
-__version__ = '1.1.59'
+__version__ = '1.1.60'
 
diff --git a/api/namex/services/nro/oracle_services.py b/api/namex/services/nro/oracle_services.py
@@ -179,12 +179,7 @@ def set_request_status_to_h(self, nr_num, examiner_username ):
             try:
                 cursor = con.cursor()
 
-                # set the fqpn if the schema is required, which is set y the deployer/configurator
-                # if the environment variable is missing from the Flask Config, then skip setting it.
-                if current_app.config.get('NRO_SCHEMA'):
-                    func_name = '{}.nro_datapump_pkg.name_examination_func'.format(current_app.config.get('NRO_SCHEMA'))
-                else:
-                    func_name = 'nro_datapump_pkg.name_examination_func'
+                func_name = 'nro_datapump_pkg.name_examination_func'
 
                 func_vars = [nr_num,           # p_nr_number
                             'H',               # p_status

diff --git a/jobs/consumed-datafix/config.py b/jobs/consumed-datafix/config.py
@@ -32,7 +32,6 @@ class BaseConfig(object):
     )
 
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('NRO_HOST', '')

diff --git a/jobs/corp-check/config.py b/jobs/corp-check/config.py
@@ -32,7 +32,6 @@ class BaseConfig(object):
     )
 
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('NRO_HOST', '')

diff --git a/jobs/missing-coprs/config.py b/jobs/missing-coprs/config.py
@@ -32,7 +32,6 @@ class BaseConfig(object):
     )
 
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('NRO_HOST', '')

diff --git a/jobs/nro-extractor/config.py b/jobs/nro-extractor/config.py
@@ -32,7 +32,6 @@ class BaseConfig(object):
     )
 
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('NRO_HOST', '')

diff --git a/services/namex-pay/config.py b/services/namex-pay/config.py
@@ -76,7 +76,6 @@ class Config():  # pylint: disable=too-few-public-methods
 
     # ORACLE - LEGACY NRO NAMESDB
     NRO_USER = os.getenv('NRO_USER', '')
-    NRO_SCHEMA = os.getenv('NRO_SCHEMA', None)
     NRO_PASSWORD = os.getenv('NRO_PASSWORD', '')
     NRO_DB_NAME = os.getenv('NRO_DB_NAME', '')
     NRO_HOST = os.getenv('ORACLE_HOST', '')