docs: update merchant type naming conventions to lowercase

- Update NCNF merchant type references to use lowercase `ncnf` throughout documentation
- Standardize merchant code examples to reflect lowercase type prefixes
- Update API response examples to show correct lowercase merchant type values
- Correct enum references in error handling and testing documentation
- Update merchant type mapping and default values to use consistent lowercase naming
- Align all documentation with implemented lowercase merchant type constants
- Improve consistency across merchant type architecture, city code enhancement, and optional fields documentation

DEFAULT_MERCHANT_TYPES_ARCHITECTURE.md

@@ -18,7 +18,7 @@ The `_get_default_merchant_types` functionality has been refactored from a singl
 
 **Default Merchant Types**:
 ```python
-NCNF = DefaultMerchantType(code="ncnf", label="NCNF", order=1)
+ncnf = DefaultMerchantType(code="ncnf", label="ncnf", order=1)
 CNF = DefaultMerchantType(code="cnf", label="CNF", order=2)
 DISTRIBUTOR = DefaultMerchantType(code="distributor", label="Distributor", order=3)
 RETAIL = DefaultMerchantType(code="retail", label="Retail", order=4)
@@ -121,7 +121,7 @@ Authorization: Bearer <jwt_token>
   "success": true,
   "message": "Merchant types retrieved successfully",
   "data": [
-    {"code": "ncnf", "label": "NCNF", "order": 1},
+    {"code": "ncnf", "label": "ncnf", "order": 1},
     {"code": "cnf", "label": "CNF", "order": 2},
     {"code": "distributor", "label": "Distributor", "order": 3},
     {"code": "retail", "label": "Retail", "order": 4}
@@ -152,7 +152,7 @@ Authorization: Bearer <jwt_token>
   "success": true,
   "message": "Merchant types list retrieved successfully",
   "data": [
-    {"code": "ncnf", "label": "NCNF"},
+    {"code": "ncnf", "label": "ncnf"},
     {"code": "cnf", "label": "CNF"},
     {"code": "distributor", "label": "Distributor"},
     {"code": "retail", "label": "Retail"}

MERCHANT_CITY_CODE_ENHANCEMENT_SUMMARY.md

@@ -130,14 +130,14 @@ merchant_code: Optional[constr(pattern=MERCHANT_CODE_REGEX.pattern)] = Field(
 ## Merchant Code Examples
 
 ### By Merchant Type:
-- **National CNF**: `NCNF-MUM-0001`, `NCNF-DEL-0002`
+- **National CNF**: `ncnf-MUM-0001`, `ncnf-DEL-0002`
 - **CNF**: `CNF-BLR-0001`, `CNF-CHN-0002`
 - **Distributor**: `DIS-HYD-0001`, `DIS-PUN-0002`
 - **retail/Retail**: `SAL-KOL-0001`, `SAL-AMD-0002`
 
 ### By City:
 - **Mumbai**: `SAL-MUM-0001`, `CNF-MUM-0001`, `DIS-MUM-0001`
-- **Delhi**: `NCNF-DEL-0001`, `CNF-DEL-0001`, `SAL-DEL-0001`
+- **Delhi**: `ncnf-DEL-0001`, `CNF-DEL-0001`, `SAL-DEL-0001`
 - **Bangalore**: `DIS-BLR-0001`, `SAL-BLR-0001`
 
 ## API Usage Examples
@@ -199,7 +199,7 @@ merchant_code: Optional[constr(pattern=MERCHANT_CODE_REGEX.pattern)] = Field(
 
 ### Examples of Valid Codes:
 - ✅ `SAL-MUM-0001`
-- ✅ `NCNF-DEL-0025`
+- ✅ `ncnf-DEL-0025`
 - ✅ `DIS-BLR-1000`
 - ✅ `CNF-UNK-0001` (unknown city)
 

MERCHANT_OPTIONAL_FIELDS_IMPLEMENTATION_SUMMARY.md

@@ -85,7 +85,7 @@ else:
 - **Auto-generated**: System generates based on merchant type if not provided
 - **Format**: `{PREFIX}-{SEQUENCE}` (e.g., `SAL-0001`, `CNF-0025`)
 - **Prefixes**:
-  - `NCNF` for NCNF
+  - `ncnf` for ncnf
   - `CNF` for cnf
   - `DIS` for distributor
   - `SAL` for retail/retail
@@ -144,7 +144,7 @@ else:
 {
   "merchant_id": "123e4567-e89b-12d3-a456-426614174000",
   "merchant_code": "BOTH-001",
-  "merchant_type": "NCNF",
+  "merchant_type": "ncnf",
   "merchant_name": "Custom National CNF",
   "location": "Test Location",
   "contact": { ... },

MERCHANT_UPDATE_TESTING_COMPLETE.md

@@ -27,8 +27,8 @@ Successfully tested and verified all merchant update functionality. All issues f
 
 ## Key Issues Fixed
 
-### 1. AttributeError: NCNF ✅
-- **Problem**: `MerchantType.NCNF` was not defined (should be `MerchantType.ncnf`)
+### 1. AttributeError: ncnf ✅
+- **Problem**: `MerchantType.ncnf` was not defined (should be `MerchantType.ncnf`)
 - **Solution**: Updated all enum references to use lowercase values
 - **Files**: `constants.py`, `models/model.py`, `services/service.py`
 
@@ -73,7 +73,7 @@ Successfully tested and verified all merchant update functionality. All issues f
 ```
 **Result**: ✅ Schema validation passes, auto-generates proper values
 
