Merge pull request #174 from Central-MakeUs/release

HamJina · web-flow · commit 563f2b6fd3f7 · 2026-02-11T18:15:30.000+09:00
Release v1.1.0
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Deploy To EC2 (Blue-Green Public)
 
 on:
   push:
-    branches: [ "main", "release" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read
diff --git a/src/main/java/com/example/ForDay/domain/activity/controller/ActivityController.java b/src/main/java/com/example/ForDay/domain/activity/controller/ActivityController.java
@@ -1,6 +1,7 @@
 package com.example.ForDay.domain.activity.controller;
 
 import com.example.ForDay.domain.activity.dto.request.UpdateActivityReqDto;
+import com.example.ForDay.domain.activity.dto.response.GetAiRecommendItemsResDto;
 import com.example.ForDay.domain.activity.service.ActivityService;
 import com.example.ForDay.global.common.response.dto.MessageResDto;
 import com.example.ForDay.global.oauth.CustomUserDetails;
@@ -29,4 +30,9 @@ public MessageResDto deleteActivity(@PathVariable(name = "activityId") Long acti
                                         @AuthenticationPrincipal CustomUserDetails user) {
         return activityService.deleteActivity(activityId, user);
     }
+
+    @GetMapping("/ai-recommend/items")
+    public GetAiRecommendItemsResDto getAiRecommendItems(@AuthenticationPrincipal CustomUserDetails user) {
+        return activityService.getAiRecommendItems(user);
+    }
 }
diff --git a/src/main/java/com/example/ForDay/domain/activity/dto/response/GetAiRecommendItemsResDto.java b/src/main/java/com/example/ForDay/domain/activity/dto/response/GetAiRecommendItemsResDto.java
@@ -0,0 +1,33 @@
+package com.example.ForDay.domain.activity.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetAiRecommendItemsResDto {
+    private MessageDto message;
+    private List<ItemDto> activityItems;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class MessageDto {
+        private String message;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ItemDto {
+        private Long itemId;
+        private Long hobbyId;
+        private String hobbyName;
+        private String content;
+        private String description;
+    }
+}
diff --git a/src/main/java/com/example/ForDay/domain/activity/entity/ActivityRecommendItem.java b/src/main/java/com/example/ForDay/domain/activity/entity/ActivityRecommendItem.java
@@ -0,0 +1,26 @@
+package com.example.ForDay.domain.activity.entity;
+
+import com.example.ForDay.domain.hobby.entity.Hobby;
+import com.example.ForDay.global.common.mapped.BaseTimeEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Table(name = "activity_recommend_items")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class ActivityRecommendItem extends BaseTimeEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "activity_recommend_item_id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_hobby_id", nullable = false)
+    private Hobby hobby;
+
+    private String content;
+    private String description;
+}
diff --git a/src/main/java/com/example/ForDay/domain/activity/repository/ActivityRecommendItemRepository.java b/src/main/java/com/example/ForDay/domain/activity/repository/ActivityRecommendItemRepository.java
@@ -0,0 +1,27 @@
+package com.example.ForDay.domain.activity.repository;
+
+import com.example.ForDay.domain.activity.entity.ActivityRecommendItem;
+import com.example.ForDay.domain.hobby.entity.Hobby;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface ActivityRecommendItemRepository extends JpaRepository<ActivityRecommendItem, Long> {
+    @Query("SELECT a FROM ActivityRecommendItem a " +
+            "JOIN FETCH a.hobby " +
+            "WHERE a.hobby IN :hobbies " +
+            "AND a.createdAt >= :start AND a.createdAt <= :end")
+    List<ActivityRecommendItem> findAllByHobbiesAndDate(
+            @Param("hobbies") List<Hobby> hobbies,
+            @Param("start") LocalDateTime start,
+            @Param("end") LocalDateTime end
+    );
+
+    @Modifying
+    @Query("DELETE FROM ActivityRecommendItem a WHERE a.createdAt < :targetDate")
+    void deleteOldItems(@Param("targetDate") LocalDateTime targetDate);
+}
diff --git a/src/main/java/com/example/ForDay/domain/activity/service/ActivityItemScheduler.java b/src/main/java/com/example/ForDay/domain/activity/service/ActivityItemScheduler.java
@@ -0,0 +1,38 @@
+package com.example.ForDay.domain.activity.service;
+
+import com.example.ForDay.domain.activity.repository.ActivityRecommendItemRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class ActivityItemScheduler {
+
+    private final ActivityRecommendItemRepository activityRecommendItemRepository;
+
+    /**
+     * 매일 새벽 3시에 실행 (cron: 초 분 시 일 월 요일)
+     * 오늘 기준으로 이틀(48시간) 전 생성된 아이템 삭제
+     */
+    @Scheduled(cron = "0 0 3 * * *")
+    @Transactional
+    public void deleteOldRecommendItems() {
+        // 기준 시간 계산: 현재 시간 - 2일
+        LocalDateTime targetDate = LocalDateTime.now().minusDays(2);
+
+        log.info("[Scheduler] 추천 아이템 삭제 시작 (기준 시간: {})", targetDate);
+
+        try {
+            activityRecommendItemRepository.deleteOldItems(targetDate);
+            log.info("[Scheduler] 추천 아이템 삭제 완료");
+        } catch (Exception e) {
+            log.error("[Scheduler] 삭제 중 오류 발생: {}", e.getMessage());
+        }
+    }
+}
diff --git a/src/main/java/com/example/ForDay/domain/activity/service/ActivityService.java b/src/main/java/com/example/ForDay/domain/activity/service/ActivityService.java
@@ -4,7 +4,10 @@
 import com.example.ForDay.domain.activity.dto.FastAPIHobbyCardReqDto;
 import com.example.ForDay.domain.activity.dto.request.UpdateActivityReqDto;
 import com.example.ForDay.domain.activity.dto.response.FastAPIHobbyCardResDto;
