From c88104169bc4fe457f98f33a91574c4dd33da573 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 금, 03 12월 2021 20:08:01 +0900 Subject: [PATCH] - api 입력 오류 수정 - api 기본값 및 중복 설정 적용 수정 --- src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java index 5d4c383..f056a56 100644 --- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java +++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java @@ -1,15 +1,12 @@ package kr.wisestone.owl.web.controller; import kr.wisestone.owl.constant.Constants; +import kr.wisestone.owl.constant.MsgConstants; import kr.wisestone.owl.domain.Issue; -import kr.wisestone.owl.service.GuideService; +import kr.wisestone.owl.exception.OwlRuntimeException; import kr.wisestone.owl.service.IssueService; import kr.wisestone.owl.util.ConvertUtil; -import kr.wisestone.owl.util.MapUtil; -import kr.wisestone.owl.web.condition.GuideCondition; -import kr.wisestone.owl.web.form.GuideForm; import kr.wisestone.owl.web.form.IssueApiForm; -import kr.wisestone.owl.web.form.IssueForm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.MediaType; @@ -45,13 +42,21 @@ @RequestMapping(value = "api/issue", method = RequestMethod.POST) public @ResponseBody - Map<String, Object> addIssue(MultipartHttpServletRequest request) throws Exception { + Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException { Map<String, Object> resJsonData = new HashMap<>(); IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT)), request.getFiles("file")); - Issue issue = this.issueService.addApiIssue(issueForm); - // 踰꾩쟾 �깮�꽦 - this.issueService.addIssueVersion(issue.getId()); + if (issueForm == null) { + throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ERROR)); + } + if (issueForm.getApiType() == IssueApiForm.ApiType.add) { + Issue issue = this.issueService.addApiIssue(issueForm); + // 踰꾩쟾 �깮�꽦 + this.issueService.addIssueVersion(issue.getId()); + } else { + this.issueService.modifyIssue(issueForm, request.getFiles("file")); + } + return this.setSuccessMessage(resJsonData); } -- Gitblit v1.8.0