Skip to content

Commit fa3e3e3

Browse files
authored
Merge pull request #135 from Team-Shaka/refactor/133
⚡️ Improve: 유저 회원가입 시 유효성 검사
2 parents 0be59aa + 618a680 commit fa3e3e3

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java'
33
id 'org.springframework.boot' version '3.1.11'
4-
id 'io.spring.dependency-management' version '1.1.4'
4+
id 'io.spring.dependency-management' version '1.1.6'
55
}
66

77
group = 'treehouse'

src/main/java/treehouse/server/api/user/presentation/dto/UserRequestDTO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ public static class checkName {
1414

1515
@Getter
1616
public static class registerUser {
17+
@NotBlank(message = "전화번호를 입력해주세요.")
1718
private String phoneNumber;
19+
@NotBlank(message = "유저이름(고유)을 입력해주세요.")
1820
private String userName;
1921
}
2022

src/main/java/treehouse/server/global/entity/User/User.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ public class User extends BaseDateTimeEntity {
4747
private Integer activeRate = 0; //활동량
4848
@Builder.Default
4949
private Integer invitationCount = 3; //남아있는 초대장의 개수
50+
@Builder.Default
51+
private Integer invitationCreatedCount = 0; //초대장 생성 횟수
5052

5153

5254
// 탈퇴일자 필요한지 확인하기
@@ -76,5 +78,15 @@ public boolean updatePushAgree(boolean pushAgree){
7678

7779
public void reduceInvitationCount() {
7880
this.invitationCount--;
81+
this.invitationCreatedCount++; // 초대장 생성 횟수 증가
82+
checkAndIncreaseInvitationCount(); // 3회마다 invitationCount 증가
83+
}
84+
85+
// 초대 횟수가 3번째일 때만 invitationCount 1 증가
86+
private void checkAndIncreaseInvitationCount() {
87+
if (this.invitationCreatedCount == 3) {
88+
this.invitationCount++; // 3번째일 때만 증가
89+
this.invitationCreatedCount = 0; // 카운트 초기화
90+
}
7991
}
8092
}

0 commit comments

Comments
 (0)