[chore] 운영 서버 최신화

build.gradle

@@ -40,7 +40,6 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     //security
-
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
@@ -49,8 +48,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'io.github.cdimascio:dotenv-java:3.0.0'
 
-
-
     // swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
 
@@ -59,8 +56,16 @@ dependencies {
     implementation 'mysql:mysql-connector-java:8.0.30'
     implementation 'com.h2database:h2:2.2.220'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.redisson:redisson-spring-boot-starter:3.22.0'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
-
+
+    // QueryDSL
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 }
 
 
@@ -71,4 +76,8 @@ tasks.named('test') {
 test {
     // 모든 테스트를 스킵하도록 설정 (임시)
     enabled = false
+}
+
+clean {
+    delete file('src/main/generated')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/umc/yeogi_gal_lae/api/budget/controller/BudgetController.java

@@ -6,13 +6,11 @@
 import com.umc.yeogi_gal_lae.api.budget.dto.BudgetAssignment;
 import com.umc.yeogi_gal_lae.api.budget.dto.BudgetDetailResponse;
 import com.umc.yeogi_gal_lae.api.budget.dto.BudgetResponse;
-import com.umc.yeogi_gal_lae.api.budget.dto.DailyBudgetAssignmentResponse;
 import com.umc.yeogi_gal_lae.api.budget.repository.BudgetRepository;
 import com.umc.yeogi_gal_lae.api.budget.service.BudgetService;
 import com.umc.yeogi_gal_lae.global.common.response.Response;
 import com.umc.yeogi_gal_lae.global.error.ErrorCode;
 import com.umc.yeogi_gal_lae.global.success.SuccessCode;
-import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -56,21 +54,7 @@ public Response<BudgetDetailResponse> getBudget(@PathVariable Long budgetId) {
         }
         Budget budget = budgetOpt.get();
         Map<String, List<BudgetAssignment>> budgetMap = budgetService.getBudgetMapById(budgetId);
-        List<DailyBudgetAssignmentResponse> dailyAssignments = BudgetConverter.toDailyBudgetAssignmentResponseList(
-                budgetMap);
-
-        // AICourse를 통해 TripPlan 정보를 조회 (TripPlan 클래스가 startDate와 endDate를 LocalDate 타입으로 제공한다고 가정)
-        String imageUrl = budget.getAiCourse().getTripPlan().getImageUrl();
-        LocalDate startDate = budget.getAiCourse().getTripPlan().getStartDate();
-        LocalDate endDate = budget.getAiCourse().getTripPlan().getEndDate();
-
-        BudgetDetailResponse detailResponse = BudgetDetailResponse.builder()
-                .dailyAssignments(dailyAssignments)
-                .imageUrl(imageUrl)
-                .startDate(startDate)
-                .endDate(endDate)
-                .build();
-
+        BudgetDetailResponse detailResponse = BudgetConverter.toBudgetDetailResponse(budget, budgetMap);
         return Response.of(SuccessCode.OK, detailResponse);
     }
 

src/main/java/com/umc/yeogi_gal_lae/api/budget/converter/BudgetConverter.java

@@ -2,6 +2,7 @@
 
 import com.umc.yeogi_gal_lae.api.budget.domain.Budget;
 import com.umc.yeogi_gal_lae.api.budget.dto.BudgetAssignment;
+import com.umc.yeogi_gal_lae.api.budget.dto.BudgetDetailResponse;
 import com.umc.yeogi_gal_lae.api.budget.dto.BudgetResponse;
 import com.umc.yeogi_gal_lae.api.budget.dto.DailyBudgetAssignmentResponse;
 import java.util.List;
@@ -33,4 +34,17 @@ public static List<DailyBudgetAssignmentResponse> toDailyBudgetAssignmentRespons
                         .build())
                 .collect(Collectors.toList());
     }
+
+    public static BudgetDetailResponse toBudgetDetailResponse(Budget budget,
+                                                              Map<String, List<BudgetAssignment>> budgetMap) {
+        List<DailyBudgetAssignmentResponse> dailyAssignments = toDailyBudgetAssignmentResponseList(budgetMap);
+        return BudgetDetailResponse.builder()
+                .dailyAssignments(dailyAssignments)
+                .location(budget.getAiCourse().getTripPlan().getLocation())
+                .imageUrl(budget.getAiCourse().getTripPlan().getImageUrl())
+                .startDate(budget.getAiCourse().getTripPlan().getStartDate())
+                .endDate(budget.getAiCourse().getTripPlan().getEndDate())
+                .build();
+    }
+
 }

src/main/java/com/umc/yeogi_gal_lae/api/budget/dto/BudgetDetailResponse.java

