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

Add notification agreement field in user-info-dto #131

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Add notification agreement field in user-info-dto #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c85532d
feat: add user-id field
inh2613 Oct 20, 2023
148a271
feat: implement find-by-user method
inh2613 Oct 20, 2023
33c6d12
feat: modify read-my-info method
inh2613 Oct 20, 2023
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
6 changes: 5 additions & 1 deletion src/main/java/org/swmaestro/repl/gifthub/auth/dto/UserInfoResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
@Getter
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class UserInfoResponseDto {
private Long id;
Copy link
Member

@jinlee1703 jinlee1703 Oct 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P5 : id를 Dto에 추가하신 이유가 궁금합니다.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

클라이언트에서 요청하여 추가하였습니다. 슬랙 스레드에 댓글로 언급되어 있어서 확인 못 하셨나봅니다!

private String username;
private String nickname;
private List<OAuthUserInfoDto> oauth;
public boolean allowNotifications;

@Builder
public UserInfoResponseDto(String username, String nickname, List<OAuthUserInfoDto> oauth) {
public UserInfoResponseDto(Long id, String username, String nickname, List<OAuthUserInfoDto> oauth, boolean allowNotifications) {
this.id = id;
this.username = username;
this.nickname = nickname;
this.oauth = oauth;
this.allowNotifications = allowNotifications;
}
}
2 changes: 2 additions & 0 deletions src/main/java/org/swmaestro/repl/gifthub/auth/repository/DeviceTokenRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ public interface DeviceTokenRepository extends JpaRepository<DeviceToken, Long>
Optional<DeviceToken> findByUserAndToken(User user, String token);

List<DeviceToken> findAllByUser(User user);

Optional<DeviceToken> findByUser(User user);
}
11 changes: 11 additions & 0 deletions src/main/java/org/swmaestro/repl/gifthub/auth/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.swmaestro.repl.gifthub.auth.dto.UserUpdateResponseDto;
import org.swmaestro.repl.gifthub.auth.entity.OAuth;
import org.swmaestro.repl.gifthub.auth.entity.User;
import org.swmaestro.repl.gifthub.auth.repository.DeviceTokenRepository;
import org.swmaestro.repl.gifthub.auth.repository.UserRepository;
import org.swmaestro.repl.gifthub.auth.type.OAuthPlatform;
import org.swmaestro.repl.gifthub.exception.BusinessException;
Expand All @@ -34,6 +35,7 @@ public class UserService implements UserDetailsService {
private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;
private final OAuthService oAuthService;
private final DeviceTokenRepository deviceTokenRepository;
Copy link
Member Author

@inh2613 inh2613 Oct 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

순환참조 문제(UserService와 DevicetokenService)가 발생해서 DeviceRepository를 두번 의존성 주입을 했습니다.

스프링 컨테이너는 싱글톤 범위로 빈을 관리하므로, DeviceTokenRepository는 하나의 인스턴스만 생성되고, 그 인스턴스가 DeviceTokenService 및 UserService에 주입된다고 하긴 해서 우선 이렇게 진행하긴 했는데, 이 방법 말고 어떻게 해결할 수 있을지 궁금합니다. (@Lazy 어노테이션 등의 방법 말고 설계를 처음부터 다시해야 하는지 등의 방법이 궁금합니다.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도 지난 번 순환 참조 문제가 발생했던 적이 있었습니다.

순환 참조 문제를 해결하기 가장 좋은 방법은 처음부터 잘 설계하자가 맞습니다. 하지만 이렇게 할 경우에는 작업 시간이 늘어나게 될 것 입니다.
@Lazy 어노테이션 또한 권장하는 방법은 아니라고 합니다. @Lazy 어노테이션은 빈의 생성 시기를 늦추는 것이지 근본적으로 순환 참조를 해결할 수는 없기 때문에(저는 임시 방편 정도로 생각하고 있습니다), 순환 참조가 발생하였을 때 이를 파악하는 시기를 늦출 뿐이라고 합니다.

예전에 제가 순환 참조를 해결하면서 작성했던 문서가 있는데 가볍게 읽어보시면 좋을 것 같습니다!

현재 구현해주신 코드가 개발 진행 속도를 고려한다면 어쩔 수 없는 선택이라고 생각합니다.


public User passwordEncryption(User user) {
return User.builder()
Expand Down Expand Up @@ -174,10 +176,19 @@ public List<OAuth> deleteOAuthInfo(User user) {
public UserInfoResponseDto readInfo(String username) {
User user = read(username);
UserInfoResponseDto userInfoResponseDto = UserInfoResponseDto.builder()
.id(user.getId())
.username(username)
.nickname(user.getNickname())
.oauth(oAuthService.list(user))
.allowNotifications(isExistDeviceToken(user))
.build();
return userInfoResponseDto;
}

/**
* DeviceToken 조회 메서드 (user)
*/
public boolean isExistDeviceToken(User user) {
return deviceTokenRepository.findByUser(user).isPresent();
}
}