Merge pull request #35 from touchmegit1:shift

Refactor database seeding scripts and improve error handling

Author: xukki241

.github/workflows/cd.yml

@@ -335,17 +335,21 @@ jobs:
             PRODUCTS_COUNT="$(get_table_count products || echo 0)"
             VARIANTS_COUNT="$(get_table_count product_variants || echo 0)"
             STOCK_COUNT="$(get_table_count inventory_stock || echo 0)"
+            SALE_ORDERS_COUNT="$(get_table_count sale_orders || echo 0)"
+            SALE_ORDER_ITEMS_COUNT="$(get_table_count sale_order_items || echo 0)"
+            TICKETS_COUNT="$(get_table_count tickets || echo 0)"
+            LOYALTY_GIFTS_COUNT="$(get_table_count loyalty_gifts || echo 0)"
             refresh_integrity_metrics
             SEED_WAS_RUN=0
 
-            echo "Post-deploy counts: products=$PRODUCTS_COUNT, variants=$VARIANTS_COUNT, inventory_stock=$STOCK_COUNT"
+            echo "Post-deploy counts: products=$PRODUCTS_COUNT, variants=$VARIANTS_COUNT, inventory_stock=$STOCK_COUNT, sale_orders=$SALE_ORDERS_COUNT, sale_order_items=$SALE_ORDER_ITEMS_COUNT, tickets=$TICKETS_COUNT, loyalty_gifts=$LOYALTY_GIFTS_COUNT"
             echo "Post-deploy integrity: joinable_variants=$JOINABLE_VARIANTS_COUNT, orphan_product_refs=$ORPHAN_PRODUCT_REFS, orphan_unit_refs=$ORPHAN_UNIT_REFS, stocked_variants=$STOCKED_VARIANTS_COUNT"
 
-            if [ "${PRODUCTS_COUNT:-0}" = "0" ] || [ "${VARIANTS_COUNT:-0}" = "0" ] || is_integrity_bad "$STOCK_COUNT"; then
+            if [ "${PRODUCTS_COUNT:-0}" = "0" ] || [ "${VARIANTS_COUNT:-0}" = "0" ] || [ "${STOCK_COUNT:-0}" = "0" ] || [ "${SALE_ORDERS_COUNT:-0}" = "0" ] || [ "${SALE_ORDER_ITEMS_COUNT:-0}" = "0" ] || [ "${TICKETS_COUNT:-0}" = "0" ] || [ "${LOYALTY_GIFTS_COUNT:-0}" = "0" ] || is_integrity_bad "$STOCK_COUNT"; then
               echo "Detected empty or inconsistent critical product data. Running reset-db-and-seed.sh..."
               if [ -f "./deploy/scripts/reset-db-and-seed.sh" ]; then
                 sudo chmod +x ./deploy/scripts/reset-db-and-seed.sh
-                sudo DEPLOY_PATH="$DEPLOY_PATH" COMPOSE_FILE="$DEPLOY_PATH/docker-compose.prod.yml" ENV_FILE="$ENV_FILE" SEED_STRATEGY="fix-first" ENABLE_LEGACY_FALLBACK="false" bash ./deploy/scripts/reset-db-and-seed.sh
+                sudo DEPLOY_PATH="$DEPLOY_PATH" COMPOSE_FILE="$DEPLOY_PATH/docker-compose.prod.yml" ENV_FILE="$ENV_FILE" SEED_STRATEGY="fix-only" bash ./deploy/scripts/reset-db-and-seed.sh
                 SEED_WAS_RUN=1
                 # Ensure services are up after seed
                 compose_cmd up -d --remove-orphans
@@ -357,13 +361,17 @@ jobs:
             PRODUCTS_COUNT_FINAL="$(get_table_count products || echo 0)"
             VARIANTS_COUNT_FINAL="$(get_table_count product_variants || echo 0)"
             STOCK_COUNT_FINAL="$(get_table_count inventory_stock || echo 0)"
+            SALE_ORDERS_COUNT_FINAL="$(get_table_count sale_orders || echo 0)"
+            SALE_ORDER_ITEMS_COUNT_FINAL="$(get_table_count sale_order_items || echo 0)"
+            TICKETS_COUNT_FINAL="$(get_table_count tickets || echo 0)"
+            LOYALTY_GIFTS_COUNT_FINAL="$(get_table_count loyalty_gifts || echo 0)"
             refresh_integrity_metrics
