From 5686b3ea9cb0a36c13e32cd719d3cf08ced87da9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 19 Oct 2026 09:30:04 +0700
Subject: [PATCH] fix(backend): prioritize value.value in getPrimaryOptionValue
 for select attribute validation

---
 apps/backend/src/lib/productAttributes.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/backend/src/lib/productAttributes.ts b/apps/backend/src/lib/productAttributes.ts
index c083275..04ae7ca 100644
--- a/apps/backend/src/lib/productAttributes.ts
+++ b/apps/backend/src/lib/productAttributes.ts
@@ -44,7 +44,7 @@ export function resolveDefinitionLocalizedField<T extends { langCode: string; la
 export function getPrimaryOptionValue(value: any): string {
   if (typeof value === 'string') return value;
   if (typeof value === 'object' && value !== null) {
-    return value.th || value.en || Object.values(value)[0] || '';
+    return value.value || value.key || value.id || value.th || value.en || Object.values(value)[0] || '';
   }
   return String(value ?? '');
 }
@@ -52,7 +52,17 @@ export function getPrimaryOptionValue(value: any): string {
 export function getLocalizedOptionLabel(value: any, lang: string): string {
   if (typeof value === 'string') return value;
   if (typeof value === 'object' && value !== null) {
-    return value[lang] || value[lang.slice(0, 2)] || value.th || value.en || Object.values(value)[0] || '';
+    return (
+      value[`label_${lang}`] ||
+      value[`label_${lang.slice(0, 2)}`] ||
+      value[lang] ||
+      value[lang.slice(0, 2)] ||
+      value.label ||
+      value.th ||
+      value.en ||
+      Object.values(value)[0] ||
+      ''
+    );
   }
   return String(value ?? '');
 }