From f88e416eaba5ccf5f0996a72f573428a81bb769f Mon Sep 17 00:00:00 2001 From: bcsd00026 Date: Sun, 9 Feb 2020 22:04:14 +0900 Subject: [PATCH] handle exception if search query is null && fix typo on grant check --- .../java/koreatech/in/controller/LostAndFoundController.java | 2 +- .../java/koreatech/in/controller/MarketPlaceController.java | 2 +- src/main/java/koreatech/in/service/SearchServiceImpl.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/koreatech/in/controller/LostAndFoundController.java b/src/main/java/koreatech/in/controller/LostAndFoundController.java index 189717cb..0ae8723d 100644 --- a/src/main/java/koreatech/in/controller/LostAndFoundController.java +++ b/src/main/java/koreatech/in/controller/LostAndFoundController.java @@ -133,7 +133,7 @@ ResponseEntity deleteLostItemComment(@ApiParam(required = true) @PathVariable(va @RequestMapping(value = "/lost/lostItems/grant/check", method = RequestMethod.POST) public @ResponseBody ResponseEntity checkGrantEditItem(@ApiParam(required = true) @RequestBody Map lostItem_id) throws Exception { - if (lostItem_id == null || !lostItem_id.containsKey("article_id")) + if (lostItem_id == null || !lostItem_id.containsKey("lostItem_id")) throw new PreconditionFailedException(new ErrorMessage("올바르지 않은 데이터입니다.", 0)); return new ResponseEntity>(lostAndFoundService.checkGrantEditLostItem(lostItem_id.get("lostItem_id")), HttpStatus.OK); diff --git a/src/main/java/koreatech/in/controller/MarketPlaceController.java b/src/main/java/koreatech/in/controller/MarketPlaceController.java index 5e2530c1..55de8274 100644 --- a/src/main/java/koreatech/in/controller/MarketPlaceController.java +++ b/src/main/java/koreatech/in/controller/MarketPlaceController.java @@ -130,7 +130,7 @@ ResponseEntity deleteItemComment(@ApiParam(required = true) @PathVariable(value @RequestMapping(value = "/market/items/grant/check", method = RequestMethod.POST) public @ResponseBody ResponseEntity checkGrantEditItem(@ApiParam(required = true) @RequestBody Map item_id) throws Exception { - if (item_id == null || !item_id.containsKey("article_id")) + if (item_id == null || !item_id.containsKey("item_id")) throw new PreconditionFailedException(new ErrorMessage("올바르지 않은 데이터입니다.", 0)); return new ResponseEntity>(marketPlaceService.checkGrantEditItem(item_id.get("item_id")), HttpStatus.OK); diff --git a/src/main/java/koreatech/in/service/SearchServiceImpl.java b/src/main/java/koreatech/in/service/SearchServiceImpl.java index 564244a4..9db7fe9c 100644 --- a/src/main/java/koreatech/in/service/SearchServiceImpl.java +++ b/src/main/java/koreatech/in/service/SearchServiceImpl.java @@ -13,6 +13,7 @@ import koreatech.in.util.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +28,7 @@ public class SearchServiceImpl implements SearchService { private SearchMapper searchMapper; public Map searchShop(SearchCriteria searchCriteria) throws Exception { - if (searchCriteria.getQuery().isEmpty()) + if (!StringUtils.hasText(searchCriteria.getQuery())) throw new PreconditionFailedException(new ErrorMessage("공백으로는 검색할 수 없습니다.", 0)); Map map = new HashMap<>(); @@ -81,7 +82,7 @@ public Map searchShop(SearchCriteria searchCriteria) throws Exce } public Map searchCommunity(SearchCriteria searchCriteria) throws Exception { - if (searchCriteria.getQuery().isEmpty()) + if (!StringUtils.hasText(searchCriteria.getQuery())) throw new PreconditionFailedException(new ErrorMessage("공백으로는 검색할 수 없습니다.", 0)); Map map = new HashMap<>();