Index: web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java =================================================================== diff -u -r0d46135d0035bbcc5f203ebaba7023acb37ba83f -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 --- web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 0d46135d0035bbcc5f203ebaba7023acb37ba83f) +++ web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7) @@ -389,7 +389,7 @@ reqStatusDTO.setC_jira_version_title(jiraVerDTOInfo.getC_title()); //REQADD 의 요구사항 아이디, 타이틀 - reqStatusDTO.setC_req_link(returnNode.getC_id().toString()); + reqStatusDTO.setC_req_link(returnNode.getC_id()); reqStatusDTO.setC_req_name(returnNode.getC_title()); @@ -548,7 +548,7 @@ reqStatusDTO.setC_jira_version_title(jiraVerDTO.getC_title()); //REQADD 의 요구사항 아이디, 타이틀 - reqStatusDTO.setC_req_link(addDTO.getC_id().toString()); + reqStatusDTO.setC_req_link(addDTO.getC_id()); reqStatusDTO.setC_req_name(addDTO.getC_title()); @@ -626,7 +626,7 @@ reqStatusAddDTO.setC_jira_version_title(jiraVerDTO.getC_title()); //REQADD 의 요구사항 아이디, 타이틀 - reqStatusAddDTO.setC_req_link(addDTO.getC_id().toString()); + reqStatusAddDTO.setC_req_link(addDTO.getC_id()); reqStatusAddDTO.setC_req_name(addDTO.getC_title()); Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java =================================================================== diff -u -r738af0e5b46a03630e8a4b1bd16e017ba2faf6e6 -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 --- web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java (.../AnonReqStatusController.java) (revision 738af0e5b46a03630e8a4b1bd16e017ba2faf6e6) +++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/controller/AnonReqStatusController.java (.../AnonReqStatusController.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7) @@ -91,7 +91,15 @@ ModelMap model, HttpServletRequest request) throws Exception { SessionUtil.setAttribute("updateStatusNode",reqStatusTableName); - reqStatus.disableJiraIssue(reqStatusTableName); + List disableIDs = reqStatus.disableJiraIssue(reqStatusTableName); + + for ( Long c_id : disableIDs ){ + ReqStatusDTO reqStatusDTO = new ReqStatusDTO(); + reqStatusDTO.setC_id(c_id); + reqStatusDTO.setC_req_link(0L); + reqStatusDTO.setC_req_name("deleted"); + reqStatus.updateNode(reqStatusDTO); + } SessionUtil.removeAttribute("updateStatusNode"); ModelAndView modelAndView = new ModelAndView("jsonView"); Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/model/ReqStatusDTO.java =================================================================== diff -u -rb7429348b97fd89d41aaa97521e08ca41cf0c2f6 -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 --- web-module/src/main/java/egovframework/api/arms/module_reqstatus/model/ReqStatusDTO.java (.../ReqStatusDTO.java) (revision b7429348b97fd89d41aaa97521e08ca41cf0c2f6) +++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/model/ReqStatusDTO.java (.../ReqStatusDTO.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7) @@ -80,7 +80,7 @@ @Column(name = "c_req_link") - private String c_req_link; + private Long c_req_link; @Column(name = "c_req_name") private String c_req_name; @@ -220,11 +220,11 @@ this.c_jira_version_url = c_jira_version_url; } - public String getC_req_link() { + public Long getC_req_link() { return c_req_link; } - public void setC_req_link(String c_req_link) { + public void setC_req_link(Long c_req_link) { this.c_req_link = c_req_link; } Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatus.java =================================================================== diff -u -r738af0e5b46a03630e8a4b1bd16e017ba2faf6e6 -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 --- web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatus.java (.../ReqStatus.java) (revision 738af0e5b46a03630e8a4b1bd16e017ba2faf6e6) +++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatus.java (.../ReqStatus.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7) @@ -13,11 +13,13 @@ import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; +import java.util.List; + public interface ReqStatus extends JsTreeHibernateService { public void putJiraIssue(String reqStatusTableName) throws Exception; public void updateJiraIssueCrawl(String reqStatusTableName) throws Exception; - public void disableJiraIssue(String reqStatusTableName) throws Exception; + public List disableJiraIssue(String reqStatusTableName) throws Exception; } \ No newline at end of file Index: web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatusImpl.java =================================================================== diff -u -rf817e6009684bdaa78675bb0e1a8635f81284bf1 -r406a474eb7f2a2623e34c1444cfcf6ed27da53e7 --- web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatusImpl.java (.../ReqStatusImpl.java) (revision f817e6009684bdaa78675bb0e1a8635f81284bf1) +++ web-module/src/main/java/egovframework/api/arms/module_reqstatus/service/ReqStatusImpl.java (.../ReqStatusImpl.java) (revision 406a474eb7f2a2623e34c1444cfcf6ed27da53e7) @@ -109,6 +109,8 @@ statusDTO.setC_jira_req_issue_link(issue.getSelf().toString()); this.updateNode(statusDTO); + }else{ + //이슈가 있으면? } } @@ -154,7 +156,7 @@ } @Override - public void disableJiraIssue(String reqStatusTableName) throws Exception { + public List disableJiraIssue(String reqStatusTableName) throws Exception { ReqStatusDTO searchStatusDTO = new ReqStatusDTO(); searchStatusDTO.setOrder(Order.asc("c_id")); Criterion criterion = Restrictions.not( @@ -165,6 +167,7 @@ searchStatusDTO.getCriterions().add(criterion); List disableList = this.getChildNode(searchStatusDTO); + List disableIDs = new ArrayList<>(); for (ReqStatusDTO statusDTO : disableList) { logger.info("statusDTO = " + statusDTO.getC_id()); @@ -200,8 +203,18 @@ updateIssueStatus(issue, "Close Issue", fieldInputs, Comment.valueOf("본 이슈는 더이상 수집되어 성과에 반영되지 않는다.")); + //이슈를 disable 처리 하였는데, + //요구사항에서는 이 이슈를 지웠겠지 ( 아이디에서 ) + //그럼 이 이슈의 링크도 지워줘야 해 + //다시 이으려고 했을 때, 구분자로 처리 해야 하니까 + //이슈를 만들려고 보니까 이미 제품(서비스)-버전-지라-지라버전의 정보가 있는 이슈가 있다? + //요구사항 아이디랑 타이틀이 없네? STATUS 업데이트 하고 + //요구사항 REQ ADD 도 업데이트 해줘야 한다. + disableIDs.add(statusDTO.getC_id()); } } + + return disableIDs; } public void updateIssueStatus(Issue issue, String status) throws IOException, URISyntaxException {