From 407cbc3f77aa48a8e1381fb6234151d27d8ded2d Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 11 Jan 2026 07:24:30 -0500 Subject: [PATCH] selected_flavor --- app/api/services/web_contents.py | 33 +++++++++++--------------------- app/models/products_templates.py | 2 ++ 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/app/api/services/web_contents.py b/app/api/services/web_contents.py index 001e6c0..e4cab6a 100644 --- a/app/api/services/web_contents.py +++ b/app/api/services/web_contents.py @@ -6,7 +6,7 @@ from app.utils.logger import logger from app.api.services.base_service import BaseService from sqlalchemy import func, desc from app.extensions import db -from app.models import MembersProductsSettings, MembersProducts, ProductsColorStyle +from app.models import MembersProductsSettings, MembersProducts, ProductsColorStyle, ProductsTemplates from threading import Thread import requests @@ -63,8 +63,13 @@ class WebContentsService(BaseService): "added": membersSubResult.added, } + selected_flavor = '' + selectedTemplate = ProductsTemplates.get_template_by_uid(membersSubResult.product_template) + if selectedTemplate: + selected_flavor = selectedTemplate.flavor + WebContentsService.get_site_imges_data(provision_uid, membersSubResult.primary_server, - membersSubResult.provision_port) + membersSubResult.provision_port, selected_flavor) if membersSubResult.colorstyle is not None and membersSubResult.colorstyle != '': # is this a valid olor scheme @@ -137,37 +142,21 @@ class WebContentsService(BaseService): return jsonify({"message": "Internal Server Error"}), 500 @staticmethod - def get_site_imges_data(provision_uid, primary_server, provision_port): - - # membersSubResult = MembersProducts.get_member_product_by_subscription_uid(provision_uid) - # - # if not membersSubResult: - # return None - + def get_site_imges_data(provision_uid, primary_server, provision_port, selected_flavor): destination_server = "http://" + str(primary_server) + ":" + str(provision_port) - api_url = destination_server + "/api" + api_url = destination_server + "/api/props" try: + payload = {'provision_uid': provision_uid, 'flavor': selected_flavor} logger.info(f"api_url: {str(api_url)}") # Make the GET request - response = requests.get(api_url) + response = requests.get(api_url, params=payload) response_data = { "provision_uid": provision_uid, # "member_id": member_id, # "product_id": product_id, - # "country": country, - # "region": region, - # "city": city, - # "latitude": latitude, - # "longitude": longitude, } - # logger.error(f"Going for Thread ******************** ") - # thread = Thread(target=MyProductsService.async_send_settings_refresh_to_kafka, - # args=(response_data, provision_uid, KafkaMessage.SITE_TRAFFIC_DATA)) - # thread.start() - # logger.error(f"After the Thread ******************** ") - return response_data except Exception as e: diff --git a/app/models/products_templates.py b/app/models/products_templates.py index 653dd87..775e1d6 100644 --- a/app/models/products_templates.py +++ b/app/models/products_templates.py @@ -20,6 +20,7 @@ class ProductsTemplates(db.Model): owner_uid = db.Column(db.String, nullable=False) provision_name = db.Column(db.String, nullable=False) added = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now()) + flavor = db.Column(db.String, nullable=True) @classmethod def get_template_by_product_id(cls, product_id): @@ -70,6 +71,7 @@ class ProductsTemplates(db.Model): "status": self.status, "owner_uid": self.owner_uid, "provision_name": self.provision_name, + "flavor": self.flavor, "added": self.added.isoformat() if self.added else None }