From e992e999b4de82ed5e727e5bf37bfc081c417ca5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 10 1월 2022 11:47:50 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java |   38 +++++++++++++++-----------------------
 1 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
index 60a23f1..c0e3290 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiOperation;
 import kr.wisestone.owl.constant.MsgConstants;
 import kr.wisestone.owl.domain.Issue;
+import kr.wisestone.owl.exception.ApiParameterException;
 import kr.wisestone.owl.exception.OwlRuntimeException;
 import kr.wisestone.owl.service.IssueService;
 import kr.wisestone.owl.util.ConvertUtil;
@@ -11,8 +12,10 @@
 import kr.wisestone.owl.web.form.ApiIssueAddForm;
 import kr.wisestone.owl.web.form.ApiIssueModifyForm;
 import kr.wisestone.owl.web.form.IssueApiForm;
-import org.json.simple.parser.ParseException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,6 +37,7 @@
 
 
     /**
+     * �씠�뒋 異붽�
      * @param apiIssueAddForm �엯�젰 �뤌 �뜲�씠�꽣
      * @param files �뙆�씪
      * @return JSON
@@ -42,20 +46,22 @@
      */
     @PostMapping(value = "/issue")
     @ApiOperation(value = "�씠�뒋 異붽�", notes = "�깉濡쒖슫 �씠�뒋瑜� 異붽��븳�떎.")
-    @ApiImplicitParam(name = "files", required = false, dataType = "file")
+    @ApiImplicitParam(name = "files", dataType = "file")
+    @ResponseStatus(HttpStatus.CREATED)
     public
     @ResponseBody
-    Map<String, Object> addIssue(ApiIssueAddForm apiIssueAddForm, @RequestParam("files") List<MultipartFile> files) throws OwlRuntimeException, CloneNotSupportedException, ParseException {
+    void addIssue(ApiIssueAddForm apiIssueAddForm, @RequestParam("files") List<MultipartFile> files)
+            throws OwlRuntimeException, CloneNotSupportedException {
         Map<String, Object> resJsonData = new HashMap<>();
 
         IssueApiForm issueApiForm = ConvertUtil.copyProperties(apiIssueAddForm, IssueApiForm.class);
-//        String str = request.getParameter(Constants.REQ_KEY_CONTENT);
+//        String str = request.getParameter(Constants.REQ_KEY_C0NTENT);
         issueApiForm.setMultipartFiles(files);
         issueApiForm.parseCustomFields(apiIssueAddForm.getCustomFields());
         issueApiForm.setApiType(IssueApiForm.ApiType.add);
         // �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�쓣 寃쎌슦 寃��깋�쓣 �븷 �닔 �뾾湲� �븣臾몄뿉 �삁�쇅泥섎━
         if (issueApiForm.getCustomFieldValues() == null || issueApiForm.getCustomFieldValues().size() == 0) {
-            throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_CUSTOM_FIELD_NOT_EXIST));
+            throw new ApiParameterException(this.messageAccessor.getMessage(MsgConstants.API_CUSTOM_FIELD_NOT_EXIST));
         }
 
         List<Issue> issues = this.issueService.addApiIssue(issueApiForm);
@@ -63,21 +69,21 @@
         for (Issue issue : issues) {
             this.issueService.addIssueVersion(issue.getId(), issue.getRegisterId());
         }
-
-        return this.setSuccessMessage(resJsonData);
     }
 
     /**
+     * �씠�뒋 �긽�깭 �닔�젙
      * @param apiIssueModifyForm �닔�젙 �뤌 �뜲�씠�꽣
      * @return JSON
      * @throws OwlRuntimeException �뙆�씪誘명꽣 �삤瑜섏떆 諛쒖깮
      * @throws CloneNotSupportedException �씠�뒋 蹂듭궗 �떆�뿉 諛쒖깮
      */
-    @PostMapping(value = "/issue/1")
+    @PutMapping(value = "/issue")
     @ApiOperation(value = "�씠�뒋 �긽�깭 �닔�젙", notes = "�궗�슜�옄 �젙�쓽 �븘�뱶媛� �룞�씪�븳 湲곗〈 �씠�뒋瑜� 蹂�寃쏀븳�떎.")
+    @ResponseStatus(HttpStatus.OK)
     public
     @ResponseBody
-    Map<String, Object> modifyIssue(ApiIssueModifyForm apiIssueModifyForm) throws OwlRuntimeException, CloneNotSupportedException, ParseException {
+    void modifyIssue(ApiIssueModifyForm apiIssueModifyForm) throws OwlRuntimeException, CloneNotSupportedException {
         Map<String, Object> resJsonData = new HashMap<>();
 
         IssueApiForm issueApiForm = ConvertUtil.copyProperties(apiIssueModifyForm, IssueApiForm.class);
@@ -89,20 +95,6 @@
         }
 
         this.issueService.modifyIssue(issueApiForm, new ArrayList<>());
-
-        return this.setSuccessMessage(resJsonData);
     }
-
-    //  �씠�뒋 議고쉶
-//    @RequestMapping(value = "/api/issueList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-//    public
-//    @ResponseBody
-//    Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
-//        Map<String, Object> resJsonData = new HashMap<>();
-//        Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
-//
-//        // todo
-//        return this.setSuccessMessage(resJsonData);
-//    }
 }
 

--
Gitblit v1.8.0