MERMS/MermsCoreFlask
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Adding live datavbase config

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-07-20 17:25:55 -04:00
parent 6dda273307
commit 39aa95cb37
4 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.live
+1 -1
View File
@@ -19,7 +19,7 @@ API_URL="/swagger.json"
DATABASE_USER=merms_panel
DATABASE_PASSWORD=merms_panel
DATABASE_HOST=10.20.30.60
DATABASE_HOST=10.13.3.60
DATABASE_PORT=5432
DATABASE_NAME=merms_panel
SQL/site_data.sql
+1 -1
View File
@@ -154,7 +154,7 @@ ALTER TABLE members_products ADD primary_server VARCHAR(100);
ALTER TABLE members_products ADD db_status INT DEFAULT 0;
ALTER TABLE members_products ADD provision_status INT DEFAULT 0;
ALTER TABLE members_products ADD p_file INT DEFAULT 0;
ALTER TABLE members_products ADD url_status INT DEFAULT 0
INSERT INTO merms_products (name,description,status,product_id, banner) VALUES ('Personal Website','Your personal professional web presence',1,'A000001', 'banner.jpg');
app/api/services/myproduct.py
+1 -1
View File
@@ -115,7 +115,7 @@ class MyProductsService(BaseService):
}
return ResponseHelper.success(data=response_data)
internal_url = str(random.randint(10000, 99999)) + ".devprov.mermsemr.com"
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)
status = 6
app/api/services/products.py
+5 -31
View File
@@ -1,12 +1,9 @@
from flask import session, jsonify
#from app.api.services import MyProductsService
# from app.api.routes.routes import myproduct_url
# from app.api.services import MyProductsService
# from app.models.loan import Loan
from app.api.services import MyProductsService
from app.utils.logger import logger
from app.api.services.base_service import BaseService
# from app.api.schemas.eligibility_check import EligibilityCheckSchema
from marshmallow import ValidationError
from app.api.enums import TransactionType
from app.api.integrations import SimbrellaIntegration
@@ -16,7 +13,6 @@ from app.models import MembersProducts, Products, Members
from app.api.services.offer_analysis import OfferAnalysis
from app.api.helpers.response_helper import ResponseHelper
from werkzeug.security import generate_password_hash, check_password_hash
# from app.api.schemas.register import RegisterSchema
from app.api.schemas.products import ProductsSchema
from app.api.schemas.user import UserSchema
@@ -30,19 +26,7 @@ class ProductsService(BaseService):
@staticmethod
def process_request(data):
"""
Process the Login request.
Args:
data (dict): The request data.
Returns:
dict: A standardized response.
"""
try:
with db.session.begin():
validated_data = ProductsService.validate_data(data, UserSchema())
@@ -50,18 +34,8 @@ class ProductsService(BaseService):
uid = validated_data.get('uid')
member_data = Members.get_member_by_uid(uid)
member_id = member_data.id
# PRODUCT_LIST = f"""SELECT p.id,p.uid,p.product_id,p.name,p.description,p.status,p.banner,
# mp.status AS prov_status,
# (CASE WHEN mp.status =6 THEN 'Preparing' WHEN mp.status=7 THEN 'Active' ELSE 'Activate Now' END) AS status_text
# FROM products p
# LEFT JOIN members_products mp ON mp.product_id = p.product_id
# AND mp.member_id ={user_id}
# ORDER BY p.id ASC"""
#
# logger.error(f"Product list query (PRODUCT_LIST: {PRODUCT_LIST})")
#
# data = db.session.execute(PRODUCT_LIST)
# get user subscription
member_subs = MyProductsService.get_member_productlist_by_member_id(member_id)
products = Products.get_user_product_list(member_id)
product_data=[]
logger.info(f"Product Data ****** *****: {products}")
@@ -169,7 +143,7 @@ class ProductsService(BaseService):
'name': t.product_id,
'description': t.product_id,
'product_id': t.product_id,
'url_protocol': 'http',
'url_protocol': 'https',
'internal_url': t.internal_url,
'external_url': t.external_url,
'status': t.status,