From 42f9d7fb2475717d38587e99c891c535f767f78f Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Thu, 1 Jan 2026 01:04:41 -0500 Subject: [PATCH] upload upgrases --- .env | 3 +- .env.live | 3 +- .env.local.example | 3 +- .env.qa | 3 +- .example.env | 3 +- .production.env | 4 ++ .qa.env | 3 +- app/api/services/file_upload.py | 19 ++++++-- app/config.py | 84 +++++++++++++++++---------------- 9 files changed, 75 insertions(+), 50 deletions(-) diff --git a/.env b/.env index bf4c245..aa2930d 100644 --- a/.env +++ b/.env @@ -58,4 +58,5 @@ STRIPE_CANCEL_URL="https://qa-panel.mermsemr.com/subscription" # UPLOAD PATHS -UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/DEV" +MEDIA_SERVER="https://qa-media.mermsemr.com" \ No newline at end of file diff --git a/.env.live b/.env.live index 34f4368..67318d6 100644 --- a/.env.live +++ b/.env.live @@ -54,4 +54,5 @@ 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" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/LIVE" +MEDIA_SERVER="https://media.mermsemr.com" \ No newline at end of file diff --git a/.env.local.example b/.env.local.example index dc8ad44..99d3906 100644 --- a/.env.local.example +++ b/.env.local.example @@ -44,4 +44,5 @@ STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyV STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZguUw42c4Rl5yjmpkdYlbpslDOaMGtOSrsL100oaN72Lne" # UPLOAD PATHS -UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/DEV" +MEDIA_SERVER="https://qa-media.mermsemr.com" \ No newline at end of file diff --git a/.env.qa b/.env.qa index e0b7c23..193707f 100644 --- a/.env.qa +++ b/.env.qa @@ -63,4 +63,5 @@ STRIPE_SUCCESS_URL="https://qa-panel.mermsemr.com/subscription-success?session_i STRIPE_CANCEL_URL="https://qa-panel.mermsemr.com/subscription" # UPLOAD PATHS -UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/DEV" +MEDIA_SERVER="https://qa-media.mermsemr.com" \ No newline at end of file diff --git a/.example.env b/.example.env index b425abd..082abad 100644 --- a/.example.env +++ b/.example.env @@ -28,4 +28,5 @@ STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyV STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZguUw42c4Rl5yjmpkdYlbpslDOaMGtOSrsL100oaN72Lne" # UPLOAD PATHS -UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/DEV" +MEDIA_SERVER="https://qa-media.mermsemr.com" \ No newline at end of file diff --git a/.production.env b/.production.env index db19a9f..8232114 100644 --- a/.production.env +++ b/.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" + diff --git a/.qa.env b/.qa.env index 83feb8f..45a8844 100644 --- a/.qa.env +++ b/.qa.env @@ -59,4 +59,5 @@ START_URL_PATTERN =".devprov.mermsemr.com" # JWT_SECRET=dce6bd64f7d7101de4f # UPLOAD PATHS -UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file +UPLOAD_FOLDER="/app/uploads/DEV" +MEDIA_SERVER="https://qa-media.mermsemr.com" \ No newline at end of file diff --git a/app/api/services/file_upload.py b/app/api/services/file_upload.py index 9a0e29d..3b84c11 100644 --- a/app/api/services/file_upload.py +++ b/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, - 'updated': t.added.isoformat() if t.added else None + 'added': 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) diff --git a/app/config.py b/app/config.py index e926c63..ea719dd 100644 --- a/app/config.py +++ b/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 = [ - "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" - ] + # 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") + # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck") + + # 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_false_rules = [ + # + # ] - ] - - rac_salary_payments = [ - "salarypaymenT_1", - "salarypaymenT_2", - "salarypaymenT_3", - "salarypaymenT_4", - "salarypaymenT_5", - "salarypaymenT_6" - ] + # rac_salary_payments = [ + # "salarypaymenT_1", + # "salarypaymenT_2", + # "salarypaymenT_3", + # "salarypaymenT_4", + # "salarypaymenT_5", + # "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()