diff --git a/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/users/service/DeviceTokenUnregisterService.java b/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/users/service/DeviceTokenUnregisterService.java index 557352566..39b188325 100644 --- a/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/users/service/DeviceTokenUnregisterService.java +++ b/pennyway-app-external-api/src/main/java/kr/co/pennyway/api/apis/users/service/DeviceTokenUnregisterService.java @@ -4,9 +4,6 @@ import kr.co.pennyway.domain.domains.device.exception.DeviceTokenErrorCode; import kr.co.pennyway.domain.domains.device.exception.DeviceTokenErrorException; import kr.co.pennyway.domain.domains.device.service.DeviceTokenService; -import kr.co.pennyway.domain.domains.user.domain.User; -import kr.co.pennyway.domain.domains.user.exception.UserErrorCode; -import kr.co.pennyway.domain.domains.user.exception.UserErrorException; import kr.co.pennyway.domain.domains.user.service.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -22,9 +19,7 @@ public class DeviceTokenUnregisterService { @Transactional public void execute(Long userId, String token) { - User user = userService.readUser(userId).orElseThrow(() -> new UserErrorException(UserErrorCode.NOT_FOUND)); - - DeviceToken deviceToken = deviceTokenService.readDeviceByUserIdAndToken(user.getId(), token).orElseThrow( + DeviceToken deviceToken = deviceTokenService.readDeviceByUserIdAndToken(userId, token).orElseThrow( () -> new DeviceTokenErrorException(DeviceTokenErrorCode.NOT_FOUND_DEVICE) ); diff --git a/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/device/domain/DeviceToken.java b/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/device/domain/DeviceToken.java index 6fa11123b..616377934 100644 --- a/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/device/domain/DeviceToken.java +++ b/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/device/domain/DeviceToken.java @@ -23,7 +23,7 @@ public class DeviceToken extends DateAuditable { @ColumnDefault("true") private Boolean activated; - @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "user_id") private User user; diff --git a/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/user/domain/User.java b/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/user/domain/User.java index dfbc2d179..6bf99ffe3 100644 --- a/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/user/domain/User.java +++ b/pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/user/domain/User.java @@ -4,7 +4,6 @@ import kr.co.pennyway.domain.common.converter.ProfileVisibilityConverter; import kr.co.pennyway.domain.common.converter.RoleConverter; import kr.co.pennyway.domain.common.model.DateAuditable; -import kr.co.pennyway.domain.domains.device.domain.DeviceToken; import kr.co.pennyway.domain.domains.user.type.ProfileVisibility; import kr.co.pennyway.domain.domains.user.type.Role; import lombok.AccessLevel; @@ -18,8 +17,6 @@ import org.springframework.util.StringUtils; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; import java.util.Objects; @Entity @@ -54,9 +51,6 @@ public class User extends DateAuditable { @ColumnDefault("NULL") private LocalDateTime deletedAt; - @OneToMany(mappedBy = "user", fetch = FetchType.LAZY) - private List deviceTokens = new ArrayList<>(); - @Builder private User(String username, String name, String password, LocalDateTime passwordUpdatedAt, String profileImageUrl, String phone, Role role, ProfileVisibility profileVisibility, NotifySetting notifySetting, boolean locked) {