Skip to content

Commit 6f9a322

Browse files
coniferconeconifercone
committed
refactor(authentication): 修改性别字段名称
1 parent 91277aa commit 6f9a322

File tree

15 files changed

+66
-50
lines changed

15 files changed

+66
-50
lines changed

‎apis/Account.http

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Accept: */*
2424
],
2525
"avatarUrl": "https://github.com/users/conifercone",
2626
"phone": "{{$random.phoneNumber.phoneNumber}}",
27-
"sex": "MALE",
27+
"gender": "MALE",
2828
"email": "{{$random.email}}",
2929
"timezone": "Asia/Shanghai",
3030
"language": "EN",

‎mumu-basis/src/main/java/baby/mumu/basis/enums/SexEnum.java ‎mumu-basis/src/main/java/baby/mumu/basis/enums/GenderEnum.java

+15-18
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,22 @@
2121
* @author <a href="mailto:[email protected]">kaiyu.shan</a>
2222
* @since 1.0.0
2323
*/
24-
public enum SexEnum {
24+
public enum GenderEnum {
2525

26-
/**
27-
* 男性
28-
*/
26+
// 基本性别选项
2927
MALE,
30-
31-
/**
32-
* 女性
33-
*/
3428
FEMALE,
35-
36-
/**
37-
* 双性
38-
*/
39-
GREY,
40-
41-
/**
42-
* 无性
43-
*/
44-
SEXLESS
29+
// 非二元性别选项
30+
// 非二元
31+
NON_BINARY,
32+
// 性别酷儿
33+
GENDER_QUEER,
34+
// 性别流动
35+
GENDER_FLUID,
36+
// 无性别
37+
AGENDER,
38+
// 其他
39+
OTHER,
40+
// 不愿透露
41+
PREFER_NOT_TO_SAY
4542
}

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/cmds/AccountRegisterCmd.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package baby.mumu.authentication.client.cmds;
1717

1818
import baby.mumu.basis.constants.RegexpConstants;
19+
import baby.mumu.basis.enums.GenderEnum;
1920
import baby.mumu.basis.enums.LanguageEnum;
20-
import baby.mumu.basis.enums.SexEnum;
2121
import io.swagger.v3.oas.annotations.media.Schema;
2222
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
2323
import jakarta.validation.constraints.NotBlank;
@@ -61,7 +61,7 @@ public class AccountRegisterCmd {
6161
private String phone;
6262

6363
@Schema(description = "性别", requiredMode = RequiredMode.NOT_REQUIRED)
64-
private SexEnum sex;
64+
private GenderEnum gender;
6565

6666
@Schema(description = "邮箱地址", requiredMode = RequiredMode.REQUIRED)
6767
@NotBlank(message = "{account.email.validation.not.blank}")

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/cmds/AccountUpdateByIdCmd.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package baby.mumu.authentication.client.cmds;
1717

18+
import baby.mumu.basis.enums.GenderEnum;
1819
import baby.mumu.basis.enums.LanguageEnum;
19-
import baby.mumu.basis.enums.SexEnum;
2020
import baby.mumu.extension.annotations.NotBlankOrNull;
2121
import io.swagger.v3.oas.annotations.media.Schema;
2222
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
@@ -51,7 +51,7 @@ public class AccountUpdateByIdCmd {
5151
private String phone;
5252

5353
@Schema(description = "性别", requiredMode = RequiredMode.NOT_REQUIRED)
54-
private SexEnum sex;
54+
private GenderEnum gender;
5555

5656
@Schema(description = "邮箱", requiredMode = RequiredMode.NOT_REQUIRED)
5757
@NotBlankOrNull(message = "{account.email.validation.not.blank}")

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/dto/AccountBasicInfoDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package baby.mumu.authentication.client.dto;
1717

1818
import baby.mumu.basis.dto.BaseDataTransferObject;
19+
import baby.mumu.basis.enums.GenderEnum;
1920
import baby.mumu.basis.enums.LanguageEnum;
20-
import baby.mumu.basis.enums.SexEnum;
2121
import java.io.Serial;
2222
import java.time.LocalDate;
2323
import java.util.List;
@@ -87,7 +87,7 @@ public class AccountBasicInfoDTO extends BaseDataTransferObject {
8787
/**
8888
* 性别
8989
*/
90-
private SexEnum sex;
90+
private GenderEnum gender;
9191

9292
/**
9393
* 电子邮箱

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/dto/AccountCurrentLoginDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import baby.mumu.basis.dto.BaseDataTransferObject;
1919
import baby.mumu.basis.enums.DigitalPreferenceEnum;
20+
import baby.mumu.basis.enums.GenderEnum;
2021
import baby.mumu.basis.enums.LanguageEnum;
21-
import baby.mumu.basis.enums.SexEnum;
2222
import baby.mumu.basis.enums.SystemThemeEnum;
2323
import baby.mumu.basis.enums.SystemThemeModeEnum;
2424
import jakarta.validation.constraints.Size;
@@ -68,7 +68,7 @@ public class AccountCurrentLoginDTO extends BaseDataTransferObject {
6868
/**
6969
* 性别
7070
*/
71-
private SexEnum sex;
71+
private GenderEnum gender;
7272

7373
/**
7474
* 邮箱

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/dto/AccountFindAllDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import baby.mumu.basis.annotations.Metamodel;
1919
import baby.mumu.basis.dto.BaseDataTransferObject;
20+
import baby.mumu.basis.enums.GenderEnum;
2021
import baby.mumu.basis.enums.LanguageEnum;
21-
import baby.mumu.basis.enums.SexEnum;
2222
import jakarta.validation.constraints.Size;
2323
import java.io.Serial;
2424
import java.time.LocalDate;
@@ -95,7 +95,7 @@ public class AccountFindAllDTO extends BaseDataTransferObject {
9595
/**
9696
* 性别
9797
*/
98-
private SexEnum sex;
98+
private GenderEnum gender;
9999

100100
/**
101101
* 电子邮件

‎mumu-services/mumu-authentication/authentication-client/src/main/java/baby/mumu/authentication/client/dto/AccountFindAllSliceDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import baby.mumu.basis.annotations.Metamodel;
1919
import baby.mumu.basis.dto.BaseDataTransferObject;
20+
import baby.mumu.basis.enums.GenderEnum;
2021
import baby.mumu.basis.enums.LanguageEnum;
21-
import baby.mumu.basis.enums.SexEnum;
2222
import jakarta.validation.constraints.Size;
2323
import java.io.Serial;
2424
import java.time.LocalDate;
@@ -95,7 +95,7 @@ public class AccountFindAllSliceDTO extends BaseDataTransferObject {
9595
/**
9696
* 性别
9797
*/
98-
private SexEnum sex;
98+
private GenderEnum gender;
9999

100100
/**
101101
* 电子邮件

‎mumu-services/mumu-authentication/authentication-client/src/main/proto/AccountService.proto

+19-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ message AccountCurrentLoginGrpcDTO{
1717
google.protobuf.StringValue username = 2;
1818
google.protobuf.StringValue avatarUrl = 3;
1919
google.protobuf.StringValue phone = 4;
20-
oneof sex_wrapper {
21-
SexEnum sex = 5;
20+
oneof gender_wrapper {
21+
GenderEnum gender = 5;
2222
}
2323
google.protobuf.StringValue email = 6;
2424
google.protobuf.StringValue timezone = 7;
@@ -71,12 +71,24 @@ message AccountRolePermissionCurrentLoginQueryGrpcDTO{
7171
}
7272

7373

74-
enum SexEnum
74+
enum GenderEnum
7575
{
76-
GREY = 0;
77-
FEMALE = 1;
78-
MALE = 2;
79-
SEXLESS = 3;
76+
// 不愿透露
77+
PREFER_NOT_TO_SAY = 0;
78+
// 基本性别选项
79+
MALE = 1;
80+
FEMALE = 2;
81+
// 非二元性别选项
82+
// 非二元
83+
NON_BINARY = 3;
84+
// 性别酷儿
85+
GENDER_QUEER = 4;
86+
// 性别流动
87+
GENDER_FLUID = 5;
88+
// 无性别
89+
AGENDER = 6;
90+
// 其他
91+
OTHER = 7;
8092
}
8193

8294
enum LanguageEnum {

‎mumu-services/mumu-authentication/authentication-domain/src/main/java/baby/mumu/authentication/domain/account/Account.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import baby.mumu.basis.constants.CommonConstants;
2222
import baby.mumu.basis.domain.BasisDomainModel;
2323
import baby.mumu.basis.enums.DigitalPreferenceEnum;
24+
import baby.mumu.basis.enums.GenderEnum;
2425
import baby.mumu.basis.enums.LanguageEnum;
25-
import baby.mumu.basis.enums.SexEnum;
2626
import com.fasterxml.jackson.annotation.JsonIgnore;
2727
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2828
import java.io.Serial;
@@ -133,7 +133,7 @@ public class Account extends BasisDomainModel implements UserDetails {
133133
/**
134134
* 性别
135135
*/
136-
private SexEnum sex;
136+
private GenderEnum gender;
137137

138138
/**
139139
* 电子邮件

‎mumu-services/mumu-authentication/authentication-infrastructure/src/main/java/baby/mumu/authentication/infrastructure/account/gatewayimpl/database/po/AccountArchivedPO.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package baby.mumu.authentication.infrastructure.account.gatewayimpl.database.po;
1717

1818
import baby.mumu.basis.annotations.Metamodel;
19+
import baby.mumu.basis.enums.GenderEnum;
1920
import baby.mumu.basis.enums.LanguageEnum;
20-
import baby.mumu.basis.enums.SexEnum;
2121
import baby.mumu.basis.po.jpa.JpaBasisArchivablePersistentObject;
2222
import io.hypersistence.utils.hibernate.type.money.MonetaryAmountType;
2323
import jakarta.persistence.AttributeOverride;
@@ -92,9 +92,9 @@ public class AccountArchivedPO extends JpaBasisArchivablePersistentObject {
9292
@Column(name = "phone", length = 200, nullable = false)
9393
private String phone;
9494

95-
@Column(name = "sex", nullable = false)
95+
@Column(name = "gender", nullable = false)
9696
@Enumerated(EnumType.STRING)
97-
private SexEnum sex;
97+
private GenderEnum gender;
9898

9999
@Size(max = 200)
100100
@Column(name = "email", length = 200, nullable = false)

‎mumu-services/mumu-authentication/authentication-infrastructure/src/main/java/baby/mumu/authentication/infrastructure/account/gatewayimpl/database/po/AccountPO.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package baby.mumu.authentication.infrastructure.account.gatewayimpl.database.po;
1717

1818
import baby.mumu.basis.annotations.Metamodel;
19+
import baby.mumu.basis.enums.GenderEnum;
1920
import baby.mumu.basis.enums.LanguageEnum;
20-
import baby.mumu.basis.enums.SexEnum;
2121
import baby.mumu.basis.po.jpa.JpaBasisArchivablePersistentObject;
2222
import baby.mumu.unique.client.config.SnowflakeIdGenerator;
2323
import io.hypersistence.utils.hibernate.type.money.MonetaryAmountType;
@@ -131,9 +131,9 @@ public class AccountPO extends JpaBasisArchivablePersistentObject {
131131
/**
132132
* 性别
133133
*/
134-
@Column(name = "sex", nullable = false)
134+
@Column(name = "gender", nullable = false)
135135
@Enumerated(EnumType.STRING)
136-
private SexEnum sex;
136+
private GenderEnum gender;
137137

138138
/**
139139
* 电子邮箱

‎mumu-services/mumu-authentication/authentication-infrastructure/src/main/java/baby/mumu/authentication/infrastructure/account/gatewayimpl/redis/po/AccountRedisPO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import baby.mumu.basis.enums.CacheLevelEnum;
1919
import baby.mumu.basis.enums.DigitalPreferenceEnum;
20+
import baby.mumu.basis.enums.GenderEnum;
2021
import baby.mumu.basis.enums.LanguageEnum;
21-
import baby.mumu.basis.enums.SexEnum;
2222
import baby.mumu.basis.enums.SystemThemeEnum;
2323
import baby.mumu.basis.enums.SystemThemeModeEnum;
2424
import baby.mumu.basis.po.jpa.JpaRedisBasisArchivablePersistentObject;
@@ -104,7 +104,7 @@ public class AccountRedisPO extends JpaRedisBasisArchivablePersistentObject {
104104
/**
105105
* 性别
106106
*/
107-
private SexEnum sex;
107+
private GenderEnum gender;
108108

109109
/**
110110
* 电子邮箱

‎mumu-services/mumu-authentication/src/main/resources/db/migration/postgresql/V1.4.0__alert_columns_for_users_table.sql

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- @formatter:off
2+
-- noinspection SqlConstantExpressionForFile
3+
-- noinspection SqlResolveForFile
4+
ALTER TABLE mumu_users RENAME COLUMN sex TO gender;
5+
ALTER TABLE mumu_users_archived RENAME COLUMN sex TO gender;
6+
ALTER TABLE mumu_users ALTER COLUMN gender SET DEFAULT 'PREFER_NOT_TO_SAY';
7+
ALTER TABLE mumu_users_archived ALTER COLUMN gender SET DEFAULT 'PREFER_NOT_TO_SAY';

‎mumu-services/mumu-authentication/src/test/java/baby/mumu/authentication/adapter/web/AccountControllerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import baby.mumu.authentication.client.cmds.AccountRegisterCmd.AccountAddressRegisterCmd;
2626
import baby.mumu.authentication.client.cmds.AccountUpdateByIdCmd;
2727
import baby.mumu.authentication.client.cmds.AccountUpdateRoleCmd;
28+
import baby.mumu.basis.enums.GenderEnum;
2829
import baby.mumu.basis.enums.LanguageEnum;
29-
import baby.mumu.basis.enums.SexEnum;
3030
import baby.mumu.unique.client.api.CaptchaGrpcService;
3131
import baby.mumu.unique.client.api.grpc.SimpleCaptchaGeneratedGrpcCmd;
3232
import baby.mumu.unique.client.api.grpc.SimpleCaptchaGeneratedGrpcDTO;
@@ -92,7 +92,7 @@ public void register() throws Exception {
9292
accountRegisterCmd.setRoleCodes(Collections.singletonList("admin"));
9393
accountRegisterCmd.setAvatarUrl("https://github.com/users/conifercone");
9494
accountRegisterCmd.setPhone("13031723736");
95-
accountRegisterCmd.setSex(SexEnum.MALE);
95+
accountRegisterCmd.setGender(GenderEnum.MALE);
9696
accountRegisterCmd.setLanguage(LanguageEnum.ZH);
9797
accountRegisterCmd.setTimezone("Asia/Shanghai");
9898
accountRegisterCmd.setEmail("[email protected]");

0 commit comments

Comments
 (0)