diff --git a/.env b/.env index e137775..923e6f7 100644 --- a/.env +++ b/.env @@ -36,6 +36,7 @@ MAIL_PASSWORD=may12002! JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" +START_URL_PATTERN =".devprov.mermsemr.com"; #Publishable key STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyVhfvXe9cp4eMnqkDPpoe9wxLLRSV0dxRee00UfhayUOT" diff --git a/.env.live b/.env.live index 6568191..ddc23d6 100644 --- a/.env.live +++ b/.env.live @@ -36,6 +36,8 @@ MAIL_PASSWORD=may12002! JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" +START_URL_PATTERN =".liveprov.mermsemr.com"; + #Publishable key STRIPE_PUB_KEY="pk_live_51RqL5OQ8vepTmh4AbXAnFmbgWDNJys2sfDcsLPVnOKRFx8EVOBOlO2RRN4lRNh6wNPhAj1A28xL3R0wHlMJ4WECo00rOM5iOto" STRIPE_PUB_KEY_0="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyVhfvXe9cp4eMnqkDPpoe9wxLLRSV0dxRee00UfhayUOT" diff --git a/.env.local.example b/.env.local.example index e8e535e..f311d13 100644 --- a/.env.local.example +++ b/.env.local.example @@ -31,6 +31,7 @@ SIMBRELLA_BASE_URL="https://bank-emulator.dev.simbrellang.net" VALID_APP_ID=app1 VALID_API_KEY=test-api-key-12345 +START_URL_PATTERN =".devprov.mermsemr.com"; # Event Bus Broker Configuration KAFKA_BROKER = '10.10.10.120:9092' diff --git a/.env.qa b/.env.qa index f6f3a4f..250b416 100644 --- a/.env.qa +++ b/.env.qa @@ -47,6 +47,8 @@ MAIL_PASSWORD=may12002! JWT_SECRET_KEY=dce6bd64f7d7101de4fed7cfc185a12851611a79bd60bbfdcc5b414b85f1fdb75e0905691c2a77ce94a7351b261fab4e183e17731ed40089f68f7290a793119f285d8ec7902d248ce15e8b1d4996ebacf5e7bcb06a38ac7ce0736f17d5c2895a499661d27095ac20aa174f9af2fba9a849dd2e6fd0aad8aa7e1ecc030c11eb8dc8dcb71d32233de3530d04f85918b9582f8b02587a7350aa34232825d4831707c7c5775026f3fdd92c5df555e6ff8b785525922709830206bbd49c371fb6e16bcab01ffccaf904108bb9789c578bce6afbb33bc77960051e680b2428d1f026473e71ef0f9997b2a6dc496e1c40509a1d289e3ff8b384c2d49e1d7719f9f4aaa1 OPENAI_API_KEY = "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" +START_URL_PATTERN =".devprov.mermsemr.com"; + #Publishable key STRIPE_PUB_KEY="pk_test_51RqL5WLjZLojw6IZmEpwFidNZSl9lLlVUHNvuFZNEz1eTR9XXepnyyVhfvXe9cp4eMnqkDPpoe9wxLLRSV0dxRee00UfhayUOT" #Secret key diff --git a/.qa.env b/.qa.env index 068234b..9571cdf 100644 --- a/.qa.env +++ b/.qa.env @@ -39,6 +39,8 @@ SIMBRELLA_API_KEY="testtest-api-key-12345" JWT_SECRET_KEY=dce6bd64f7d7101de4f +START_URL_PATTERN =".devprov.mermsemr.com"; + # APP_PORT=14700 # FLASK_APP=project/__init__.py # FLASK_DEBUG=1 diff --git a/app/api/services/myproduct.py b/app/api/services/myproduct.py index 1749743..b4f2771 100644 --- a/app/api/services/myproduct.py +++ b/app/api/services/myproduct.py @@ -23,6 +23,7 @@ from app.config import Config class MyProductsService(BaseService): + START_URL_PATTERN = Config.START_URL_PATTERN @staticmethod def process_provision_actions(data): @@ -219,9 +220,7 @@ class MyProductsService(BaseService): } return ResponseHelper.success(data=response_data) - internal_url = str(random.randint(100000, 999999)) + ".devprov.mermsemr.com" - # INSERT_NEW_PRODUCT = "INSERT INTO members_products (member_id ,product_id,status,internal_url) VALUES (%s, %s, %s, %s)" - # val_insert = (member_id, product_id,6,internal_url) + internal_url = str(random.randint(100000, 999999)) + MyProductsService.START_URL_PATTERN # ".devprov.mermsemr.com" status = 6 subscription = MembersProducts.create_subscription(member_id, product_id, status, internal_url) diff --git a/app/config.py b/app/config.py index 808e3c3..55bd79c 100644 --- a/app/config.py +++ b/app/config.py @@ -31,6 +31,7 @@ class Config: SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" SQLALCHEMY_TRACK_MODIFICATIONS = False + START_URL_PATTERN = os.environ.get("START_URL_PATTERN",".devprov.mermsemr.com") JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "secret-key") JWT_ACCESS_TOKEN_EXPIRES = os.getenv("JWT_ACCESS_TOKEN_EXPIRES", timedelta(hours=1))