Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] 앱 최초 진입 시 정보 조회 API #192

Merged
merged 2 commits into from
Sep 25, 2024
Merged

[FEAT] 앱 최초 진입 시 정보 조회 API #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c700d
[STYLE] 코드 포맷팅
Kim-TaeUk Sep 20, 2024
90a8712
[FEAT] 앱 최초 진입 시 정보 조회 기능 구현
Kim-TaeUk Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/java/org/websoso/WSSServer/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
import org.websoso.WSSServer.dto.feed.UserFeedsGetResponse;
import org.websoso.WSSServer.dto.user.EditMyInfoRequest;
import org.websoso.WSSServer.dto.user.EditProfileStatusRequest;
import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
import org.websoso.WSSServer.dto.user.LoginResponse;
import org.websoso.WSSServer.dto.user.MyProfileResponse;
import org.websoso.WSSServer.dto.user.NicknameValidation;
import org.websoso.WSSServer.dto.user.ProfileGetResponse;
import org.websoso.WSSServer.dto.user.ProfileStatusResponse;
import org.websoso.WSSServer.dto.user.RegisterUserInfoRequest;
import org.websoso.WSSServer.dto.user.UpdateMyProfileRequest;
import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
import org.websoso.WSSServer.dto.user.UserNovelCountGetResponse;
import org.websoso.WSSServer.dto.userNovel.UserGenrePreferencesGetResponse;
import org.websoso.WSSServer.dto.userNovel.UserNovelAndNovelsGetResponse;
Expand Down Expand Up @@ -191,7 +192,7 @@ public ResponseEntity<UserGenrePreferencesGetResponse> getUserGenrePreferences(P
.status(OK)
.body(userNovelService.getUserAttractivePointsAndKeywords(visitor, ownerId));
}

@PutMapping("/info")
public ResponseEntity<Void> editMyInfo(Principal principal,
@Valid @RequestBody EditMyInfoRequest editMyInfoRequest) {
Expand All @@ -201,4 +202,12 @@ public ResponseEntity<Void> editMyInfo(Principal principal,
.status(NO_CONTENT)
.build();
}

@GetMapping("/me")
public ResponseEntity<UserIdAndNicknameResponse> getUserIdAndNickname(Principal principal) {
User user = userService.getUserOrException(Long.valueOf(principal.getName()));
return ResponseEntity
.status(OK)
.body(userService.getUserIdAndNickname(user));
}
}
16 changes: 16 additions & 0 deletions src/main/java/org/websoso/WSSServer/dto/user/UserIdAndNicknameResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.websoso.WSSServer.dto.user;

import org.websoso.WSSServer.domain.User;

public record UserIdAndNicknameResponse(
Long userId,
String nickname
) {

public static UserIdAndNicknameResponse of(User user) {
return new UserIdAndNicknameResponse(
user.getUserId(),
user.getNickname()
);
}
}
6 changes: 6 additions & 0 deletions src/main/java/org/websoso/WSSServer/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.websoso.WSSServer.domain.User;
import org.websoso.WSSServer.dto.user.EditMyInfoRequest;
import org.websoso.WSSServer.dto.user.EditProfileStatusRequest;
import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
import org.websoso.WSSServer.dto.user.LoginResponse;
import org.websoso.WSSServer.dto.user.MyProfileResponse;
Expand Down Expand Up @@ -174,4 +175,9 @@ private Genre findByGenreNameOrThrow(String genreName) {
public void editMyInfo(User user, EditMyInfoRequest editMyInfoRequest) {
user.editMyInfo(editMyInfoRequest);
}

@Transactional(readOnly = true)
public UserIdAndNicknameResponse getUserIdAndNickname(User user) {
return UserIdAndNicknameResponse.of(user);
}
}
Loading