upload upgrases

.env

@@ -59,3 +59,4 @@ STRIPE_CANCEL_URL="https://qa-panel.mermsemr.com/subscription"
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/DEV"
+MEDIA_SERVER="https://qa-media.mermsemr.com"

.env.live

@@ -55,3 +55,4 @@ STRIPE_CANCEL_URL="https://panel.mermsemr.com/subscription"
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/LIVE"
+MEDIA_SERVER="https://media.mermsemr.com"

.env.local.example

@@ -45,3 +45,4 @@ STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZg
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/DEV"
+MEDIA_SERVER="https://qa-media.mermsemr.com"

.env.qa

@@ -64,3 +64,4 @@ STRIPE_CANCEL_URL="https://qa-panel.mermsemr.com/subscription"
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/DEV"
+MEDIA_SERVER="https://qa-media.mermsemr.com"

.example.env

@@ -29,3 +29,4 @@ STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZg
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/DEV"
+MEDIA_SERVER="https://qa-media.mermsemr.com"

.production.env

@@ -55,3 +55,7 @@ STRIPE_SUCCESS_URL="https://panel.mermsemr.com/subscription-success?session_id={
 STRIPE_CANCEL_URL="https://panel.mermsemr.com/subscription"
 
 
+# UPLOAD PATHS
+UPLOAD_FOLDER="/app/uploads/LIVE"
+MEDIA_SERVER="https://media.mermsemr.com"
+

.qa.env

@@ -60,3 +60,4 @@ START_URL_PATTERN =".devprov.mermsemr.com"
 
 # UPLOAD PATHS
 UPLOAD_FOLDER="/app/uploads/DEV"
+MEDIA_SERVER="https://qa-media.mermsemr.com"

app/api/services/file_upload.py

@@ -13,6 +13,7 @@ import os
 from werkzeug.utils import secure_filename
 import time
 from app.api.helpers.response_helper import ResponseHelper
+from app.api.schemas.user import UserSchema
 
 class FileUploadService(BaseService):
     UPLOAD_FOLDER = settings.UPLOAD_FOLDER  # '/app/uploads'  # '/uploads'
@@ -22,13 +23,24 @@ class FileUploadService(BaseService):
     def member_webfiles(data):
 
         try:
+            validated_data = FileUploadService.validate_data(data, UserSchema())
+            user_token = validated_data.get('token')
+            member_uid = str(validated_data.get('uid'))
+
+            # Who is this
+            member_data = Members.get_member_by_uid(member_uid)
+            if not member_data:
+                return jsonify({"message": "User not found"}), 500
+
+            member_id=member_data.id
+
             result_file_list = MembersWebfiles.get_member_webfiles_by_member_id(20)
             file_list = []
             if result_file_list:
                 for t in result_file_list:
                     file_list.append({
                         'id': t.id,
-                        'uid': t.uid,
+                        'file_uid': t.uid,
                         'member_id': t.member_id,
                         'member_uid': t.member_uid,
                         'file_group': t.file_group,
@@ -37,12 +49,13 @@ class FileUploadService(BaseService):
                         'file_type': t.file_type,
                         'status': t.status,
                         'file_size': t.file_size,
-                        'added': t.added,
+                        'added': t.added.isoformat() if t.added else None,
-                        'updated': t.added.isoformat() if t.added else None
+                        'updated': t.updated.isoformat() if t.updated else None
                     })
 
             response_data = {
                 "file_list": file_list,
+                "media_server": settings.MEDIA_SERVER,
             }
 
             return ResponseHelper.success(data=response_data)

app/config.py

@@ -47,56 +47,58 @@ class Config:
     STRIPE_SUCCESS_URL = os.environ.get("STRIPE_SUCCESS_URL","https://qa-panel.mermsemr.com/subscription-success?session_id={CHECKOUT_SESSION_ID}")
     STRIPE_CANCEL_URL = os.environ.get("STRIPE_CANCEL_URL","https://qa-panel.mermsemr.com/subscriptio")
 
-   # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck")
     VALID_APP_ID = os.getenv("SIMBRELLA_APP_ID", "app1")
     VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345")
-    SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337")
-    SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
 
