Merge pull request #283 from MOONSHOT-Team/feature/#282

[Feat] #282 - 소셜 API 구현
MOONSHOT-Team · May 31, 2024 · 5db61dd · 5db61dd
2 parents ecc0005 + c769667
commit 5db61dd
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 13 deletions.
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/controller/ObjectiveApi.java b/moonshot-api/src/main/java/org/moonshot/objective/controller/ObjectiveApi.java
@@ -11,7 +11,8 @@
 import org.moonshot.objective.dto.request.ModifyObjectiveRequestDto;
 import org.moonshot.objective.dto.request.OKRCreateRequestDto;
 import org.moonshot.objective.dto.response.DashboardResponseDto;
-import org.moonshot.objective.dto.response.HistoryResponseDto;
+import org.moonshot.objective.dto.response.history.HistoryResponseDto;
+import org.moonshot.objective.dto.response.social.SocialOKRResponseDto;
 import org.moonshot.objective.model.Category;
 import org.moonshot.objective.model.Criteria;
 import org.moonshot.response.MoonshotResponse;
@@ -21,6 +22,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @Tag(name = "Objective", description = "Objective 관련 API")
 interface ObjectiveApi {
 
@@ -71,4 +74,11 @@ ResponseEntity<MoonshotResponse<HistoryResponseDto>> getObjectiveHistory(@LoginU
                                                                              @RequestParam(required = false) final Category category,
                                                                              @RequestParam(required = false) final Criteria criteria);
 
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "2012", description = "소셜 조회에 성공하였습니다."),
+            @ApiResponse(responseCode = "4100", description = "인증토큰이 존재하지 않습니다.", content = @Content(mediaType = "application/json", schema = @Schema(implementation = MoonshotResponse.class)))
+    })
+    @Operation(summary = "소셜 목록 조회")
+    ResponseEntity<MoonshotResponse<List<SocialOKRResponseDto>>> getObjectiveSocial();
+
 }
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/controller/ObjectiveController.java b/moonshot-api/src/main/java/org/moonshot/objective/controller/ObjectiveController.java
@@ -8,7 +8,8 @@
 import org.moonshot.objective.dto.request.ModifyObjectiveRequestDto;
 import org.moonshot.objective.dto.request.OKRCreateRequestDto;
 import org.moonshot.objective.dto.response.DashboardResponseDto;
-import org.moonshot.objective.dto.response.HistoryResponseDto;
+import org.moonshot.objective.dto.response.history.HistoryResponseDto;
+import org.moonshot.objective.dto.response.social.SocialOKRResponseDto;
 import org.moonshot.objective.model.Category;
 import org.moonshot.objective.model.Criteria;
 import org.moonshot.objective.service.ObjectiveService;
@@ -27,6 +28,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -69,7 +72,14 @@ public ResponseEntity<MoonshotResponse<HistoryResponseDto>> getObjectiveHistory(
                                                                                     @RequestParam(required = false, name = "category") final Category category,
                                                                                     @RequestParam(required = false, name = "criteria") final Criteria criteria) {
         HistoryResponseDto response = objectiveService.getObjectiveHistory(userId, year, category, criteria);
-        return ResponseEntity.ok(MoonshotResponse.success(SuccessType.OK, response));
+        return ResponseEntity.ok(MoonshotResponse.success(SuccessType.GET_HISTORY_SUCCESS, response));
+    }
+
+    @GetMapping("/social")
+    @Logging(item = "Social", action = "Get")
+    public ResponseEntity<MoonshotResponse<List<SocialOKRResponseDto>>> getObjectiveSocial() {
+        List<SocialOKRResponseDto> response = objectiveService.getObjectiveSocial();
+        return ResponseEntity.ok(MoonshotResponse.success(SuccessType.GET_SOCIAL_SUCCESS, response));
     }
 
 }
diff --git a/...ive/dto/response/HistoryKeyResultDto.java → ...response/history/HistoryKeyResultDto.java b/...ive/dto/response/HistoryKeyResultDto.java → ...response/history/HistoryKeyResultDto.java
@@ -1,4 +1,4 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import java.util.List;
 import org.moonshot.keyresult.model.KeyResult;

