Merge branch 'dev' into feat#154

Author: GerHerMo

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

@@ -6,6 +6,7 @@
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
@@ -16,6 +17,7 @@
 
 @Entity
 @Table(name = "users")  // 예약어 충돌 방지를 위해 "users" 권장
+@EntityListeners(AuditingEntityListener.class)
 @Getter
 @Setter
 @NoArgsConstructor

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

@@ -270,9 +270,11 @@ public void notificationInit() {
     public void myBarInit() {
         if (myBarRepository.count() > 0) return;
 
-        User userA = userRepository.findByNickname("사용자A").orElseThrow();
-        User userB = userRepository.findByNickname("사용자B").orElseThrow();
-        User userC = userRepository.findByNickname("사용자C").orElseThrow();
+        User userA = userRepository.findByNickname("사용자A").orElse(null);
+        User userB = userRepository.findByNickname("사용자B").orElse(null);
+        User userC = userRepository.findByNickname("사용자C").orElse(null);
+
+        if (userA == null || userC == null) return;
 
         // 칵테일 참조 준비
         var cocktails = cocktailRepository.findAll();
@@ -290,9 +292,10 @@ public void myBarInit() {
         myBarRepository.findByUser_IdAndCocktail_Id(userA.getId(), c1.getId()).ifPresent(m -> m.setKeptAt(java.time.LocalDateTime.now().minusDays(2)));
         myBarRepository.findByUser_IdAndCocktail_Id(userA.getId(), c2.getId()).ifPresent(m -> m.setKeptAt(java.time.LocalDateTime.now().minusDays(1)));
 
-        // B: c3 keep 후 unkeep -> DELETED
-        myBarService.keep(userB.getId(), c3.getId());
-        myBarService.unkeep(userB.getId(), c3.getId());
+        if (userB != null && !userB.isDeleted()) {
+            myBarService.keep(userB.getId(), c3.getId());
+            myBarService.unkeep(userB.getId(), c3.getId());
+        }
 
         // C: c2(now-3d), c3(now-2d), c4(now-1h)
         myBarService.keep(userC.getId(), c2.getId());

src/main/resources/application-dev.yml

@@ -20,12 +20,22 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
     hibernate:
-      ddl-auto: update  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제
+      ddl-auto: create-drop  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제 / db_dev 에러 방지용으로 upsdate->create-drop 변경
     properties:
       hibernate:
         format_sql: true
         show_sql: true
 
+  cloud:
+    aws:
+      region:
+        static: ap-northeast-2
+      stack:
+        auto: false
+      credentials:
+        access-key: ${AWS_ACCESS_KEY_ID:dummy}  # 로컬용 더미값
+        secret-key: ${AWS_SECRET_ACCESS_KEY:dummy}
+
 # Swagger 설정
 springdoc:
   api-docs:

src/main/resources/application-prod.yml

@@ -23,6 +23,12 @@ spring:
     properties:
       hibernate:
         show_sql: false
+  cloud:
+    aws:
+      region:
+        static: ap-northeast-2
+      stack:
+        auto: false
 
 springdoc:
   swagger-ui: