朱子纯 / test6

Commit 26bef0e5f11b125bdb4849a2a6de438d99fefe70

Authored by zichun
1 parent 09db8958

feat(usr): 修改用户入参 UpdateUserDTO 与校验 REQ-USR-002

Inline Side-by-side
Showing 2 changed files with 205 additions and 0 deletions
backend/src/main/java/com/xly/erp/modules/usr/dto/UpdateUserDTO.java 0 → 100644
  View file @26bef0e
  1 +package com.xly.erp.modules.usr.dto;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonProperty;
  4 +import jakarta.validation.constraints.Max;
  5 +import jakarta.validation.constraints.Min;
  6 +import jakarta.validation.constraints.NotBlank;
  7 +import jakarta.validation.constraints.Pattern;
  8 +import jakarta.validation.constraints.Size;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 修改用户入参（docs/05 契约 / spec § 2.1）。REQ-USR-002 T1。
  13 + *
  14 + * <p>用于 {@code PUT /api/usr/users/{id}}：管理员修改已有用户基本信息。
  15 + * 部分更新语义（spec § 8 D3）——可选字段（{@code sUserNo} / {@code iEmployeeId} /
  16 + * {@code iCanModifyBill} / {@code iIsVoid}）传 {@code null} = 本次不改该列（保持原值），
  17 + * 非 null 即覆盖；{@code permissionIds} 非 null 全量覆盖授权、{@code []} 清空、{@code null} 不改。</p>
  18 + *
  19 + * <p>本 DTO <b>不含</b> {@code sUserName} / {@code sPassword} / 审计字段（{@code tCreateDate} /
  20 + * {@code sCreator}）/ 租户字段，这些字段为只读、本接口不接收（spec § 2.1 / § 3）。</p>
  21 + *
  22 + * <p>字段为匈牙利前缀命名（与列名一致），其 getter 形如 {@code getSUserType} 会被
  23 + * Jackson 推断为属性名 {@code SUserType}，与契约 JSON 键不符；故对带前缀字段显式
  24 + * {@link JsonProperty} 锁定 JSON 键名（与 {@code CreateUserDTO} 同样做法）。</p>
  25 + */
  26 +public class UpdateUserDTO {
  27 +
  28 + /** 用户号：可选；非 null 覆盖，null 不改。 */
  29 + @JsonProperty("sUserNo")
  30 + @Size(max = 50, message = "用户号长度不能超过 50")
  31 + private String sUserNo;
  32 +
  33 + /** 关联职员 ID：可选，存在性在 Service 校验；非 null 覆盖，null 不改。 */
  34 + @JsonProperty("iEmployeeId")
  35 + private Integer iEmployeeId;
  36 +
  37 + /** 用户类型：必填，取值 ∈ {普通用户, 超级管理员}。 */
  38 + @JsonProperty("sUserType")
  39 + @NotBlank(message = "用户类型不能为空")
  40 + @Pattern(regexp = "^(普通用户|超级管理员)$", message = "用户类型取值非法")
  41 + private String sUserType;
  42 +
  43 + /** 界面语言：必填，取值 ∈ {中文, 英文, 繁体}。 */
  44 + @JsonProperty("sLanguage")
  45 + @NotBlank(message = "语言不能为空")
  46 + @Pattern(regexp = "^(中文|英文|繁体)$", message = "语言取值非法")
  47 + private String sLanguage;
  48 +
  49 + /** 单据修改权限：可选，0 / 1；null 不改。 */
  50 + @JsonProperty("iCanModifyBill")
  51 + @Min(value = 0, message = "单据修改权限取值非法")
  52 + @Max(value = 1, message = "单据修改权限取值非法")
  53 + private Integer iCanModifyBill;
  54 +
  55 + /** 作废 / 禁用标志：可选，0 正常 / 1 禁用；null 不改。 */
  56 + @JsonProperty("iIsVoid")
  57 + @Min(value = 0, message = "作废标志取值非法")
  58 + @Max(value = 1, message = "作废标志取值非法")
  59 + private Integer iIsVoid;
  60 +
  61 + /** 权限组 ID 列表：可选；非 null 全量覆盖授权，[] 清空，null 不改。元素存在性在 Service 校验。 */
  62 + @JsonProperty("permissionIds")
  63 + private List<Integer> permissionIds;
  64 +
  65 + public String getSUserNo() {
  66 + return sUserNo;
  67 + }
  68 +
  69 + public void setSUserNo(String sUserNo) {
  70 + this.sUserNo = sUserNo;
  71 + }
  72 +
  73 + public Integer getIEmployeeId() {
  74 + return iEmployeeId;
  75 + }
  76 +
  77 + public void setIEmployeeId(Integer iEmployeeId) {
  78 + this.iEmployeeId = iEmployeeId;
  79 + }
  80 +
  81 + public String getSUserType() {
  82 + return sUserType;
  83 + }
  84 +
  85 + public void setSUserType(String sUserType) {
  86 + this.sUserType = sUserType;
  87 + }
  88 +
  89 + public String getSLanguage() {
  90 + return sLanguage;
  91 + }
  92 +
  93 + public void setSLanguage(String sLanguage) {
  94 + this.sLanguage = sLanguage;
  95 + }
  96 +
  97 + public Integer getICanModifyBill() {
  98 + return iCanModifyBill;
  99 + }
  100 +
  101 + public void setICanModifyBill(Integer iCanModifyBill) {
  102 + this.iCanModifyBill = iCanModifyBill;
  103 + }
  104 +
  105 + public Integer getIIsVoid() {
  106 + return iIsVoid;
  107 + }
  108 +
  109 + public void setIIsVoid(Integer iIsVoid) {
  110 + this.iIsVoid = iIsVoid;
  111 + }
  112 +
  113 + public List<Integer> getPermissionIds() {
  114 + return permissionIds;
  115 + }
  116 +
  117 + public void setPermissionIds(List<Integer> permissionIds) {
  118 + this.permissionIds = permissionIds;
  119 + }
  120 +}