-    RAC_RESULT_accountStatus = os.environ.get("RAC_RESULT_accountStatus", "true")
-    RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
-    RAC_RESULT_creditBureauCheck = os.environ.get("RAC_RESULT_creditBureauCheck", "false")
-    RAC_RESULT_crmsCheck = os.environ.get("RAC_RESULT_crmsCheck", "true")
-    RAC_RESULT_hasLien = os.environ.get("RAC_RESULT_hasLien", "false")
-    RAC_RESULT_hasPastDueLoan = os.environ.get("RAC_RESULT_hasPastDueLoan", "false")
-    RAC_RESULT_hasSalaryAccount = os.environ.get("RAC_RESULT_hasSalaryAccount", "true")
-    RAC_RESULT_isWhitelisted = os.environ.get("RAC_RESULT_isWhitelisted", "true")
-    RAC_RESULT_noBouncedCheck = os.environ.get("RAC_RESULT_noBouncedCheck", "true")
 
-    rac_true_rules = [
+    # SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337")
-        "rule1_45day_sal",
+    # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
-        "rule2_2m_sal",
+    # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck")
-        "rule3_no_bounced_check",
-        "rule4_current_loan_payments",
-        "rule5_no_past_due_fadv_loan",
-        "rule6_no_past_due_other_loan",
-        "rule7_consistent_salary_amount",
-        "rule8_whitelisted",
-        "rule9_regular_account",
-        "rule10_bvn_validation",
-        "rule11_CRC_no_delinquency",
-        "rule12_CRMS_no_delinquency",
-        "rule13_BVN_ignore",
-        "rule14_no_lien",
-        "rule15_null_ignore"
-    ]
 
-    rac_false_rules = [
+    # RAC_RESULT_accountStatus = os.environ.get("RAC_RESULT_accountStatus", "true")
+    # RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
+    # RAC_RESULT_creditBureauCheck = os.environ.get("RAC_RESULT_creditBureauCheck", "false")
+    # RAC_RESULT_crmsCheck = os.environ.get("RAC_RESULT_crmsCheck", "true")
+    # RAC_RESULT_hasLien = os.environ.get("RAC_RESULT_hasLien", "false")
+    # RAC_RESULT_hasPastDueLoan = os.environ.get("RAC_RESULT_hasPastDueLoan", "false")
+    # RAC_RESULT_hasSalaryAccount = os.environ.get("RAC_RESULT_hasSalaryAccount", "true")
+    # RAC_RESULT_isWhitelisted = os.environ.get("RAC_RESULT_isWhitelisted", "true")
+    # RAC_RESULT_noBouncedCheck = os.environ.get("RAC_RESULT_noBouncedCheck", "true")
+    #
+    # rac_true_rules = [
+    #     "rule1_45day_sal",
+    #     "rule2_2m_sal",
+    #     "rule3_no_bounced_check",
+    #     "rule4_current_loan_payments",
+    #     "rule5_no_past_due_fadv_loan",
+    #     "rule6_no_past_due_other_loan",
+    #     "rule7_consistent_salary_amount",
+    #     "rule8_whitelisted",
+    #     "rule9_regular_account",
+    #     "rule10_bvn_validation",
+    #     "rule11_CRC_no_delinquency",
+    #     "rule12_CRMS_no_delinquency",
+    #     "rule13_BVN_ignore",
+    #     "rule14_no_lien",
+    #     "rule15_null_ignore"
+    # ]
     
-    ]
+    # rac_false_rules = [
+    #
+    # ]
 
-    rac_salary_payments = [
+    # rac_salary_payments = [
-        "salarypaymenT_1",
+    #     "salarypaymenT_1",
-        "salarypaymenT_2",
+    #     "salarypaymenT_2",
-        "salarypaymenT_3",
+    #     "salarypaymenT_3",
-        "salarypaymenT_4",
+    #     "salarypaymenT_4",
-        "salarypaymenT_5",
+    #     "salarypaymenT_5",
-        "salarypaymenT_6"
+    #     "salarypaymenT_6"
-    ]
+    # ]
 
     STRIPE_PRIV_KEY = os.getenv("STRIPE_PRIV_KEY", "WRONG_KEY_SUPPLIED")
 
     UPLOAD_FOLDER=os.environ.get("UPLOAD_FOLDER", "/app/uploads/DEV")
-
+    MEDIA_SERVER = os.environ.get("MEDIA_SERVER", "https://media.mermsemr.com")
 
 settings = Config()