docs(merchant_type): Update merchant type references from salon to retail and NCNF

- Update supported merchant types documentation from `national_cnf`, `cnf`, `distributor`, `salon` to `NCNF`, `cnf`, `distributor`, `retail`
- Replace all `salon` references with `retail` across documentation and example code
- Update role mapping from `role_salon_owner` to `role_retail_owner` in SCM permissions integration
- Update example payloads and API documentation to use retail merchant type
- Update model field descriptions and schema examples to reflect new merchant type values
- Update test data and demo scripts to use retail instead of salon
- Standardize merchant type naming conventions across all internal schemas and API endpoints

MERCHANT_TYPE_IMPLEMENTATION.md

@@ -9,7 +9,7 @@ Enhanced the system users functionality to capture and store `merchant_type` inf
 ### 1. Merchant Type Capture
 - **Automatic Detection**: When creating a user, if `merchant_type` is not provided, the system attempts to fetch it from the SCM service using the `merchant_id`
 - **Manual Override**: `merchant_type` can be explicitly provided during user creation
-- **Supported Types**: `national_cnf`, `cnf`, `distributor`, `salon`
+- **Supported Types**: `NCNF`, `cnf`, `distributor`, `retail`
 
 ### 2. Enhanced Data Model
 - Added `merchant_type` field to `SystemUserModel`
@@ -26,10 +26,10 @@ Enhanced the system users functionality to capture and store `merchant_type` inf
 ### Model Changes
 ```python
 # SystemUserModel
-merchant_type: Optional[str] = Field(None, description="Merchant type (national_cnf, cnf, distributor, salon)")
+merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
 
 # CreateUserRequest  
-merchant_type: Optional[str] = Field(None, description="Merchant type (national_cnf, cnf, distributor, salon)")
+merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
 
 # UserInfoResponse
 merchant_id: str = Field(..., description="Merchant ID")
@@ -67,8 +67,8 @@ POST /auth/users/list
   "projection_list": ["user_id", "username", "merchant_type", "role"],
   "status_filter": "active",
   "role_filter": "admin",
-  "merchant_id_filter": "mch_salon_001",
-  "merchant_type_filter": "salon"
+  "merchant_id_filter": "mch_retail_001",
+  "merchant_type_filter": "retail"
 }
 ```
 
@@ -79,8 +79,8 @@ POST /auth/users/list
   "data": [
     {
       "user_id": "usr_123",
-      "username": "salon_owner",
-      "merchant_type": "salon",
+      "username": "retail_owner",
+      "merchant_type": "retail",
       "role": "user"
     }
   ],
@@ -95,10 +95,10 @@ POST /auth/users/list
 ### 1. Create User with Explicit Merchant Type
 ```python
 user_data = CreateUserRequest(
-    username="salon_owner",
-    email="owner@salon.com",
-    merchant_id="mch_salon_001",
-    merchant_type="salon",  # Explicitly provided
+    username="retail_owner",
+    email="owner@retail.com",
+    merchant_id="mch_retail_001",
+    merchant_type="retail",  # Explicitly provided
     password="SecurePass@123!",
     first_name="retail",
     last_name="Owner",
@@ -122,9 +122,9 @@ user_data = CreateUserRequest(
 
 ### 3. List Users by Merchant Type
 ```python
