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

🐛 fix: return value of user.getMusicApp() is null #170

Merged
merged 4 commits into from
Jul 10, 2023
Merged

🐛 fix: return value of user.getMusicApp() is null #170

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f97900b
:bug: fix return value of user.getMusicApp() is null
yunyoung1819 Jul 4, 2023
8d07053
:bug: fix return value of user.getMusicApp() is null
yunyoung1819 Jul 4, 2023
3833e4d
:bug: fix test code error
yunyoung1819 Jul 7, 2023
b963913
:recycle: refactor: MusicApp.java remove null check
yunyoung1819 Jul 10, 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
1 change: 1 addition & 0 deletions backend/streetdrop-api/src/main/java/com/depromeet/domains/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public User getOrCreateUserByIdfv(String idfv) {
User newUser = User.builder()
.nickname(generateDefaultNickname())
.idfv(idfv)
.musicApp(MusicApp.YOUTUBE_MUSIC)
.build();
return userRepository.save(newUser);
}
Expand Down
3 changes: 2 additions & 1 deletion backend/streetdrop-api/src/test/java/unit/security/provider/SecurityUserDetailsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.depromeet.user.User;
import com.depromeet.security.provider.SecurityUserDetails;
import com.depromeet.user.vo.MusicApp;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand All @@ -16,7 +17,7 @@ public class SecurityUserDetailsTest {
@Test
@DisplayName("SecurityUserDetails 테스트")
void testSecurityUserDetailsTest() {
User user = new User("nickname", "idfv");
User user = new User("nickname", "idfv", MusicApp.YOUTUBE_MUSIC);
SecurityUserDetails securityUserDetails = new SecurityUserDetails(user);
assertThat(securityUserDetails.getAuthorities()).isNull();
assertThat(securityUserDetails.getPassword()).isNull();
Expand Down
7 changes: 6 additions & 1 deletion backend/streetdrop-domain/src/main/java/com/depromeet/user/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ public class User extends BaseTimeEntity {
private MusicApp musicApp;

@Builder
public User(String nickname, String idfv) {
public User(String nickname, String idfv, MusicApp musicApp) {
this.nickname = nickname;
this.idfv = idfv;
this.musicApp = musicApp;
}

public MusicApp getMusicApp() {
return musicApp;
}

public User changeNickname(String nickname) {
Expand Down
12 changes: 7 additions & 5 deletions backend/streetdrop-domain/src/main/java/com/depromeet/user/vo/MusicApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package com.depromeet.user.vo;

import lombok.Getter;
import java.util.Arrays;
import java.util.stream.Collectors;

@Getter
public enum MusicApp {
YOUTUBE_MUSIC("youtubemusic"),
SPOTIFY("spotify"),
Expand All @@ -16,4 +11,11 @@ public enum MusicApp {
MusicApp(String appName) {
this.appName = appName;
}

public String getAppName() {
if (appName == null) {
yunyoung1819 marked this conversation as resolved.
Show resolved Hide resolved
return YOUTUBE_MUSIC.appName;
}
return appName;
}
}
Loading