diff --git a/...dto/response/HistoryObjectiveListDto.java → ...onse/history/HistoryObjectiveListDto.java b/...dto/response/HistoryObjectiveListDto.java → ...onse/history/HistoryObjectiveListDto.java
@@ -1,7 +1,8 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+
 import org.moonshot.objective.model.Objective;
 
 public record HistoryObjectiveListDto(

diff --git a/...tive/dto/response/HistoryResponseDto.java → .../response/history/HistoryResponseDto.java b/...tive/dto/response/HistoryResponseDto.java → .../response/history/HistoryResponseDto.java
@@ -1,4 +1,4 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import java.util.List;
 

diff --git a/...bjective/dto/response/HistoryTaskDto.java → .../dto/response/history/HistoryTaskDto.java b/...bjective/dto/response/HistoryTaskDto.java → .../dto/response/history/HistoryTaskDto.java
@@ -1,4 +1,4 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import org.moonshot.task.model.Task;
 

diff --git a/...dto/response/ObjectiveGroupByYearDto.java → ...onse/history/ObjectiveGroupByYearDto.java b/...dto/response/ObjectiveGroupByYearDto.java → ...onse/history/ObjectiveGroupByYearDto.java
@@ -1,6 +1,7 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import java.util.List;
+
 import org.moonshot.objective.model.Objective;
 
 public record ObjectiveGroupByYearDto(

diff --git a/...nshot/objective/dto/response/YearDto.java → ...jective/dto/response/history/YearDto.java b/...nshot/objective/dto/response/YearDto.java → ...jective/dto/response/history/YearDto.java
@@ -1,4 +1,4 @@
-package org.moonshot.objective.dto.response;
+package org.moonshot.objective.dto.response.history;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...shot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialKeyResultDto.java b/...shot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialKeyResultDto.java
@@ -0,0 +1,35 @@
+package org.moonshot.objective.dto.response.social;
+
+import org.moonshot.keyresult.model.KeyResult;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+public record SocialKeyResultDto(
+        String krTitle,
+        String krStartAt,
+        String krExpireAt,
+        Long keyResultId,
+        Integer krIdx,
+        Long krTarget,
+        String krMetric,
+        List<SocialTaskDto> taskList
+) {
+    public static SocialKeyResultDto of(KeyResult keyResult) {
+        return getSocialKeyResultDto(keyResult);
+    }
+
+    private static SocialKeyResultDto getSocialKeyResultDto(KeyResult keyResult) {
+        return new SocialKeyResultDto(
+                keyResult.getTitle(),
+                keyResult.getPeriod().getStartAt().format(DateTimeFormatter.ISO_LOCAL_DATE),
+                keyResult.getPeriod().getExpireAt().format(DateTimeFormatter.ISO_LOCAL_DATE),
+                keyResult.getId(),
+                keyResult.getIdx(),
+                keyResult.getTarget(),
+                keyResult.getMetric(),
+                keyResult.getTaskList().stream().map(SocialTaskDto::of).toList()
+        );
+    }
+}
+
diff --git a/...ot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialOKRResponseDto.java b/...ot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialOKRResponseDto.java
@@ -0,0 +1,26 @@
+package org.moonshot.objective.dto.response.social;
+
+import org.moonshot.objective.model.Objective;
+import org.moonshot.user.model.User;
+
+public record SocialOKRResponseDto(
+    String category,
+    String userName,
+    String userImg,
+    Long like,
+    String userIntro,
+    SocialObjectiveDto okrTreeData
+) {
+    public static SocialOKRResponseDto of(Objective objective) {
+        return new SocialOKRResponseDto(
+                objective.getCategory().getValue(),
+                objective.getUser().getNickname(),
+                objective.getUser().getImageUrl(),
+                objective.getHeartCount(),
+                objective.getUser().getDescription(),
+                SocialObjectiveDto.of(objective)
+        );
+    }
+
+}
+
diff --git a/...shot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialObjectiveDto.java b/...shot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialObjectiveDto.java
@@ -0,0 +1,26 @@
+package org.moonshot.objective.dto.response.social;
+
+import org.moonshot.objective.model.Objective;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+public record SocialObjectiveDto(
+        String objTitle,
+        String objCategory,
+        String objContent,
+        String objStartAt,
+        String objExpireAt,
+        List<SocialKeyResultDto> krList
+) {
+    public static SocialObjectiveDto of(Objective objective) {
+        return new SocialObjectiveDto(
+                objective.getTitle(),
+                objective.getCategory().getValue(),
+                objective.getContent(),
+                objective.getPeriod().getStartAt().format(DateTimeFormatter.ISO_LOCAL_DATE),
+                objective.getPeriod().getExpireAt().format(DateTimeFormatter.ISO_LOCAL_DATE),
+                objective.getKeyResultList().stream().map(SocialKeyResultDto::of).toList()
+        );
+    }
+}
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialTaskDto.java b/moonshot-api/src/main/java/org/moonshot/objective/dto/response/social/SocialTaskDto.java
@@ -0,0 +1,15 @@
+package org.moonshot.objective.dto.response.social;
+
+import org.moonshot.task.model.Task;
+
+public record SocialTaskDto(
+        String taskTitle,
+        Integer taskIdx
+) {
+    public static SocialTaskDto of(Task task) {
+        return new SocialTaskDto(
+                task.getTitle(),
+                task.getIdx()
+        );
+    }
+}
diff --git a/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java b/moonshot-api/src/main/java/org/moonshot/objective/service/ObjectiveService.java
@@ -20,12 +20,14 @@
 import org.moonshot.exception.BadRequestException;
 import org.moonshot.exception.NotFoundException;
 import org.moonshot.keyresult.service.KeyResultService;
+import org.moonshot.log.dto.response.LogResponseDto;
 import org.moonshot.objective.dto.request.ModifyIndexRequestDto;
 import org.moonshot.objective.dto.request.ModifyObjectiveRequestDto;
 import org.moonshot.objective.dto.request.OKRCreateRequestDto;
 import org.moonshot.objective.dto.response.DashboardResponseDto;
-import org.moonshot.objective.dto.response.HistoryResponseDto;
-import org.moonshot.objective.dto.response.ObjectiveGroupByYearDto;
+import org.moonshot.objective.dto.response.history.HistoryResponseDto;
+import org.moonshot.objective.dto.response.history.ObjectiveGroupByYearDto;
+import org.moonshot.objective.dto.response.social.SocialOKRResponseDto;
 import org.moonshot.objective.model.Category;
 import org.moonshot.objective.model.Criteria;
 import org.moonshot.objective.model.IndexService;
@@ -139,6 +141,14 @@ public HistoryResponseDto getObjectiveHistory(final Long userId, final Integer y
         return HistoryResponseDto.of(groupsSortedByCriteria, categories);
     }
 
+    @Transactional(readOnly = true)
+    public List<SocialOKRResponseDto> getObjectiveSocial() {
+        List<Objective> objectives = objectiveRepository.findSocialObjectives();
+        return objectives.stream()
+                .map(SocialOKRResponseDto::of)
+                .toList();
+    }
+
     @Override
     public void modifyIdx(final ModifyIndexRequestDto request, final Long userId) {
         Long objectiveCount = objectiveRepository.countAllByUserId(userId);

diff --git a/moonshot-api/src/test/java/org/moonshot/objective/service/ObjectiveServiceTest.java b/moonshot-api/src/test/java/org/moonshot/objective/service/ObjectiveServiceTest.java
@@ -23,8 +23,8 @@
 import org.moonshot.objective.dto.request.ModifyObjectiveRequestDto;
 import org.moonshot.objective.dto.request.OKRCreateRequestDto;
 import org.moonshot.objective.dto.response.DashboardResponseDto;
-import org.moonshot.objective.dto.response.HistoryResponseDto;
-import org.moonshot.objective.dto.response.ObjectiveGroupByYearDto;
+import org.moonshot.objective.dto.response.history.HistoryResponseDto;
+import org.moonshot.objective.dto.response.history.ObjectiveGroupByYearDto;
 import org.moonshot.objective.model.Category;
 import org.moonshot.objective.model.Criteria;
 import org.moonshot.objective.model.Objective;

diff --git a/moonshot-common/src/main/java/org/moonshot/response/SuccessType.java b/moonshot-common/src/main/java/org/moonshot/response/SuccessType.java
@@ -24,6 +24,7 @@ public enum SuccessType {
     PATCH_KR_ACHIEVE_SUCCESS(HttpStatus.OK, 2009, "KeyResult 수정 후 목표를 달성하였습니다."),
     POST_LOG_ACHIEVE_SUCCESS(HttpStatus.OK, 2010, "체크인 Log 생성 후 목표를 달성하였습니다."),
     DELETE_OBJECTIVE_SUCCESS(HttpStatus.OK, 2011, "Objective 삭제를 성공하였습니다."),
+    GET_SOCIAL_SUCCESS(HttpStatus.OK, 2012,"소셜 조회에 성공하였습니다."),
 
     /**
      * 201 CREATED (2100 ~ 2199)

diff --git a/...hot-domain/src/main/java/org/moonshot/objective/repository/ObjectiveCustomRepository.java b/...hot-domain/src/main/java/org/moonshot/objective/repository/ObjectiveCustomRepository.java
@@ -9,4 +9,6 @@ public interface ObjectiveCustomRepository {
 
     List<Objective> findObjectives(Long userId, Integer year, Category category, Criteria criteria);
 
+    List<Objective> findSocialObjectives();
+
 }
diff --git a/...domain/src/main/java/org/moonshot/objective/repository/ObjectiveCustomRepositoryImpl.java b/...domain/src/main/java/org/moonshot/objective/repository/ObjectiveCustomRepositoryImpl.java
@@ -66,4 +66,16 @@ private OrderSpecifier<?> order(Criteria criteria) {
         return orderSpecifier;
     }
 
+    @Override
+    public List<Objective> findSocialObjectives() {
+        return queryFactory.selectFrom(objective).distinct()
+                .join(objective.user).fetchJoin()
+                .join(objective.keyResultList, keyResult).fetchJoin()
+                .join(keyResult.taskList, task)
+                .where(objective.isPublic.eq(true))
+                .orderBy(objective.heartCount.desc(), objective.id.desc())
+                .limit(10)
+                .fetch();
+    }
+
 }