-# Get all salon users with minimal fields
+# Get all retail users with minimal fields
 payload = {
-    "merchant_type_filter": "salon",
+    "merchant_type_filter": "retail",
     "projection_list": ["user_id", "username", "merchant_id", "merchant_type"]
 }
 ```

SCM_PERMISSIONS_INTEGRATION.md

@@ -21,7 +21,7 @@ Added new method `get_scm_permissions_by_role()`:
 - `super_admin` → `role_super_admin`
 - `admin` → `role_company_admin`
 - `manager` → `role_cnf_manager`
-- `user` → `role_salon_owner`
+- `user` → `role_retail_owner`
 
 ### 3. Authentication Router (`app/auth/controllers/router.py`)
 Updated `/login` endpoint:

app/internal/schemas.py

@@ -29,7 +29,7 @@ class CreateUserFromEmployeeRequest(BaseModel):
                 "phone": "+919876543210",
                 "role_id": "role_employee",
                 "merchant_id": "merchant_001",
-                "merchant_type": "salon",
+                "merchant_type": "retail",
                 "username": "john_doe",
                 "metadata": {
                     "created_from": "employee",
@@ -55,12 +55,12 @@ class CreateUserFromMerchantRequest(BaseModel):
         json_schema_extra = {
             "example": {
                 "merchant_id": "merchant_001",
-                "merchant_type": "salon",
-                "email": "owner@salon.com",
+                "merchant_type": "retail",
+                "email": "owner@retail.com",
                 "merchant_name": "Beauty retail",
                 "phone": "+919876543210",
-                "role_id": "role_salon_owner",
-                "username": "salon_owner",
+                "role_id": "role_retail_owner",
+                "username": "retail_owner",
                 "metadata": {
                     "created_from": "merchant",
                     "merchant_code": "SAL-001"

app/system_users/controllers/router.py

@@ -191,7 +191,7 @@ async def list_users_with_projection(
     - `status_filter`: Filter by user status (active, inactive, suspended, etc.)
     - `role_filter`: Filter by user role
     - `merchant_id_filter`: Filter by merchant ID
-    - `merchant_type_filter`: Filter by merchant type (national_cnf, cnf, distributor, salon)
+    - `merchant_type_filter`: Filter by merchant type (NCNF, cnf, distributor, retail)
     
     **Projection Fields Available:**
     user_id, username, email, merchant_id, merchant_type, first_name, last_name, 

app/system_users/models/model.py

@@ -55,7 +55,7 @@ class SystemUserModel(BaseModel):
     username: str = Field(..., description="Unique username (lowercase alphanumeric)")
     email: EmailStr = Field(..., description="User email address")
     merchant_id: str = Field(..., description="User Merchant Information")
-    merchant_type: Optional[str] = Field(None, description="Merchant type (national_cnf, cnf, distributor, salon)")
+    merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
     
     # Authentication
     password_hash: str = Field(..., description="Bcrypt hashed password")
@@ -102,8 +102,8 @@ class SystemUserModel(BaseModel):
                 "user_id": "usr_01HZQX5K3N2P8R6T4V9W",
                 "username": "john.doe",
                 "email": "john.doe@company.com",
-                "merchant_id": "mch_salon_001",
-                "merchant_type": "salon",
+                "merchant_id": "mch_retail_001",
+                "merchant_type": "retail",
                 "password_hash": "$2b$12$LQv3c1yqBWVHxkd0LHAkCOYz6TtxMQJqhN8/LeVMstdMT6jmDQrji",
                 "first_name": "John",
                 "last_name": "Doe",

app/system_users/schemas/schema.py

@@ -43,7 +43,7 @@ class CreateUserRequest(BaseModel):
     username: str = Field(..., description="Unique username", min_length=3, max_length=30)
     email: EmailStr = Field(..., description="Email address")
     merchant_id: str = Field(..., description="Merchant ID for the user")
-    merchant_type: Optional[str] = Field(None, description="Merchant type (national_cnf, cnf, distributor, salon)")
+    merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
     password: str = Field(..., description="Password", min_length=8, max_length=100)
     first_name: str = Field(..., description="First name", min_length=1, max_length=50)
     last_name: Optional[str] = Field(None, description="Last name", max_length=50)

app/system_users/services/service.py

@@ -547,8 +547,8 @@ class SystemUserService:
                 "super_admin": "role_super_admin",
                 "admin": "role_company_admin",
                 "manager": "role_cnf_manager",
-                "user": "role_salon_owner",
-                "read_only": "role_salon_staff"
+                "user": "role_retail_owner",
+                "read_only": "role_retail_staff"
             }
             
             # Get the SCM role_id

create_initial_users.py

@@ -28,7 +28,7 @@ async def create_initial_users():
                 "username": "superadmin",
                 "email": "superadmin@cuatrolabs.com",
                 "merchant_id": "company_cuatro_beauty_ltd",
-                "merchant_type": "national_cnf",
+                "merchant_type": "NCNF",
                 "password_hash": pwd_context.hash("SuperAdmin@123!"),
                 "first_name": "Super",
                 "last_name": "Admin",
@@ -51,7 +51,7 @@ async def create_initial_users():
                 "username": "admin",
                 "email": "admin@cuatrolabs.com",
                 "merchant_id": "company_cuatro_beauty_ltd",
-                "merchant_type": "national_cnf",
+                "merchant_type": "NCNF",
                 "password_hash": pwd_context.hash("CompanyAdmin@123!"),
                 "first_name": "Company",
                 "last_name": "Admin",
@@ -74,7 +74,7 @@ async def create_initial_users():
                 "username": "manager",
                 "email": "manager@cuatrolabs.com",
                 "merchant_id": "company_cuatro_beauty_ltd",
-                "merchant_type": "national_cnf",
+                "merchant_type": "NCNF",
                 "password_hash": pwd_context.hash("Manager@123!"),
                 "first_name": "Team",
                 "last_name": "Manager",

demo_merchant_type_users.py

@@ -30,10 +30,10 @@ async def demo_merchant_type_users():
         # Demo users with different merchant types
         demo_users = [
             {
-                "username": "salon_manager_demo",
-                "email": "salon.manager.demo@example.com",
-                "merchant_id": "mch_demo_salon_001",
-                "merchant_type": "salon",  # Explicitly provided
+                "username": "retail_manager_demo",
+                "email": "retail.manager.demo@example.com",
+                "merchant_id": "mch_demo_retail_001",
+                "merchant_type": "retail",  # Explicitly provided
                 "password": "Demoretail@123!",
                 "first_name": "Demo",
                 "last_name": "retail Manager",
@@ -112,7 +112,7 @@ async def demo_merchant_type_users():
         print(f"\n🔍 Filtering users by merchant_type")
         print("-" * 50)
         
-        merchant_types = ["salon", "distributor", "cnf", "national_cnf"]
+        merchant_types = ["retail", "distributor", "cnf", "NCNF"]
         
         for merchant_type in merchant_types:
             try:

migration_add_merchant_type.py

@@ -85,7 +85,7 @@ async def migrate_merchant_type():
             
             if not merchant_type:
                 logger.warning(f"⚠️  No merchant found for merchant_id {merchant_id} (user {user_id}), setting default")
-                merchant_type = "salon"  # Default fallback
+                merchant_type = "retail"  # Default fallback
             
             # Update user with merchant_type
             result = await auth_users_collection.update_one(

test_scm_permissions.py

@@ -21,7 +21,7 @@ async def test_scm_permissions():
         "super_admin": "role_super_admin",
         "admin": "role_company_admin",
         "manager": "role_cnf_manager",
-        "user": "role_salon_owner"
+        "user": "role_retail_owner"
     }
     
     for user_role, scm_role_id in role_mapping.items():

test_system_users_with_merchant_type.py

@@ -44,10 +44,10 @@ async def test_create_user_with_merchant_type():
     # Test user data with different merchant types
     test_users = [
         {
-            "username": "salon_owner_001",
-            "email": "salon.owner@example.com",
-            "merchant_id": "mch_salon_001",
-            "merchant_type": "salon",
+            "username": "retail_owner_001",
+            "email": "retail.owner@example.com",
+            "merchant_id": "mch_retail_001",
+            "merchant_type": "retail",
             "password": "retailOwner@123!",
             "first_name": "retail",
             "last_name": "Owner",
@@ -120,9 +120,9 @@ async def test_list_users_with_projection():
             }
         },
         {
-            "name": "Filter by merchant_type = salon",
+            "name": "Filter by merchant_type = retail",
             "payload": {
-                "merchant_type_filter": "salon",
+                "merchant_type_filter": "retail",
                 "projection_list": ["user_id", "username", "email", "merchant_id", "merchant_type"]
             }
         },
@@ -181,7 +181,7 @@ async def test_merchant_type_filtering():
     
     headers = {"Authorization": f"Bearer {token}"}
     
-    merchant_types = ["salon", "distributor", "cnf", "national_cnf"]
+    merchant_types = ["retail", "distributor", "cnf", "NCNF"]
     
     async with aiohttp.ClientSession() as session:
         for merchant_type in merchant_types: