KCY-Fit-a-Pet · heejinnn · Feb 4, 2024 · Feb 2, 2024 · Feb 2, 2024 · Feb 3, 2024
diff --git a/README.md b/README.md
@@ -5,6 +5,15 @@
 - [프론트엔드](https://github.com/KCY-Fit-a-Pet/fit-a-pet-client): [최희진](https://github.com/heejinnn)
 - 백엔드: [양재서](https://github.com/psychology50)
 
+## [개발 기록]
+- [Side Project: Kakao Chat CI](https://jaeseo0519.tistory.com/323)
+- [NCP Cloud Function & Object Storage presigned URL 발급](https://jaeseo0519.tistory.com/331)
+- [Service Layer 분리에 대하여](https://jaeseo0519.tistory.com/314)
+- [API 세분화에 대하여](https://jaeseo0519.tistory.com/341)
+- [OIDC OAuth2 인증](https://jaeseo0519.tistory.com/349)
+- [Nginx 구성과 HTTPS 설정](https://jaeseo0519.tistory.com/354)
+- [GitHub Action & NCP CD pipeline 구축](https://jaeseo0519.tistory.com/354)
+
 ## [ Contents ]
 - [Project Summary](#project-summary)
 - [Version Control](#version-control)

diff --git a/src/main/java/com/kcy/fitapet/domain/care/service/component/CareManageService.java b/src/main/java/com/kcy/fitapet/domain/care/service/component/CareManageService.java
@@ -7,12 +7,12 @@
 import com.kcy.fitapet.domain.care.dto.CareInfoRes;
 import com.kcy.fitapet.domain.care.dto.CareSaveReq;
 import com.kcy.fitapet.domain.care.exception.CareErrorCode;
-import com.kcy.fitapet.domain.care.service.module.CareSaveService;
+import com.kcy.fitapet.domain.care.service.module.CareUpdateService;
 import com.kcy.fitapet.domain.care.service.module.CareSearchService;
 import com.kcy.fitapet.domain.care.type.WeekType;
 import com.kcy.fitapet.domain.log.domain.CareLog;
 import com.kcy.fitapet.domain.log.dto.CareLogInfo;
-import com.kcy.fitapet.domain.log.service.CareLogSaveService;
+import com.kcy.fitapet.domain.log.service.CareLogUpdateService;
 import com.kcy.fitapet.domain.log.service.CareLogSearchService;
 import com.kcy.fitapet.domain.member.service.module.MemberSearchService;
 import com.kcy.fitapet.domain.pet.domain.Pet;
@@ -32,13 +32,13 @@
 @RequiredArgsConstructor
 @Slf4j
 public class CareManageService {
-    private final CareSaveService careSaveService;
+    private final CareUpdateService careUpdateService;
 
     private final MemberSearchService memberSearchService;
     private final PetSearchService petSearchService;
     private final CareSearchService careSearchService;
     private final CareLogSearchService careLogSearchService;
-    private final CareLogSaveService careLogSaveService;
+    private final CareLogUpdateService careLogUpdateService;
 
     @Transactional
     public List<?> findCareCategoryNamesByPetId(Long petId) {
@@ -84,14 +84,13 @@ public CareLogInfo doCare(Long careDateId, Long userId) {
         }
 
         // TODO: 케어 등록 시간 10분 전부터 수행할 수 있도록 조건 추가?
-
         LocalDateTime today = LocalDateTime.now();
         if (careLogSearchService.existsByCareDateIdOnLogDate(careDateId, today)) {
             log.warn("이미 케어를 수행한 기록이 존재합니다.");
             throw new GlobalErrorException(CareErrorCode.ALREADY_CARED);
         }
 
-        CareLog careLog = careLogSaveService.save(CareLog.of(careDate));
+        CareLog careLog = careLogUpdateService.save(CareLog.of(careDate));
         log.info("careLog: {}", careLog);
         return CareLogInfo.of(careLog.getLogDate(), memberSearchService.findById(userId).getUid());
     }
@@ -120,13 +119,13 @@ private void persistAboutCare(
             List<CareSaveReq.AdditionalPetDto> additionalPetDtos
     ) {
         List<CareCategory> categories = findOrCreateCategories(categoryDto, additionalPetDtos);
-        careSaveService.saveCareCategories(categories);
+        careUpdateService.saveCareCategories(categories);
 
         List<Care> cares = createCares(categoryDto, careInfoDto, categories);
-        careSaveService.saveCares(cares);
+        careUpdateService.saveCares(cares);
 
         List<CareDate> dates = createCareDates(careInfoDto, cares);
-        careSaveService.saveCareDates(dates);
+        careUpdateService.saveCareDates(dates);
     }
 
     private List<CareCategory> findOrCreateCategories(

diff --git a/.../care/service/module/CareSaveService.java → ...are/service/module/CareUpdateService.java b/.../care/service/module/CareSaveService.java → ...are/service/module/CareUpdateService.java
@@ -16,7 +16,7 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CareSaveService {
+public class CareUpdateService {
     private final CareRepository careRepository;
     private final CareDateRepository careDateRepository;
     private final CareCategoryRepository careCategoryRepository;

diff --git a/...omain/log/service/CareLogSaveService.java → ...ain/log/service/CareLogUpdateService.java b/...omain/log/service/CareLogSaveService.java → ...ain/log/service/CareLogUpdateService.java
@@ -1,14 +1,14 @@
 package com.kcy.fitapet.domain.log.service;
 
-import com.kcy.fitapet.domain.care.domain.Care;
 import com.kcy.fitapet.domain.log.dao.CareLogRepository;
 import com.kcy.fitapet.domain.log.domain.CareLog;
+import com.kcy.fitapet.domain.log.domain.CareLogId;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class CareLogSaveService {
+public class CareLogUpdateService {
     private final CareLogRepository careLogRepository;
 
     public CareLog save(CareLog careLog) {

diff --git a/src/main/java/com/kcy/fitapet/domain/memo/api/MemoApi.java b/src/main/java/com/kcy/fitapet/domain/memo/api/MemoApi.java
@@ -17,6 +17,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.data.web.SortDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -89,7 +90,10 @@ public ResponseEntity<?> deleteSubMemoCategory(@PathVariable("pet_id") Long petI
     public ResponseEntity<?> getMemosAndSubCategories(
             @PathVariable("pet_id") Long petId, @PathVariable("memo_category_id") Long memoCategoryId,
             @RequestParam(value = "search", defaultValue = "", required = false) String search,
-            @PageableDefault(size = 15, page = 0, sort = "memo.createdAt", direction = Sort.Direction.DESC) Pageable pageable
+            @PageableDefault(size = 5, page = 0) @SortDefault.SortDefaults({
+                    @SortDefault(sort = "memo.createdAt", direction = Sort.Direction.DESC),
+                    @SortDefault(sort = "memoImage.id", direction = Sort.Direction.ASC)}
+            ) Pageable pageable
     ) {
         MemoInfoDto.PageResponse res = memoManageService.findMemosInMemoCategory(memoCategoryId, pageable, search);
         return ResponseEntity.ok(SuccessResponse.from(res));
@@ -112,7 +116,10 @@ public ResponseEntity<?> getMemosAndSubCategories(
     @PreAuthorize("isAuthenticated() and @managerAuthorize.isManager(principal.userId, #petId)")
     public ResponseEntity<?> getMemosByPet(
             @PathVariable("pet_id") Long petId,
-            @PageableDefault(size = 5, page = 0, sort = "memo.createdAt", direction = Sort.Direction.DESC) Pageable pageable
+            @PageableDefault(size = 5, page = 0) @SortDefault.SortDefaults({
+                    @SortDefault(sort = "memo.createdAt", direction = Sort.Direction.DESC),
+                    @SortDefault(sort = "memoImage.id", direction = Sort.Direction.ASC)}
+            ) Pageable pageable
     ) {
         MemoInfoDto.PageResponse res = memoManageService.findMemosByPetId(petId, pageable);
         return ResponseEntity.ok(SuccessResponse.from(res));

diff --git a/src/main/java/com/kcy/fitapet/domain/memo/dao/MemoQueryDslRepository.java b/src/main/java/com/kcy/fitapet/domain/memo/dao/MemoQueryDslRepository.java
@@ -9,6 +9,6 @@
 
 public interface MemoQueryDslRepository {
     Optional<MemoInfoDto.MemoInfo> findMemoAndMemoImageUrlsById(Long memoId);
-    Slice<MemoInfoDto.MemoInfo> findMemosInMemoCategory(Long memoCategoryId, Pageable pageable, String target);
-    Slice<MemoInfoDto.MemoInfo> findMemosByPetId(Long petId, Pageable pageable);
+    Slice<MemoInfoDto.MemoSummaryInfo> findMemosInMemoCategory(Long memoCategoryId, Pageable pageable, String target);
+    Slice<MemoInfoDto.MemoSummaryInfo> findMemosByPetId(Long petId, Pageable pageable);
 }
diff --git a/src/main/java/com/kcy/fitapet/domain/memo/dao/MemoQueryDslRepositoryImpl.java b/src/main/java/com/kcy/fitapet/domain/memo/dao/MemoQueryDslRepositoryImpl.java
@@ -7,6 +7,7 @@
 import com.kcy.fitapet.global.common.util.querydsl.QueryDslUtil;
 import com.kcy.fitapet.global.common.util.querydsl.RepositorySliceHelper;
 import com.querydsl.core.ResultTransformer;
+import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
@@ -21,7 +22,7 @@
 import java.util.Optional;
 
 import static com.querydsl.core.group.GroupBy.groupBy;
-import static com.querydsl.core.types.Projections.list;
+import static com.querydsl.core.group.GroupBy.list;
 
 @Repository
 @RequiredArgsConstructor
@@ -34,28 +35,32 @@ public class MemoQueryDslRepositoryImpl implements MemoQueryDslRepository {
 
     @Override
     public Optional<MemoInfoDto.MemoInfo> findMemoAndMemoImageUrlsById(Long memoId) {
-        return Optional.of(queryFactory
-                .select(
-                        Projections.constructor(
-                                MemoInfoDto.MemoInfo.class,
-                                memo.id,
-                                memoCategory.categoryName,
-                                QueryDslUtil.left(memo.title, Expressions.constant(19)),
-                                QueryDslUtil.left(memo.content, Expressions.constant(16)),
-                                memo.createdAt,
-                                list(
-                                        Projections.constructor(
-                                                MemoInfoDto.MemoImageInfo.class,
-                                                memoImage.id,
-                                                memoImage.imgUrl
-                                        ).skipNulls()
-                                ).skipNulls()
-                        )
-                )
+        List<MemoInfoDto.MemoInfo> result = queryFactory
                 .from(memo)
+                .leftJoin(memoCategory).on(memoCategory.id.eq(memo.memoCategory.id))
                 .leftJoin(memoImage).on(memo.id.eq(memoImage.memo.id))
                 .where(memo.id.eq(memoId))
-                .fetchFirst());
+                .transform(
+                        groupBy(memoCategory.id, memo.id).list(
+                                Projections.constructor(
+                                        MemoInfoDto.MemoInfo.class,
+                                        memo.id,
+                                        memoCategory.categoryName,
+                                        memo.title,
+                                        memo.content,
+                                        memo.createdAt,
+                                        list(
+                                                Projections.constructor(
+                                                        MemoInfoDto.MemoImageInfo.class,
+                                                        memoImage.id,
+                                                        memoImage.imgUrl
+                                                ).skipNulls()
+                                        )
+                                )
+                        )
+                );
+
+        return result.isEmpty() ? Optional.empty() : Optional.of(result.get(0));
     }
 
     /**
@@ -81,8 +86,8 @@ public Optional<MemoInfoDto.MemoInfo> findMemoAndMemoImageUrlsById(Long memoId)
      * </pre>
      */
     @Override
-    public Slice<MemoInfoDto.MemoInfo> findMemosInMemoCategory(Long memoCategoryId, Pageable pageable, String target) {
-         List<MemoInfoDto.MemoInfo> results = queryFactory
+    public Slice<MemoInfoDto.MemoSummaryInfo> findMemosInMemoCategory(Long memoCategoryId, Pageable pageable, String target) {
+         List<MemoInfoDto.MemoSummaryInfo> results = queryFactory
                 .from(memo)
                 .leftJoin(memoImage).on(memoImage.memo.id.eq(memo.id))
                 .where(memo.id.in(
@@ -104,8 +109,8 @@ public Slice<MemoInfoDto.MemoInfo> findMemosInMemoCategory(Long memoCategoryId,
     }
 
     @Override
-    public Slice<MemoInfoDto.MemoInfo> findMemosByPetId(Long petId, Pageable pageable) {
-        List<MemoInfoDto.MemoInfo> results = queryFactory
+    public Slice<MemoInfoDto.MemoSummaryInfo> findMemosByPetId(Long petId, Pageable pageable) {
+        List<MemoInfoDto.MemoSummaryInfo> results = queryFactory
                 .from(memoCategory)
                 .leftJoin(memo).on(memo.memoCategory.id.eq(memoCategory.id))
                 .leftJoin(memoImage).on(memoImage.memo.id.eq(memo.id))
@@ -125,10 +130,10 @@ public Slice<MemoInfoDto.MemoInfo> findMemosByPetId(Long petId, Pageable pageabl
         return RepositorySliceHelper.toSlice(results, pageable);
     }
 
-    private ResultTransformer<List<MemoInfoDto.MemoInfo>> createMemoInfoDtoResultTransformer() {
+    private ResultTransformer<List<MemoInfoDto.MemoSummaryInfo>> createMemoInfoDtoResultTransformer() {
         return groupBy(memo.id).list(
                 Projections.constructor(
-                        MemoInfoDto.MemoInfo.class,
+                        MemoInfoDto.MemoSummaryInfo.class,
                         memo.id,
                         queryFactory.select(memoCategory.categoryName).from(memoCategory).where(memoCategory.id.eq(memo.memoCategory.id)),
                         QueryDslUtil.left(memo.title, Expressions.constant(19)),
@@ -139,8 +144,13 @@ private ResultTransformer<List<MemoInfoDto.MemoInfo>> createMemoInfoDtoResultTra
                                         MemoInfoDto.MemoImageInfo.class,
                                         memoImage.id,
                                         memoImage.imgUrl
-                                ).skipNulls()
-                        ).skipNulls()
+                                )
+                        ).getExpression()
+//                        Projections.constructor( // TODO: 2024-02-02 : memoImage 결과가 여러 개일 때, 어떤 결과를 반환하는지? LIMIT을 밖으로 빼도 되는지?
+//                                MemoInfoDto.MemoImageInfo.class,
+//                                memoImage.id,
+//                                memoImage.imgUrl
+//                        )
                 )
         );
     }

diff --git a/src/main/java/com/kcy/fitapet/domain/memo/dto/MemoInfoDto.java b/src/main/java/com/kcy/fitapet/domain/memo/dto/MemoInfoDto.java
@@ -1,6 +1,7 @@
 package com.kcy.fitapet.domain.memo.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.kcy.fitapet.domain.memo.domain.Memo;
@@ -11,9 +12,11 @@
 import lombok.Getter;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Slice;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 @Getter
 public class MemoInfoDto {
@@ -42,31 +45,55 @@ public record MemoInfo(
         public MemoInfo(Long memoId, String categorySuffix, String title, String content, LocalDateTime createdAt, List<MemoImageInfo> memoImages) {
             this.memoId = memoId;
             this.categorySuffix = categorySuffix;
-            this.title = title.length() == 19 ? title + "..." : title;
-            this.content = content.length() == 16 ? content + "..." : content;
+            this.title = title;
+            this.content = content;
             this.createdAt = createdAt;
             this.memoImages = (memoImages == null) ? List.of() : memoImages;
         }
     }
 
+    @Builder
+    @Dto(name = "memo")
+    public record MemoSummaryInfo(
+            Long memoId,
+            String categorySuffix,
+            String title,
+            String content,
+            @JsonSerialize(using = LocalDateTimeSerializer.class)
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            LocalDateTime createdAt,
+            MemoImageInfo memoImage
+    ) {
+        public MemoSummaryInfo(Long memoId, String categorySuffix, String title, String content, LocalDateTime createdAt, MemoImageInfo memoImage) {
+            this.memoId = memoId;
+            this.categorySuffix = categorySuffix;
+            this.title = title.length() == 19 ? title + "..." : title;
+            this.content = content.length() == 16 ? content.replace("\n", "  ") + "..." : content.replace("\n", "  ");
+            this.createdAt = createdAt;
+            this.memoImage = memoImage;
+        }
+    }
+
     public record MemoImageInfo(
+            @JsonInclude(JsonInclude.Include.NON_NULL)
             Long memoImageId,
+            @JsonInclude(JsonInclude.Include.NON_EMPTY)
             String imgUrl
     ) {
         public MemoImageInfo(Long memoImageId, String imgUrl) {
             this.memoImageId = memoImageId;
-            this.imgUrl = imgUrl;
+            this.imgUrl = Objects.toString(imgUrl, "");
         }
     }
 
     public record PageResponse(
-            @Schema(description = "메모 목록") List<MemoInfo> memos,
+            @Schema(description = "메모 목록") List<?> memos,
             @Schema(description = "현재 페이지") int currentPageNumber,
             @Schema(description = "페이지 크기") int pageSize,
             @Schema(description = "현재 페이지의 데이터 개수") int numberOfElements,
             @Schema(description = "다음 페이지 존재 여부") boolean hasNext
     ) {
-        public static PageResponse from(@NotNull Slice<MemoInfo> page) {
+        public static PageResponse from(@NotNull Slice<?> page) {
             return new PageResponse(page.getContent(), page.getPageable().getPageNumber(), page.getPageable().getPageSize(), page.getNumberOfElements(), page.hasNext());
         }
     }

diff --git a/src/main/java/com/kcy/fitapet/domain/memo/service/module/MemoSearchService.java b/src/main/java/com/kcy/fitapet/domain/memo/service/module/MemoSearchService.java
@@ -76,14 +76,14 @@ public MemoInfoDto.MemoInfo findMemoAndMemoImageUrlsById(Long memoId) {
 
     @Transactional(readOnly = true)
     public MemoInfoDto.PageResponse findMemosInMemoCategory(Long memoCategoryId, Pageable pageable, String target) {
-        Slice<MemoInfoDto.MemoInfo> page = memoRepository.findMemosInMemoCategory(memoCategoryId, pageable, target);
+        Slice<MemoInfoDto.MemoSummaryInfo> page = memoRepository.findMemosInMemoCategory(memoCategoryId, pageable, target);
 
         return MemoInfoDto.PageResponse.from(page);
     }
 
     @Transactional(readOnly = true)
     public MemoInfoDto.PageResponse findMemosByPetId(Long petId, Pageable pageable) {
-        Slice<MemoInfoDto.MemoInfo> page = memoRepository.findMemosByPetId(petId, pageable);
+        Slice<MemoInfoDto.MemoSummaryInfo> page = memoRepository.findMemosByPetId(petId, pageable);
 
         return MemoInfoDto.PageResponse.from(page);
     }

diff --git a/src/main/java/com/kcy/fitapet/domain/oauth/dao/OauthRepository.java b/src/main/java/com/kcy/fitapet/domain/oauth/dao/OauthRepository.java
@@ -8,7 +8,7 @@
 import java.util.Optional;
 
 public interface OauthRepository extends ExtendedJpaRepository<OauthAccount, Long> {
-    Optional<OauthAccount> findByOauthIdAndProvider(BigInteger oauthId, ProviderType provider);
-    boolean existsByOauthIdAndProvider(BigInteger oauthId, ProviderType provider);
+    Optional<OauthAccount> findByOauthIdAndProvider(String oauthId, ProviderType provider);
+    boolean existsByOauthIdAndProvider(String oauthId, ProviderType provider);
     boolean existsByEmail(String email);
 }