Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-06-26 15:57:43 +09:00
56 changed files with 769 additions and 213 deletions

View File

@@ -113,7 +113,7 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
-Dspring.datasource.username=ko_research
-Dspring.datasource.password=koresearch1@#4
-Daes.secret-key=092HW829O0A0AVR0
-Dpath.upload.storage=SFTP
-Dpath.upload.storage=LOCAL
-Dpath.upload.sftp.public=/home/etribe/data/upload
-Dpath.upload.sftp.tmpdir=${user.home}/upload/tmpdir
-Dfile.upload.sftp.ip=115.68.193.117
@@ -121,6 +121,9 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
-Dfile.upload.sftp.password=Etribe@3415
-Dfile.upload.sftp.port=22
```
** 주의 : 운영서버일 경우 -Dpath.upload.storage=SFTP로 설정
## JDBC 및 데이터 핸들링 구성 옵션

View File

@@ -1,8 +1,8 @@
package app.module.admin.config.application.security;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.MessageUtil;

View File

@@ -0,0 +1,134 @@
package app.module.admin.config.application.util;
import app.module.admin.config.application.util.model.ExcelSheetDto;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Component;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
@Component
public class ExcelWriterUtil {
public static byte[] writeExcel(List<ExcelSheetDto> sheets) {
try (Workbook workbook = new XSSFWorkbook()) {
CellStyle bodyStyle = createBodyStyle(workbook);
CellStyle commaStyle = createCommaStyle(workbook);
for (ExcelSheetDto sheetDto : sheets) {
Sheet sheet = workbook.createSheet(sheetDto.getSheetName());
List<String> headers = sheetDto.getHeaders();
List<List<String>> dataRows = sheetDto.getData();
// 헤더 작성
Row headerRow = sheet.createRow(0);
for (int col = 0; col < headers.size(); col++) {
String headerText = headers.get(col);
IndexedColors bgColor = sheetDto.getHeaderBgColors() != null
? sheetDto.getHeaderBgColors().getOrDefault(col, IndexedColors.GREY_25_PERCENT)
: IndexedColors.GREY_25_PERCENT;
CellStyle headerStyle = createHeaderStyle(workbook, bgColor);
Cell cell = headerRow.createCell(col);
cell.setCellValue(headerText);
cell.setCellStyle(headerStyle);
}
// 데이터 작성
for (int r = 0; r < dataRows.size(); r++) {
Row row = sheet.createRow(r + 1);
List<String> rowData = dataRows.get(r);
for (int c = 0; c < rowData.size(); c++) {
Cell cell = row.createCell(c);
String value = rowData.get(c);
if (sheetDto.getCommaColumns() != null &&
sheetDto.getCommaColumns().contains(c) &&
isNumeric(value)) {
cell.setCellValue(Double.parseDouble(value));
cell.setCellStyle(commaStyle);
} else {
cell.setCellValue(value);
cell.setCellStyle(bodyStyle);
}
}
}
// 컬럼 너비 수동 계산
for (int col = 0; col < headers.size(); col++) {
int maxLength = getByteLength(headers.get(col));
for (List<String> rowData : dataRows) {
if (col < rowData.size()) {
int length = getByteLength(rowData.get(col));
if (length > maxLength) {
maxLength = length;
}
}
}
sheet.setColumnWidth(col, (maxLength + 2) * 256);
}
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
workbook.write(out);
return out.toByteArray();
} catch (IOException e) {
throw new RuntimeException("엑셀 생성 실패", e);
}
}
private static boolean isNumeric(String value) {
if (value == null) return false;
try {
Double.parseDouble(value);
return true;
} catch (NumberFormatException e) {
return false;
}
}
private static int getByteLength(String value) {
return value == null ? 0 : value.getBytes().length;
}
private static CellStyle createHeaderStyle(Workbook workbook, IndexedColors bgColor) {
CellStyle style = workbook.createCellStyle();
Font font = workbook.createFont();
font.setBold(true);
style.setFont(font);
style.setAlignment(HorizontalAlignment.CENTER);
style.setVerticalAlignment(VerticalAlignment.CENTER);
style.setFillForegroundColor(bgColor.getIndex());
style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
setBorder(style);
return style;
}
private static CellStyle createBodyStyle(Workbook workbook) {
CellStyle style = workbook.createCellStyle();
style.setAlignment(HorizontalAlignment.LEFT);
style.setVerticalAlignment(VerticalAlignment.CENTER);
setBorder(style);
return style;
}
private static CellStyle createCommaStyle(Workbook workbook) {
CellStyle style = workbook.createCellStyle();
style.setAlignment(HorizontalAlignment.RIGHT);
style.setVerticalAlignment(VerticalAlignment.CENTER);
style.setDataFormat(workbook.createDataFormat().getFormat("#,##0"));
setBorder(style);
return style;
}
private static void setBorder(CellStyle style) {
style.setBorderTop(BorderStyle.THIN);
style.setBorderBottom(BorderStyle.THIN);
style.setBorderLeft(BorderStyle.THIN);
style.setBorderRight(BorderStyle.THIN);
}
}

View File

@@ -0,0 +1,45 @@
package app.module.admin.config.application.util.model;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.List;
import java.util.Set;
import java.util.Map;
public class ExcelSheetDto {
/**
* 시트명
*/
private String sheetName;
/**
* 테이블 해더 리스트
*/
private List<String> headers;
/**
* 데이터 리스트 (해더와 같아야 한다. 값이 없다면 null이라도 넣어줘야해요.)
*/
private List<List<String>> data;
/**
* 입력한 데이터 중 comma가 필요한 라인 선택 0 부터
*/
private Set<Integer> commaColumns;
/**
* 해더의 배경색 지정 : 0부터 시작
*/
private Map<Integer, IndexedColors> headerBgColors; // 💡 추가: 컬럼별 배경색
public ExcelSheetDto(String sheetName, List<String> headers, List<List<String>> data,
Set<Integer> commaColumns, Map<Integer, IndexedColors> headerBgColors) {
this.sheetName = sheetName;
this.headers = headers;
this.data = data;
this.commaColumns = commaColumns;
this.headerBgColors = headerBgColors;
}
public String getSheetName() { return sheetName; }
public List<String> getHeaders() { return headers; }
public List<List<String>> getData() { return data; }
public Set<Integer> getCommaColumns() { return commaColumns; }
public Map<Integer, IndexedColors> getHeaderBgColors() { return headerBgColors; }
}

View File

@@ -27,10 +27,7 @@ import java.util.stream.Collectors;
class AdminUpdatePostController {
private final AdminUpdateValidator adminUpdateValidator;
private final RoleListPortIn roleListPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final SaveAdminPortIn saveAdminPortIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/api/settings/admin/update")
ResponseEntity<?> operate( @RequestBody AdminUpdateBindingVO bindingVO, BindingResult bindingResult) {

View File

@@ -40,7 +40,7 @@ class CreateNoticeDao implements CreateNoticePortOut {
mapper.createNotice(dto);
if (dto.getFileMappingId() != null && !dto.getFileMappingId().isEmpty()) {
mapper.createNoticeHasUploadFile(new CreateNoticeHasUploadFilesParam(
mapper.createNoticeUploadFile(new CreateNoticeHasUploadFilesParam(
dto.getId(),
dto.getFileMappingId().stream()
.map(Long::parseLong)

View File

@@ -7,5 +7,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateNoticeMapper {
void createNotice(CreateNoticeDto dto);
void createNoticeHasUploadFile(CreateNoticeHasUploadFilesParam param);
void createNoticeUploadFile(CreateNoticeHasUploadFilesParam param);
}

View File

@@ -4,8 +4,10 @@ import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePo
import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice;
import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd;
import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,8 @@ class GetNoticeDao implements GetNoticePortOut {
private final GetNoticeMapper mapper;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override
@Transactional
@@ -35,13 +39,13 @@ class GetNoticeDao implements GetNoticePortOut {
// 참조 URL 전달
uploadFile.setReferURL(
fileUrlPortIn.getInline(
uploadFile.getType().getFileStorageType(),
FileStorageType.valueOf(uploadStorageType),
uploadFile.getPath(),
uploadFile.getName()));
// attachment URL 전달
uploadFile.setAttachmentURL(
fileUrlPortIn.getAttachment(
uploadFile.getType().getFileStorageType(), uploadFile.getId()));
FileStorageType.valueOf(uploadStorageType), uploadFile.getId()));
return uploadFile;
})

View File

@@ -20,7 +20,7 @@ class RemoveNoticesDao implements RemoveNoticesPortOut {
String loginUser = CommonUtil.getLoginUsername();;
LocalDateTime now = LocalDateTime.now();
mapper.deleteNoticeHasFiles(
mapper.deleteNoticeUploadFiles(
new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser));
mapper.deleteNotices(
new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser));

View File

@@ -6,5 +6,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveNoticesMapper {
void deleteNotices(RemoveNoticesParam param);
void deleteNoticeHasFiles(RemoveNoticesParam param);
void deleteNoticeUploadFiles(RemoveNoticesParam param);
}

View File

@@ -1,27 +1,27 @@
package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence;
import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam;
import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto;
import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortOut;
import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd;
import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.util.CommonUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
@Slf4j
@Repository
@RequiredArgsConstructor
class UpdateNoticeDao implements UpdateNoticePortOut {
private final UpdateNoticeMapper mapper;
@Override
@UpdateCommand
public void operate(UpdateNoticeCmd command) {
mapper.updateNotice(
new UpdateNoticeDto(
command.getId(),
command.getTitle(),
@@ -34,21 +34,5 @@ class UpdateNoticeDao implements UpdateNoticePortOut {
CommonUtil.getLoginUsername()
));
// 첨부파일 초기화
mapper.deleteFileUploads(new NoticeHasUploadFile(command.getId()));
// 첨부파일 있을 시, 등록
if (command.getFileMappingId() != null && !command.getFileMappingId().isEmpty()) {
mapper.createFileUploads(new CreateUploadFileParam(
command.getId(),
command.getFileMappingId().stream()
.map(Long::parseLong)
.toList(),
LocalDateTime.now(),
CommonUtil.getLoginUsername(),
LocalDateTime.now(),
CommonUtil.getLoginUsername()
));
}
}
}

View File

@@ -1,14 +1,9 @@
package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence;
import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam;
import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto;
import app.module.core.config.adapters.persistence.entity.ArticleHasUploadFile;
import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface UpdateNoticeMapper {
void updateNotice(UpdateNoticeDto dto);
void deleteFileUploads(NoticeHasUploadFile noticeHasUploadFile);
void createFileUploads(CreateUploadFileParam param);
}

View File

@@ -1,18 +0,0 @@
package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.time.LocalDateTime;
import java.util.List;
@Getter
@AllArgsConstructor
public class CreateUploadFileParam {
private Long id;
private List<Long> fileMappingId;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
}

View File

@@ -3,6 +3,9 @@ package app.module.admin.usecase.communication.notice.updateNotice.adapters.web;
import app.module.admin.usecase.communication.notice.updateNotice.adapters.web.model.UpdateNoticeReqVO;
import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn;
import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.usecase.file.updateFile.ports.UpdateFilePortIn;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -16,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
class UpdateNoticeController {
private final UpdateNoticePortIn updateNoticePortIn;
private final UpdateFilePortIn updateFilePortIn;
@PutMapping(path = "/api/communication/notices/update")
ResponseEntity<?> operate(@RequestBody @Valid UpdateNoticeReqVO reqVO, BindingResult bindingResult) {
@@ -26,6 +30,13 @@ class UpdateNoticeController {
.body(bindingResult.getFieldErrors());
}
updateFilePortIn.operate(
new UpdateFileCmd(
reqVO.getId(),
reqVO.getFileMappingId().stream().map(Long::parseLong).toList(),
FileUploadType.NOTICE)
);
updateNoticePortIn.operate(
new UpdateNoticeCmd(
reqVO.getId(),
@@ -34,8 +45,8 @@ class UpdateNoticeController {
reqVO.getVisible(),
reqVO.getStartDate(),
reqVO.getEndDate(),
reqVO.getFileMappingId()
));
reqVO.getFileMappingId())
);
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}

View File

@@ -1,11 +1,13 @@
package app.module.admin.usecase.editor.adapters.web;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn;
import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import java.io.IOException;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
@@ -18,6 +20,8 @@ public class EditorImageUploadController {
private final SaveToStoragePortIn saveToStoragePortIn;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@PostMapping(path = "/api/editorImage/upload")
ResponseEntity<?> editorImageUpload(MultipartFile editorImage) throws IOException {
@@ -27,7 +31,7 @@ public class EditorImageUploadController {
return ResponseEntity.status(HttpStatus.OK)
.body(
fileUrlPortIn.getInline(
saveToStorage.getType().getFileStorageType(),
FileStorageType.valueOf(uploadStorageType),
saveToStorage.getPath(),
saveToStorage.getName()));
}

View File

@@ -0,0 +1,124 @@
package app.module.admin.usecase.excel.getExcelMultilSheet.adapters.web;
import app.module.admin.config.application.util.model.ExcelSheetDto;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import app.module.admin.config.application.util.ExcelWriterUtil;
import java.util.List;
import java.util.Set;
import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Map;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@RestController
@RequiredArgsConstructor
class GetExcelMultiSheetController {
@GetMapping("/api/admin/excel/multisheet")
public ResponseEntity<byte[]> exportHouseholdExcel() {
// 시트 1: 조사 대상 목록 (타이틀 10개)
ExcelSheetDto sheet1 = new ExcelSheetDto(
"조사 대상",
List.of("ID", "이름", "성별", "나이", "주소", "전화번호", "이메일", "등록일", "상태", "비고"),
List.of(
List.of("1", "홍길동", "남", "30", "서울", "010-1234-5678", "hong@example.com", "2024-01-01", "완료", ""),
List.of("2", "김영희", "여", "28", "부산", "010-2222-3333", "kim@example.com", "2024-01-02", "미완료", "응답 거부")
),
Set.of(3), // 나이 컬럼에 콤마 포맷 적용 (예시용)
Map.of(
0, IndexedColors.LIGHT_CORNFLOWER_BLUE,
3, IndexedColors.LIGHT_YELLOW,
7, IndexedColors.LIGHT_ORANGE
)
);
/*
취득 데이터는 변환해서 넣어줘도 됩니다.
List<Household> rawList = ... // List<Object>를 캐스팅 or 변환
List<List<String>> excelData = rawList.stream()
.map(dto -> List.of(
String.valueOf(dto.getId()),
dto.getName(),
dto.getGender(),
String.valueOf(dto.getAge()),
dto.getAddress(),
dto.getPhone(),
dto.getEmail(),
dto.getRegDate().toString(),
dto.getStatus(),
dto.getNote()
))
.toList();
ExcelSheetDto sheet = new ExcelSheetDto(
"조사 대상",
List.of("ID", "이름", "성별", "나이", "주소", "전화번호", "이메일", "등록일", "상태", "비고"),
excelData, // <----------------------------------@@@@@@@@@@@@@@@@
Set.of(3),
Map.of(
0, IndexedColors.LIGHT_CORNFLOWER_BLUE,
3, IndexedColors.LIGHT_YELLOW,
7, IndexedColors.LIGHT_ORANGE
)
);
*/
// 시트 2: 응답 통계 (타이틀 7개)
ExcelSheetDto sheet2 = new ExcelSheetDto(
"응답 통계",
List.of("구분", "총건수", "응답수", "미응답", "응답률", "평균시간", "비고"),
List.of(
List.of("전체", "1000", "850", "150", "85%", "5분", ""),
List.of("서울", "400", "360", "40", "90%", "4분", "")
),
Set.of(1, 2, 3), // 숫자열에 콤마 포맷 적용
Map.of(
1, IndexedColors.LIGHT_GREEN,
2, IndexedColors.LIGHT_GREEN,
3, IndexedColors.LIGHT_YELLOW
)
);
// 시트 3: 조사자별 실적 (타이틀 5개)
ExcelSheetDto sheet3 = new ExcelSheetDto(
"조사자 실적",
List.of("조사자명", "조사건수", "완료건수", "진행률", "비고"),
List.of(
List.of("박조사", "200", "180", "90%", ""),
List.of("이조사", "150", "100", "66.6%", "")
),
Set.of(1, 2), // 조사건수, 완료건수에 콤마 포맷
Map.of(
0, IndexedColors.LIGHT_TURQUOISE,
1, IndexedColors.LIGHT_ORANGE,
2, IndexedColors.LIGHT_ORANGE
)
);
// 시트 모음
List<ExcelSheetDto> sheets = List.of(sheet1, sheet2, sheet3);
byte[] excel = ExcelWriterUtil.writeExcel(sheets);
String rawFileName = "조사결과_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20");
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName)
.body(excel);
}
}

View File

@@ -1,8 +0,0 @@
package app.module.admin.usecase.loggedinuser.save.ports;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
public interface LoggedInUserSavePortIn {
void connect(LoggedInUserSaveCmd loggedInUserSaveCmd);
}

View File

@@ -1,8 +0,0 @@
package app.module.admin.usecase.loggedinuser.save.ports;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
public interface LoggedInUserSavePortOut {
void connect(LoggedInUserSaveCmd loggedInUser);
}

View File

@@ -5,13 +5,14 @@ import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Getter
@Setter
public class ResearchersVisitDetailReqVO {
private String id;
private String visitDate;
public class ResearchersVisitDetailReqVO extends AuditCommand {
private Integer id;
private LocalDate visitDate;
private ManagementType managementType;
private String content;
private String isGiftSent;

View File

@@ -37,23 +37,16 @@
)
</insert>
<insert id="createNoticeHasUploadFile">
<!-- createNoticeHasUploadFile 게시글 등록 시, 첨부파일 join 데이터 등록 -->
INSERT INTO notice_has_upload_file
(
notice_id,
upload_files_id,
<include refid="common.fields.CreateUpdateBaseColumns"/>
)
VALUES
<update id="createNoticeUploadFile">
update upload_file
set mapping_id = #{id},
<include refid="common.fields.UpdateBaseSet"/>
where id IN (
<foreach collection="fileMappingIds" item="fileId" separator=",">
(
#{id},
#{fileId},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
#{fileId}
</foreach>
</insert>
)
</update>
</mapper>

View File

@@ -29,8 +29,7 @@
resultType="app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile">
/* getUploadFiles 상세 게시글 조회 시, 첨부파일 조회 */
SELECT
awuf.notice_id AS noticeId,
awuf.upload_files_id AS uploadfileId,
uf.mapping_id,
uf.id AS id,
uf.created_at AS createdAt,
uf.created_by AS createdBy,
@@ -41,9 +40,7 @@
uf.origin_name AS originName,
uf.path AS path,
uf.type AS type
FROM notice_has_upload_file awuf
INNER JOIN upload_file uf
ON awuf.upload_files_id = uf.id
WHERE awuf.notice_id = #{id} AND awuf.is_deleted = false
FROM upload_file uf
WHERE uf.mapping_id = #{id} AND uf.is_deleted = false AND uf.type ='NOTICE'
</select>
</mapper>

View File

@@ -78,16 +78,15 @@
resultType="app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles">
/* getUploadFiles : 게시물 리스트의 대표 이미지 */
SELECT
awuf.notice_id,
uf.mapping_id as notice_id,
uf.id,
uf.type,
uf.path,
uf.name,
uf.origin_name,
uf.file_length
FROM notice_has_upload_file awuf
INNER JOIN upload_file uf ON awuf.upload_files_id = uf.id
WHERE awuf.notice_id IN
FROM upload_file uf
WHERE uf.mapping_id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>

View File

@@ -13,11 +13,11 @@
</foreach>
</update>
<update id="deleteNoticeHasFiles">
/* deleteNoticeHasFiles : 게시물-파일 매핑 논리 삭제 */
UPDATE notice_has_upload_file
<update id="deleteNoticeUploadFiles">
/* deleteNoticeUploadFiles : 게시물-파일 매핑 논리 삭제 */
UPDATE upload_file
SET <include refid="common.fields.DeleteBaseSet" />
WHERE notice_id IN
WHERE type='NOTICE' and mapping_id IN
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>

View File

@@ -4,32 +4,6 @@
<mapper
namespace="app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.UpdateNoticeMapper">
<update id="deleteFileUploads">
/* deleteFileUploads 게시글 수정 시, 첨부파일 join 데이터 삭제 */
UPDATE notice_has_upload_file
SET
<include refid="common.fields.DeleteBaseSet"/>
WHERE notice_id = #{noticeId}
</update>
<insert id="createFileUploads">
/* createFileUploads 게시글 수정 시, 첨부파일 join 데이터 등록 */
INSERT INTO notice_has_upload_file
(
notice_id,
upload_files_id,
<include refid="common.fields.CreateUpdateBaseColumns"/>
)
VALUES
<foreach collection="fileMappingId" item="fileId" separator=",">
(
#{id},
#{fileId},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</foreach>
</insert>
<update id="updateNotice">
/* updateNotice 게시글 수정 */
UPDATE notice
@@ -42,4 +16,5 @@
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{id}
</update>
</mapper>

View File

@@ -225,8 +225,15 @@
set visit_date = #{visitDate},
content = #{content},
management_type = #{managementType},
is_gift_sent = #{isGiftSent},
<include refid="common.fields.UpdateBaseSet" />
<choose>
<when test="isGiftSent">
is_gift_sent = true,
</when>
<when test="!isGiftSent">
is_gift_sent = false,
</when>
</choose>
<include refid="common.fields.UpdateBaseSet" />
where id = #{id}
</update>

View File

@@ -5,6 +5,14 @@
<th layout:fragment="content">
<section>
<table class="type-form confirm" th:object="${researcherDto}" >
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>아이디</th>

View File

@@ -40,9 +40,6 @@
<span class="btn-txt">로그인</span>
</button>
</div>
<ul class="info-bullet-list">
<li><a href="">공식가입센터 관리자 바로가기</a></li>
</ul>
</form>
</section>
<ul class="logo-list">

View File

@@ -10,4 +10,9 @@ public enum FileStorageType {
S3("AWS S3 스토리지"),
SFTP("SFTP");
private final String desc;
private String name;
public String getName() {
return name();
}
}

View File

@@ -10,12 +10,12 @@ import lombok.RequiredArgsConstructor;
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FileUploadType {
// URI og:image 용 이미지 파일
OG_IMAGE(FileStorageType.LOCAL, "/ogImage", Set.of(AcceptableFileType.IMAGE)),
OG_IMAGE(Set.of(FileStorageType.LOCAL), "/ogImage", Set.of(AcceptableFileType.IMAGE)),
// WEB Editor 이미지 파일
EDITOR_IMAGE(FileStorageType.LOCAL, "/editorImage", Set.of(AcceptableFileType.IMAGE)),
EDITOR_IMAGE(Set.of(FileStorageType.LOCAL), "/editorImage", Set.of(AcceptableFileType.IMAGE)),
PUBLIC(
FileStorageType.LOCAL,
Set.of(FileStorageType.LOCAL),
"/common",
Set.of(
AcceptableFileType.IMAGE,
@@ -28,7 +28,7 @@ public enum FileUploadType {
AcceptableFileType.PDF,
AcceptableFileType.ZIP)),
PRIVATE(
FileStorageType.LOCAL,
Set.of(FileStorageType.LOCAL),
"/private",
Set.of(
AcceptableFileType.IMAGE,
@@ -41,7 +41,10 @@ public enum FileUploadType {
AcceptableFileType.PDF,
AcceptableFileType.ZIP)),
NOTICE(
FileStorageType.SFTP,
Set.of(
FileStorageType.SFTP,
FileStorageType.LOCAL
),
"/notice",
Set.of(
AcceptableFileType.IMAGE,
@@ -55,15 +58,15 @@ public enum FileUploadType {
AcceptableFileType.ZIP)),
RECEIPT(
FileStorageType.SFTP,
"/receipt",
Set.of(FileStorageType.SFTP,FileStorageType.LOCAL),
"/receipt",
Set.of(
AcceptableFileType.IMAGE
)
);
private final FileStorageType fileStorageType;
private final Set<FileStorageType> fileStorageType;
private final String subPath;
private final Set<AcceptableFileType> acceptableFileTypes;

View File

@@ -1,7 +1,7 @@
package app.module.core.config.application.util;
import app.module.core.config.adapters.persistence.entity.UploadFile;
import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector;
import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.SftpException;
@@ -28,7 +28,7 @@ public class SftpFileDeleteUtil {
* @throws JSchException SFTP 연결 오류
* @throws SftpException SFTP 작업 오류
*/
public void deleteRealFile(UploadFile deleteFile) throws JSchException, SftpException {
public void deleteRealFile(UploadFileDto deleteFile) throws JSchException, SftpException {
if (deleteFile == null || deleteFile.getPath() == null || deleteFile.getName() == null) {
log.error("Invalid file information: {}", deleteFile);
throw new IllegalArgumentException("Invalid file information");

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.article.getArticle.adapters.persistence;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.article.getArticle.ports.GetArticlePortOut;
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticle;
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd;
@@ -9,6 +10,7 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,9 @@ class GetArticleDao implements GetArticlePortOut {
private final GetArticleMapper mapper;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override
@Transactional
public Optional<GetArticle> operate(GetArticleCmd command) {
@@ -34,13 +39,13 @@ class GetArticleDao implements GetArticlePortOut {
// 참조 URL 전달
uploadFile.setReferURL(
fileUrlPortIn.getInline(
uploadFile.getType().getFileStorageType(),
FileStorageType.valueOf(uploadStorageType),
uploadFile.getPath(),
uploadFile.getName()));
// attachment URL 전달
uploadFile.setAttachmentURL(
fileUrlPortIn.getAttachment(
uploadFile.getType().getFileStorageType(), uploadFile.getId()));
FileStorageType.valueOf(uploadStorageType), uploadFile.getId()));
return uploadFile;
})

View File

@@ -1,12 +1,14 @@
package app.module.core.usecase.file.createFile.adapters.persistence;
import app.module.core.config.adapters.persistence.entity.UploadFile;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.file.createFile.ports.CreateFilePortOut;
import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile;
import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
@Repository
@@ -15,6 +17,10 @@ class CreateFileDao implements CreateFilePortOut {
private final CreateFileMapper mapper;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override
public Optional<CreateFile> operate(CreateFileCmd command) {
UploadFile uploadFile = new UploadFile(
@@ -23,7 +29,7 @@ class CreateFileDao implements CreateFilePortOut {
command.getPath(),
command.getName(),
command.getOriginName(),
command.getFileLength());
command.getFileLength() );
mapper.insertFile(uploadFile);
@@ -37,11 +43,11 @@ class CreateFileDao implements CreateFilePortOut {
uploadFile.getFileLength(),
// 참조 URL 전달
fileUrlPortIn.getInline(
uploadFile.getType().getFileStorageType(),
FileStorageType.valueOf(uploadStorageType),
uploadFile.getPath(),
uploadFile.getName()),
// attachment URL 전달
fileUrlPortIn.getAttachment(
uploadFile.getType().getFileStorageType(), uploadFile.getId())));
FileStorageType.valueOf(uploadStorageType), uploadFile.getId())));
}
}

View File

@@ -20,6 +20,7 @@ import java.util.Set;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import org.apache.tika.Tika;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +31,8 @@ public class SaveToStorageService implements SaveToStoragePortIn {
private final MessageUtil messageUtil;
private final Tika tika;
private final Set<FileUploadStrategy> fileUploadStrategies;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override
public Optional<SaveToStorage> operate(FileUploadType fileUploadType,
@@ -45,7 +48,7 @@ public class SaveToStorageService implements SaveToStoragePortIn {
String subPath = getDirPath(fileUploadType.getSubPath());
String createFilename = getUUIDFilename(getFileExtension(originalFilename).orElse(null));
getFileUploadStrategy(fileUploadType.getFileStorageType())
getFileUploadStrategy(FileStorageType.valueOf(uploadStorageType))
.operate(multipartFile, subPath, createFilename);
return Optional.of(
@@ -128,6 +131,6 @@ public class SaveToStorageService implements SaveToStoragePortIn {
() ->
new NoSuchElementException(
String.format("No file upload strategy found: %s",
fileStorageType.name())));
fileStorageType.getName())));
}
}

View File

@@ -0,0 +1,66 @@
package app.module.core.usecase.file.updateFile.adapters.persistence;
import app.module.core.config.adapters.persistence.entity.UploadFile;
import app.module.core.config.application.annotation.DeleteCommand;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.SftpFileDeleteUtil;
import app.module.core.usecase.file.createFile.ports.CreateFilePortOut;
import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile;
import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd;
import app.module.core.usecase.file.updateFile.ports.UpdateFilePortOut;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateUploadFileParam;
import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.SftpException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional;
@Slf4j
@Repository
@RequiredArgsConstructor
class UpdateFileDao implements UpdateFilePortOut {
private final UpdateFileMapper mapper;
private final SftpFileDeleteUtil sftpFileDeleteUtil;
@Override
@DeleteCommand
public void operate(UpdateFileCmd command) {
List<UploadFileDto> deletedFileList = mapper.findDeleteFileList(new UpdateUploadFileParam(
command.getId(),
command.getFileMappingIds(),
command.getType().getName()
));
for (UploadFileDto file : deletedFileList) {
try {
sftpFileDeleteUtil.deleteRealFile(file);
} catch (JSchException | SftpException e) {
log.error("Failed to delete file from SFTP for mapping ID {}: {}", file.getId(), e.getMessage(), e);
throw new RuntimeException("Failed to delete file from SFTP", e);
} catch (Exception e) {
log.error("Unexpected error while deleting file for mapping ID {}: {}", file.getId(), e.getMessage(), e);
throw new RuntimeException("Unexpected error while deleting file", e);
}
}
if (!deletedFileList.isEmpty()) {
mapper.deleteFile(
new UpdateUploadFileParam(
command.getId(),
deletedFileList.stream().map(UploadFileDto::getId).toList(),
command.getType().getName()));
}
command.getFileMappingIds().forEach(fileId -> mapper.updateFile(new UploadFileDto(fileId, command.getId(),command.getType().getName())));
}
}

View File

@@ -0,0 +1,14 @@
package app.module.core.usecase.file.updateFile.adapters.persistence;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateUploadFileParam;
import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface UpdateFileMapper {
List<UploadFileDto> findDeleteFileList(UpdateUploadFileParam uploadFile);
void deleteFile(UpdateUploadFileParam uploadFile);
void updateFile(UploadFileDto uploadFile);
}

View File

@@ -0,0 +1,8 @@
package app.module.core.usecase.file.updateFile.ports;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd;
public interface UpdateFilePortIn {
void operate(UpdateFileCmd command);
}

View File

@@ -0,0 +1,8 @@
package app.module.core.usecase.file.updateFile.ports;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd;
public interface UpdateFilePortOut {
void operate(UpdateFileCmd command);
}

View File

@@ -0,0 +1,20 @@
package app.module.core.usecase.file.updateFile.ports.application;
import app.module.core.usecase.file.updateFile.ports.UpdateFilePortIn;
import app.module.core.usecase.file.updateFile.ports.UpdateFilePortOut;
import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class UpdateFileService implements UpdateFilePortIn {
private final UpdateFilePortOut portOut;
@Override
public void operate(UpdateFileCmd command) {
portOut.operate(command);
}
}

View File

@@ -0,0 +1,19 @@
package app.module.core.usecase.file.updateFile.ports.application.domain;
import app.module.core.config.application.enums.FileUploadType;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateFileCmd {
private Long id;
private List<Long> fileMappingIds;
private FileUploadType type;
}

View File

@@ -0,0 +1,18 @@
package app.module.core.usecase.file.updateFile.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import app.module.core.config.application.enums.FileUploadType;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Setter
@Getter
@AllArgsConstructor
public class UpdateUploadFileParam extends AuditCommand {
private Long id;
private List<Long> fileMappingIds;
private String type;
}

View File

@@ -0,0 +1,43 @@
package app.module.core.usecase.file.updateFile.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import app.module.core.config.adapters.persistence.component.AuditEntity;
import app.module.core.config.application.enums.FileUploadType;
import lombok.*;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class UploadFileDto extends AuditCommand {
private Long id;
private Long mappingId;
private String type;
private String path;
private String name;
private String originName;
private Long fileLength;
private LocalDateTime updatedAt;
private String updatedBy;
public UploadFileDto(Long id) {
this.id = id;
}
public UploadFileDto(Long id, Long mappingId, String type) {
this.id = id;
this.mappingId = mappingId;
this.type = type;
}
}

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.getAttachment.adapters.web;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.file.getFile.ports.GetFilePortIn;
import app.module.core.usecase.file.getFile.ports.application.domain.GetFile;
import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd;
@@ -27,6 +28,8 @@ class GetAttachmentController {
private String cloudFrontDomain;
@Value("${app.aws.s3.bucketFolder:null}")
private String bucketFolder;
@Value("${path.upload.storage}")
private String uploadStorageType;
@GetMapping(path = "/content-disposition/attachment/{fileId}")
ResponseEntity<?> operate(@PathVariable Long fileId) throws MalformedURLException {
@@ -55,7 +58,7 @@ class GetAttachmentController {
UrlResource resource = null;
switch (getFile.getType().getFileStorageType()) {
switch (FileStorageType.valueOf(uploadStorageType)) {
case LOCAL:
String filePath =
Paths.get(publicPath, getFile.getPath(), getFile.getName())

View File

@@ -1,7 +1,7 @@
package app.module.admin.usecase.loggedinuser.save.adapter.persistence;
package app.module.core.usecase.loggedinuser.save.adapter.persistence;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.config.adapters.persistence.entity.LoggedInUser;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.loggedinuser.save.adapter.persistence;
package app.module.core.usecase.loggedinuser.save.adapter.persistence;
import app.module.core.config.adapters.persistence.entity.LoggedInUser;
import org.apache.ibatis.annotations.Mapper;

View File

@@ -0,0 +1,8 @@
package app.module.core.usecase.loggedinuser.save.ports;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
public interface LoggedInUserSavePortIn {
void connect(LoggedInUserSaveCmd loggedInUserSaveCmd);
}

View File

@@ -0,0 +1,8 @@
package app.module.core.usecase.loggedinuser.save.ports;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
public interface LoggedInUserSavePortOut {
void connect(LoggedInUserSaveCmd loggedInUser);
}

View File

@@ -1,8 +1,8 @@
package app.module.admin.usecase.loggedinuser.save.ports.application;
package app.module.core.usecase.loggedinuser.save.ports.application;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.admin.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut;
import app.module.admin.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

View File

@@ -1,11 +1,7 @@
package app.module.admin.usecase.loggedinuser.save.ports.application.domain;
package app.module.core.usecase.loggedinuser.save.ports.application.domain;
import app.module.core.config.application.enums.AppType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.*;
@Getter
@Setter

View File

@@ -1,11 +1,8 @@
package app.module.admin.usecase.loggedinuser.save.ports.application.domain;
package app.module.core.usecase.loggedinuser.save.ports.application.domain;
import lombok.*;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Builder
@Getter

View File

@@ -1,6 +1,5 @@
package app.module.core.usecase.uicode.view.adapters.persistence;
import app.module.core.config.adapters.persistence.repository.UICodeRepo;
import app.module.core.usecase.uicode.view.ports.UICodeViewPortOut;
import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView;
import lombok.RequiredArgsConstructor;

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.uri.save.ports.application;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.config.application.exception.AlreadyExistItemException;
import app.module.core.config.application.util.MessageUtil;
@@ -11,6 +12,7 @@ import app.module.core.usecase.uri.save.ports.URISavePortIn;
import app.module.core.usecase.uri.save.ports.URISavePortOut;
import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand;
import app.module.core.usecase.uri.view.ports.URIViewPortIn;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import lombok.RequiredArgsConstructor;
@@ -28,6 +30,8 @@ class URISaveService implements URISavePortIn {
private final MessageUtil messageUtil;
private final SaveToStoragePortIn saveToStoragePortIn;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Transactional
@CacheEvict(
@@ -59,7 +63,7 @@ class URISaveService implements URISavePortIn {
uri.setOgImage(
fileUrlPortIn.getInline(
ogImg.getType().getFileStorageType(), ogImg.getPath(), ogImg.getName()));
FileStorageType.valueOf(uploadStorageType), ogImg.getPath(), ogImg.getName()));
}
return uriSavePortOut.connect(uri);

View File

@@ -1,5 +1,6 @@
package app.module.core.usecase.user.findUser.ports.application;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import app.module.core.usecase.user.findUser.ports.FindUserPortIn;
import app.module.core.usecase.user.findUser.ports.FindUserPortOut;
@@ -8,6 +9,7 @@ import app.module.core.usecase.user.findUser.ports.application.domain.FindUser;
import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Service
@@ -17,6 +19,9 @@ class FindUserService implements FindUserPortIn {
private final FindUserPortOut portOut;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override
public Optional<FindUser> operate(FindUserCmd command) {
return portOut
@@ -29,14 +34,14 @@ class FindUserService implements FindUserPortIn {
// 참조 URL 전달
profileImg.setReferURL(
fileUrlPortIn.getInline(
profileImg.getType().getFileStorageType(),
FileStorageType.valueOf(uploadStorageType),
profileImg.getPath(),
profileImg.getName()));
// attachment URL 전달
profileImg.setAttachmentURL(
fileUrlPortIn.getAttachment(
profileImg.getType().getFileStorageType(), profileImg.getId()));
FileStorageType.valueOf(uploadStorageType), profileImg.getId()));
}
return Optional.of(findUser);

View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper">
<select id="findDeleteFileList" resultType="app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto">
SELECT file_length,
id,
name,
origin_name,
path,
type,
mapping_id
FROM upload_file
WHERE type = #{type} and mapping_id = #{id} and is_deleted = false
<if test="fileMappingIds != null and fileMappingIds.size() > 0">
and id NOT IN (
<foreach collection="fileMappingIds" item="fileId" separator="," >
#{fileId}
</foreach>
)
</if>
</select>
<update id="deleteFile">
UPDATE upload_file
SET
<include refid="common.fields.DeleteBaseSet"/>
WHERE type = #{type} and mapping_id = #{id} and is_deleted = false
<if test="fileMappingIds != null and fileMappingIds.size() > 0">
and id IN (
<foreach collection="fileMappingIds" item="fileId" separator="," >
#{fileId}
</foreach>
)
</if>
</update>
<update id="updateFile" >
UPDATE upload_file
SET mapping_id = #{mappingId},
type = #{type},
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{id}
</update>
</mapper>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.loggedinuser.save.adapter.persistence.LoggedInUserSaveMapper">
namespace="app.module.core.usecase.loggedinuser.save.adapter.persistence.LoggedInUserSaveMapper">
<insert id="insert" parameterType="app.module.core.config.adapters.persistence.entity.LoggedInUser">
INSERT INTO logged_in_user

View File

@@ -83,7 +83,8 @@ COMMENT ON COLUMN role.is_deleted IS '삭제 여부';
CREATE SEQUENCE upload_file_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE upload_file (
id bigint DEFAULT nextval('upload_file_seq') NOT NULL, -- 파일 ID (PK)
id int8 DEFAULT nextval('upload_file_seq') NOT NULL, -- 파일 ID (PK)
mapping_id int8, -- 파일 매핑 ID
name varchar(255), -- 시스템 저장 파일명
origin_name varchar(255), -- 원본 파일명
path varchar(255), -- 파일 경로
@@ -115,6 +116,7 @@ CREATE TABLE upload_file (
COMMENT ON TABLE upload_file IS '업로드 파일 정보 테이블';
COMMENT ON COLUMN upload_file.id IS '파일 ID (PK)';
COMMENT ON COLUMN upload_file.mapping_id IS '파일 매핑 ID';
COMMENT ON COLUMN upload_file.name IS '시스템 저장 파일명';
COMMENT ON COLUMN upload_file.origin_name IS '원본 파일명';
COMMENT ON COLUMN upload_file.path IS '파일 경로';
@@ -1865,37 +1867,6 @@ COMMENT ON COLUMN notice.is_deleted IS '삭제여부';
-- ============================================
-- TABLE : notice_has_upload_file
-- DESC : 공지사항 파일 매핑 테이블
-- ============================================
CREATE TABLE notice_has_upload_file (
upload_files_id bigint NOT NULL, -- 업로드 파일 ID (FK)
notice_id varchar(255) NOT NULL, -- 공지사항 ID (FK)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
updated_by varchar(255), -- 수정자
deleted_at timestamp(6), -- 삭제일
deleted_by varchar(255), -- 삭제자
is_deleted boolean DEFAULT false NOT NULL -- 삭제 여부
);
ALTER TABLE notice_has_upload_file ADD CONSTRAINT fk_notice_has_upload_file__notice FOREIGN KEY (notice_id) REFERENCES notice(id);
ALTER TABLE notice_has_upload_file ADD CONSTRAINT fk_notice_has_upload_file__upload_file FOREIGN KEY (upload_files_id) REFERENCES upload_file(id);
COMMENT ON TABLE notice_has_upload_file IS '공지사항 파일 매핑 테이블';
COMMENT ON COLUMN notice_has_upload_file.upload_files_id IS '업로드 파일 ID';
COMMENT ON COLUMN notice_has_upload_file.notice_id IS '공지사항 ID';
COMMENT ON COLUMN notice_has_upload_file.created_at IS '생성일';
COMMENT ON COLUMN notice_has_upload_file.created_by IS '생성자';
COMMENT ON COLUMN notice_has_upload_file.updated_at IS '수정일';
COMMENT ON COLUMN notice_has_upload_file.updated_by IS '수정자';
COMMENT ON COLUMN notice_has_upload_file.deleted_at IS '삭제일';
COMMENT ON COLUMN notice_has_upload_file.deleted_by IS '삭제자';
COMMENT ON COLUMN notice_has_upload_file.is_deleted IS '삭제여부';
-- ============================================

View File

@@ -0,0 +1,56 @@
package app.module.front.config.application.security;
import app.module.core.config.application.enums.AppType;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.time.LocalDateTime;
@Component
@RequiredArgsConstructor
@Slf4j
public class FrontAuthSuccessEvent {
private final LoggedInUserSavePortIn loggedInUserSavePortIn;
@EventListener
public void handleAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
Authentication authentication = event.getAuthentication();
FrontHouseholdUser householdUser = (FrontHouseholdUser) authentication.getPrincipal();
HttpServletRequest request =
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// 로그인 이력 쌓기
loggedInUserSavePortIn.connect(
LoggedInUserSaveCmd.builder()
.loggedInUserId(
LoggedInUserIdSaveCmd.builder()
.appType(AppType.FRONT)
.id(authentication.getName())
.build())
.clientIP(CommonUtil.getClientIP(request))
.lastLoggedInAt(LocalDateTime.now())
.build());
}
@EventListener
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
Exception e = event.getException();
Authentication authentication = event.getAuthentication();
log.warn("Unsuccessful authentication result: {}", authentication, e);
}
}