+import com.example.ForDay.domain.activity.dto.response.GetAiRecommendItemsResDto;
 import com.example.ForDay.domain.activity.entity.Activity;
+import com.example.ForDay.domain.activity.entity.ActivityRecommendItem;
+import com.example.ForDay.domain.activity.repository.ActivityRecommendItemRepository;
 import com.example.ForDay.domain.friend.repository.FriendRelationRepository;
 import com.example.ForDay.domain.friend.type.FriendRelationStatus;
 import com.example.ForDay.domain.hobby.dto.request.FastAPIRecommendReqDto;
@@ -36,6 +39,11 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -52,6 +60,7 @@ public class ActivityService {
     private final HobbyRepository hobbyRepository;
     private final FriendRelationRepository friendRelationRepository;
     private final RestTemplate restTemplate;
+    private final ActivityRecommendItemRepository recommendItemRepository;
 
     @Value("${fastapi.url}")
     private String fastApiBaseUrl;
@@ -353,6 +362,46 @@ public CollectActivityResDto collectActivity(Long hobbyId, Long activityId, Cust
         return new CollectActivityResDto(hobby.getId(), hobby.getHobbyName(), build.getId(), build.getContent(), "활동이 정상적으로 담겼습니다.");
     }
 
+    @Transactional(readOnly = true)
+    public GetAiRecommendItemsResDto getAiRecommendItems(CustomUserDetails user) {
+        User currentUser = userUtil.getCurrentUser(user);
+        String currentUserId = currentUser.getId();
+
+        // 메세지 조회 -> 논의 한 후 수정 예정
+
+        // 1. 현재 유저의 현재 진행 중인 취미 조회
+        List<Hobby> progressHobbies = hobbyRepository.findAllByUserIdAndStatusOrderByIdDesc(
+                currentUserId,
+                HobbyStatus.IN_PROGRESS
+        );
+
+        if (progressHobbies.isEmpty()) {
+            return new GetAiRecommendItemsResDto(new GetAiRecommendItemsResDto.MessageDto(), Collections.emptyList());
+        }
+
+        // 2. 오늘 날짜 범위 설정
+        LocalDateTime startOfToday = LocalDate.now().atStartOfDay();
+        LocalDateTime endOfToday = LocalDate.now().atTime(LocalTime.MAX);
+
+        // 3. 오늘 생성된 추천 아이템 조회
+        List<ActivityRecommendItem> items = recommendItemRepository.findAllByHobbiesAndDate(
+                progressHobbies, startOfToday, endOfToday
+        );
+
+        // 4. DTO 변환
+        List<GetAiRecommendItemsResDto.ItemDto> itemDtos = items.stream()
+                .map(item -> new GetAiRecommendItemsResDto.ItemDto(
+                        item.getId(),
+                        item.getHobby().getId(),
+                        item.getHobby().getHobbyName(),
+                        item.getContent(),
+                        item.getDescription()
+                ))
+                .toList();
+
+        return new GetAiRecommendItemsResDto(new GetAiRecommendItemsResDto.MessageDto(), itemDtos);
+    }
+
     // 유틸 클래스
     private Activity getActivityByUserId(Long activityId, String userId) {
         return activityRepository.findByIdAndUserId(activityId, userId).orElseThrow(() -> new CustomException(ErrorCode.ACTIVITY_NOT_FOUND));
diff --git a/src/main/java/com/example/ForDay/domain/app/type/ImageUsageType.java b/src/main/java/com/example/ForDay/domain/app/type/ImageUsageType.java
@@ -3,5 +3,9 @@
 public enum ImageUsageType {
     ACTIVITY_RECORD,
     PROFILE_IMAGE,
-    COVER_IMAGE
+    COVER_IMAGE,
+
+    TEST_ACTIVITY_RECORD,
+    TEST_PROFILE_IMAGE,
+    TEST_COVER_IMAGE
 }
diff --git a/src/main/java/com/example/ForDay/domain/auth/service/AuthService.java b/src/main/java/com/example/ForDay/domain/auth/service/AuthService.java
@@ -119,7 +119,7 @@ public GuestLoginResDto guestLogin(GuestLoginReqDto reqDto) {
         String guestUserId = reqDto.getGuestUserId();
         boolean newUser;
 
-        if(reqDto.getGuestUserId().startsWith("withdrawn")) {
+        if(guestUserId != null && StringUtils.hasText(guestUserId) && guestUserId.startsWith("withdrawn")) {
             throw new CustomException(ErrorCode.USER_NOT_FOUND);
         }
 
diff --git a/src/main/java/com/example/ForDay/domain/hobby/controller/HobbyController.java b/src/main/java/com/example/ForDay/domain/hobby/controller/HobbyController.java
@@ -168,12 +168,6 @@ public CollectActivityResDto collectActivity(@PathVariable(name = "hobbyId") Lon
         return activityService.collectActivity(hobbyId, activityId, user);
     }
 
-    @Override
-    @GetMapping("/stories/tabs")
-    public GetHobbyStoryTabsResDto getHobbyStoryTabs(@AuthenticationPrincipal CustomUserDetails user) {
-        return hobbyService.getHobbyStoryTabs(user);
-    }
-
     @Override
     @GetMapping("/check")
     public CanCreateHobbyResDto canCreateHobby(@RequestParam(value = "name") String name,
diff --git a/src/main/java/com/example/ForDay/domain/hobby/controller/HobbyControllerDocs.java b/src/main/java/com/example/ForDay/domain/hobby/controller/HobbyControllerDocs.java
@@ -1222,26 +1222,6 @@ CollectActivityResDto collectActivity(
 
             @AuthenticationPrincipal CustomUserDetails user);
 
-
-    @Operation(
-            summary = "취미 스토리 탭 조회",
-            description = "사용자가 진행 중인 취미 목록을 최신순으로 조회합니다. 결과가 없으면 빈 리스트를 반환합니다."
-    )
-    @ApiResponses(value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "조회 성공",
-                    content = @Content(schema = @Schema(implementation = GetHobbyStoryTabsResDto.class))
-            ),
-            @ApiResponse(
-                    responseCode = "200 (Empty)",
-                    description = "진행 중인 취미가 없을 때",
-                    content = @Content(examples = @ExampleObject(value = "{\"status\": 200, \"success\": true, \"data\": {\"tabInfo\": []}}"))
-            )
-    })
-    GetHobbyStoryTabsResDto getHobbyStoryTabs(@AuthenticationPrincipal CustomUserDetails user);
-
-
     @Operation(summary = "취미 이름 중복 확인", description = "사용자가 생성하려는 취미 이름이 이미 등록되어 있는지 확인합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "성공적인 응답 (중복 여부는 data.availability로 확인)")
diff --git a/src/main/java/com/example/ForDay/domain/hobby/repository/HobbyRepositoryImpl.java b/src/main/java/com/example/ForDay/domain/hobby/repository/HobbyRepositoryImpl.java
@@ -35,6 +35,14 @@ public class HobbyRepositoryImpl implements HobbyRepositoryCustom {
     @Override
     public GetHomeHobbyInfoResDto getHomeHobbyInfo(Long targetHobbyId, User currentUser) {
 
+        var isCurrentHobbyExpr = new CaseBuilder()
+                .when(hobby.id.eq(targetHobbyId)).then(true)
+                .otherwise(false);
+
+        var currentHobbyOrderKey = new CaseBuilder()
+                .when(hobby.id.eq(targetHobbyId)).then(0)
+                .otherwise(1);
+
         // 1. Hobby 리스트 조회 (현재 사용자의 진행 중인 취미들)
         List<GetHomeHobbyInfoResDto.InProgressHobbyDto> hobbyList = queryFactory
                 .select(Projections.constructor(GetHomeHobbyInfoResDto.InProgressHobbyDto.class,
@@ -46,7 +54,8 @@ public GetHomeHobbyInfoResDto getHomeHobbyInfo(Long targetHobbyId, User currentU
                 .from(hobby)
                 .where(hobby.user.eq(currentUser),
                         hobby.status.eq(HobbyStatus.IN_PROGRESS))
-                .orderBy(hobby.createdAt.desc())
+                .orderBy(currentHobbyOrderKey.asc(),
+                        hobby.createdAt.desc())
                 .fetch();
 
         if (hobbyList.isEmpty()) return null;
@@ -111,13 +120,13 @@ public Map<HobbyStatus, Long> getCountsByStatus(User user) {
     public OnboardingDataDto getOnboardingDate(User user) {
         return queryFactory
                 .select(Projections.constructor(OnboardingDataDto.class,
-                        hobby.id,
-                        hobby.hobbyInfoId,
-                        hobby.hobbyName,
-                        hobby.hobbyPurpose,
-                        hobby.hobbyTimeMinutes,
-                        hobby.executionCount,
-                        hobby.goalDays
+                                hobby.id,
+                                hobby.hobbyInfoId,
+                                hobby.hobbyName,
+                                hobby.hobbyPurpose,
+                                hobby.hobbyTimeMinutes,
+                                hobby.executionCount,
+                                hobby.goalDays
                         )
                 )
                 .from(hobby)
diff --git a/src/main/java/com/example/ForDay/domain/hobby/service/HobbyService.java b/src/main/java/com/example/ForDay/domain/hobby/service/HobbyService.java
diff --git a/src/main/java/com/example/ForDay/domain/record/dto/response/GetActivityRecordByStoryResDto.java b/src/main/java/com/example/ForDay/domain/record/dto/response/GetActivityRecordByStoryResDto.java
diff --git a/src/main/java/com/example/ForDay/domain/record/repository/ActivityRecordRepositoryCustom.java b/src/main/java/com/example/ForDay/domain/record/repository/ActivityRecordRepositoryCustom.java
diff --git a/src/main/java/com/example/ForDay/domain/record/repository/ActivityRecordRepositoryImpl.java b/src/main/java/com/example/ForDay/domain/record/repository/ActivityRecordRepositoryImpl.java
diff --git a/src/main/java/com/example/ForDay/domain/record/service/ActivityRecordService.java b/src/main/java/com/example/ForDay/domain/record/service/ActivityRecordService.java
diff --git a/src/main/java/com/example/ForDay/infra/s3/service/S3Service.java b/src/main/java/com/example/ForDay/infra/s3/service/S3Service.java

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public GuestLoginResDto guestLogin(GuestLoginReqDto reqDto) {`
`119`	`119`	`String guestUserId = reqDto.getGuestUserId();`
`120`	`120`	`boolean newUser;`
`121`	`121`
`122`		`- if(reqDto.getGuestUserId().startsWith("withdrawn")) {`
	`122`	`+ if(guestUserId != null && StringUtils.hasText(guestUserId) && guestUserId.startsWith("withdrawn")) {`
`123`	`123`	`throw new CustomException(ErrorCode.USER_NOT_FOUND);`
`124`	`124`	`}`
`125`	`125`