fix: streamline JWT token generation tests and enhance user model tests by removing unnecessary imports and simplifying error handling in user service

Author: erweixin

backend-nodejs/domains/auth/service/jwt_service.test.ts

@@ -40,7 +40,7 @@ describe('JWTService', () => {
     });
 
     it('生成的 Token 应该在指定时间后过期', () => {
-      const { token, expiresAt } = jwtService.generateAccessToken(testUserId, testEmail);
+      const { expiresAt } = jwtService.generateAccessToken(testUserId, testEmail);
       const expectedExpiry = Date.now() + config.accessTokenExpiry * 1000;
 
       // 允许 1 秒的误差
@@ -69,7 +69,7 @@ describe('JWTService', () => {
     });
 
     it('生成的 Token 应该在指定时间后过期', () => {
-      const { token, expiresAt } = jwtService.generateRefreshToken(testUserId);
+      const { expiresAt } = jwtService.generateRefreshToken(testUserId);
       const expectedExpiry = Date.now() + config.refreshTokenExpiry * 1000;
 
       // 允许 1 秒的误差

backend-nodejs/domains/user/model/user.test.ts

@@ -4,7 +4,6 @@
 
 import { describe, it, expect } from 'vitest';
 import { User, UserStatuses } from './user.js';
-import bcrypt from 'bcryptjs';
 
 describe('User Model', () => {
   describe('create', () => {

backend-nodejs/domains/user/model/user.ts

@@ -201,7 +201,7 @@ function normalizeEmail(email: string): string {
  * 验证邮箱格式
  */
 function isValidEmail(email: string): boolean {
-  const emailRegex = /^[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}$/;
+  const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
   return emailRegex.test(email);
 }
 

backend-nodejs/domains/user/service/user_service.ts

@@ -108,11 +108,7 @@ export class UserService {
     }
 
     // Step 4: 更新用户字段
-    try {
-      user.updateProfile(input.username, input.fullName, input.avatarURL);
-    } catch (error) {
-      throw error; // 直接抛出 Model 层的错误
-    }
+    user.updateProfile(input.username, input.fullName, input.avatarURL);
 
     // Step 5: 保存用户
     await this.userRepo.update(ctx, user);
@@ -156,11 +152,7 @@ export class UserService {
     }
 
     // Step 4 & 5: 更新密码（包含哈希）
-    try {
-      await user.updatePassword(input.newPassword);
-    } catch (error) {
-      throw error; // 直接抛出 Model 层的错误
-    }
+    await user.updatePassword(input.newPassword);
 
     // 保存到数据库
     await this.userRepo.update(ctx, user);

backend-nodejs/domains/user/tests/change_password.test.ts

@@ -11,7 +11,6 @@ import { registerUserRoutes } from '../http/router.js';
 import { createAuthMiddleware } from '../../../infrastructure/middleware/auth.js';
 import { JWTService } from '../../auth/service/jwt_service.js';
 import { UserRepositoryImpl } from '../repository/user_repo.js';
-import { User } from '../model/user.js';
 
 describe('ChangePassword Handler', () => {
   let app: FastifyInstance;

backend-nodejs/infrastructure/monitoring/logger/logger.ts

@@ -123,13 +123,15 @@ export class Logger {
  */
 function createOutputStream(config: LoggerConfig): NodeJS.WritableStream {
   switch (config.output) {
-    case 'stdout':
+    case 'stdout': {
       return process.stdout;
+    }
 
-    case 'stderr':
+    case 'stderr': {
       return process.stderr;
+    }
 
-    case 'file':
+    case 'file': {
       if (!config.outputPath) {
         throw new Error('outputPath is required when output=file');
       }
@@ -171,9 +173,11 @@ function createOutputStream(config: LoggerConfig): NodeJS.WritableStream {
       });
 
       return rotatingStream;
+    }
 
-    default:
+    default: {
       return process.stdout;
+    }
   }
 }
 

scripts/pre-commit-format.sh

@@ -22,6 +22,7 @@ fi
 
 HAS_GO_FILES=false
 HAS_FRONTEND_FILES=false
+HAS_BACKEND_NODEJS_FILES=false
 
 # 检查是否有 Go 文件
 for file in $STAGED_FILES; do
@@ -39,6 +40,14 @@ for file in $STAGED_FILES; do
     fi
 done
 
+# 检查是否有 backend-nodejs 文件
+for file in $STAGED_FILES; do
+    if [[ "$file" == backend-nodejs/* ]] && [[ "$file" =~ \.(ts)$ ]]; then
+        HAS_BACKEND_NODEJS_FILES=true
+        break
+    fi
+done
+
 # 格式化 Go 代码
 if [ "$HAS_GO_FILES" = true ]; then
     echo "📐 Formatting Go code..."
@@ -121,7 +130,60 @@ if [ "$HAS_FRONTEND_FILES" = true ]; then
     echo ""
 fi
 
+# 检查 backend-nodejs ESLint
+if [ "$HAS_BACKEND_NODEJS_FILES" = true ]; then
+    echo "🔍 Checking backend-nodejs ESLint..."
+    
+    # 检查是否有 pnpm
+    if ! command -v pnpm >/dev/null 2>&1; then
+        echo "⚠️  pnpm not found, skipping ESLint check"
+        echo "   Install with: npm install -g pnpm"
+    else
+        cd "$ROOT_DIR/backend-nodejs"
+        
+        # 收集需要检查的 TypeScript 文件
+        TS_FILES=()
+        for file in $STAGED_FILES; do
+            if [[ "$file" == backend-nodejs/* ]] && [[ "$file" =~ \.(ts)$ ]]; then
+                REL_PATH="${file#backend-nodejs/}"
+                if [ -f "$ROOT_DIR/backend-nodejs/$REL_PATH" ]; then
+                    TS_FILES+=("$REL_PATH")
+                fi
+            fi
+        done
+        
+        if [ ${#TS_FILES[@]} -gt 0 ]; then
+            # 运行 ESLint 检查（只检查错误，警告不会阻止提交）
+            echo "  Checking ${#TS_FILES[@]} TypeScript file(s)..."
+            
+            # 运行 lint 并捕获输出和退出码
+            LINT_OUTPUT=$(pnpm lint 2>&1)
+            LINT_EXIT_CODE=$?
+            
+            # 检查是否有错误（非零退出码表示有错误）
+            if [ $LINT_EXIT_CODE -eq 0 ]; then
+                echo "✅ ESLint check passed (warnings are allowed)"
+            else
+                echo ""
+                echo "❌ ESLint check failed! Found errors that must be fixed."
+                echo ""
+                echo "$LINT_OUTPUT" | grep -E "(error|✖)" | head -20
+                echo ""
+                echo "   Please fix the errors before committing."
+                echo "   Run 'cd backend-nodejs && pnpm lint' to see all issues."
+                echo "   Or run 'cd backend-nodejs && pnpm lint:fix' to auto-fix some issues."
+                echo ""
+                cd "$ROOT_DIR"
+                exit 1
+            fi
+        fi
+        
+        cd "$ROOT_DIR"
+    fi
+    echo ""
+fi
+
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "✅ Code formatting complete!"
+echo "✅ Code formatting and linting complete!"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 

scripts/setup-pre-commit.sh

@@ -37,9 +37,10 @@ chmod +x "$PRE_COMMIT_HOOK"
 
 echo "✅ Pre-commit hook installed at: $PRE_COMMIT_HOOK"
 echo ""
-echo "📝 The hook will automatically format:"
-echo "   • Go files (using gofmt/goimports)"
-echo "   • Frontend files (using prettier)"
+echo "📝 The hook will automatically:"
+echo "   • Format Go files (using gofmt/goimports)"
+echo "   • Format Frontend files (using prettier)"
+echo "   • Check backend-nodejs ESLint (errors will block commit)"
 echo ""
 echo "🎯 To test the hook, try:"
 echo "   git add <some files>"