Skip to content

Commit bf7e715

Browse files
committed
refactor: update user creation response type and user mapper function
1 parent e3fc75b commit bf7e715

File tree

5 files changed

+25
-8
lines changed

5 files changed

+25
-8
lines changed

src/main/java/org/umaxcode/controller/UserAuthController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ public class UserAuthController {
2323
@ResponseStatus(HttpStatus.CREATED)
2424
public SuccessResponse signup(@RequestBody UserCreationDto request) {
2525

26-
String message = userAuthService.register(request);
26+
UserDto registeredUser = userAuthService.register(request);
2727
return SuccessResponse.builder()
28-
.message(message)
28+
.message("User created successfully")
29+
.data(registeredUser)
2930
.build();
3031
}
3132

src/main/java/org/umaxcode/domain/dto/response/UserDto.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
@Builder
66
public record UserDto(
77
String userId,
8-
String email
8+
String username,
9+
String email,
10+
String role
911
) {
1012
}

src/main/java/org/umaxcode/mapper/UserMapper.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,15 @@ public static List<UserDto> toUserDto(List<UserType> users) {
1919
.email(u.attributes().stream()
2020
.filter(a -> "email".equalsIgnoreCase(a.name()))
2121
.map(AttributeType::value)
22-
.findFirst().orElse(null)
23-
)
22+
.findFirst().orElse(null))
23+
.username(u.attributes().stream()
24+
.filter(a -> "name".equalsIgnoreCase(a.name()))
25+
.map(AttributeType::value)
26+
.findFirst().orElse(null))
27+
.role(u.attributes().stream()
28+
.filter(a -> "custom:role".equalsIgnoreCase(a.name()))
29+
.map(AttributeType::value)
30+
.findFirst().orElse(null))
2431
.build()
2532
).toList();
2633
}

src/main/java/org/umaxcode/service/UserAuthService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public interface UserAuthService {
99

10-
String register(UserCreationDto request);
10+
UserDto register(UserCreationDto request);
1111

1212
List<UserDto> fetchAllUsers();
1313
}

src/main/java/org/umaxcode/service/impl/UserAuthServiceImpl.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class UserAuthServiceImpl implements UserAuthService {
3232
private String userPoolId;
3333

3434
@Override
35-
public String register(UserCreationDto request) {
35+
public UserDto register(UserCreationDto request) {
3636

3737
try {
3838
AdminCreateUserRequest adminRequest = AdminCreateUserRequest.builder()
@@ -51,7 +51,14 @@ public String register(UserCreationDto request) {
5151
AdminCreateUserResponse response = cognitoClient.adminCreateUser(adminRequest);
5252
startStateMachineForSNSSub(request.email());
5353
System.out.println("User" + response.user());
54-
return "User created: " + response.user().username();
54+
55+
return UserDto.builder()
56+
.userId(request.username())
57+
.email(request.email())
58+
.username(request.username())
59+
.role(Role.USER.toString())
60+
.build();
61+
5562
} catch (CognitoIdentityProviderException e) {
5663
throw new UserAuthException("Failed to create user: " + e.getMessage());
5764
}

0 commit comments

Comments
 (0)