From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/AttachedFileServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/AttachedFileServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/AttachedFileServiceImpl.java
index 8057f64..0e118f1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/AttachedFileServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/AttachedFileServiceImpl.java
@@ -119,6 +119,35 @@
}
}
+ // 泥⑤� �뙆�씪�쓣 �벑濡앺븳�떎. - API �뿉�꽌 �궗�슜
+ @Override
+ @Transactional
+ public List<AttachedFile> addAttachedFile(Workspace workspace, Issue issue, List<Map<String, Object>> files) {
+ if (workspace == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.WORKSPACE_NOT_EXIST));
+ }
+
+ if (issue == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISSUE_NOT_EXIST));
+ }
+
+ if (files != null && files.size() > 0) {
+ List<Map<String, Object>> convertFileMaps = Lists.newArrayList();
+
+ for (Map<String, Object> file : files) {
+ String fileName = MapUtil.getString(file, "fileName");
+ String fileStr = MapUtil.getString(file, "file");
+ String contentType = MapUtil.getString(file, "contentType");
+ convertFileMaps.add(CommonUtil.makeFileMap(fileName, fileStr, contentType));
+ }
+
+ return this.addAttachedFiles(workspace, convertFileMaps, issue, null, AttachedType.SUMMER);
+ }
+ return null;
+ }
+
// 泥⑤� �뙆�씪�쓣 �벑濡앺븳�떎. - �씠�뒋 �깮�꽦, �닔�젙�뿉�꽌 �궗�슜
@Override
@Transactional
--
Gitblit v1.8.0