-            echo "Post-start final counts: products=$PRODUCTS_COUNT_FINAL, variants=$VARIANTS_COUNT_FINAL, inventory_stock=$STOCK_COUNT_FINAL"
+            echo "Post-start final counts: products=$PRODUCTS_COUNT_FINAL, variants=$VARIANTS_COUNT_FINAL, inventory_stock=$STOCK_COUNT_FINAL, sale_orders=$SALE_ORDERS_COUNT_FINAL, sale_order_items=$SALE_ORDER_ITEMS_COUNT_FINAL, tickets=$TICKETS_COUNT_FINAL, loyalty_gifts=$LOYALTY_GIFTS_COUNT_FINAL"
             echo "Post-start final integrity: joinable_variants=$JOINABLE_VARIANTS_COUNT, orphan_product_refs=$ORPHAN_PRODUCT_REFS, orphan_unit_refs=$ORPHAN_UNIT_REFS, stocked_variants=$STOCKED_VARIANTS_COUNT"
 
-            if [ "${PRODUCTS_COUNT_FINAL:-0}" = "0" ] || [ "${VARIANTS_COUNT_FINAL:-0}" = "0" ] || is_integrity_bad "$STOCK_COUNT_FINAL"; then
-              echo "ERROR: Critical product data is still inconsistent after deploy + seed."
-              echo "Diagnostics: products=$PRODUCTS_COUNT_FINAL, variants=$VARIANTS_COUNT_FINAL, stock=$STOCK_COUNT_FINAL, joinable_variants=$JOINABLE_VARIANTS_COUNT, orphan_product_refs=$ORPHAN_PRODUCT_REFS, orphan_unit_refs=$ORPHAN_UNIT_REFS, stocked_variants=$STOCKED_VARIANTS_COUNT"
+            if [ "${PRODUCTS_COUNT_FINAL:-0}" = "0" ] || [ "${VARIANTS_COUNT_FINAL:-0}" = "0" ] || [ "${STOCK_COUNT_FINAL:-0}" = "0" ] || [ "${SALE_ORDERS_COUNT_FINAL:-0}" = "0" ] || [ "${SALE_ORDER_ITEMS_COUNT_FINAL:-0}" = "0" ] || [ "${TICKETS_COUNT_FINAL:-0}" = "0" ] || [ "${LOYALTY_GIFTS_COUNT_FINAL:-0}" = "0" ] || is_integrity_bad "$STOCK_COUNT_FINAL"; then
+              echo "ERROR: Critical seed data is still inconsistent after deploy + seed."
+              echo "Diagnostics: products=$PRODUCTS_COUNT_FINAL, variants=$VARIANTS_COUNT_FINAL, stock=$STOCK_COUNT_FINAL, sale_orders=$SALE_ORDERS_COUNT_FINAL, sale_order_items=$SALE_ORDER_ITEMS_COUNT_FINAL, tickets=$TICKETS_COUNT_FINAL, loyalty_gifts=$LOYALTY_GIFTS_COUNT_FINAL, joinable_variants=$JOINABLE_VARIANTS_COUNT, orphan_product_refs=$ORPHAN_PRODUCT_REFS, orphan_unit_refs=$ORPHAN_UNIT_REFS, stocked_variants=$STOCKED_VARIANTS_COUNT"
               compose_cmd logs --tail=150 mysql backend || true
               exit 1
             fi

README.md

@@ -100,10 +100,10 @@ File docker-compose.prod.yml dùng image:
 - docker.io/<IMAGE_NAMESPACE>/smalltrend-frontend:<IMAGE_TAG>
 
 ## Lưu ý quan trọng về seed
-Đã chuẩn hóa nhiều đoạn INSERT trong backend/src/main/resources/data.sql theo kiểu có danh sách cột để tránh lỗi lệch thứ tự cột giữa các máy.
+Seed mặc định hiện tại dùng `deploy/fix_seed.sql` (được generate từ `backend/src/main/resources/data.sql` để map đúng cột cho các bảng dễ lệch schema).
 Nếu gặp lỗi seed sau khi pull code mới:
