Przeglądaj źródła

feat(S-cfc-59): 家庭加入准入校验门禁实现,joinRequiredInfoTest 转绿

- FamilyJoinRequestService.createJoinRequest 新增 validateJoinRequiredInfo 校验块
- 真实姓名 trim 后 1-20 字;出生日期非空、不晚于今天、不早于 1900-01-01(不设年龄上限);性别仅 male/female
- 缺失/非法直接抛错,不写 family_join_requests,保持与规格 2026-11-07-family-join-required-info 一致
- 无新增 DB 迁移(users 表已有 real_name/birthday/gender)
opencode 1 tydzień temu
rodzic
commit
925ba6720a

+ 45 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyJoinRequestService.java

@@ -18,6 +18,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -26,6 +29,13 @@ import java.util.stream.Collectors;
 @Service
 public class FamilyJoinRequestService {
 
+    /** 准入校验:三项必填信息缺失或不合规的统一提示(规格 2026-11-07-family-join-required-info §4.1) */
+    private static final String MSG_JOIN_REQUIRED_INFO = "请先完善真实姓名、出生日期与性别后再申请加入家庭";
+    private static final String MSG_BIRTHDAY_FUTURE = "出生日期不能晚于今天";
+    private static final String MSG_BIRTHDAY_ILLEGAL = "出生日期不合法";
+    /** 生日下限:早于此日期视为非法(不设年龄上限,长辈可正常加入) */
+    private static final LocalDate MIN_BIRTHDAY = LocalDate.of(1900, 1, 1);
+
     @Resource
     private FamilyInvitationMapper familyInvitationMapper;
 
@@ -125,6 +135,9 @@ public class FamilyJoinRequestService {
             throw new RuntimeException("您已有待审批的加入请求,请勿重复提交");
         }
 
+        // 准入校验:被邀请人必须已完善真实姓名/出生日期/性别(需求变更 2026-11-07-family-join-required-info)
+        validateJoinRequiredInfo(currentUser);
+
         // 创建请求
         FamilyJoinRequest request = new FamilyJoinRequest();
         request.setRequesterUserId(userId);
@@ -144,6 +157,38 @@ public class FamilyJoinRequestService {
         return request;
     }
 
+    /**
+     * 准入校验(规格 2026-11-07-family-join-required-info §4.1 / AC-R3):
+     * 真实姓名 trim 后 1–20 字;出生日期非空、不晚于今天、不早于 1900-01-01(不设年龄上限);
+     * 性别仅限 male / female 二值(大小写敏感)。任一不合规直接抛错,不创建加入请求。
+     *
+     * 校验顺序:先判「缺失/格式」(统一文案),再判生日区间(具体文案),
+     * 保证前端可直接用 e.message 做差异化提示。
+     */
+    private void validateJoinRequiredInfo(User currentUser) {
+        String realName = currentUser.getRealName() == null ? "" : currentUser.getRealName().trim();
+        if (realName.isEmpty() || realName.length() > 20) {
+            throw new RuntimeException(MSG_JOIN_REQUIRED_INFO);
+        }
+        if (currentUser.getBirthday() == null) {
+            throw new RuntimeException(MSG_JOIN_REQUIRED_INFO);
+        }
+        String gender = currentUser.getGender();
+        if (!"male".equals(gender) && !"female".equals(gender)) {
+            throw new RuntimeException(MSG_JOIN_REQUIRED_INFO);
+        }
+        // 用 epoch 毫秒还原 LocalDate:兼容 java.util.Date 与 java.sql.Date(后者 toInstant 会抛异常)
+        LocalDate birthday = Instant.ofEpochMilli(currentUser.getBirthday().getTime())
+                .atZone(ZoneId.systemDefault())
+                .toLocalDate();
+        if (birthday.isAfter(LocalDate.now())) {
+            throw new RuntimeException(MSG_BIRTHDAY_FUTURE);
+        }
+        if (birthday.isBefore(MIN_BIRTHDAY)) {
+            throw new RuntimeException(MSG_BIRTHDAY_ILLEGAL);
+        }
+    }
+
     /**
      * 审批通过加入请求(兼容旧调用:不指定辈分 → 仅写 familyRole,不落地辈分/关系)
      */