Merge branch 'develop' into fix/101-change-timeline-cursor

module-presentation/build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    testImplementation 'org.springframework.security:spring-security-test'
 
     // swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'

module-presentation/src/main/java/com/depromeet/memory/dto/request/TimelineRequestDto.java

@@ -8,6 +8,8 @@
 
 @Getter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TimelineRequestDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "최초 조회 이후 나온 timeline 리스트 중 가장 마지막 요소의 memory recordAt")

module-presentation/src/main/java/com/depromeet/pool/service/PoolServiceImpl.java

@@ -1,7 +1,5 @@
 package com.depromeet.pool.service;
 
-import static com.depromeet.pool.service.PoolValidator.*;
-
 import com.depromeet.exception.NotFoundException;
 import com.depromeet.member.Member;
 import com.depromeet.member.repository.MemberRepository;
@@ -86,10 +84,4 @@ private Pool getPool(Long poolId) {
                 .findById(poolId)
                 .orElseThrow(() -> new NotFoundException(PoolErrorType.NOT_FOUND));
     }
-
-    private FavoritePool getFavoritePool(Long favoritePoolId) {
-        return poolRepository
-                .findFavoritePoolById(favoritePoolId)
-                .orElseThrow(() -> new NotFoundException(PoolErrorType.FAVORITE_NOT_FOUND));
-    }
 }

module-presentation/src/test/java/com/depromeet/memory/config/ControllerTestConfig.java

@@ -0,0 +1,29 @@
+package com.depromeet.memory.config;
+
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@SpringJUnitWebConfig
+public abstract class ControllerTestConfig {
+    @Autowired protected WebApplicationContext webApplicationContext;
+    protected MockMvc mockMvc;
+
+    @BeforeEach
+    void setUp() {
+        this.mockMvc =
+                MockMvcBuilders.webAppContextSetup(webApplicationContext)
+                        .apply(springSecurity())
+                        .defaultRequest(post("/**").with(csrf()))
+                        .defaultRequest(patch("/**").with(csrf()))
+                        .defaultRequest(delete("/**").with(csrf()))
+                        .build();
+    }
+}

module-presentation/src/test/java/com/depromeet/memory/controller/MemoryControllerTest.java