-1. Xóa và tạo lại DB nhỏ gọn
-2. Chạy lại run-seed.cmd
+1. Regenerate file seed chuẩn: `node deploy/gen_fix_seed.js`
+2. Chạy lại `backend/run-seed.cmd` (script sẽ tự verify các bảng trọng yếu như products, variants, tickets, loyalty_gifts, sale_orders)
 
 ## Tài liệu bổ sung
 - PRODUCTION_SETUP_STEPS.md

backend/run-seed.cmd

@@ -1,5 +1,5 @@
 @echo off
-setlocal
+setlocal EnableExtensions DisableDelayedExpansion
 chcp 65001 >nul
 
 echo ==============================================
@@ -33,13 +33,21 @@ if not defined DB_USERNAME set "DB_USERNAME=root"
 set "DB_PASSWORD=%DB_PASSWORD%"
 if not defined DB_PASSWORD set "DB_PASSWORD=1234"
 
-set "SEED_FILE=src\main\resources\data.sql"
+set "SEED_FILE=..\deploy\fix_seed.sql"
+if not exist "%SEED_FILE%" set "SEED_FILE=src\main\resources\data.sql"
 
 if not exist "%SEED_FILE%" (
 	echo [ERROR] Seed file not found: %SEED_FILE%
 	exit /b 1
 )
 
