Spring Batch 기반의 추천 시스템 로직 구현

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.22'
     id 'org.springframework.boot' version '3.3.4'
     id 'io.spring.dependency-management' version '1.1.6'
 }
@@ -13,6 +14,10 @@ java {
     }
 }
 
+kotlin {
+    jvmToolchain(21)
+}
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
@@ -33,6 +38,10 @@ dependencies {
     testImplementation 'org.springframework.security:spring-security-test'
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
+    // batch
+    implementation 'org.springframework.boot:spring-boot-starter-batch'
+    testImplementation 'org.springframework.batch:spring-batch-test'
+
     // lombok
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
@@ -44,11 +53,17 @@ dependencies {
 
     // db
     implementation 'org.postgresql:postgresql:42.7.1'
-//    implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.neo4j.driver:neo4j-java-driver:5.14.0'
+//    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     // test
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:5.2.1"
+
+    // kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
     // swaggerDoc
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'

src/main/java/com/example/silverbridgeX_user/RecommendActivity/controller/RecommendActivityController.java

@@ -1,5 +1,8 @@
 package com.example.silverbridgeX_user.RecommendActivity.controller;
 
+import com.example.silverbridgeX_user.RecommendActivity.converter.RecommendActivityConverter;
+import com.example.silverbridgeX_user.RecommendActivity.domain.RecommendActivity;
+import com.example.silverbridgeX_user.RecommendActivity.dto.RecommendActivityResponseDto.RecommendActivityResDtos;
 import com.example.silverbridgeX_user.RecommendActivity.service.RecommendActivityService;
 import com.example.silverbridgeX_user.global.api_payload.ApiResponse;
 import com.example.silverbridgeX_user.global.api_payload.SuccessCode;
@@ -9,10 +12,11 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import java.time.LocalDateTime;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,33 +29,45 @@ public class RecommendActivityController {
     private final RecommendActivityService recommendActivityService;
     private final UserService userService;
 
-    @Operation(summary = "활동 선택", description = "로그 저장, selected 간선 생성합니다.")
+    @Operation(summary = "활동 반환", description = "추천하는 활동 리스트를 반환합니다.")
     @ApiResponses({
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "ACTIVITY_2001", description = "선택한 활동 로그와 selected 간선 저장 완료했습니다."),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "ACTIVITY_2001", description = "추천하는 활동 리스를 반환 완료했습니다."),
     })
-    @DeleteMapping("/select")
-    public ApiResponse<String> select(
-            @RequestParam(name = "activityId") Long activityId,
+    @GetMapping("/recommend-activity")
+    public ApiResponse<RecommendActivityResDtos> getRecommendActivities(
             @AuthenticationPrincipal CustomUserDetails customUserDetails
     ) {
         User user = userService.findByUserName(customUserDetails.getUsername());
-        recommendActivityService.handleActivitySelection(user, activityId);
-        return ApiResponse.onSuccess(SuccessCode.USER_LOGOUT_SUCCESS, "로그 저장 완료");
+        List<RecommendActivity> recommendActivities = recommendActivityService.getRecommendActivities(user);
+        return ApiResponse.onSuccess(SuccessCode.RECOMMEND_ACTIVITY_VIEW_LIST_SUCCESS,
+                RecommendActivityConverter.recommendActivityResDtos(recommendActivities));
     }
 
-    @Operation(summary = "활동 열람", description = "로그 저장합니다.")
+    @Operation(summary = "활동 선택", description = "활동 선택 로그를 저장, selected 간선 생성합니다.")
     @ApiResponses({
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "ACTIVITY_2002", description = "열람한 활동 로그 저장 완료했습니다."),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "ACTIVITY_2002", description = "선택한 활동 로그와 selected 간선 저장 완료했습니다."),
     })
-    @DeleteMapping("/view")
-    public ApiResponse<String> view(
-            @RequestParam(name = "activityId") Long activityId,
-            @AuthenticationPrincipal CustomUserDetails customUserDetails
+    @PostMapping("/select")
+    public ApiResponse<String> select(
+            @AuthenticationPrincipal CustomUserDetails customUserDetails,
+            @RequestParam(name = "activityId") Long activityId
     ) {
         User user = userService.findByUserName(customUserDetails.getUsername());
-
         recommendActivityService.handleActivitySelection(user, activityId);
+        return ApiResponse.onSuccess(SuccessCode.RECOMMEND_ACTIVITY_SELECT_LOG_SUCCESS, "선택 로그 저장 완료");
+    }
 
-        return ApiResponse.onSuccess(SuccessCode.USER_LOGOUT_SUCCESS, "로그 저장 완료");
+    @Operation(summary = "활동 열람", description = "활동 열람 로그를 저장합니다.")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "ACTIVITY_2003", description = "열람한 활동 로그를 저장 완료했습니다."),
+    })
+    @PostMapping("/view")
+    public ApiResponse<String> view(
+            @AuthenticationPrincipal CustomUserDetails customUserDetails,
+            @RequestParam(name = "activityId") Long activityId
+    ) {
+        User user = userService.findByUserName(customUserDetails.getUsername());
+        recommendActivityService.handleActivityView(user, activityId);
+        return ApiResponse.onSuccess(SuccessCode.RECOMMEND_ACTIVITY_VIEW_LOG_SUCCESS, "열람 로그 저장 완료");
     }
 }

