Merge pull request #4 from mijin0721/devepole

메뉴 품절 여부 컬럼 추가 및 공지사항 삭제 service 수정

src/main/java/com/hallym/festival/domain/menu/controller/MenuController.java

@@ -39,4 +39,10 @@ public Map<String, String> deleteMenu(@PathVariable(name = "mno") Long mno) {
         String result = menuService.delete(mno);
         return Map.of("result", result);
     }
+
+    @PutMapping("sell/{mno}")
+    public Map<String, String> modifySell(@PathVariable(name = "mno") Long mno) {
+        String result = menuService.modifySoldOut(mno);
+        return Map.of("result", result);
+    }
 }

src/main/java/com/hallym/festival/domain/menu/dto/MenuRequestDto.java

@@ -1,6 +1,7 @@
 package com.hallym.festival.domain.menu.dto;
 
 import com.hallym.festival.domain.booth.entity.Booth;
+import com.hallym.festival.domain.menu.entity.MenuSell;
 import lombok.*;
 
 
@@ -14,4 +15,5 @@ public class MenuRequestDto {
     private Long price;
     private Boolean is_deleted;
     private Booth booth;
+    private MenuSell menuSell;
 }

src/main/java/com/hallym/festival/domain/menu/dto/MeunResponseDto.java

@@ -1,5 +1,6 @@
 package com.hallym.festival.domain.menu.dto;
 
+import com.hallym.festival.domain.menu.entity.MenuSell;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,4 +14,5 @@ public class MeunResponseDto {
     private Long mno;
     private String name;
     private Long price;
+    private MenuSell menuSell;
 }

src/main/java/com/hallym/festival/domain/menu/entity/Menu.java

@@ -35,10 +35,17 @@ public class Menu extends BaseTimeEntity {
     @JoinColumn(name = "bno")
     private Booth booth;
 
+    @Enumerated(EnumType.STRING)
+    private MenuSell menuSell;
+
     public void setIs_deleted(Boolean is_deleted) {
         this.is_deleted = is_deleted;
     }
 
+    public void setMenuSell(MenuSell menuSell) {
+        this.menuSell = menuSell;
+    }
+
     public void updateMenu(Menu menu) {
         this.name = menu.name;
         this.price = menu.price;

src/main/java/com/hallym/festival/domain/menu/entity/MenuSell.java

@@ -0,0 +1,12 @@
+package com.hallym.festival.domain.menu.entity;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+public enum MenuSell {
+    SOID, SELL;
+
+    @JsonCreator
+    public static MenuSell from(String s) {
+        return MenuSell.valueOf(s);
+    }
+}

src/main/java/com/hallym/festival/domain/menu/service/MenuService.java

@@ -14,4 +14,6 @@ public interface MenuService {
     MeunResponseDto modify(Long mno, MenuRequestDto MenuRequestDto);
 
     String delete(Long mno);
+
+    String modifySoldOut(Long mno);
 }

src/main/java/com/hallym/festival/domain/menu/service/MenuServicelmpl.java

@@ -5,6 +5,7 @@
 import com.hallym.festival.domain.menu.dto.MenuRequestDto;
 import com.hallym.festival.domain.menu.dto.MeunResponseDto;
 import com.hallym.festival.domain.menu.entity.Menu;
+import com.hallym.festival.domain.menu.entity.MenuSell;
 import com.hallym.festival.domain.menu.repository.MenuRepository;
 import com.hallym.festival.global.exception.WrongBoothId;
 import lombok.RequiredArgsConstructor;
@@ -26,8 +27,9 @@ public class MenuServicelmpl implements MenuService {
     @Transactional
     public MeunResponseDto create(Long bno, MenuRequestDto menuRequestDto) {
         Optional<Booth> booth = boothRepository.findById(bno);
-        menuRequestDto.setBooth(booth.get());
         Menu newMenu = modelMapper.map(menuRequestDto, Menu.class);
+        newMenu.setBooth(booth.get());
+        newMenu.setMenuSell(MenuSell.SELL);
         menuRepository.save(newMenu);
         return modelMapper.map(newMenu, MeunResponseDto.class);
     }
@@ -55,6 +57,24 @@ public String delete(Long mno) {
         return "delete success";
     }
 
+    @Override
+    public String modifySoldOut(Long mno) {
+        Optional<Menu> byMno = menuRepository.findById(mno);
+
+        Menu menu = byMno.orElseThrow();
+
+        if(menu.getMenuSell() == MenuSell.SELL) {
+            menu.setMenuSell(MenuSell.SOID);
+            menuRepository.save(menu);
+            return "Menu is sold out";
+        } else {
+            menu.setMenuSell(MenuSell.SELL);
+            menuRepository.save(menu);
+            return "Menu is sell";
+        }
+    }
+
+
     public List<MeunResponseDto> getMenuList(List<Menu> all) {
         return all.stream().map(menu -> this.toDto(menu)).collect(Collectors.toList());
     }

src/main/java/com/hallym/festival/domain/notice/service/NoticeServicelmpl.java

@@ -15,6 +15,7 @@
 
 import javax.transaction.Transactional;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -55,7 +56,8 @@ public NoticeDto getNotice(Long nno) { //공지사항 상세 조회
     }
 
     public String delete(Long nno) { //공지사항 삭제
-        Notice notice = findByNotice(nno);
+        Optional<Notice> byNno = noticeRepository.findById(nno);
+        Notice notice = byNno.get();
         notice.setIs_deleted(Boolean.TRUE);
         return "delete success";
     }

src/test/java/com/hallym/festival/service/MenuServiceTests.java

@@ -89,4 +89,10 @@ public void testInsertBoothAndMenu() {
         menuService.create(bno, menuRequestDto);
 
     }
+
+    @Test
+    public void testSoldOut() {
+        Long mno = 1L;
+        menuService.modifySoldOut(mno);
+    }
 }