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

Ignore: ๐Ÿ› Devcie Token ์‚ญ์ œ ์‹œ, ์‚ฌ์šฉ์ž๊ฐ€ ์ •๋ณด ์‚ญ์ œ๋˜๋Š” ์—๋Ÿฌ ํ•ธ๋“ค๋ง #148

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Ignore: ๐Ÿ› Devcie Token ์‚ญ์ œ ์‹œ, ์‚ฌ์šฉ์ž๊ฐ€ ์ •๋ณด ์‚ญ์ œ๋˜๋Š” ์—๋Ÿฌ ํ•ธ๋“ค๋ง #148

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
ab9ce8e
fix: user entity์˜ device token ์—ญ์ฐธ์กฐ ์ œ๊ฑฐ
psychology50 Aug 13, 2024
c1c6f42
fix: device token unregister service์—์„œ user ์˜์†ํ™” ์ œ๊ฑฐ
psychology50 Aug 13, 2024
5acffe8
fix: device_entity์˜ ์ž์‹์˜ cascade ์˜ต์…˜ ์ œ๊ฑฐ
psychology50 Aug 13, 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
7 changes: 1 addition & 6 deletions ...api/src/main/java/kr/co/pennyway/api/apis/users/service/DeviceTokenUnregisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
);

Expand Down
2 changes: 1 addition & 1 deletion pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/device/domain/DeviceToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 0 additions & 6 deletions pennyway-domain/src/main/java/kr/co/pennyway/domain/domains/user/domain/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -54,9 +51,6 @@ public class User extends DateAuditable {
@ColumnDefault("NULL")
private LocalDateTime deletedAt;

@OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
private List<DeviceToken> 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) {
Expand Down
Loading