From dc27865c47a66171fb617b55f30e45908eea5aae Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 7 Oct 2025 06:35:46 -0400
Subject: [PATCH] country fix

---
 app/api/services/office_country.py | 14 ++++++++------
 app/models/country.py              | 12 ++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/api/services/office_country.py b/app/api/services/office_country.py
index 3e09881..2b7a95f 100644
--- a/app/api/services/office_country.py
+++ b/app/api/services/office_country.py
@@ -46,17 +46,19 @@ class OfficeCountryService(BaseService):
             val_type = data.get('val_type', '')
             country_uid = data.get('country_uid', '')
             code = data.get('code', '')
-            val = data.get('val', '')
+            val = data.get('val', 0)
             country_result=[]
-            if val_type == 'STATUS':
-                country_result = Country.set_country_status(country_uid, code, val)
+            with db.session.begin():
+                if val_type == 'STATUS':
+                    country_result = Country.set_country_status(country_uid, code, val)
 
-            if val_type == 'SIGNUP':
-                country_result = Country.set_country_signup(country_uid, code, val)
+                if val_type == 'SIGNUP':
+                    country_result = Country.set_country_signup(country_uid, code, val)
 
 
             account_result = {
-                "set_country_data":country_result,
+                "set_country_data":country_result.id,
+                "value": val,
                 "message": "Updated"
             }
             logger.info('RETURN API::get office account view')
diff --git a/app/models/country.py b/app/models/country.py
index 74695b1..14f8322 100644
--- a/app/models/country.py
+++ b/app/models/country.py
@@ -2,7 +2,8 @@ from datetime import datetime, timezone, timedelta
 from app.extensions import db
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
-
+import logging
+logger = logging.getLogger(__name__)
 
 class Country(db.Model):
     __tablename__ = 'country'
@@ -24,25 +25,28 @@ class Country(db.Model):
 
     @classmethod
     def get_all_countries(cls):
-        country_list = cls.query.all()
+        country_list = cls.query.order_by(cls.description.asc()).all()
         if not country_list:
             return None
         return country_list
 
     @classmethod
     def set_country_status(cls, country_uid, code, val):
-
+        logger.info(f" Data for  set_country_status Data {country_uid} ,{code} {val}")
         country_data = cls.query.filter_by(uid=str(country_uid), code=str(code)).first()
         if not country_data:
             return None
-        country_data.status = val
+        logger.info("UPDT::")
+        country_data.status = int(val)
         return country_data
 
     @classmethod
     def set_country_signup(cls, country_uid, code, val):
+        logger.info(f" Data for  set_country_signup Data {country_uid} ,{code} {val}")
         country_data = cls.query.filter_by(uid=str(country_uid), code=str(code)).first()
         if not country_data:
             return None
+        logger.info("UPDT::")
         country_data.signup = val
         return country_data