수입/지출 데이터 삭제시 OCR의 경우 파일 실삭제

This commit is contained in:
주수현
2025-07-07 11:11:10 +09:00
parent e85d6feda1
commit 35c9bab244
12 changed files with 247 additions and 7 deletions

View File

@@ -1,12 +1,19 @@
package app.module.front.usecase.daily.expense.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.SftpFileDeleteUtil;
import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseTypeCount;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut;
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.SftpException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -16,6 +23,10 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyExpenseDao implements DailyExpensePortOut {
private final DailyExpenseMapper dailyExpenseMapper;
private final UpdateFileMapper updateFileMapper;
@Value("${path.upload.storage}")
private String uploadStorageType;
private final SftpFileDeleteUtil sftpFileDeleteUtil;
@Override
public List<DailyExpenseDto> list(GetDailyExpenseCmd command) {
@@ -38,9 +49,26 @@ public class DailyExpenseDao implements DailyExpensePortOut {
@Override
public void remove(GetDailyExpenseCmd findCmd, RemoveDailyExpenseCmd command) {
Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd);
if (existCount != 0) {
DailyExpenseTypeCount existCount = dailyExpenseMapper.getRecordExistTypeCount(findCmd);
if (existCount.getCount() != 0) {
dailyExpenseMapper.removeDailyExpense(command);
if("OCR".equals(existCount.getInputType().name())){
dailyExpenseMapper.removeDailyExpenseReceipt(command);
if(existCount.getFileIdCount() == 1){
if("SFTP".equals(uploadStorageType)){
try {
sftpFileDeleteUtil.deleteRealFile(existCount.getFileId());
} catch (JSchException | SftpException e) {
log.error("SFTP 오류 e.getMessage={}", e.getMessage());
throw new RuntimeException(e);
} catch (Exception ignored){
log.error(ignored.getMessage());
}
}else{
updateFileMapper.deleteReceiptFile(existCount.getFileId(), CommonUtil.getLoginUsername());
}
}
}
log.debug("[RemoveDailyExpense] record={}", command);
}

View File

@@ -1,10 +1,12 @@
package app.module.front.usecase.daily.expense.adapters.persistence;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseTypeCount;
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -27,6 +29,13 @@ public interface DailyExpenseMapper {
*/
Integer getRecordExistCount(GetDailyExpenseCmd command);
/**
* 일계부 지출 데이터 존재 여부
*
* @param command 검색 조건
* @return 중복 개수
*/
DailyExpenseTypeCount getRecordExistTypeCount(GetDailyExpenseCmd command);
/**
* 일계부 지출 등록
*
@@ -47,4 +56,11 @@ public interface DailyExpenseMapper {
* @param command 삭제 데이터
*/
void removeDailyExpense(RemoveDailyExpenseCmd command);
/**
* 일계부 지출 영수증 삭제
*
* @param command 삭제 데이터
*/
void removeDailyExpenseReceipt(RemoveDailyExpenseCmd command);
}

View File

@@ -0,0 +1,15 @@
package app.module.front.usecase.daily.expense.adapters.persistence.model;
import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyExpenseTypeCount {
private Long count;
private DailyInputType inputType;
private Long fileId;
private Long fileIdCount;
}

View File

@@ -1,12 +1,20 @@
package app.module.front.usecase.daily.income.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.config.application.util.SftpFileDeleteUtil;
import app.module.core.usecase.file.getFile.adapters.persistence.GetFileMapper;
import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeTypeCount;
import app.module.front.usecase.daily.income.ports.DailyIncomePortOut;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.SftpException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -16,6 +24,10 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyIncomeDao implements DailyIncomePortOut {
private final DailyIncomeMapper dailyIncomeMapper;
private final UpdateFileMapper updateFileMapper;
@Value("${path.upload.storage}")
private String uploadStorageType;
private final SftpFileDeleteUtil sftpFileDeleteUtil;
@Override
public List<DailyIncomeDto> list(GetDailyIncomeCmd command) {
@@ -38,10 +50,27 @@ public class DailyIncomeDao implements DailyIncomePortOut {
@Override
public void remove(GetDailyIncomeCmd findCmd, RemoveDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
if (existCount != 0) {
DailyIncomeTypeCount existCount = dailyIncomeMapper.getRecordExistTypeCount(findCmd);
if (existCount.getCount() != 0) {
dailyIncomeMapper.removeDailyIncome(command);
if("OCR".equals(existCount.getInputType().name())){
dailyIncomeMapper.removeDailyIncomeReceipt(command);
if(existCount.getFileIdCount() == 1){
if("SFTP".equals(uploadStorageType)){
try {
sftpFileDeleteUtil.deleteRealFile(existCount.getFileId());
} catch (JSchException | SftpException e) {
log.error("SFTP 오류 e.getMessage={}", e.getMessage());
throw new RuntimeException(e);
} catch (Exception ignored){
log.error(ignored.getMessage());
}
}else{
updateFileMapper.deleteReceiptFile(existCount.getFileId(), CommonUtil.getLoginUsername());
}
}
}
log.debug("[RemoveDailyIncome] record={}", command);
}
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.income.adapters.persistence;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeTypeCount;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
@@ -26,6 +27,13 @@ public interface DailyIncomeMapper {
*/
Integer getRecordExistCount(GetDailyIncomeCmd command);
/**
* 일계부 수입 데이터 존재 여부, OCR 여부 , 매핑된 첨부파일 개수 확인
*
* @param command 검색 조건
* @return 중복 개수
*/
DailyIncomeTypeCount getRecordExistTypeCount(GetDailyIncomeCmd command);
/**
* 일계부 수입 등록
*
@@ -46,4 +54,11 @@ public interface DailyIncomeMapper {
* @param command 삭제 데이터
*/
void removeDailyIncome(RemoveDailyIncomeCmd command);
/**
* 일계부 수입 영수증 삭제
*
* @param command 삭제 데이터
*/
void removeDailyIncomeReceipt(RemoveDailyIncomeCmd command);
}

View File

@@ -0,0 +1,15 @@
package app.module.front.usecase.daily.income.adapters.persistence.model;
import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyIncomeTypeCount {
private Long count;
private DailyInputType inputType;
private Long fileId;
private Long fileIdCount;
}

View File

@@ -27,6 +27,27 @@
</if>
</select>
<select id="getRecordExistTypeCount">
select count(1) as count,
ds.input_type,
rhr.file_id,
COALESCE(fc.file_id_count, 0) as file_id_count
from daily_expense ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
left join
receipt_has_record rhr on ds.id = rhr.receipt_type_id and rhr.is_deleted = false
left join (
select file_id,COUNT(*) AS file_id_count
FROM receipt_has_record
where is_deleted = false and type = 'EXPENSE'
group by file_id
) fc on fc.file_id = rhr.file_id
where ds.is_deleted = false
<if test="id != null and id != '0'">
and ds.id = #{id}
</if>
group by ds.id,rhr.file_id,fc.file_id_count
</select>
<insert id="createDailyExpense" useGeneratedKeys="true" keyProperty="id">
insert into daily_expense (
daily_record_seq, input_type, category, income_mark
@@ -69,4 +90,13 @@
</if>
</update>
<update id="removeDailyExpenseReceipt">
update receipt_has_record set
<include refid="common.fields.DeleteBaseSet"/>
where is_deleted = false
<if test="id != null and id != ''">
and receipt_type_id = #{id}
</if>
</update>
</mapper>

View File

@@ -27,6 +27,30 @@
</if>
</select>
<select id="getRecordExistTypeCount">
select count(1) as count,
ds.input_type,
rhr.file_id,
COALESCE(fc.file_id_count, 0) as file_id_count
from daily_income ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
left join
receipt_has_record rhr on ds.id = rhr.receipt_type_id and rhr.is_deleted = false
left join (
select file_id,COUNT(*) AS file_id_count
FROM receipt_has_record
where is_deleted = false and type = 'INCOME'
group by file_id
) fc on fc.file_id = rhr.file_id
where ds.is_deleted = false
<if test="id != null and id != '0'">
and ds.id = #{id}
</if>
group by ds.id,rhr.file_id,fc.file_id_count
</select>
<insert id="createDailyIncome" useGeneratedKeys="true" keyProperty="id">
insert into daily_income (
daily_record_seq, input_type, category, expense_mark
@@ -70,4 +94,13 @@
</if>
</update>
<update id="removeDailyIncomeReceipt">
update receipt_has_record set
<include refid="common.fields.DeleteBaseSet"/>
where is_deleted = false
<if test="id != null and id != ''">
and receipt_type_id = #{id}
</if>
</update>
</mapper>

View File

@@ -272,14 +272,17 @@
);
},
addFileInput() {
// 새로운 input type="file" 요소 생성
// 여기에서 파일 첨부 몇개인지 확인하고 하루 3개,,,, 총 6개씩,,,
const fileInput = document.createElement('input');
fileInput.type = 'file';
fileInput.accept = 'image/*';
fileInput.style.display = 'none';
fileInput.name = 'file';
// 파일 선택 시 이벤트 처리
// 파일 선택
fileInput.addEventListener('change', (event) => {
const files = event.target.files;
const previewContainer = $('#file-upload-container');
@@ -330,7 +333,6 @@
`);
previewContainer.append(fileItem);
// 파일 정보와 서버 응답 저장
uploadedReceipt.push({
fileId: fileItemId,
file: file,