src/main/java/com/example/silverbridgeX_user/RecommendActivity/converter/RecommendActivityConverter.java

@@ -0,0 +1,52 @@
+package com.example.silverbridgeX_user.RecommendActivity.converter;
+
+import com.example.silverbridgeX_user.RecommendActivity.domain.RecommendActivity;
+import com.example.silverbridgeX_user.RecommendActivity.dto.RecommendActivityResponseDto.RecommendActivityResDto;
+import com.example.silverbridgeX_user.RecommendActivity.dto.RecommendActivityResponseDto.RecommendActivityResDtos;
+import com.example.silverbridgeX_user.activity.domain.Activity;
+import com.example.silverbridgeX_user.user.domain.User;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class RecommendActivityConverter {
+    public static RecommendActivity saveRecommendActivity(LocalDate date, Integer number, User user,
+                                                          Activity activity) {
+        return RecommendActivity.builder()
+                .date(date)
+                .user(user)
+                .number(number)
+                .activity(activity)
+                .build();
+    }
+
+    public static RecommendActivityResDto recommendActivityResDto(RecommendActivity recommendActivity) {
+        Activity activity = recommendActivity.getActivity();
+        String address =
+                activity.getStreetAddress().isEmpty() ? activity.getLotNumberAddress() : activity.getStreetAddress();
+        String content = activity.getEndDate().equals("2999-12-31")
+                ? (activity.getHomepageUrl() != null && !activity.getHomepageUrl().isBlank()
+                ? activity.getHomepageUrl()
+                : activity.getPhoneNumber())
+                : activity.getStartDate() + " ~ " + activity.getEndDate();
+
+        return RecommendActivityResDto.builder()
+                .tag(String.valueOf(activity.getActivityType()))
+                .name(activity.getName())
+                .address(address)
+                .content(content)
+                .build();
+    }
+
+    public static RecommendActivityResDtos recommendActivityResDtos(List<RecommendActivity> activities) {
+
+        List<RecommendActivityResDto> dtoList = activities.stream()
+                .map(RecommendActivityConverter::recommendActivityResDto)
+                .collect(Collectors.toList());
+
+        return RecommendActivityResDtos.builder()
+                .recommendActivityResDtos(dtoList)
+                .build();
+    }
+
+}

src/main/java/com/example/silverbridgeX_user/RecommendActivity/domain/ActionType.java

@@ -0,0 +1,6 @@
+package com.example.silverbridgeX_user.RecommendActivity.domain;
+
+public enum ActionType {
+    VIEW,
+    SELECT
+}

src/main/java/com/example/silverbridgeX_user/RecommendActivity/domain/ActivityLog.java

@@ -0,0 +1,47 @@
+package com.example.silverbridgeX_user.RecommendActivity.domain;
+
+import com.example.silverbridgeX_user.activity.domain.Activity;
+import com.example.silverbridgeX_user.user.domain.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Table(name = "activity_log")
+public class ActivityLog {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private ActionType actionType;
+
+    private LocalDateTime time;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "activity_id")
+    private Activity activity;
+
+}

src/main/java/com/example/silverbridgeX_user/RecommendActivity/domain/RecommendActivity.java

@@ -1,5 +1,6 @@
 package com.example.silverbridgeX_user.RecommendActivity.domain;
 
+import com.example.silverbridgeX_user.activity.domain.Activity;
 import com.example.silverbridgeX_user.user.domain.User;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -34,6 +35,6 @@ public class RecommendActivity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "activity_id")
-    private User activity;
+    private Activity activity;
 
 }

src/main/java/com/example/silverbridgeX_user/RecommendActivity/dto/RecommendActivityResponseDto.java

@@ -0,0 +1,45 @@
+package com.example.silverbridgeX_user.RecommendActivity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+public class RecommendActivityResponseDto {
+
+    @Schema(description = "RecommendActivityResDtos")
+    @Getter
+    @Setter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class RecommendActivityResDtos {
+        @Schema(description = "추천 활동 리스트")
+        private List<RecommendActivityResDto> recommendActivityResDtos;
+    }
+
+    @Schema(description = "RecommendActivityResDto")
+    @Getter
+    @Setter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class RecommendActivityResDto {
+        @Schema(description = "태그")
+        private String tag;
+
+        @Schema(description = "이름")
+        private String name;
+
+        @Schema(description = "주소")
+        private String address;
+
+        @Schema(description = "기간/링크/전화번호")
+        private String content;
+    }
+
+}

src/main/java/com/example/silverbridgeX_user/RecommendActivity/repository/RecommendActivityRepository.java

@@ -1,8 +1,12 @@
 package com.example.silverbridgeX_user.RecommendActivity.repository;
 
 import com.example.silverbridgeX_user.RecommendActivity.domain.RecommendActivity;
+import com.example.silverbridgeX_user.user.domain.User;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RecommendActivityRepository extends JpaRepository<RecommendActivity, Long> {
+    List<RecommendActivity> findAllByUser(User user);
 
+    void deleteByUser(User user);
 }