[#29] 카페 오픈, 마감 기능 구현

src/main/java/com/flab/cafeguidebook/controller/CafeController.java

@@ -81,7 +81,7 @@ public ResponseEntity getMyCafe(@PathVariable Long cafeId,
   }
 
   @PatchMapping("/{cafeId}")
-  public ResponseEntity updateCafe(@PathVariable long cafeId,
+  public ResponseEntity updateCafe(@PathVariable Long cafeId,
       @RequestBody @Validated CafeDTO cafeDTO, BindingResult bindingResult,
       HttpSession httpSession) {
     Long userId = (Long) httpSession.getAttribute(SessionKeys.USER_ID);
@@ -94,4 +94,28 @@ public ResponseEntity updateCafe(@PathVariable long cafeId,
     cafeService.updateCafe(cafeDTO);
     return ResponseEntity.ok(cafeDTO);
   }
+
+  @PatchMapping("/{cafeId}/open")
+  public ResponseEntity openCafe (@PathVariable Long cafeId, HttpSession httpSession){
+    Long userId = (Long) httpSession.getAttribute(SessionKeys.USER_ID);
+    boolean openCafe = cafeService.openCafe(cafeId);
+    if (!openCafe) {
+      LOGGER.info("카페를 오픈할 수 없습니다. userId = {}, cafeId = {}", userId, cafeId);
+      return ResponseEntity.badRequest().build();
+    } else {
+      return ResponseEntity.ok().build();
+    }
+  }
+
+  @PatchMapping("/{cafeId}/close")
+  public ResponseEntity closeCafe (@PathVariable Long cafeId, HttpSession httpSession){
+    Long userId = (Long) httpSession.getAttribute(SessionKeys.USER_ID);
+    boolean closeCafe = cafeService.closeCafe(cafeId);
+    if (!closeCafe) {
+      LOGGER.info("카페를 마감할 수 없습니다. userId = {}, cafeId = {}", userId, cafeId);
+      return ResponseEntity.badRequest().build();
+    } else {
+      return ResponseEntity.ok().build();
+    }
+  }
 }

src/main/java/com/flab/cafeguidebook/domain/Cafe.java

@@ -3,7 +3,6 @@
 import com.flab.cafeguidebook.enumeration.CafeCondition;
 import com.flab.cafeguidebook.enumeration.CafeRegistration;
 import java.time.LocalDateTime;
-import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class Cafe {
 

src/main/java/com/flab/cafeguidebook/mapper/CafeMapper.java

@@ -2,6 +2,7 @@
 
 import com.flab.cafeguidebook.domain.Cafe;
 import com.flab.cafeguidebook.dto.CafeDTO;
+import com.flab.cafeguidebook.enumeration.CafeCondition;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.flab.cafeguidebook.enumeration.CafeRegistration;
@@ -25,4 +26,8 @@ public interface CafeMapper {
   public int updateRegistration(@Param("id") Long id,
       @Param("registration") CafeRegistration registration);
 
+  public int openCafe(@Param("cafeId") long cafeId, @Param("cafeCondition") CafeCondition cafeCondition);
+
+  public int closeCafe(@Param("cafeId") long cafeId, @Param("cafeCondition") CafeCondition cafeCondition);
+
 }

src/main/java/com/flab/cafeguidebook/service/CafeService.java

@@ -2,6 +2,7 @@
 
 import com.flab.cafeguidebook.converter.CafeConverter.CafeDTOToCafeConverter;
 import com.flab.cafeguidebook.dto.CafeDTO;
+import com.flab.cafeguidebook.enumeration.CafeCondition;
 import com.flab.cafeguidebook.enumeration.CafeRegistration;
 import com.flab.cafeguidebook.mapper.CafeMapper;
 import java.util.List;
@@ -42,4 +43,14 @@ public boolean updateCafe(CafeDTO cafeDTO) {
     int updateCafe = cafeMapper.updateCafe(cafeDTOToCafeConverter.convert(cafeDTO));
     return updateCafe == 1;
   }
+
+  public boolean openCafe(Long cafeId) {
+    int openCafe = cafeMapper.openCafe(cafeId, CafeCondition.OPEN);
+    return openCafe == 1;
+  }
+
+  public boolean closeCafe(Long cafeId) {
+    int closeCafe = cafeMapper.closeCafe(cafeId, CafeCondition.CLOSE);
+    return closeCafe == 1;
+  }
 }

src/main/resources/mybatis/mapper/CafeMapper.xml

@@ -39,28 +39,27 @@
             #{withPet},
             #{cafeCondition},
             #{cafeRegistration})
+    <selectKey resultType="long" keyProperty="cafeId" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
-
   <select id="selectMyAllCafe" parameterType="long"
     resultType="com.flab.cafeguidebook.dto.CafeDTO">
     SELECT *
     FROM CAFE
     WHERE user_id = #{userId}
   </select>
-
   <select id="selectMyCafe" resultType="com.flab.cafeguidebook.dto.CafeDTO"
     parameterType="map">
     SELECT *
     FROM CAFE
     WHERE cafe_id = #{cafeId}
       AND user_id = #{userId}
   </select>
-
   <delete id="deleteAllCafe">
     DELETE
     FROM CAFE;
   </delete>
-
   <update id="updateCafe" parameterType="com.flab.cafeguidebook.dto.CafeDTO">
     UPDATE CAFE
     SET
@@ -79,11 +78,19 @@
     update_date = now()
     WHERE cafe_id = #{cafeId}
   </update>
-
+  <update id="openCafe">
+    UPDATE CAFE
+    SET cafe_condition = #{cafeCondition}
+    WHERE cafe_id = #{cafeId}
+  </update>
+  <update id="closeCafe">
+    UPDATE CAFE
+    SET cafe_condition = #{cafeCondition}
+    WHERE cafe_id = #{cafeId}
+  </update>
   <update id="updateRegistration">
-        UPDATE CAFE SET cafe_registration = #{cafeRegistration}
-        WHERE cafe_id = #{cafeId}
-    </update>
-
+    UPDATE CAFE SET cafe_registration = #{cafeRegistration}
+    WHERE cafe_id = #{cafeId}
+  </update>
 </mapper>
 

src/main/resources/mybatis/mapper/OptionMapper.xml

@@ -11,6 +11,9 @@
             #{menuId},
             #{optionPrice},
             #{optionStatus})
+    <selectKey resultType="long" keyProperty="optionId" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateOption" parameterType="com.flab.cafeguidebook.dto.OptionDTO">
     UPDATE MENUOPTION

src/test/java/com/flab/cafeguidebook/controller/CafeControllerTest.java

@@ -69,6 +69,7 @@ public void addCafe(CafeDTO testCafeDTO) throws Exception {
 
   @Test
   public void getMyAllCafe(List<CafeDTO> testCafeDTOList) throws Exception {
+
     for (int i = 0; i < testCafeDTOList.size(); i++) {
       addCafe(testCafeDTOList.get(i));
     }
@@ -85,12 +86,10 @@ public void getMyAllCafe(List<CafeDTO> testCafeDTOList) throws Exception {
   @Test
   public void updateCafe(CafeDTO testCafeDTO) throws Exception {
 
-    final long CAFEID = 1;
-    testCafeDTO.setCafeId(CAFEID);
     addCafe(testCafeDTO);
 
-    mockMvc.perform(patch("/owner/cafe/" + CAFEID)
-        .sessionAttr("userId", testCafeDTO.getUserId())
+    mockMvc.perform(patch("/owner/cafe/" + testCafeDTO.getCafeId())
+        .sessionAttr(SessionKeys.USER_ID, testCafeDTO.getUserId())
         .contentType(MediaType.APPLICATION_JSON_UTF8)
         .content(objectMapper.writeValueAsString(testCafeDTO))
         .accept(MediaType.APPLICATION_JSON_UTF8))

src/test/java/com/flab/cafeguidebook/service/CafeServiceTest.java

@@ -8,6 +8,7 @@
 
 import com.flab.cafeguidebook.converter.CafeConverter.CafeDTOToCafeConverter;
 import com.flab.cafeguidebook.domain.Cafe;
+import com.flab.cafeguidebook.enumeration.CafeCondition;
 import com.flab.cafeguidebook.fixture.CafeDTOListFixtureProvider;
 import com.flab.cafeguidebook.dto.CafeDTO;
 import com.flab.cafeguidebook.fixture.CafeDTOFixtureProvider;
@@ -80,4 +81,16 @@ public void updateCafe(CafeDTO testCafeDTO, Cafe testCafe) {
     given(cafeMapper.updateCafe(testCafe)).willReturn(1);
     assertThat(cafeService.updateCafe(testCafeDTO)).isEqualTo(true);
   }
+
+  @Test
+  public void openCafe(CafeDTO testCafeDTO) {
+    given(cafeMapper.openCafe(testCafeDTO.getCafeId(), CafeCondition.OPEN)).willReturn(1);
+    assertThat(cafeService.openCafe(testCafeDTO.getCafeId())).isEqualTo(true);
+  }
+
+  @Test
+  public void closeCafe(CafeDTO testCafeDTO) {
+    given(cafeMapper.closeCafe(testCafeDTO.getCafeId(), CafeCondition.CLOSE)).willReturn(1);
+    assertThat(cafeService.closeCafe(testCafeDTO.getCafeId())).isEqualTo(true);
+  }
 }