... ...
backend/src/test/java/com/xly/erp/modules/usr/dto/UpdateUserDTOValidationTest.java 0 → 100644
  View file @26bef0e
  1 +package com.xly.erp.modules.usr.dto;
  2 +
  3 +import static org.assertj.core.api.Assertions.assertThat;
  4 +
  5 +import jakarta.validation.ConstraintViolation;
  6 +import jakarta.validation.Validation;
  7 +import jakarta.validation.Validator;
  8 +import jakarta.validation.ValidatorFactory;
  9 +import java.util.Set;
  10 +import org.junit.jupiter.api.AfterAll;
  11 +import org.junit.jupiter.api.BeforeAll;
  12 +import org.junit.jupiter.api.Test;
  13 +
  14 +/**
  15 + * REQ-USR-002 T1：UpdateUserDTO Bean Validation 校验。
  16 + *
  17 + * <p>用 {@link Validator} 直接 validate DTO，断言 violations。</p>
  18 + */
  19 +class UpdateUserDTOValidationTest {
  20 +
  21 + private static ValidatorFactory factory;
  22 + private static Validator validator;
  23 +
  24 + @BeforeAll
  25 + static void setUp() {
  26 + factory = Validation.buildDefaultValidatorFactory();
  27 + validator = factory.getValidator();
  28 + }
  29 +
  30 + @AfterAll
  31 + static void tearDown() {
  32 + if (factory != null) {
  33 + factory.close();
  34 + }
  35 + }
  36 +
  37 + private UpdateUserDTO minimalValid() {
  38 + UpdateUserDTO dto = new UpdateUserDTO();
  39 + dto.setSUserType("普通用户");
  40 + dto.setSLanguage("中文");
  41 + return dto;
  42 + }
  43 +
  44 + @Test
  45 + void acceptsMinimalValidBody() {
  46 + Set<ConstraintViolation<UpdateUserDTO>> violations = validator.validate(minimalValid());
  47 + assertThat(violations).isEmpty();
  48 + }
  49 +
  50 + @Test
  51 + void rejectsBlankUserType() {
  52 + UpdateUserDTO dto = minimalValid();
  53 + dto.setSUserType(" ");
  54 + Set<ConstraintViolation<UpdateUserDTO>> violations = validator.validate(dto);
  55 + assertThat(violations)
  56 + .anyMatch(v -> v.getPropertyPath().toString().equals("sUserType"));
  57 + }
  58 +
  59 + @Test
  60 + void rejectsIllegalLanguage() {
  61 + UpdateUserDTO dto = minimalValid();
  62 + dto.setSLanguage("日文");
  63 + Set<ConstraintViolation<UpdateUserDTO>> violations = validator.validate(dto);
  64 + assertThat(violations)
  65 + .anyMatch(v -> v.getPropertyPath().toString().equals("sLanguage"));
  66 + }
  67 +
  68 + @Test
  69 + void rejectsOutOfRangeIsVoid() {
  70 + UpdateUserDTO dto = minimalValid();
  71 + dto.setIIsVoid(2);
  72 + Set<ConstraintViolation<UpdateUserDTO>> violations = validator.validate(dto);
  73 + assertThat(violations)
  74 + .anyMatch(v -> v.getPropertyPath().toString().equals("iIsVoid"));
  75 + }
  76 +
  77 + @Test
  78 + void rejectsOutOfRangeCanModifyBill() {
  79 + UpdateUserDTO dto = minimalValid();
  80 + dto.setICanModifyBill(2);
  81 + Set<ConstraintViolation<UpdateUserDTO>> violations = validator.validate(dto);
  82 + assertThat(violations)
  83 + .anyMatch(v -> v.getPropertyPath().toString().equals("iCanModifyBill"));
  84 + }
  85 +}
... ...