From 33c38652d55c9d89142294939418fb68c818f39b Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 28 Dec 2025 15:11:48 -0500 Subject: [PATCH] file upload-path --- .env | 2 ++ .env.live | 3 +++ .env.local.example | 2 ++ .env.qa | 3 +++ .example.env | 4 ++-- .qa.env | 5 ++++- app/api/services/file_upload.py | 16 +++++++++++++--- app/config.py | 1 + 8 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.env b/.env index e4041df..bf4c245 100644 --- a/.env +++ b/.env @@ -57,3 +57,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 diff --git a/.env.live b/.env.live index 4582e83..34f4368 100644 --- a/.env.live +++ b/.env.live @@ -52,3 +52,6 @@ STRIPE_PRIV_KEY_0="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ij STRIPE_SUCCESS_URL="https://panel.mermsemr.com/subscription-success?session_id={CHECKOUT_SESSION_ID}" STRIPE_CANCEL_URL="https://panel.mermsemr.com/subscription" + +# UPLOAD PATHS +UPLOAD_FOLDER="/app/uploads/LIVE" \ No newline at end of file diff --git a/.env.local.example b/.env.local.example index c42556c..dc8ad44 100644 --- a/.env.local.example +++ b/.env.local.example @@ -43,3 +43,5 @@ STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyV #Secret key STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZguUw42c4Rl5yjmpkdYlbpslDOaMGtOSrsL100oaN72Lne" +# UPLOAD PATHS +UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file diff --git a/.env.qa b/.env.qa index fe3107b..e0b7c23 100644 --- a/.env.qa +++ b/.env.qa @@ -61,3 +61,6 @@ STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZg STRIPE_SUCCESS_URL="https://qa-panel.mermsemr.com/subscription-success?session_id={CHECKOUT_SESSION_ID}" STRIPE_CANCEL_URL="https://qa-panel.mermsemr.com/subscription" + +# UPLOAD PATHS +UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file diff --git a/.example.env b/.example.env index af932e3..b425abd 100644 --- a/.example.env +++ b/.example.env @@ -27,5 +27,5 @@ STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyV #Secret key STRIPE_PRIV_KEY="sk_test_51RqL5WLjZLojw6IZZa921BftQWmxZ4JDxrHUrFZvc5kwJhxtK3ijZguUw42c4Rl5yjmpkdYlbpslDOaMGtOSrsL100oaN72Lne" - -SIMBRELLA_BASE_URL=*************** \ No newline at end of file +# UPLOAD PATHS +UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file diff --git a/.qa.env b/.qa.env index 4dc000c..83feb8f 100644 --- a/.qa.env +++ b/.qa.env @@ -56,4 +56,7 @@ START_URL_PATTERN =".devprov.mermsemr.com" # MAIL_PORT= 465 # MAIL_USERNAME=message@chiefsoft.com # MAIL_PASSWORD=may12002! -# JWT_SECRET=dce6bd64f7d7101de4f \ No newline at end of file +# JWT_SECRET=dce6bd64f7d7101de4f + +# UPLOAD PATHS +UPLOAD_FOLDER="/app/uploads/DEV" \ No newline at end of file diff --git a/app/api/services/file_upload.py b/app/api/services/file_upload.py index 609baeb..5483218 100644 --- a/app/api/services/file_upload.py +++ b/app/api/services/file_upload.py @@ -2,6 +2,7 @@ from flask import jsonify from app.api.enums import KafkaMessage from app.api.services import MyProductsService +from app.config import settings from app.models import Members from app.utils.logger import logger from app.api.services.base_service import BaseService @@ -9,19 +10,25 @@ from sqlalchemy import func, desc from app.extensions import db import os from werkzeug.utils import secure_filename +import time class FileUploadService(BaseService): - UPLOAD_FOLDER = '/app/uploads' # '/uploads' + UPLOAD_FOLDER = settings.UPLOAD_FOLDER # '/app/uploads' # '/uploads' ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'} @staticmethod def process_file_upload(upload_type: str, file, member_uid): + timestamp_integer = int(time.time()) + + ## MAKE SURE WE HAVE BASE FOLDERS + if not os.path.isdir(FileUploadService.UPLOAD_FOLDER): + os.makedirs(FileUploadService.UPLOAD_FOLDER) file_uid = "I GOT HERE " try: - #Who is this + # Who is this member_data = Members.get_member_by_uid(member_uid) if not member_data: return [] @@ -38,7 +45,10 @@ class FileUploadService(BaseService): os.makedirs(save_path) filename = secure_filename(file.filename) - final_save_path = os.path.join(save_path, filename) + # This is to avert duplicate file name issues + save_filename = str(timestamp_integer) + "-" + filename + final_save_path = os.path.join(save_path, save_filename) + logger.info(f'POST CALLED 6 {final_save_path}') file.save(final_save_path) diff --git a/app/config.py b/app/config.py index f6aff51..eb2f49c 100644 --- a/app/config.py +++ b/app/config.py @@ -98,6 +98,7 @@ class Config: STRIPE_PRIV_KEY = os.getenv("STRIPE_PRIV_KEY", "WRONG_KEY_SUPPLIED") + UPLOAD_FOLDER=os.environ.get("RAC_RESULT_accountStatus", "/app/uploads/DEV") settings = Config()