@@ -12,6 +12,7 @@
 @AllArgsConstructor
 @Builder
 public class BudgetDetailResponse {
+    private String location;
     private String imageUrl;
     private LocalDate startDate;
     private LocalDate endDate;

src/main/java/com/umc/yeogi_gal_lae/api/budget/service/BudgetService.java

@@ -80,6 +80,7 @@ private String buildBudgetPrompt(String scheduleJson) {
         prompt.append("Given the following travel schedule in JSON format: ")
                 .append(scheduleJson)
                 .append(", generate budget recommendations for each day. ");
+        prompt.append("단, 'placeName' 필드의 값은 반드시 한국어로만 작성되어야 하며, 영어 표현은 사용하지 마세요. ");
         prompt.append(
                 "For each place, assign exactly one budget type (one of MEAL, ACTIVITY, SHOPPING, TRANSPORT) and a recommended amount. ");
         prompt.append(
@@ -125,7 +126,7 @@ private Map<String, List<BudgetAssignment>> parseBudgetGptResponse(String gptRes
             if (jsonStart != -1) {
                 content = content.substring(jsonStart);
             }
-            return objectMapper.readValue(content, new TypeReference<Map<String, List<BudgetAssignment>>>() {
+            return objectMapper.readValue(content, new TypeReference<>() {
             });
         } catch (Exception e) {
             e.printStackTrace();
@@ -144,13 +145,11 @@ public Map<String, List<BudgetAssignment>> getBudgetMapById(Long id) {
         }
         try {
             String budgetJson = budgetOpt.get().getBudgetJson();
-            return objectMapper.readValue(budgetJson, new TypeReference<Map<String, List<BudgetAssignment>>>() {
+            return objectMapper.readValue(budgetJson, new TypeReference<>() {
             });
         } catch (Exception e) {
             e.printStackTrace();
             return Collections.emptyMap();
         }
     }
-
-
 }

src/main/java/com/umc/yeogi_gal_lae/api/notification/controller/NotificationController.java

@@ -4,6 +4,7 @@
 import com.umc.yeogi_gal_lae.api.notification.service.NotificationService;
 import com.umc.yeogi_gal_lae.api.notification.domain.NotificationType;
 import com.umc.yeogi_gal_lae.api.tripPlan.types.TripPlanType;
+import com.umc.yeogi_gal_lae.api.user.domain.User;
 import com.umc.yeogi_gal_lae.api.vote.AuthenticatedUserUtils;
 import com.umc.yeogi_gal_lae.global.common.response.Response;
 import com.umc.yeogi_gal_lae.global.success.SuccessCode;
@@ -59,6 +60,10 @@ public ResponseEntity<Response<Void>> createEndNotification(
      */
     @GetMapping
     public ResponseEntity<Response<List<NotificationDto>>> getAllNotifications() {
+
+        //로그인 없을시 에러냄
+        String userEmail = AuthenticatedUserUtils.getAuthenticatedUserEmail();
+
         List<NotificationDto> notifications = notificationService.getAllNotifications();
         return ResponseEntity.ok(Response.of(SuccessCode.NOTIFICATION_FETCH_OK, notifications));
     }

src/main/java/com/umc/yeogi_gal_lae/api/room/service/RoomService.java

@@ -167,10 +167,9 @@ public RoomListResponse getRoomsByUserId(Long userId) {
                         .roomId(room.getId())
                         .roomName(room.getName())
                         .members(room.getRoomMembers().stream()
-                                .filter(member -> !member.getUser().getId().equals(userId)) // 본인 제외
                                 .map(member -> new SimpleRoomMemberResponse(
                                         member.getUser().getId(),
-                                        member.getUser().getProfileImage() // 프로필 이미지 추가
+                                        member.getUser().getId().equals(userId) ? null : member.getUser().getProfileImage() // 본인 프로필만 null 처리
                                 ))
                                 .collect(Collectors.toList()))
                         .build())

src/main/java/com/umc/yeogi_gal_lae/api/vote/domain/Vote.java

@@ -1,11 +1,15 @@
 package com.umc.yeogi_gal_lae.api.vote.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.umc.yeogi_gal_lae.api.tripPlan.domain.TripPlan;
 import com.umc.yeogi_gal_lae.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Builder
 @Getter  @Setter
 @NoArgsConstructor
@@ -19,17 +23,19 @@ public class Vote extends BaseEntity {
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "trip_plan_id", nullable = false)
+    @JsonIgnore
     private TripPlan tripPlan;
 
-    // 특정 사용자의 투표 결과 조회 빈번하게 일어날 것으로 예상되기에, VoteRoom 을 통하지 않고 바로 Use 와 매핑
-    // VoteRoom 은 투표 방 자체를 관리하고, Vote 는 사용자들의 실제 투표 데이터를 관리하므로 역할 분리
-    // 투표 데이터를 추가하거나 변경할 때 VoteRoom 에 불필요한 데이터가 섞이지 않기 위함
-
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "vote_room_id", nullable = false)
+    @JsonIgnore
     private VoteRoom voteRoom;
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private VoteType type;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @Override
+    public LocalDateTime getCreatedAt() { return super.getCreatedAt(); }
 }

src/main/java/com/umc/yeogi_gal_lae/api/vote/dto/request/VoteRequest.java

@@ -6,6 +6,7 @@
 import net.minidev.json.annotate.JsonIgnore;
 
 
+@NoArgsConstructor
 public class VoteRequest {
 
 

src/main/java/com/umc/yeogi_gal_lae/api/vote/dto/request/VoteRoomRequest.java

@@ -1,12 +1,16 @@
 package com.umc.yeogi_gal_lae.api.vote.dto.request;
 
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 
-@Builder
 @Getter
+@NoArgsConstructor
+@Builder  // 추가
+@AllArgsConstructor  // 필요 시 추가
 public class VoteRoomRequest {
 
     @NotNull
@@ -17,5 +21,4 @@ public class VoteRoomRequest {
 
     @NotNull
     private Long voteRoomId;
-
 }