Skip to content

Commit 3fb5e24

Browse files
committed
add mobileNumberand address to builder
1 parent 191ce03 commit 3fb5e24

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/main/java/com/podzilla/auth/model/User.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
import jakarta.persistence.JoinTable;
1111
import jakarta.persistence.OneToMany;
1212
import jakarta.persistence.OneToOne;
13-
import jakarta.persistence.Table;
1413
import jakarta.persistence.FetchType;
1514
import jakarta.persistence.JoinColumn;
16-
import jakarta.persistence.OneToMany;
1715
import jakarta.persistence.CascadeType;
1816
import jakarta.validation.constraints.Email;
19-
import jakarta.validation.constraints.NotBlank;
2017
import lombok.AllArgsConstructor;
2118
import lombok.Data;
2219
import lombok.Getter;
@@ -25,12 +22,6 @@
2522
import java.util.Set;
2623
import java.util.UUID;
2724

28-
import jakarta.validation.constraints.Email;
29-
import lombok.AllArgsConstructor;
30-
import lombok.Builder;
31-
import lombok.Data;
32-
import lombok.NoArgsConstructor;
33-
import lombok.Getter;
3425

3526
@Entity
3627
@Table(name = "users")
@@ -58,7 +49,6 @@ public final class User {
5849
orphanRemoval = true)
5950
private Address address;
6051

61-
@Builder.Default
6252
@ManyToMany(fetch = FetchType.EAGER)
6353
@JoinTable(name = "users_roles",
6454
joinColumns = @JoinColumn(name = "user_id"),
@@ -80,6 +70,8 @@ private User(final Builder builder) {
8070
this.roles = builder.roles;
8171
this.refreshTokens = builder.refreshTokens;
8272
this.enabled = builder.enabled;
73+
this.mobileNumber = builder.mobileNumber;
74+
this.address = builder.address;
8375
}
8476

8577
public static class Builder {
@@ -90,6 +82,8 @@ public static class Builder {
9082
private Set<Role> roles = new HashSet<>();
9183
private Set<RefreshToken> refreshTokens = new HashSet<>();
9284
private Boolean enabled = true;
85+
private String mobileNumber;
86+
private Address address;
9387

9488
public Builder id(final UUID id) {
9589
this.id = id;
@@ -121,6 +115,16 @@ public Builder enabled(final Boolean enabled) {
121115
return this;
122116
}
123117

118+
public Builder address(final Address address) {
119+
this.address = address;
120+
return this;
121+
}
122+
123+
public Builder mobileNumber(final String mobileNumber) {
124+
this.mobileNumber = mobileNumber;
125+
return this;
126+
}
127+
124128
public User build() {
125129
return new User(this);
126130
}

src/test/java/com/podzilla/auth/service/AdminServiceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void getUsers_shouldReturnListOfUsers() {
5151
@Test
5252
void updateUserActivation_shouldActivateUserSuccessfully() {
5353
UUID userId = UUID.randomUUID();
54-
User user = User.builder()
54+
User user = new User.Builder()
5555
.id(userId)
5656
.email("user@example.com")
5757
.name("Test User")
@@ -71,7 +71,7 @@ void updateUserActivation_shouldActivateUserSuccessfully() {
7171
@Test
7272
void updateUserActivation_shouldDeactivateUserSuccessfully() {
7373
UUID userId = UUID.randomUUID();
74-
User user = User.builder()
74+
User user = new User.Builder()
7575
.id(userId)
7676
.email("user@example.com")
7777
.name("Test User")
@@ -92,7 +92,7 @@ void updateUserActivation_shouldDeactivateUserSuccessfully() {
9292
@Test
9393
void deleteUser_shouldDeleteUserSuccessfully() {
9494
UUID userId = UUID.randomUUID();
95-
User user = User.builder()
95+
User user = new User.Builder()
9696
.id(userId)
9797
.email("user@example.com")
9898
.name("Test User")

0 commit comments

Comments
 (0)