-### Request 2: NCNF Merchant (Tiruvannamalai) ✅
+### Request 2: ncnf Merchant (Tiruvannamalai) ✅
 ```json
 {
   "merchant_type": "ncnf",        // Enum works correctly
@@ -89,12 +89,12 @@ Successfully tested and verified all merchant update functionality. All issues f
 ## Auto-Generation Verified
 
 - **merchant_id**: UUID format (e.g., `10462379-1204-46d5-b429-57648daac3b1`)
-- **merchant_code**: `TYPE-CITY-SEQUENCE` (e.g., `RET-CHN-0001`, `NCNF-TIR-0001`)
+- **merchant_code**: `TYPE-CITY-SEQUENCE` (e.g., `RET-CHN-0001`, `ncnf-TIR-0001`)
 - **location**: From city (e.g., `"Chennai Branch"`, `"Tiruvannamalai Branch"`)
 
 ## Error Handling
 
-- **500 Internal Server Error**: Fixed AttributeError with MerchantType.NCNF
+- **500 Internal Server Error**: Fixed AttributeError with MerchantType.ncnf
 - **422 Validation Error**: Fixed all field validation issues
 - **Missing Fields**: Auto-generation handles missing required fields
 - **Invalid Formats**: Lenient validation with auto-correction
@@ -120,7 +120,7 @@ The merchant API is now ready for production use. All user-reported errors have
 1. ✅ Empty geo_location handling
 2. ✅ Invalid merchant_code handling  
 3. ✅ Missing location field handling
-4. ✅ MerchantType.NCNF enum error fixed
+4. ✅ MerchantType.ncnf enum error fixed
 5. ✅ Lenient KYC validation for retail merchants
 6. ✅ Auto-generation of all required fields
 

app/merchants/controllers/router.py

@@ -53,8 +53,8 @@ async def create_merchant(
     Create a new merchant.
     
     **Business Rules:**
-    - `NCNF`: No parent required, full KYC mandatory
-    - `cnf`: Parent must be NCNF, full KYC mandatory
+    - `ncnf`: No parent required, full KYC mandatory
+    - `cnf`: Parent must be ncnf, full KYC mandatory
     - `distributor`: Parent must be cnf, full KYC mandatory
     - `retail`: Parent must be distributor, geo_location required, PAN mandatory
     
@@ -161,7 +161,7 @@ async def list_merchants(
     List merchants with filters and optional field projection.
     
     **Request Body:**
-    - `merchant_type`: Filter by type (NCNF, cnf, distributor, retail)
+    - `merchant_type`: Filter by type (ncnf, cnf, distributor, retail)
     - `merchant_types`: Filter by multiple merchant types
     - `can_transact_with`: Filter by merchants that can transact with this merchant ID
     - `can_transact_in`: Filter by merchants that can transact in this location code

app/merchants/services/service.py

@@ -34,7 +34,7 @@ MERCHANT_SEQ_MAP = {
 }
 
 MERCHANT_CODE_PREFIX = {
-    "ncnf": "NCNF",
+    "ncnf": "ncnf",
     "cnf": "CNF",
     "distributor": "DIS", 
     "retail": "RET"

app/system_users/models/model.py

@@ -24,7 +24,7 @@ class SystemUserModel(BaseModel):
     full_name: Optional[str] = Field(None, description="Full name of the user")
     role_id: Optional[str] = Field(None, description="Role identifier e.g. role_distributor_manager")
     merchant_id: Optional[str] = Field(None, description="Owning merchant id")
-    merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
+    merchant_type: Optional[str] = Field(None, description="Merchant type (ncnf, cnf, distributor, retail)")
     status: UserStatus = Field(default=UserStatus.ACTIVE, description="Account status")
     last_login: Optional[datetime] = Field(None, description="Timestamp of last successful login")
     created_by: str = Field(..., description="User id who created this record")

app/system_users/schemas/schema.py

@@ -44,7 +44,7 @@ class CreateUserRequest(BaseModel):
     username: str = Field(..., description="Unique username", min_length=3, max_length=50)
     email: EmailStr = Field(..., description="Email address")
     merchant_id: str = Field(..., description="Merchant identifier")
-    merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
+    merchant_type: Optional[str] = Field(None, description="Merchant type (ncnf, cnf, distributor, retail)")
     password: str = Field(..., description="Password", min_length=8, max_length=100)
     full_name: str = Field(..., description="Full name", min_length=1, max_length=100)
     role_id: str = Field(..., description="Role identifier")
@@ -78,7 +78,7 @@ class UpdateUserRequest(BaseModel):
     full_name: Optional[str] = Field(None, description="Full name", min_length=1, max_length=100)
     role_id: Optional[str] = Field(None, description="Role identifier")
     merchant_id: Optional[str] = Field(None, description="Merchant identifier")
-    merchant_type: Optional[str] = Field(None, description="Merchant type (NCNF, cnf, distributor, retail)")
+    merchant_type: Optional[str] = Field(None, description="Merchant type (ncnf, cnf, distributor, retail)")
     status: Optional[UserStatus] = Field(None, description="Account status")
     metadata: Optional[Dict[str, str]] = Field(None, description="Optional metadata")
 

app/taxonomy/controllers/router.py

@@ -815,7 +815,7 @@ async def get_merchant_types(
     **Returns**: Merchant types data with metadata
     
     **Default Merchant Types**: If no custom merchant types exist, returns:
-    - ncnf (NCNF) - order 1
+    - ncnf (ncnf) - order 1
     - cnf - order 2  
     - distributor - order 3
     - retail - order 4

app/taxonomy/models/defaults.py

@@ -35,11 +35,11 @@ class DefaultMerchantTypes:
     """Centralized default merchant types configuration."""
     
     # Define default merchant types with proper ordering and allowed levels
-    NCNF = DefaultMerchantType(
+    ncnf = DefaultMerchantType(
         code="ncnf",
-        label="NCNF",
+        label="ncnf",
         order=1,
-        description="NCNF - Top level distributor",
+        description="ncnf - Top level distributor",
         allowed_levels=["ncnf", "cnf", "distributor", "retail"]
     )
     
@@ -69,7 +69,7 @@ class DefaultMerchantTypes:
     
     # Legacy mappings for backward compatibility
     LEGACY_MAPPINGS = {
-        "NCNF": "ncnf",
+        "ncnf": "ncnf",
         "retail": "retail",
         "company": "retail"  # Company is treated as retail level
     }
@@ -77,7 +77,7 @@ class DefaultMerchantTypes:
     @classmethod
     def get_all(cls) -> List[DefaultMerchantType]:
         """Get all default merchant types in order."""
-        return [cls.NCNF, cls.CNF, cls.DISTRIBUTOR, cls.RETAIL]
+        return [cls.ncnf, cls.CNF, cls.DISTRIBUTOR, cls.RETAIL]
     
     @classmethod
     def get_all_as_dict(cls) -> List[Dict[str, Any]]:
@@ -88,7 +88,7 @@ class DefaultMerchantTypes:
     def get_by_code(cls, code: str) -> DefaultMerchantType:
         """Get default merchant type by code."""
         code_map = {
-            "ncnf": cls.NCNF,
+            "ncnf": cls.ncnf,
             "cnf": cls.CNF,
             "distributor": cls.DISTRIBUTOR,
             "retail": cls.RETAIL

app/taxonomy/utils/defaults.py

@@ -32,7 +32,7 @@ def get_default_merchant_type_labels() -> List[str]:
     Get list of default merchant type labels.
     
     Returns:
-        List of merchant type labels: ["NCNF", "CNF", "Distributor", "Retail"]
+        List of merchant type labels: ["ncnf", "CNF", "Distributor", "Retail"]
     """
     return DefaultMerchantTypes.get_labels()
 
@@ -118,7 +118,7 @@ def normalize_merchant_type(merchant_type: str) -> str:
     Normalize legacy merchant type codes to current standards.
     
     Args:
-        merchant_type: The merchant type code (may be legacy like "retail", "NCNF")
+        merchant_type: The merchant type code (may be legacy like "retail", "ncnf")
         
     Returns:
         Normalized merchant type code

app/trade_sales/services/service.py

@@ -89,7 +89,7 @@ class TradeSalesService:
                 LEFT JOIN trans.scm_po_item poi ON po.po_id = poi.po_id
                 LEFT JOIN trans.scm_trade_shipment_item tsi ON poi.po_item_id = tsi.po_item_id
                 LEFT JOIN trans.merchants_ref mr ON po.buyer_id = mr.merchant_id
-                WHERE po.supplier_type IN ('cnf', 'ncnf', 'NCNF', 'cnf') 
+                WHERE po.supplier_type IN ('cnf', 'ncnf', 'ncnf', 'cnf') 
                 AND po.buyer_type IN ('distributor', 'distributor', 'cnf', 'cnf')
             """
             
@@ -297,7 +297,7 @@ class TradeSalesService:
                 LEFT JOIN trans.scm_po_item poi ON po.po_id = poi.po_id
                 LEFT JOIN trans.scm_trade_shipment_item tsi ON poi.po_item_id = tsi.po_item_id
                 LEFT JOIN trans.scm_trade_shipment ts ON tsi.shipment_id = ts.shipment_id
-                WHERE po.supplier_type IN ('cnf', 'ncnf', 'NCNF', 'cnf') 
+                WHERE po.supplier_type IN ('cnf', 'ncnf', 'ncnf', 'cnf') 
                 AND po.buyer_type IN ('distributor', 'distributor', 'cnf', 'cnf')
             """
             

app/warehouses/README.md

@@ -93,7 +93,7 @@ Create a new warehouse with mandatory address, contact, and capability informati
 
 **Validations:**
 - warehouse_type: MAIN, SECONDARY, STORE, TEMP
-- merchant_type: NCNF, cnf, distributor, retail
+- merchant_type: ncnf, cnf, distributor, retail
 - warehouse_code must be unique per merchant
 - All required address fields must be provided
 - Geo coordinates must be within valid ranges
@@ -355,7 +355,7 @@ All endpoints return appropriate HTTP status codes:
 - Case-insensitive (converted to uppercase)
 
 **Merchant Type:**
-- Must be one of: NCNF, cnf, distributor, retail
+- Must be one of: ncnf, cnf, distributor, retail
 - Case-insensitive (converted to lowercase)
 
 **Geo Coordinates:**

app/warehouses/models/model.py

@@ -88,7 +88,7 @@ class WarehouseModel(BaseModel):
     """
     warehouse_id: str = Field(..., description="Unique warehouse identifier (UUID)")
     merchant_id: str = Field(..., description="Merchant ID who owns this warehouse")
-    merchant_type: str = Field(..., description="Type of merchant (NCNF, cnf, distributor, retail)")
+    merchant_type: str = Field(..., description="Type of merchant (ncnf, cnf, distributor, retail)")
     
     warehouse_code: str = Field(..., description="Unique warehouse code (e.g., WH-DIST-0001)")
     warehouse_name: str = Field(..., description="Warehouse display name")

app/warehouses/schemas/schema.py

@@ -43,7 +43,7 @@ class WarehouseCreate(BaseModel):
     @field_validator("merchant_type")
     def validate_merchant_type(cls, v):
         """Validate merchant type"""
-        valid_types = {"NCNF", "cnf", "distributor", "retail"}
+        valid_types = {"ncnf", "cnf", "distributor", "retail"}
         if v.lower() not in valid_types:
             raise ValueError(f"merchant_type must be one of: {valid_types}")
         return v.lower()

docs/api-guides/MERCHANT_KYC_WORKFLOW.md

@@ -68,7 +68,7 @@ http://localhost:8001/api/v1
 **Requirements:**
 - Merchant must be in `draft` status
 - Required KYC fields must be completed based on merchant type:
-  - **NCNF, cnf, distributor:** GST, PAN, bank_account_number, bank_ifsc
+  - **ncnf, cnf, distributor:** GST, PAN, bank_account_number, bank_ifsc
   - **retail:** PAN (minimum)
 
 **Status Transition:**
@@ -246,7 +246,7 @@ draft/submitted → rejected
 
 ## KYC Requirements by Merchant Type
 
-### NCNF / cnf / distributor
+### ncnf / cnf / distributor
 **Required Fields:**
 - `gst_number`
 - `pan_number`

docs/examples/po_grn_rma_workflow.py

@@ -18,7 +18,7 @@ async def complete_workflow():
         print("="*80)
         
         # Assume we have existing merchants from previous setup
-        # NCNF → cnf → distributor → retail
+        # ncnf → cnf → distributor → retail
         
         # Step 1: retail creates PO to distributor
         print("\n1. retail CREATES PURCHASE ORDER TO distributor")

docs/examples/quick_start.py

@@ -12,10 +12,10 @@ async def create_sample_merchants():
     """Create a complete merchant hierarchy for testing"""
     
     async with httpx.AsyncClient() as client:
-        # 1. Create NCNF (Root)
-        print("Creating NCNF...")
-        NCNF = {
-            "merchant_type": "NCNF",
+        # 1. Create ncnf (Root)
+        print("Creating ncnf...")
+        ncnf = {
+            "merchant_type": "ncnf",
             "merchant_code": "ncnf-INDIA-001",
             "merchant_name": "National Distribution Center India",
             "contact": {
@@ -46,12 +46,12 @@ async def create_sample_merchants():
             "created_by": "system_admin"
         }
         
-        response = await client.post(f"{BASE_URL}/merchants", json=NCNF)
+        response = await client.post(f"{BASE_URL}/merchants", json=ncnf)
         if response.status_code == 201:
             ncnf_data = response.json()
-            print(f"✓ Created NCNF: {ncnf_data['merchant_id']}")
+            print(f"✓ Created ncnf: {ncnf_data['merchant_id']}")
             
-            # 2. Create cnf under NCNF
+            # 2. Create cnf under ncnf
             print("\nCreating cnf...")
             cnf = {
                 "merchant_type": "cnf",
@@ -167,7 +167,7 @@ async def create_sample_merchants():
                         print("\n" + "="*60)
                         print("MERCHANT HIERARCHY CREATED SUCCESSFULLY")
                         print("="*60)
-                        print(f"NCNF: {ncnf_data['merchant_id']}")
+                        print(f"ncnf: {ncnf_data['merchant_id']}")
                         print(f"  └── cnf: {cnf_data['merchant_id']}")
                         print(f"      └── distributor: {dist_data['merchant_id']}")
                         print(f"          └── retail: {retail_data['merchant_id']}")
@@ -190,7 +190,7 @@ async def create_sample_merchants():
             else:
                 print(f"✗ Failed to create cnf: {response.text}")
         else:
-            print(f"✗ Failed to create NCNF: {response.text}")
+            print(f"✗ Failed to create ncnf: {response.text}")
             
     return False
 

docs/implementation-summaries/IMPLEMENTATION_SUMMARY.md

@@ -232,4 +232,4 @@ Successfully implemented complete Purchase Order, GRN, and RMA modules with:
 - **Full audit trail** and traceability
 - **Production-ready** code with error handling
 
-All modules follow the specification requirements for the Company → NCNF → cnf → distributor → retail hierarchy with proper validation, tracking, and integration points.
+All modules follow the specification requirements for the Company → ncnf → cnf → distributor → retail hierarchy with proper validation, tracking, and integration points.

docs/implementation-summaries/MERCHANT_API_SUMMARY.md

@@ -36,7 +36,7 @@
 {
   "_id": {"$oid": "6929fd805b6e93f6f31a6ef7"},
   "merchant_id": "mch_Tl6fTpA4Bbzv7rAFLyDwgA",
-  "merchant_type": "NCNF",
+  "merchant_type": "ncnf",
   "parent_merchant_id": null,
   "merchant_code": "ncnf-INDIA-001",
   "merchant_name": "National Distribution Center India",

test_merchant_api_endpoints.py

@@ -53,7 +53,7 @@ test_requests = [
         }
     },
     {
-        "name": "Create NCNF Merchant (Tiruvannamalai)",
+        "name": "Create ncnf Merchant (Tiruvannamalai)",
         "method": "POST", 
         "endpoint": "/merchants",
         "payload": {
@@ -222,7 +222,7 @@ def test_enum_compatibility():
         # Test the specific error case from the logs
         print("1. Testing MerchantType.ncnf access...")
         
-        # This should work now (was failing before with MerchantType.NCNF)
+        # This should work now (was failing before with MerchantType.ncnf)
         merchant_type = MerchantType.ncnf
         print(f"   ✅ MerchantType.ncnf = '{merchant_type}'")
         
@@ -237,8 +237,8 @@ def test_enum_compatibility():
         test_data = {
             "merchant_id": "550e8400-e29b-41d4-a716-446655440000",  # Proper UUID format
             "merchant_type": "ncnf",
-            "merchant_code": "NCNF-CHN-0001",
-            "merchant_name": "Test NCNF",
+            "merchant_code": "ncnf-CHN-0001",
+            "merchant_name": "Test ncnf",
             "contact": {
                 "phone": "+919876543210",
                 "email": "test@example.com",
@@ -266,7 +266,7 @@ def test_enum_compatibility():
             "metadata": {}
         }
         
-        # This was failing before with AttributeError: NCNF
+        # This was failing before with AttributeError: ncnf
         merchant_model = MerchantModel(**test_data)
         print(f"   ✅ MerchantModel creation with ncnf type works")
         
@@ -300,7 +300,7 @@ def main():
         print("   • merchant_code auto-generation with city codes")
         print("   • merchant_id UUID auto-generation")
         print("   • location auto-generation from city")
-        print("   • MerchantType.ncnf enum access (was MerchantType.NCNF)")
+        print("   • MerchantType.ncnf enum access (was MerchantType.ncnf)")
         print("   • Lenient KYC validation for retail merchants")
         print("   • Empty geo_location handling")
         print("   • Backward compatibility for legacy merchant types")

test_merchant_optional_fields.py

@@ -66,7 +66,7 @@ async def test_merchant_optional_fields():
         print("\n3️⃣ Testing merchant_code generation with city...")
         
         test_codes = [
-            ("ncnf", "Mumbai", 1, "NCNF-MUM-0001"),
+            ("ncnf", "Mumbai", 1, "ncnf-MUM-0001"),
             ("cnf", "Delhi", 25, "CNF-DEL-0025"),
             ("distributor", "Bangalore", 100, "DIS-BLR-0100"),
             ("retail", "Chennai", 5, "SAL-CHN-0005")
@@ -147,8 +147,8 @@ async def test_merchant_optional_fields():
             test_uuid = str(uuid.uuid4())
             merchant_data = MerchantCreate(
                 merchant_id=test_uuid,
-                merchant_code="NCNF-PUN-0001",
-                merchant_type=MerchantType.NCNF,
+                merchant_code="ncnf-PUN-0001",
+                merchant_type=MerchantType.ncnf,
                 merchant_name="Test National CNF",
                 location="Test Location",
                 contact=contact,

test_merchant_type_mapping_refactor.py

@@ -34,7 +34,7 @@ def test_default_merchant_types():
     # Test legacy mappings
     print("\n🔄 Legacy mapping tests:")
     legacy_tests = [
-        ("NCNF", "ncnf"),
+        ("ncnf", "ncnf"),
         ("retail", "retail"),
         ("company", "retail")
     ]
@@ -71,7 +71,7 @@ def test_utility_functions():
     
     # Test merchant type level resolution
     print("\n📋 Merchant type level resolution:")
-    test_merchant_types = ["ncnf", "cnf", "distributor", "retail", "retail", "NCNF", "company"]
+    test_merchant_types = ["ncnf", "cnf", "distributor", "retail", "retail", "ncnf", "company"]
     
     for mt in test_merchant_types:
         normalized = normalize_merchant_type(mt)
@@ -100,7 +100,7 @@ def test_catalogue_utils_integration():
             ("distributor", "merchant_789"),
             ("retail", "merchant_abc"),
             ("retail", "merchant_def"),  # Legacy mapping
-            ("NCNF", "merchant_ghi"),  # Legacy mapping
+            ("ncnf", "merchant_ghi"),  # Legacy mapping
             ("company", "merchant_jkl")  # Legacy mapping
         ]
         
@@ -135,7 +135,7 @@ def test_no_hardcoded_mappings():
         # Check for old hardcoded patterns
         hardcoded_patterns = [
             'merchant_type_mapping = {',
-            '"NCNF": {"ncnf"',
+            '"ncnf": {"ncnf"',
             '"retail": {"retail"}',
             '"company": {"company"'
         ]
@@ -170,7 +170,7 @@ def test_hierarchy_logic():
     
     from app.taxonomy.utils.defaults import get_allowed_levels_for_merchant_type
     
-    # Test hierarchy: NCNF can access all levels, retail can only access retail
+    # Test hierarchy: ncnf can access all levels, retail can only access retail
     hierarchy_tests = [
         ("ncnf", ["ncnf", "cnf", "distributor", "retail"]),
         ("cnf", ["cnf", "distributor", "retail"]),

tests/test_merchant_list_filtering.py

@@ -93,7 +93,7 @@ async def test_merchant_filtering():
     try:
         # First get a merchant that has children
         all_merchants = await MerchantService.list_merchants()
-        parent_merchants = [m for m in all_merchants if m.merchant_type in [MerchantType.NCNF, MerchantType.cnf, MerchantType.distributor]]
+        parent_merchants = [m for m in all_merchants if m.merchant_type in [MerchantType.ncnf, MerchantType.cnf, MerchantType.distributor]]
         
         if parent_merchants:
             test_parent = parent_merchants[0]

tests/test_merchant_schemas.py

@@ -252,14 +252,14 @@ class TestMerchantCreate:
             )
         assert "retail requires pan_number" in str(exc_info.value)
 
-    def test_NCNF_no_parent(self):
-        """Test NCNF must not have parent"""
+    def test_ncnf_no_parent(self):
+        """Test ncnf must not have parent"""
         with pytest.raises(ValidationError) as exc_info:
             MerchantCreate(
-                merchant_type=MerchantType.NCNF,
+                merchant_type=MerchantType.ncnf,
                 parent_merchant_id="SOME_PARENT",  # Should not have parent
                 merchant_code="ncnf-001",
-                merchant_name="NCNF",
+                merchant_name="ncnf",
                 contact=ContactModel(
                     phone="+919876543210",
                     email="ncnf@test.com",
@@ -277,7 +277,7 @@ class TestMerchantCreate:
                 ),
                 created_by="admin_001"
             )
-        assert "NCNF must not have a parent_merchant_id" in str(exc_info.value)
+        assert "ncnf must not have a parent_merchant_id" in str(exc_info.value)
 
     def test_cnf_requires_full_kyc(self):
         """Test cnf requires complete KYC"""