@@ -0,0 +1,116 @@
+package com.depromeet.memory.controller;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+import com.depromeet.memory.api.MemoryController;
+import com.depromeet.memory.config.ControllerTestConfig;
+import com.depromeet.memory.facade.MemoryFacade;
+import com.depromeet.memory.mock.WithCustomMockMember;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+
+@WebMvcTest(MemoryController.class)
+public class MemoryControllerTest extends ControllerTestConfig {
+    @Autowired private ObjectMapper objectMapper;
+
+    @MockBean MemoryFacade memoryFacade;
+
+    @Test
+    @WithCustomMockMember
+    void 수영기록을_생성합니다() throws Exception {
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("poolId", 1);
+        requestBody.put("item", "오리발");
+        requestBody.put("heartRate", 115);
+        requestBody.put("pace", "05:00:00");
+        requestBody.put("kcal", 300);
+        requestBody.put("recordAt", "2024-07-24");
+        requestBody.put("startTime", "11:00:00");
+        requestBody.put("endTime", "11:50:00");
+        requestBody.put("lane", 25);
+        requestBody.put("diary", "일기를 기록한다");
+
+        List<Map<String, Object>> strokes = new ArrayList<>();
+        Map<String, Object> stroke = new HashMap<>();
+        stroke.put("name", "자유형");
+        stroke.put("laps", 3);
+        stroke.put("meter", 150);
+        strokes.add(stroke);
+
+        requestBody.put("strokes", strokes);
+
+        List<Long> imageIdList = new ArrayList<>();
+        requestBody.put("imageIdList", imageIdList);
+
+        mockMvc.perform(
+                        post("/api/memory")
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .content(objectMapper.writeValueAsString(requestBody)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("MEMORY_1"))
+                .andExpect(jsonPath("$.message").value("수영 기록 저장에 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    public void 수영기록을_조회합니다() throws Exception {
+        mockMvc.perform(get("/api/memory/{memoryId}", 1))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("MEMORY_2"))
+                .andExpect(jsonPath("$.message").value("수영 기록 조회에 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    public void 수영기록을_갱신합니다() throws Exception {
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("poolId", 1);
+        requestBody.put("recordAt", "2024-07-24");
+        requestBody.put("startTime", "11:00:00");
+        requestBody.put("endTime", "11:50:00");
+        mockMvc.perform(
+                        patch("/api/memory/{memoryId}", 1)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .content(objectMapper.writeValueAsString(requestBody)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("MEMORY_3"))
+                .andExpect(jsonPath("$.message").value("수영 기록 수정에 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    public void 수영기록_타임라인을_조회합니다() throws Exception {
+        mockMvc.perform(
+                        get("/api/memory/timeline")
+                                .param("cursorId", "1L")
+                                .param("date", "2024-07")
+                                .param("size", "5"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("MEMORY_4"))
+                .andExpect(jsonPath("$.message").value("타임라인 조회에 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    public void 수영기록_캘린더를_조회합니다() throws Exception {
+        mockMvc.perform(get("/api/memory/calendar").param("yearMonth", "2024-07"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("MEMORY_5"))
+                .andExpect(jsonPath("$.message").value("캘린더 조회에 성공하였습니다"))
+                .andDo(print());
+    }
+}

module-presentation/src/test/java/com/depromeet/memory/controller/PoolControllerTest.java

@@ -0,0 +1,77 @@
+package com.depromeet.memory.controller;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+import com.depromeet.memory.config.ControllerTestConfig;
+import com.depromeet.memory.mock.WithCustomMockMember;
+import com.depromeet.pool.api.PoolController;
+import com.depromeet.pool.service.PoolService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.mockito.BDDMockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+
+@WebMvcTest(PoolController.class)
+public class PoolControllerTest extends ControllerTestConfig {
+    @Autowired private ObjectMapper objectMapper;
+
+    @MockBean PoolService poolService;
+
+    @Test
+    @WithCustomMockMember
+    void 이름쿼리로_수영장을_조회합니다() throws Exception {
+        mockMvc.perform(get("/api/pool/search").param("nameQuery", "검색인자"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("POOL_1"))
+                .andExpect(jsonPath("$.message").value("수영장 검색을 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    void 즐겨찾기_수영장_및_최근_검색_수영장을_조회합니다() throws Exception {
+        mockMvc.perform(get("/api/pool/search/initial"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("POOL_2"))
+                .andExpect(jsonPath("$.message").value("즐겨찾기 및 최근 검색 수영장 조회를 성공하였습니다"))
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    void 수영장을_즐겨찾기에_등록합니다() throws Exception {
+        Map<String, Long> requestBody = new HashMap<>();
+        requestBody.put("poolId", 1L);
+        BDDMockito.given(poolService.putFavoritePool(any(), any())).willReturn("1");
+
+        mockMvc.perform(
+                        put("/api/pool/favorite")
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .content(objectMapper.writeValueAsString(requestBody)))
+                .andExpect(status().isCreated())
+                .andDo(print());
+    }
+
+    @Test
+    @WithCustomMockMember
+    void 수영장을_즐겨찾기에서_삭제합니다() throws Exception {
+        Map<String, Long> requestBody = new HashMap<>();
+        requestBody.put("poolId", 1L);
+        BDDMockito.given(poolService.putFavoritePool(any(), any())).willReturn(null);
+
+        mockMvc.perform(
+                        put("/api/pool/favorite")
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .content(objectMapper.writeValueAsString(requestBody)))
+                .andExpect(status().isNoContent())
+                .andDo(print());
+    }
+}

module-presentation/src/test/java/com/depromeet/memory/fixture/MemberFixture.java

@@ -0,0 +1,16 @@
+package com.depromeet.memory.fixture;
+
+import com.depromeet.member.Member;
+import com.depromeet.member.MemberRole;
+
+public class MemberFixture {
+    public static Member make(Long userId, String role) {
+        return Member.builder()
+                .id(userId)
+                .name("member")
+                .email("test@gmail.com")
+                .role(MemberRole.valueOf(role))
+                .goal(1000)
+                .build();
+    }
+}

module-presentation/src/test/java/com/depromeet/memory/fixture/PoolFixture.java

@@ -0,0 +1,9 @@
+package com.depromeet.memory.fixture;
+
+import com.depromeet.pool.Pool;
+
+public class PoolFixture {
+    public static Pool make(String name, String address, Integer lane) {
+        return Pool.builder().name(name).address(address).lane(lane).build();
+    }
+}

module-presentation/src/test/java/com/depromeet/memory/mock/FakePoolRepository.java

@@ -9,27 +9,35 @@
 import java.util.Optional;
 
 public class FakePoolRepository implements PoolRepository {
-    private Long autoGeneratedId = 0L;
-    private final List<Pool> data = new ArrayList<>();
+    private Long poolAutoGeneratedId = 0L;
+    private Long favoritePoolAutoGeneratedId = 0L;
+    private Long poolSerachAutoGeneratedId = 0L;
+    private final List<Pool> poolData = new ArrayList<>();
+    private final List<FavoritePool> favoritePoolData = new ArrayList<>();
+    private final List<PoolSearch> poolSearchData = new ArrayList<>();
 
     @Override
     public List<Pool> findPoolsByName(String nameQuery) {
-        return data.stream().filter(item -> item.getName().contains(nameQuery)).limit(3).toList();
+        return poolData.stream().filter(item -> item.getName().contains(nameQuery)).toList();
     }
 
     @Override
     public List<FavoritePool> findFavoritePools(Long memberId) {
-        return null;
+        return favoritePoolData.stream()
+                .filter(item -> item.getMember().getId().equals(memberId))
+                .toList();
     }
 
     @Override
     public List<PoolSearch> findSearchedPools(Long memberId) {
-        return null;
+        return poolSearchData.stream()
+                .filter(item -> item.getMember().getId().equals(memberId))
+                .toList();
     }
 
     @Override
     public Optional<Pool> findById(Long poolId) {
-        return data.stream().filter(item -> item.getId().equals(poolId)).findAny();
+        return poolData.stream().filter(item -> item.getId().equals(poolId)).findAny();
     }
 
     @Override
@@ -39,24 +47,57 @@ public Optional<FavoritePool> findFavoritePoolById(Long favoritePoolId) {
 
     @Override
     public Pool save(Pool pool) {
-        return null;
+        Pool newPool =
+                Pool.builder()
+                        .id(++poolAutoGeneratedId)
+                        .name(pool.getName())
+                        .address(pool.getAddress())
+                        .lane(pool.getLane())
+                        .build();
+        poolData.add(newPool);
+        return newPool;
     }
 
     @Override
     public PoolSearch savePoolSearch(PoolSearch poolSearch) {
-        return null;
+        PoolSearch newPoolSearch =
+                PoolSearch.builder()
+                        .id(++poolSerachAutoGeneratedId)
+                        .pool(poolSearch.getPool())
+                        .member(poolSearch.getMember())
+                        .build();
+        poolSearchData.add(newPoolSearch);
+        return newPoolSearch;
     }
 
     @Override
     public FavoritePool saveFavoritePool(FavoritePool favoritePool) {
-        return null;
+        FavoritePool newFavoritePool =
+                FavoritePool.builder()
+                        .id(++favoritePoolAutoGeneratedId)
+                        .pool(favoritePool.getPool())
+                        .member(favoritePool.getMember())
+                        .build();
+        favoritePoolData.add(newFavoritePool);
+        return newFavoritePool;
     }
 
     @Override
     public boolean existsFavoritePool(FavoritePool favoritePool) {
-        return false;
+        return favoritePoolData.stream()
+                .anyMatch(
+                        item ->
+                                item.getPool().getId().equals(favoritePool.getPool().getId())
+                                        && item.getMember()
+                                                .getId()
+                                                .equals(favoritePool.getMember().getId()));
     }
 
     @Override
-    public void deleteFavoritePool(FavoritePool favoritePool) {}
+    public void deleteFavoritePool(FavoritePool favoritePool) {
+        favoritePoolData.removeIf(
+                it ->
+                        it.getPool().getId().equals(favoritePool.getPool().getId())
+                                && it.getMember().getId().equals(favoritePool.getMember().getId()));
+    }
 }