Skip to content

Commit ba0b6fe

Browse files
authored
hotfix:오류 수정 (#168)
1 parent 435ab6f commit ba0b6fe

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/main/java/com/back/domain/user/entity/User.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.*;
77
import org.springframework.data.annotation.CreatedDate;
88
import org.springframework.data.annotation.LastModifiedDate;
9+
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
910
import org.springframework.security.core.GrantedAuthority;
1011
import org.springframework.security.core.authority.SimpleGrantedAuthority;
1112

@@ -16,6 +17,7 @@
1617

1718
@Entity
1819
@Table(name = "users") // 예약어 충돌 방지를 위해 "users" 권장
20+
@EntityListeners(AuditingEntityListener.class)
1921
@Getter
2022
@Setter
2123
@NoArgsConstructor

src/main/java/com/back/global/init/DevInitData.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,11 @@ public void notificationInit() {
270270
public void myBarInit() {
271271
if (myBarRepository.count() > 0) return;
272272

273-
User userA = userRepository.findByNickname("사용자A").orElseThrow();
274-
User userB = userRepository.findByNickname("사용자B").orElseThrow();
275-
User userC = userRepository.findByNickname("사용자C").orElseThrow();
273+
User userA = userRepository.findByNickname("사용자A").orElse(null);
274+
User userB = userRepository.findByNickname("사용자B").orElse(null);
275+
User userC = userRepository.findByNickname("사용자C").orElse(null);
276+
277+
if (userA == null || userC == null) return;
276278

277279
// 칵테일 참조 준비
278280
var cocktails = cocktailRepository.findAll();
@@ -290,9 +292,10 @@ public void myBarInit() {
290292
myBarRepository.findByUser_IdAndCocktail_Id(userA.getId(), c1.getId()).ifPresent(m -> m.setKeptAt(java.time.LocalDateTime.now().minusDays(2)));
291293
myBarRepository.findByUser_IdAndCocktail_Id(userA.getId(), c2.getId()).ifPresent(m -> m.setKeptAt(java.time.LocalDateTime.now().minusDays(1)));
292294

293-
// B: c3 keep 후 unkeep -> DELETED
294-
myBarService.keep(userB.getId(), c3.getId());
295-
myBarService.unkeep(userB.getId(), c3.getId());
295+
if (userB != null && !userB.isDeleted()) {
296+
myBarService.keep(userB.getId(), c3.getId());
297+
myBarService.unkeep(userB.getId(), c3.getId());
298+
}
296299

297300
// C: c2(now-3d), c3(now-2d), c4(now-1h)
298301
myBarService.keep(userC.getId(), c2.getId());

0 commit comments

Comments
 (0)