diff --git a/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java b/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java index 5e8b9c55..5690e0c2 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/controller/AuthController.java @@ -46,9 +46,8 @@ public ResponseEntity afterSocialLogin( } @PostMapping("/device") - public ResponseEntity saveDeviceToken(@RequestBody DeviceTokenRequest request){ + public ResponseEntity saveDeviceToken(@RequestBody DeviceTokenRequest request) { authService.saveDeviceToken(request); return ResponseEntity.noContent().build(); } - } diff --git a/backend/src/main/java/com/twtw/backend/domain/member/dto/request/DeviceTokenRequest.java b/backend/src/main/java/com/twtw/backend/domain/member/dto/request/DeviceTokenRequest.java index b128bbd2..b7e8a9db 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/dto/request/DeviceTokenRequest.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/dto/request/DeviceTokenRequest.java @@ -4,8 +4,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; -import java.util.UUID; - @Getter @NoArgsConstructor @AllArgsConstructor diff --git a/backend/src/main/java/com/twtw/backend/domain/member/entity/DeviceToken.java b/backend/src/main/java/com/twtw/backend/domain/member/entity/DeviceToken.java index 6d60555b..0d9b7da9 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/entity/DeviceToken.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/entity/DeviceToken.java @@ -3,11 +3,14 @@ import com.twtw.backend.global.audit.AuditListener; import com.twtw.backend.global.audit.Auditable; import com.twtw.backend.global.audit.BaseTime; + import jakarta.persistence.*; + import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; + import org.hibernate.annotations.Where; import java.util.UUID; @@ -34,10 +37,11 @@ public class DeviceToken implements Auditable { @Column(nullable = false) private BaseTime baseTime; - public DeviceToken(String deviceToken){ + public DeviceToken(String deviceToken) { this.deviceToken = deviceToken; } - public void setMember(Member member){this.member = member;} - + public void setMember(Member member) { + this.member = member; + } } diff --git a/backend/src/main/java/com/twtw/backend/domain/member/entity/Member.java b/backend/src/main/java/com/twtw/backend/domain/member/entity/Member.java index 8844164a..ef7226d1 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/entity/Member.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/entity/Member.java @@ -72,7 +72,7 @@ public void updateProfileImage(final String profileImage) { this.profileImage = profileImage; } - public void updateDeviceToken(final DeviceToken deviceToken){ + public void updateDeviceToken(final DeviceToken deviceToken) { this.deviceToken = deviceToken; deviceToken.setMember(this); } diff --git a/backend/src/main/java/com/twtw/backend/domain/member/repository/DeviceTokenRepository.java b/backend/src/main/java/com/twtw/backend/domain/member/repository/DeviceTokenRepository.java index cc44449a..92fce073 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/repository/DeviceTokenRepository.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/repository/DeviceTokenRepository.java @@ -1,9 +1,9 @@ package com.twtw.backend.domain.member.repository; import com.twtw.backend.domain.member.entity.DeviceToken; + import org.springframework.data.jpa.repository.JpaRepository; import java.util.UUID; -public interface DeviceTokenRepository extends JpaRepository { -} +public interface DeviceTokenRepository extends JpaRepository {} diff --git a/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java b/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java index bee5ecf5..b994a4a9 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/service/AuthService.java @@ -73,7 +73,6 @@ public AfterLoginResponse saveMember(MemberSaveRequest request) { return new AfterLoginResponse(AuthStatus.SIGNIN, tokenDto); } - private void validateNickname(final MemberSaveRequest request) { if (memberRepository.existsByNickname(request.getNickname())) { throw new NicknameExistsException(); @@ -151,9 +150,8 @@ public Member getMemberByJwt() { throw new EntityNotFoundException(); } - @Transactional - public void saveDeviceToken(DeviceTokenRequest request){ + public void saveDeviceToken(DeviceTokenRequest request) { Member member = getMemberByJwt(); DeviceToken deviceToken = new DeviceToken(request.getDeviceToken()); member.updateDeviceToken(deviceToken); diff --git a/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java b/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java index e29eee70..aa01771a 100644 --- a/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java +++ b/backend/src/main/java/com/twtw/backend/domain/member/service/MemberService.java @@ -1,18 +1,15 @@ package com.twtw.backend.domain.member.service; -import com.twtw.backend.domain.member.dto.request.DeviceTokenRequest; import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse; import com.twtw.backend.domain.member.dto.response.MemberResponse; import com.twtw.backend.domain.member.dto.response.SearchMemberResponse; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.member.mapper.MemberMapper; -import com.twtw.backend.domain.member.repository.DeviceTokenRepository; import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.domain.plan.entity.Plan; import com.twtw.backend.global.exception.EntityNotFoundException; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; diff --git a/backend/src/test/java/com/twtw/backend/domain/member/controller/AuthControllerTest.java b/backend/src/test/java/com/twtw/backend/domain/member/controller/AuthControllerTest.java index 4ae38965..5df773ca 100644 --- a/backend/src/test/java/com/twtw/backend/domain/member/controller/AuthControllerTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/member/controller/AuthControllerTest.java @@ -160,8 +160,7 @@ void saveDeviceToken() throws Exception { mockMvc.perform( post("/auth/device") .content( - toRequestBody( - new DeviceTokenRequest("THIS_IS_TEST_TOKEN"))) + toRequestBody(new DeviceTokenRequest("THIS_IS_TEST_TOKEN"))) .contentType(MediaType.APPLICATION_JSON)); // then diff --git a/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java index 583baac0..c5ce7d0c 100644 --- a/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/member/service/AuthServiceTest.java @@ -2,13 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.twtw.backend.domain.member.dto.request.DeviceTokenRequest; import com.twtw.backend.domain.member.dto.request.MemberSaveRequest; import com.twtw.backend.domain.member.dto.request.OAuthRequest; import com.twtw.backend.domain.member.dto.response.AfterLoginResponse; import com.twtw.backend.domain.member.entity.AuthStatus; import com.twtw.backend.domain.member.entity.AuthType; -import com.twtw.backend.domain.member.entity.DeviceToken; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.domain.member.repository.RefreshTokenRepository; @@ -30,7 +28,6 @@ public class AuthServiceTest extends ExcludeTest { @Autowired private RefreshTokenRepository refreshTokenRepository; - @Test @DisplayName("Kakao 회원 가입이 수행되는가") void saveMemberKakao() { @@ -81,5 +78,4 @@ void getTokenByOAuthSuccess() { // then assertThat(response.getStatus().equals(AuthStatus.SIGNIN)).isTrue(); } - } diff --git a/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java b/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java index 5e46c7e3..8a01bfaf 100644 --- a/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java +++ b/backend/src/test/java/com/twtw/backend/domain/member/service/MemberServiceTest.java @@ -3,11 +3,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.twtw.backend.domain.member.dto.request.DeviceTokenRequest; import com.twtw.backend.domain.member.dto.response.DuplicateNicknameResponse; import com.twtw.backend.domain.member.dto.response.MemberResponse; import com.twtw.backend.domain.member.dto.response.SearchMemberResponse; -import com.twtw.backend.domain.member.entity.DeviceToken; import com.twtw.backend.domain.member.entity.Member; import com.twtw.backend.domain.member.repository.MemberRepository; import com.twtw.backend.fixture.member.MemberEntityFixture; @@ -22,7 +20,6 @@ class MemberServiceTest extends LoginTest { @Autowired private MemberService memberService; @Autowired private MemberRepository memberRepository; - @Test @DisplayName("닉네임 중복 체크가 제대로 동작하는가") void checkNickname() { @@ -73,5 +70,4 @@ void searchMemberByNickname() { // then assertThat(response.getMemberResponse().getMemberId()).isEqualTo(member.getId()); } - }