country model

This commit is contained in:
CHIEFSOFT\ameye
2025-10-06 06:02:24 -04:00
parent 2558b51aa4
commit 3d4fbba98e
7 changed files with 322 additions and 7 deletions
+9 -1
View File
@@ -13,9 +13,10 @@ from app.api.services import (
SubscriptionsService,
CommonDataService,
OfficeCustomerService,
GenerativesService, OfficeUsersService, OfficeTemplatesService
GenerativesService, OfficeUsersService, OfficeTemplatesService, OfficeCountryService
)
from app.api.services.comments import CommentsService
from app.models import Country
from app.utils.logger import logger
from app.api.middlewares import enforce_json, require_auth
import os
@@ -381,6 +382,13 @@ def get_dashboard():
result = OfficeDashboardService.get_dashboard_data()
return jsonify(result)
@api.route('/office/country', methods=['GET'])
# @token_required
def get_office_country():
# Call the dashboard service
result = OfficeCountryService.get_office_country_list()
return jsonify(result)
@api.route('/office/customers', methods=['GET'])
# @token_required
+1
View File
@@ -17,4 +17,5 @@ from app.api.services.office_customer import OfficeCustomerService
from app.api.services.office_dashboard import OfficeDashboardService
from app.api.services.office_users import OfficeUsersService
from app.api.services.office_templates import OfficeTemplatesService
from app.api.services.office_country import OfficeCountryService
+40
View File
@@ -0,0 +1,40 @@
from flask import jsonify
from app.utils.logger import logger
from app.api.services.base_service import BaseService
from sqlalchemy import func, desc
from datetime import datetime, timedelta, timezone
from app.extensions import db
from app.models import Country
class OfficeCountryService(BaseService):
@staticmethod
def get_office_country_list(filters):
logger.info('ENTER API::get get_office_country_list')
try:
account_result_data =[]
account_result = Country.get_all_countries()
if account_result:
for t in account_result:
account_result_data.append({
'id': t.id,
'uid': t.uid,
'code': t.code,
'description': t.description,
'status': t.status,
'signup': t.signup,
})
account_result = {
"country_data":account_result_data,
}
logger.info('RETURN API::get office account view')
logger.info(account_result)
return account_result
except Exception as e:
logger.error(f"An error occurred while get_office_country_list data: {str(e)}", exc_info=True)
return jsonify({"message": "Internal Server Error"}), 500
+12 -5
View File
@@ -184,15 +184,22 @@ class ProductsService(BaseService):
}
return ResponseHelper.success(data=response_data)
MembersProductsRefresh.create_subscription_refresh(member_id,product_id, subscription_uid)
# if memberSubscription.uid != subscription_uid :
activeRefresh = MembersProductsRefresh.get_active_refresh_by_subscription_uid(subscription_uid)
if activeRefresh:
return {
"message": "Invalid Refresh",
"error_message": "Current active refresh found- please wait for 2 to 5 minutes and try again",
"member_id":member_id,
"uid": member_data.uid,
}, 400
#products = MembersProducts.get_member_productlist_by_member_id(member_id)
plannedRefresh = MembersProductsRefresh.create_subscription_refresh(member_id,product_id, subscription_uid)
# Simulate processing
response_data = {
"products_data": [],
"message": "Rebuild Planned - will be completed in 90 seconds",
"error_message": "",
"refresh_uid": plannedRefresh.uid,
"member_id":member_id,
"uid": member_data.uid,
}