Merge pull request #11 from KathreftisAI/qa-release

Qa release
KathreftisAI · Apr 24, 2024 · f07b100 · f07b100
2 parents 0b369f8 + 98b71be
commit f07b100
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,9 @@ COPY requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Install Flask
-RUN pip install flask
+#RUN pip install flask
+
+#COPY config.yaml /config/config.yaml
 
 # Make port 5000 available to the world outside this container
 EXPOSE 8000

diff --git a/config.yaml b/config.yaml
@@ -1,2 +1,2 @@
 MONGODB_CONNECTION_STRING: mongodb://unoadmin:[email protected]:27019,10.0.1.6:27020,10.0.1.6:27021/?authSource=admin&replicaSet=sso-rs&retryWrites=true&w=majority
-CYMMETRI_DB_PREFIX: cymmetri-
+CYMMETRI_DB_PREFIX: newqa-
diff --git a/dev.py b/dev.py
@@ -651,7 +651,7 @@ async def get_mapped(data: dict, tenant: str = Header(...)):
 
 
 
-            l2 = ['department', 'employeeId', 'designation', 'appUpdatedDate', 'displayName', 'mobile', 'country', 'city', 'email', 'end_date', 'firstName', 'middleName', 'login', 'lastName', 'userType', 'dateOfBirth', 'endDate', 'startDate', 'password', 'status', 'profilePicture', 'appUserId', 'landline']
+            l2 = ['department', 'employeeId', 'designation', 'appUpdatedDate', 'displayName', 'mobile', 'country', 'city', 'email', 'end_date', 'firstName', 'middleName', 'login', 'lastName', 'userType', 'dateOfBirth', 'endDate', 'startDate', 'password', 'status', 'profilePicture', 'appUserId']
 
             l2_datatypes = {
                             'department': 'STRING',
@@ -677,9 +677,8 @@ async def get_mapped(data: dict, tenant: str = Header(...)):
                             'startDate': 'DATE',
                             'password': 'password',
                             'status': 'STRING',
-                            'profilePicture': 'profilePicture',
-                            'appUserId': 'STRING',
-                            'landline': 'STRING'
+                            'profilePicture': 'ARRAY',
+                            'appUserId': 'STRING'
                         }
 
             l2, l2_datatypes, custom_attributes = add_custom_attributes_to_list(l2, l2_datatypes, tenant)

diff --git a/policy_mapping.py b/policy_mapping.py
@@ -615,7 +615,7 @@ async def get_mapped(data: dict, tenant: str = Header(...)):
 
 
 
-            l2 = ['department', 'employeeId', 'designation', 'appUpdatedDate', 'displayName', 'mobile', 'country', 'city', 'email', 'end_date', 'firstName', 'middleName', 'login', 'lastName', 'userType', 'dateOfBirth', 'endDate', 'startDate', 'password', 'status', 'profilePicture', 'appUserId', 'landline']
+            l2 = ['department', 'employeeId', 'designation', 'appUpdatedDate', 'displayName', 'mobile', 'country', 'city', 'email', 'end_date', 'firstName', 'middleName', 'login', 'lastName', 'userType', 'dateOfBirth', 'endDate', 'startDate', 'password', 'status', 'profilePicture', 'appUserId']
 
             l2_datatypes = {
                             'department': 'STRING',
@@ -641,9 +641,8 @@ async def get_mapped(data: dict, tenant: str = Header(...)):
                             'startDate': 'DATE',
                             'password': 'password',
                             'status': 'STRING',
-                            'profilePicture': 'profilePicture',
-                            'appUserId': 'STRING',
-                            'landline': 'STRING'
+                            'profilePicture': 'ARRAY',
+                            'appUserId': 'STRING'
                         }
 
             l2, l2_datatypes, custom_attributes = add_custom_attributes_to_list(l2, l2_datatypes, tenant)