diff --git a/src/main/java/com/example/cp_main_be/domain/garden/garden/presentation/GardenController.java b/src/main/java/com/example/cp_main_be/domain/garden/garden/presentation/GardenController.java
index dc3c0982..3c27a6b3 100644
--- a/src/main/java/com/example/cp_main_be/domain/garden/garden/presentation/GardenController.java
+++ b/src/main/java/com/example/cp_main_be/domain/garden/garden/presentation/GardenController.java
@@ -33,24 +33,24 @@ public ResponseEntity<ApiResponse<GardenResponse>> getGarden(@PathVariable Long
   @Operation(summary = "내 정원에 물 주기", description = "자신의 정원에 물을 줍니다.")
   @PostMapping("/{gardenId}/mywater")
   public ResponseEntity<ApiResponse<Void>> waterMyGarden(
-      @AuthenticationPrincipal Long userId, @PathVariable Long gardenId) {
-    gardenService.waterGarden(userId, gardenId);
+      @AuthenticationPrincipal User user, @PathVariable Long gardenId) {
+    gardenService.waterGarden(user.getId(), gardenId);
     return ResponseEntity.ok(ApiResponse.success(null));
   }
 
   @Operation(summary = "남의 정원에 물 주기", description = "남의 정원에 물을 줍니다.")
   @PostMapping("/{gardenId}/friendwater")
   public ResponseEntity<ApiResponse<Void>> waterYourGarden(
-      @AuthenticationPrincipal Long userId, @PathVariable Long gardenId) {
-    gardenService.waterGarden(userId, gardenId);
+      @AuthenticationPrincipal User user, @PathVariable Long gardenId) {
+    gardenService.waterGarden(user.getId(), gardenId);
     return ResponseEntity.ok(ApiResponse.success(null));
   }
 
   @Operation(summary = "정원에 햇빛 주기", description = "자신의 정원에 햇빛을 줍니다.")
   @PostMapping("/{gardenId}/sunlight")
   public ResponseEntity<ApiResponse<Void>> sunlightGarden(
-      @AuthenticationPrincipal Long userId, @PathVariable Long gardenId) {
-    gardenService.sunlightGarden(userId, gardenId);
+      @AuthenticationPrincipal User user, @PathVariable Long gardenId) {
+    gardenService.sunlightGarden(user.getId(), gardenId);
     return ResponseEntity.ok(ApiResponse.success(null));
   }
 
diff --git a/src/main/java/com/example/cp_main_be/domain/mission/diaryimage/domain/DiaryImage.java b/src/main/java/com/example/cp_main_be/domain/mission/diaryimage/domain/DiaryImage.java
index 5a31150c..ed447d2e 100644
--- a/src/main/java/com/example/cp_main_be/domain/mission/diaryimage/domain/DiaryImage.java
+++ b/src/main/java/com/example/cp_main_be/domain/mission/diaryimage/domain/DiaryImage.java
@@ -5,6 +5,7 @@
 import jakarta.persistence.*;
 import java.time.LocalDateTime;
 import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
 
 @Entity
 @Getter
@@ -30,6 +31,7 @@ public class DiaryImage {
   private User user;
 
   @Column(name = "created_at")
+  @CreatedDate
   private LocalDateTime createdAt;
 
   public void updateImageUrl(String newImageUrl) {