+findstr /C:"DỮ LIỆU BÙ ĐẮP CHO CÁC BẢNG BỊ LỖI SCHEMA TRANSACTIONS" "%SEED_FILE%" >nul 2>nul
+if not errorlevel 1 (
+	echo [ERROR] Seed file contains legacy mock patch block and is not allowed.
+	echo [HINT] Regenerate deploy\fix_seed.sql using: node deploy\gen_fix_seed.js
+	exit /b 1
+)
+
 set "MYSQL_EXE=mysql"
 where mysql >nul 2>nul
 if errorlevel 1 (
@@ -60,6 +68,7 @@ if not defined MYSQL_EXE (
 )
 
 echo [INFO] Target DB: %DB_NAME% at %DB_HOST%:%DB_PORT%
+echo [INFO] Seed file: %SEED_FILE%
 
 set "MYSQL_PWD=%DB_PASSWORD%"
 
@@ -70,15 +79,85 @@ if errorlevel 1 (
 	exit /b 1
 )
 
-"%MYSQL_EXE%" --default-character-set=utf8mb4 -h%DB_HOST% -P%DB_PORT% -u%DB_USERNAME% %DB_NAME% < "%SEED_FILE%" >nul
+"%MYSQL_EXE%" --default-character-set=utf8mb4 -h%DB_HOST% -P%DB_PORT% -u%DB_USERNAME% %DB_NAME% < "%SEED_FILE%"
 if errorlevel 1 (
 	echo [ERROR] Failed to import seed file into %DB_NAME%.
 	set "MYSQL_PWD="
 	exit /b 1
 )
 
+call :query_scalar "SELECT COUNT(*) FROM users;" USERS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM products;" PRODUCTS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM product_variants;" VARIANTS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM inventory_stock;" STOCK_COUNT
+call :query_scalar "SELECT COUNT(*) FROM sale_orders;" SALE_ORDERS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM sale_order_items;" SALE_ORDER_ITEMS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM tickets;" TICKETS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM loyalty_gifts;" LOYALTY_GIFTS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM product_variants pv LEFT JOIN products p ON p.id = pv.product_id LEFT JOIN units u ON u.id = pv.unit_id WHERE p.id IS NOT NULL AND u.id IS NOT NULL;" JOINABLE_VARIANTS_COUNT
+call :query_scalar "SELECT COUNT(*) FROM product_variants pv LEFT JOIN products p ON p.id = pv.product_id WHERE p.id IS NULL;" ORPHAN_PRODUCT_REFS
+call :query_scalar "SELECT COUNT(*) FROM product_variants pv LEFT JOIN units u ON u.id = pv.unit_id WHERE u.id IS NULL;" ORPHAN_UNIT_REFS
+call :query_scalar "SELECT COUNT(DISTINCT variant_id) FROM inventory_stock WHERE COALESCE(quantity, 0) > 0;" STOCKED_VARIANTS_COUNT
+
+if not defined USERS_COUNT set "USERS_COUNT=0"
+if not defined PRODUCTS_COUNT set "PRODUCTS_COUNT=0"
+if not defined VARIANTS_COUNT set "VARIANTS_COUNT=0"
+if not defined STOCK_COUNT set "STOCK_COUNT=0"
+if not defined SALE_ORDERS_COUNT set "SALE_ORDERS_COUNT=0"
+if not defined SALE_ORDER_ITEMS_COUNT set "SALE_ORDER_ITEMS_COUNT=0"
+if not defined TICKETS_COUNT set "TICKETS_COUNT=0"
+if not defined LOYALTY_GIFTS_COUNT set "LOYALTY_GIFTS_COUNT=0"
+if not defined JOINABLE_VARIANTS_COUNT set "JOINABLE_VARIANTS_COUNT=0"
+if not defined ORPHAN_PRODUCT_REFS set "ORPHAN_PRODUCT_REFS=0"
+if not defined ORPHAN_UNIT_REFS set "ORPHAN_UNIT_REFS=0"
+if not defined STOCKED_VARIANTS_COUNT set "STOCKED_VARIANTS_COUNT=0"
+
+echo [INFO] Seed verification counts:
+echo        users=%USERS_COUNT%, products=%PRODUCTS_COUNT%, variants=%VARIANTS_COUNT%, inventory_stock=%STOCK_COUNT%
+echo        sale_orders=%SALE_ORDERS_COUNT%, sale_order_items=%SALE_ORDER_ITEMS_COUNT%, tickets=%TICKETS_COUNT%, loyalty_gifts=%LOYALTY_GIFTS_COUNT%
+echo        joinable_variants=%JOINABLE_VARIANTS_COUNT%, orphan_product_refs=%ORPHAN_PRODUCT_REFS%, orphan_unit_refs=%ORPHAN_UNIT_REFS%, stocked_variants=%STOCKED_VARIANTS_COUNT%
+
+if "%USERS_COUNT%"=="0" goto :seed_invalid
+if "%PRODUCTS_COUNT%"=="0" goto :seed_invalid
+if "%VARIANTS_COUNT%"=="0" goto :seed_invalid
+if "%STOCK_COUNT%"=="0" goto :seed_invalid
+if "%SALE_ORDERS_COUNT%"=="0" goto :seed_invalid
+if "%SALE_ORDER_ITEMS_COUNT%"=="0" goto :seed_invalid
+if "%TICKETS_COUNT%"=="0" goto :seed_invalid
+if "%LOYALTY_GIFTS_COUNT%"=="0" goto :seed_invalid
+if "%JOINABLE_VARIANTS_COUNT%"=="0" goto :seed_invalid
+if not "%ORPHAN_PRODUCT_REFS%"=="0" goto :seed_invalid
+if not "%ORPHAN_UNIT_REFS%"=="0" goto :seed_invalid
+if "%STOCKED_VARIANTS_COUNT%"=="0" goto :seed_invalid
+
 set "MYSQL_PWD="
 
 echo.
 echo [SUCCESS] Seed completed for database %DB_NAME%.
 exit /b 0
+
+:query_scalar
+setlocal
+set "QUERY=%~1"
+set "OUT_VAR=%~2"
+set "TMP_FILE=%TEMP%\smalltrend_seed_%RANDOM%_%RANDOM%.tmp"
+
+"%MYSQL_EXE%" --default-character-set=utf8mb4 -h%DB_HOST% -P%DB_PORT% -u%DB_USERNAME% -N -s %DB_NAME% -e "%QUERY%" > "%TMP_FILE%" 2>nul
+if errorlevel 1 (
+	if exist "%TMP_FILE%" del "%TMP_FILE%" >nul 2>nul
+	endlocal & set "%~2=0"
+	goto :eof
+)
+
+set "VALUE="
+if exist "%TMP_FILE%" set /p VALUE=<"%TMP_FILE%"
+if exist "%TMP_FILE%" del "%TMP_FILE%" >nul 2>nul
+if not defined VALUE set "VALUE=0"
+
+endlocal & set "%~2=%VALUE%"
+goto :eof
+
+:seed_invalid
+echo [ERROR] Seed completed but validation failed. Database is inconsistent.
+set "MYSQL_PWD="
+exit /b 1