Merge branch 'dev' into 'deploy-dev-front'
Dev See merge request korea-research/korea-research!95
This commit is contained in:
@@ -1,56 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.entity;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public class Article extends AuditEntity {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String title;
|
||||
|
||||
private String content;
|
||||
|
||||
private Boolean visible;
|
||||
|
||||
private LocalDateTime startDate;
|
||||
|
||||
private LocalDateTime endDate;
|
||||
|
||||
private Integer orderNo;
|
||||
|
||||
private List<UploadFile> uploadFiles = Collections.emptyList();
|
||||
|
||||
private List<ArticleComment> articleComments = Collections.emptyList();
|
||||
|
||||
public Article(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Article(
|
||||
Long id,
|
||||
String title,
|
||||
String content,
|
||||
Boolean visible,
|
||||
LocalDateTime startDate,
|
||||
LocalDateTime endDate,
|
||||
Integer orderNo,
|
||||
List<UploadFile> uploadFiles) {
|
||||
this.id = id;
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
this.visible = visible;
|
||||
this.startDate = startDate;
|
||||
this.endDate = endDate;
|
||||
this.orderNo = orderNo;
|
||||
this.uploadFiles = (uploadFiles != null) ? uploadFiles : Collections.emptyList();
|
||||
}
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.entity;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ArticleComment extends AuditEntity {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String content;
|
||||
|
||||
private Long articleId;
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.entity;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ArticleHasUploadFile extends AuditEntity {
|
||||
|
||||
private Long articleId;
|
||||
|
||||
private Long uploadFilesId;
|
||||
|
||||
public ArticleHasUploadFile(Long articleId) {
|
||||
this.articleId = articleId;
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,8 @@ public class UploadFile extends AuditEntity {
|
||||
private String originName;
|
||||
|
||||
private Long fileLength;
|
||||
private String ocr;
|
||||
private Long dailyRecordSeq;
|
||||
|
||||
public UploadFile(Long id) {
|
||||
this.id = id;
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.initData;
|
||||
|
||||
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper;
|
||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.stream.IntStream;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.ApplicationArguments;
|
||||
import org.springframework.boot.ApplicationRunner;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class InitArticleData implements ApplicationRunner {
|
||||
|
||||
private final CreateArticlePortIn createArticlePortIn;
|
||||
private final RemoveAllArticleMapper removeAllArticleMapper;
|
||||
|
||||
@Value("${app.initData.core}")
|
||||
private boolean isCoreDataRequired;
|
||||
|
||||
@Override
|
||||
public void run(ApplicationArguments args) throws Exception {
|
||||
if (!isCoreDataRequired) {
|
||||
return;
|
||||
}
|
||||
|
||||
// article_has_upload_file 테이블 우선 삭제
|
||||
removeAllArticleMapper.deleteAllFiles();
|
||||
// article_comment 테이블 우선 삭제
|
||||
removeAllArticleMapper.deleteAllComments();
|
||||
// article 전체 데이터 삭제
|
||||
removeAllArticleMapper.deleteAll();
|
||||
|
||||
IntStream.range(0, 25)
|
||||
.forEach(
|
||||
idx ->
|
||||
createArticlePortIn.operate(
|
||||
new CreateArticleCmd(
|
||||
String.format("Article No.%s", idx),
|
||||
String.format("Content No.%s", idx),
|
||||
true,
|
||||
LocalDateTime.now(),
|
||||
LocalDateTime.now().plusMonths(2),
|
||||
null)));
|
||||
}
|
||||
}
|
||||
@@ -34,14 +34,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
|
||||
final String ADMIN = "uri.admin";
|
||||
|
||||
final String ADMIN_BOARD = "uri.admin.board";
|
||||
|
||||
final String ADMIN_ARTICLE = "uri.admin.board.article";
|
||||
final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create";
|
||||
final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}";
|
||||
final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete";
|
||||
final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel";
|
||||
|
||||
final String ADMIN_SETTINGS = "uri.admin.settings";
|
||||
|
||||
final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group";
|
||||
@@ -53,12 +45,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles";
|
||||
final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege";
|
||||
|
||||
final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group";
|
||||
final String ADMIN_SETTINGS_USER = "uri.admin.settings.user";
|
||||
final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update";
|
||||
final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role";
|
||||
final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege";
|
||||
|
||||
final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin";
|
||||
final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front";
|
||||
final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode";
|
||||
@@ -69,10 +55,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
"uri.admin.analysis.operationLog.{{pathVar}}";
|
||||
final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel";
|
||||
|
||||
final String ADMIN_ADD_ONS = "uri.admin.addons";
|
||||
final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email";
|
||||
final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create";
|
||||
|
||||
// 임가현황 메뉴
|
||||
final String ADMIN_HOUSEHOLD = "uri.admin.household"; // 1depth
|
||||
final String ADMIN_HOUSEHOLD_STATUS = "uri.admin.household.households"; // 2depth 임가 리스트
|
||||
@@ -146,15 +128,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN,
|
||||
ADMIN_BOARD,
|
||||
"게시판",
|
||||
"/board",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN,
|
||||
@@ -164,15 +137,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN,
|
||||
ADMIN_ADD_ONS,
|
||||
"Add-ons (부가기능)",
|
||||
"/add-ons",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN,
|
||||
@@ -292,7 +256,7 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
ADMIN_COMMUNICATION,
|
||||
ADMIN_COMMUNICATION_SUGGESTION_VIEW,
|
||||
"건의사항 상세",
|
||||
"/communication/suggestions/view/{{pathVar}}",
|
||||
"/communication/suggestions/{{pathVar}}",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
@@ -304,53 +268,8 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
"/communication/sms",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
// 커뮤니케이션 메뉴 끝
|
||||
|
||||
// 예제 게시판 - 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_BOARD,
|
||||
ADMIN_ARTICLE,
|
||||
"예제 게시판",
|
||||
"/board/articles",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ARTICLE,
|
||||
ADMIN_ARTICLE_CREATE,
|
||||
"예제 게시판 등록",
|
||||
"/board/articles/create",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ARTICLE,
|
||||
ADMIN_ARTICLE_UPDATE,
|
||||
"예제 게시판 수정",
|
||||
"/board/articles/{{pathVar}}",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ARTICLE,
|
||||
ADMIN_ARTICLE_DELETE,
|
||||
"예제 게시판 삭제",
|
||||
"/board/articles/delete",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ARTICLE,
|
||||
ADMIN_ARTICLE_EXCEL,
|
||||
"예제 게시판 엑셀 다운로드",
|
||||
"/board/articles/excel",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));
|
||||
// 예제 게시판 - 끝
|
||||
|
||||
// 분석 메뉴 시작
|
||||
appendURI(
|
||||
@@ -382,37 +301,7 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
// 분석 메뉴 끝
|
||||
|
||||
|
||||
// Add-ons 메뉴 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ADD_ONS,
|
||||
ADMIN_ADD_ONS_SEND_EMAIL,
|
||||
"Email 발송",
|
||||
"/addons/email/form",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_ADD_ONS_SEND_EMAIL,
|
||||
ADMIN_ADD_ONS_SEND_EMAIL_CREATE,
|
||||
"Email 입력폼",
|
||||
"/addons/email/form",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
// Add-ons 메뉴 끝
|
||||
|
||||
|
||||
// 관리자 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS,
|
||||
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||
"관리자 & 역할",
|
||||
"/settings/adminGroup",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||
@@ -458,71 +347,6 @@ public class InitUriAdminData implements ApplicationRunner {
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||
ADMIN_SETTINGS_ADMIN_ROLE,
|
||||
"관리자 역할",
|
||||
"/settings/adminRoles",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_ADMIN_GROUP,
|
||||
ADMIN_SETTINGS_ADMIN_PRIVILEGE,
|
||||
"관리자 권한",
|
||||
"/settings/adminPrivilege",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
// 사용자 & 역할 - 시작
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS,
|
||||
ADMIN_SETTINGS_USER_GROUP,
|
||||
"사용자 & 역할",
|
||||
"/settings/userGroup",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_USER_GROUP,
|
||||
ADMIN_SETTINGS_USER,
|
||||
"사용자 목록",
|
||||
"/settings/users",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_USER,
|
||||
ADMIN_SETTINGS_USER_UPDATE,
|
||||
"사용자 수정",
|
||||
"/settings/users/{{pathVar}}",
|
||||
false,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_USER_GROUP,
|
||||
ADMIN_SETTINGS_USER_ROLE,
|
||||
"사용자 역할",
|
||||
"/settings/userRoles",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS_USER_GROUP,
|
||||
ADMIN_SETTINGS_USER_PRIVILEGE,
|
||||
"사용자 권한",
|
||||
"/settings/userPrivilege",
|
||||
true,
|
||||
Set.of("ROLE_ADMIN"));
|
||||
// 사용자 & 역할 - 끝
|
||||
|
||||
appendURI(
|
||||
AppType.ADMIN,
|
||||
ADMIN_SETTINGS,
|
||||
|
||||
@@ -109,77 +109,5 @@ public class InitUriFrontData implements ApplicationRunner {
|
||||
Set.of("ROLE_GENERAL")),
|
||||
null,
|
||||
false);
|
||||
|
||||
// 예제게시판
|
||||
uriSavePortIn.connect(
|
||||
new URISaveCommand(
|
||||
FRONT_ROOT_ID + ".board.articles",
|
||||
FRONT_ROOT_ID,
|
||||
AppType.FRONT,
|
||||
"/board/articles",
|
||||
true,
|
||||
"예제게시판",
|
||||
null,
|
||||
"예제게시판",
|
||||
"예제게시판 페이지",
|
||||
"예제게시판",
|
||||
null,
|
||||
Set.of("ROLE_GENERAL")),
|
||||
null,
|
||||
false);
|
||||
|
||||
// 예제 게시판 등록
|
||||
uriSavePortIn.connect(
|
||||
new URISaveCommand(
|
||||
FRONT_ROOT_ID + ".board.article.create",
|
||||
FRONT_ROOT_ID,
|
||||
AppType.FRONT,
|
||||
"/board/articles/create",
|
||||
false,
|
||||
"예제 게시판 등록",
|
||||
null,
|
||||
"예제 게시판 등록",
|
||||
"예제 게시판 등록 페이지",
|
||||
"예제 게시판 등록",
|
||||
null,
|
||||
Set.of("ROLE_GENERAL")),
|
||||
null,
|
||||
false);
|
||||
|
||||
// 예제 게시판 상세
|
||||
uriSavePortIn.connect(
|
||||
new URISaveCommand(
|
||||
FRONT_ROOT_ID + ".board.article.{{pathVar}}",
|
||||
FRONT_ROOT_ID,
|
||||
AppType.FRONT,
|
||||
"/board/articles/{{pathVar}}",
|
||||
false,
|
||||
"예제 게시판 상세",
|
||||
null,
|
||||
"예제 게시판 상세",
|
||||
"예제 게시판 상세 페이지",
|
||||
"예제 게시판 상세",
|
||||
null,
|
||||
Set.of("ROLE_GENERAL")),
|
||||
null,
|
||||
false);
|
||||
|
||||
// 예제 게시판 수정
|
||||
uriSavePortIn.connect(
|
||||
new URISaveCommand(
|
||||
FRONT_ROOT_ID + ".board.article.update.{{pathVar}}",
|
||||
FRONT_ROOT_ID,
|
||||
AppType.FRONT,
|
||||
"/board/articles/update/{{pathVar}}",
|
||||
false,
|
||||
"예제 게시판 수정",
|
||||
null,
|
||||
"예제 게시판 수정",
|
||||
"예제 게시판 수정 페이지",
|
||||
"예제 게시판 수정",
|
||||
null,
|
||||
Set.of("ROLE_GENERAL")),
|
||||
null,
|
||||
false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
package app.module.core.config.adapters.persistence.initData;
|
||||
|
||||
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper;
|
||||
import app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper;
|
||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.stream.IntStream;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.ApplicationArguments;
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.initData.helper;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface RemoveAllArticleMapper {
|
||||
void deleteAll();
|
||||
void deleteAllFiles();
|
||||
void deleteAllComments();
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleComment;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface ArticleCommentRepo {
|
||||
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface ArticleRepo {
|
||||
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface FrontUserPrivilegeRepo {
|
||||
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface FrontUserRepo {
|
||||
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.Role;
|
||||
import app.module.core.config.application.enums.AppType;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.data.domain.Sort;
|
||||
|
||||
@Mapper
|
||||
public interface FrontUserRoleRepo {
|
||||
|
||||
List<Role> findByAppType(AppType appType, Sort sort);
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package app.module.core.config.adapters.persistence.repository;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.Privilege;
|
||||
import app.module.core.config.application.enums.AppType;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.data.domain.Sort;
|
||||
|
||||
@Mapper
|
||||
public interface PrivilegeRepo {
|
||||
List<Privilege> findByAppType(AppType appType, Sort sort);
|
||||
}
|
||||
@@ -9,5 +9,4 @@ public enum DailyInputType {
|
||||
* 영수증 입력
|
||||
*/
|
||||
OCR,
|
||||
;
|
||||
}
|
||||
|
||||
@@ -6,13 +6,14 @@ import lombok.RequiredArgsConstructor;
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum DailySort {
|
||||
INCOME("수입"),
|
||||
WORK("임업노동 투입"),
|
||||
EXPENSE("지출"),
|
||||
POWER("동력 사용시간"),
|
||||
FORESTRY("임업생산물 중 자가소비량"),
|
||||
FARMING("농업생산물 중 자가소비량"),
|
||||
INCOME("수입", "수입"),
|
||||
WORK("임업노동 투입", "임업노동 투입"),
|
||||
EXPENSE("지출", "지출"),
|
||||
POWER("동력 사용시간", "동력사용시간"),
|
||||
FORESTRY("임업생산물 중 자가소비량", "자가임업 생산물 중 자가소비량"),
|
||||
FARMING("농업생산물 중 자가소비량", "자가농업 생산물 중 자가소비량"),
|
||||
;
|
||||
|
||||
private final String desc;
|
||||
private final String desc2;
|
||||
}
|
||||
|
||||
@@ -13,5 +13,4 @@ public enum DailyStatus {
|
||||
* 등록 완료
|
||||
*/
|
||||
DONE,
|
||||
;
|
||||
}
|
||||
|
||||
@@ -13,5 +13,4 @@ public enum DailyTargetStatus {
|
||||
* 대상 아님
|
||||
*/
|
||||
NONE,
|
||||
;
|
||||
}
|
||||
|
||||
@@ -56,10 +56,16 @@ public enum FileUploadType {
|
||||
AcceptableFileType.TXT,
|
||||
AcceptableFileType.PDF,
|
||||
AcceptableFileType.ZIP)),
|
||||
|
||||
RECEIPT(
|
||||
INCOME(
|
||||
Set.of(FileStorageType.SFTP,FileStorageType.LOCAL),
|
||||
"/receipt",
|
||||
"/income",
|
||||
Set.of(
|
||||
AcceptableFileType.IMAGE
|
||||
)
|
||||
),
|
||||
EXPENSE(
|
||||
Set.of(FileStorageType.SFTP,FileStorageType.LOCAL),
|
||||
"/expense",
|
||||
Set.of(
|
||||
AcceptableFileType.IMAGE
|
||||
)
|
||||
|
||||
@@ -7,5 +7,5 @@ import lombok.RequiredArgsConstructor;
|
||||
@RequiredArgsConstructor
|
||||
public enum SaveType {
|
||||
CREATE,
|
||||
UPDATE;
|
||||
UPDATE
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package app.module.core.config.application.util;
|
||||
|
||||
import app.module.core.config.constants.DailyRecordConstants;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -9,6 +11,8 @@ import java.text.DecimalFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@Slf4j
|
||||
@@ -81,29 +85,28 @@ public class DailyUtil {
|
||||
|
||||
/**
|
||||
* 데이터 수정 가능 여부
|
||||
* [정책] 15일전까지 데이터 수정 가능(등록도 불가)
|
||||
* @param startDate
|
||||
* @param endDate
|
||||
*
|
||||
* @param startDate 시작일
|
||||
* @param endDate 종료일
|
||||
* @return true=수정 가능, false=수정 불가
|
||||
*/
|
||||
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
|
||||
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.MODIFIY_LIMIT_DAY);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
}
|
||||
|
||||
/**
|
||||
* 데이터 등록 가능 여부
|
||||
* @param startDate
|
||||
* @param endDate
|
||||
* @return
|
||||
*
|
||||
* @param startDate 시작일
|
||||
* @param endDate 종료일
|
||||
* @return true=등록 가능, false=등록 불가
|
||||
*/
|
||||
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
|
||||
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||
LocalDate limitStart = LocalDate.now().minusDays(DailyRecordConstants.REGISTER_LIMIT_DAY);
|
||||
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
|
||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -126,4 +129,35 @@ public class DailyUtil {
|
||||
|
||||
return new DecimalFormat("###,###").format(Double.parseDouble(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* 농업 생산물의 UI Code 데이터의 수입부호, 지출부호 조회
|
||||
*
|
||||
* @param uiCodeList UI Code 목록
|
||||
* @param targetCode 조회 코드
|
||||
* @return 수입부호, 지출부호 Map
|
||||
*/
|
||||
public HashMap<String, String> getMarkByFarming(List<UICodeElement> uiCodeList, String targetCode) {
|
||||
String incomeMark = null;
|
||||
String expenseMark = null;
|
||||
if (!"code.record.farming.self".equals(targetCode)) {
|
||||
String returnValue = null;
|
||||
for (UICodeElement codeSetup : uiCodeList) {
|
||||
if (codeSetup.getId().equalsIgnoreCase(targetCode)) {
|
||||
returnValue = codeSetup.getCodeValue();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (returnValue != null) {
|
||||
incomeMark = returnValue.split(",")[0];
|
||||
expenseMark = returnValue.split(",")[1];
|
||||
}
|
||||
}
|
||||
|
||||
HashMap<String, String> returnValue = new HashMap<>();
|
||||
returnValue.put("incomeMark", incomeMark);
|
||||
returnValue.put("expenseMark", expenseMark);
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package app.module.core.config.application.util;
|
||||
|
||||
import app.module.core.usecase.file.getFile.adapters.persistence.GetFileMapper;
|
||||
import app.module.core.usecase.file.getFile.ports.application.domain.GetFile;
|
||||
import app.module.core.usecase.file.saveToStorage.ports.application.strategy.SftpConnector;
|
||||
import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper;
|
||||
import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto;
|
||||
import com.jcraft.jsch.ChannelSftp;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
@@ -18,6 +21,8 @@ import java.nio.file.Paths;
|
||||
public class SftpFileDeleteUtil {
|
||||
|
||||
private final SftpConnector sftpConnector;
|
||||
private final GetFileMapper getFileMapper;
|
||||
private final UpdateFileMapper updateFileMapper;
|
||||
|
||||
@Value("${path.upload.sftp.public}")
|
||||
private String publicPath;
|
||||
@@ -64,6 +69,47 @@ public class SftpFileDeleteUtil {
|
||||
}
|
||||
}
|
||||
|
||||
public void deleteRealFile(Long deleteFileId) throws JSchException, SftpException {
|
||||
GetFile deleteFile = getFileMapper.findById(deleteFileId).orElseThrow();
|
||||
updateFileMapper.deleteReceiptFile(deleteFileId,CommonUtil.getLoginUsername());
|
||||
|
||||
if (deleteFile == null || deleteFile.getPath() == null || deleteFile.getName() == null) {
|
||||
log.error("Invalid file information: {}", deleteFile);
|
||||
throw new IllegalArgumentException("Invalid file information");
|
||||
}
|
||||
|
||||
// 경로 검증 및 생성
|
||||
String filePath = constructSafeFilePath(deleteFile.getPath(), deleteFile.getName());
|
||||
log.info("Attempting to delete file from SFTP: {}", filePath);
|
||||
|
||||
// SFTP 연결 확인 및 재연결
|
||||
if (!sftpConnector.isConnected()) {
|
||||
log.warn("SFTP connection lost, attempting to reconnect");
|
||||
sftpConnector.connect();
|
||||
}
|
||||
ChannelSftp channelSftp = sftpConnector.getChannelSftp();
|
||||
if (channelSftp == null) {
|
||||
log.error("SFTP channel is not initialized");
|
||||
throw new SftpException(ChannelSftp.SSH_FX_NO_CONNECTION, "SFTP channel is not initialized");
|
||||
}
|
||||
|
||||
// 파일 삭제
|
||||
try {
|
||||
channelSftp.stat(filePath); // 파일 존재 여부 확인
|
||||
channelSftp.rm(filePath);
|
||||
log.info("File deleted successfully from SFTP: {}", filePath);
|
||||
} catch (SftpException e) {
|
||||
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
|
||||
log.warn("File does not exist on SFTP: {}", filePath);
|
||||
} else {
|
||||
log.error("Failed to delete file from SFTP: {}, error: {}", filePath, e.getMessage(), e);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 경로 조작 방지를 위해 안전한 파일 경로 생성
|
||||
*/
|
||||
|
||||
@@ -16,4 +16,34 @@ public class DailyRecordConstants {
|
||||
* [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
||||
*/
|
||||
public static final String INCOME_EXPENSE_MARK = "91206";
|
||||
|
||||
/**
|
||||
* 지출의 유형
|
||||
* [정책] 2 고정
|
||||
*/
|
||||
public static final String EXPENSE_CATEGORY = "2";
|
||||
|
||||
/**
|
||||
* 지출의 수입부호
|
||||
* [정책] 외상판매 Y 일 경우 수입부호 52210 적재
|
||||
*/
|
||||
public static final String EXPENSE_INCOME_MARK = "52210";
|
||||
|
||||
/**
|
||||
* 임업생산물의 지출부호
|
||||
* [정책] 81011 고정
|
||||
*/
|
||||
public static final String FORESTRY_EXPENSE_MARK = "81011";
|
||||
|
||||
/**
|
||||
* 일계부 등록 가능 일
|
||||
* [정책] 15일전까지 데이터 등록 가능
|
||||
*/
|
||||
public static final int REGISTER_LIMIT_DAY = 15;
|
||||
|
||||
/**
|
||||
* 일계부 수정 가능 일
|
||||
* [정책] 15일전까지 데이터 수정 가능
|
||||
*/
|
||||
public static final int MODIFIY_LIMIT_DAY = 15;
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleComment;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.CreateArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class CreateArticleCommentDao implements CreateArticleCommentPortOut {
|
||||
|
||||
private final CreateArticleCommentMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<CreateArticleComment> operate(CreateArticleCommentCmd command) {
|
||||
|
||||
ArticleComment articleComment = new ArticleComment(
|
||||
null,
|
||||
command.getContent(),
|
||||
command.getArticleId()
|
||||
);
|
||||
|
||||
mapper.insertArticleComment(articleComment);
|
||||
|
||||
return Optional.of(
|
||||
new CreateArticleComment(
|
||||
articleComment.getId(),
|
||||
articleComment.getContent(),
|
||||
articleComment.getCreatedBy(),
|
||||
articleComment.getUpdatedAt()
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleComment;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface CreateArticleCommentMapper {
|
||||
void insertArticleComment(ArticleComment articleComment);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface CreateArticleCommentPortIn {
|
||||
|
||||
Optional<CreateArticleComment> operate(CreateArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface CreateArticleCommentPortOut {
|
||||
|
||||
Optional<CreateArticleComment> operate(CreateArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.CreateArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.CreateArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleComment;
|
||||
import app.module.core.usecase.article.comment.createArticleComment.ports.application.domain.CreateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class CreateArticleCommentService implements CreateArticleCommentPortIn {
|
||||
|
||||
private final CreateArticleCommentPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<CreateArticleComment> operate(CreateArticleCommentCmd command) {
|
||||
return portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.ports.application.domain;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateArticleComment {
|
||||
private Long id;
|
||||
private String content;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.createArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateArticleCommentCmd {
|
||||
private Long articleId;
|
||||
private String content;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.GetArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleComment;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetArticleCommentDao implements GetArticleCommentPortOut {
|
||||
|
||||
private final GetArticleCommentMapper mapper;
|
||||
|
||||
@Override
|
||||
public Optional<GetArticleComment> operate(GetArticleCommentCmd command) {
|
||||
return mapper.findArticleCommentById(command.getId());
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleComment;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetArticleCommentMapper {
|
||||
Optional<GetArticleComment> findArticleCommentById(Long id);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleComment;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetArticleCommentPortIn {
|
||||
|
||||
Optional<GetArticleComment> operate(GetArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleComment;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetArticleCommentPortOut {
|
||||
|
||||
Optional<GetArticleComment> operate(GetArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.GetArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.GetArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleComment;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetArticleCommentService implements GetArticleCommentPortIn {
|
||||
|
||||
private final GetArticleCommentPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetArticleComment> operate(GetArticleCommentCmd command) {
|
||||
return portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleComment {
|
||||
private Long id;
|
||||
private String content;
|
||||
private Long articleId;
|
||||
private String CreatedBy;
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleCommentCmd {
|
||||
private Long id;
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.GetArticleCommentsPortOut;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleComments;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleCommentsCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetArticleCommentsDao implements GetArticleCommentsPortOut {
|
||||
|
||||
private final GetArticleCommentsMapper mapper;
|
||||
|
||||
@Override
|
||||
public Page<GetArticleComments> operate(Pageable pageable, GetArticleCommentsCmd command) {
|
||||
// 댓글 목록 조회
|
||||
List<GetArticleComments> result = mapper.findAll(pageable, command);
|
||||
|
||||
return new PageImpl<>(
|
||||
mapper.findAll(pageable, command),
|
||||
pageable,
|
||||
result.isEmpty() ? 0 : result.get(0).getTotal());
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleComments;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleCommentsCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetArticleCommentsMapper {
|
||||
List<GetArticleComments> findAll(@Param("pageable") Pageable pageable,
|
||||
@Param("cmd") GetArticleCommentsCmd cmd);
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleComments;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleCommentsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetArticleCommentsPortIn {
|
||||
|
||||
Page<GetArticleComments> operate(Pageable pageable, GetArticleCommentsCmd command);
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleComments;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleCommentsCmd;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetArticleCommentsPortOut {
|
||||
|
||||
Page<GetArticleComments> operate(Pageable pageable, GetArticleCommentsCmd command);
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.GetArticleCommentsPortIn;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.GetArticleCommentsPortOut;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleComments;
|
||||
import app.module.core.usecase.article.comment.getArticleComments.ports.application.domain.GetArticleCommentsCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetArticleCommentsService implements GetArticleCommentsPortIn {
|
||||
|
||||
private final GetArticleCommentsPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Page<GetArticleComments> operate(Pageable pageable, GetArticleCommentsCmd command) {
|
||||
return portOut.operate(pageable, command);
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.ports.application.domain;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleComments {
|
||||
private Long id;
|
||||
private String content;
|
||||
private Long articleId;
|
||||
private Boolean isAuthor;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private Integer total;
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.getArticleComments.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleCommentsCmd {
|
||||
private Long articleId;
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.adapters.persistence.model.RemoveArticleCommentParam;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.RemoveArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain.RemoveArticleCommentCmd;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class RemoveArticleCommentDao implements RemoveArticleCommentPortOut {
|
||||
|
||||
private final RemoveArticleCommentMapper mapper;
|
||||
|
||||
@Override
|
||||
public void operate(RemoveArticleCommentCmd command) {
|
||||
String loginUser = CommonUtil.getLoginUsername();
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
mapper.deleteById(
|
||||
new RemoveArticleCommentParam(
|
||||
command.getRemoveId(), now, loginUser, now, loginUser));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.adapters.persistence.model.RemoveArticleCommentParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface RemoveArticleCommentMapper {
|
||||
void deleteById(RemoveArticleCommentParam param);
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.adapters.persistence.model;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class RemoveArticleCommentParam {
|
||||
private Long id;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private LocalDateTime deletedAt;
|
||||
private String deletedBy;
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain.RemoveArticleCommentCmd;
|
||||
|
||||
public interface RemoveArticleCommentPortIn {
|
||||
|
||||
void operate(RemoveArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain.RemoveArticleCommentCmd;
|
||||
|
||||
public interface RemoveArticleCommentPortOut {
|
||||
|
||||
void operate(RemoveArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.ports.application;
|
||||
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.GetArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.RemoveArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.RemoveArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain.RemoveArticleCommentCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class RemoveArticleCommentService implements RemoveArticleCommentPortIn {
|
||||
|
||||
private final RemoveArticleCommentPortOut portOut;
|
||||
private final GetArticleCommentPortIn getArticleCommentPortIn;
|
||||
|
||||
@Override
|
||||
public void operate(RemoveArticleCommentCmd command) {
|
||||
|
||||
getArticleCommentPortIn.operate(new GetArticleCommentCmd(command.getRemoveId()))
|
||||
.filter(comment -> comment.getCreatedBy().equals(CommonUtil.getLoginUsername()))
|
||||
.orElseThrow(() -> new RuntimeException("삭제 권한이 없는 사용자입니다."));
|
||||
|
||||
portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class RemoveArticleCommentCmd {
|
||||
private Long removeId;
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleComment;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.UpdateArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleComment;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class UpdateArticleCommentDao implements UpdateArticleCommentPortOut {
|
||||
|
||||
private final UpdateArticleCommentMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Optional<UpdateArticleComment> operate(UpdateArticleCommentCmd cmd) {
|
||||
|
||||
ArticleComment comment =
|
||||
new ArticleComment(cmd.getCommentId(), cmd.getContent(), cmd.getArticleId());
|
||||
|
||||
mapper.updateComment(comment);
|
||||
|
||||
return Optional.of(new UpdateArticleComment(comment.getId(), comment.getContent()));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleComment;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface UpdateArticleCommentMapper {
|
||||
void updateComment(ArticleComment articleComment);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleComment;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface UpdateArticleCommentPortIn {
|
||||
|
||||
Optional<UpdateArticleComment> operate(UpdateArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.ports;
|
||||
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleComment;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface UpdateArticleCommentPortOut {
|
||||
|
||||
Optional<UpdateArticleComment> operate(UpdateArticleCommentCmd command);
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.ports.application;
|
||||
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.GetArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.getArticleComment.ports.application.domain.GetArticleCommentCmd;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.UpdateArticleCommentPortIn;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.UpdateArticleCommentPortOut;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleComment;
|
||||
import app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain.UpdateArticleCommentCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class UpdateArticleCommentService implements UpdateArticleCommentPortIn {
|
||||
|
||||
private final UpdateArticleCommentPortOut portOut;
|
||||
private final GetArticleCommentPortIn getArticleCommentPortIn;
|
||||
|
||||
@Override
|
||||
public Optional<UpdateArticleComment> operate(UpdateArticleCommentCmd command) {
|
||||
|
||||
getArticleCommentPortIn.operate(new GetArticleCommentCmd(command.getCommentId()))
|
||||
.filter(comment -> comment.getCreatedBy().equals(CommonUtil.getLoginUsername()))
|
||||
.orElseThrow(() -> new RuntimeException("수정 권한이 없는 사용자입니다."));
|
||||
|
||||
return portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateArticleComment {
|
||||
private Long id;
|
||||
private String content;
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package app.module.core.usecase.article.comment.updateArticleComment.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateArticleCommentCmd {
|
||||
private Long commentId;
|
||||
private String content;
|
||||
private Long articleId;
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleDto;
|
||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleHasUploadFilesParam;
|
||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class CreateArticleDao implements CreateArticlePortOut {
|
||||
|
||||
private final CreateArticleMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Optional<CreateArticle> operate(CreateArticleCmd command) {
|
||||
// max orderNo
|
||||
int maxOrderNo = mapper.getArticleOrderNo();
|
||||
|
||||
CreateArticleDto dto =
|
||||
new CreateArticleDto(
|
||||
null,
|
||||
command.getTitle(),
|
||||
command.getContent(),
|
||||
command.getVisible(),
|
||||
maxOrderNo,
|
||||
command.getStartDate(),
|
||||
command.getEndDate(),
|
||||
command.getFileMappingId(),
|
||||
command.getCreatedAt(),
|
||||
command.getCreatedBy(),
|
||||
command.getUpdatedAt(),
|
||||
command.getUpdatedBy());
|
||||
|
||||
mapper.createArticle(dto);
|
||||
|
||||
if (dto.getFileMappingId() != null && !dto.getFileMappingId().isEmpty()) {
|
||||
mapper.createArticleHasUploadFile(new CreateArticleHasUploadFilesParam(
|
||||
dto.getId(),
|
||||
dto.getFileMappingId().stream()
|
||||
.map(Long::parseLong)
|
||||
.collect(Collectors.toList()),
|
||||
dto.getCreatedAt(),
|
||||
dto.getCreatedBy(),
|
||||
dto.getUpdatedAt(),
|
||||
dto.getUpdatedBy()
|
||||
));
|
||||
}
|
||||
|
||||
return Optional.of(new CreateArticle(dto.getOrderNo(), dto.getId()));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleDto;
|
||||
import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleHasUploadFilesParam;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface CreateArticleMapper {
|
||||
int getArticleOrderNo();
|
||||
void createArticle(CreateArticleDto dto);
|
||||
void createArticleHasUploadFile(CreateArticleHasUploadFilesParam param);
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.adapters.persistence.model;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CreateArticleDto {
|
||||
private Long id;
|
||||
private String title;
|
||||
private String content;
|
||||
private Boolean visible;
|
||||
private Integer orderNo;
|
||||
private LocalDateTime startDate;
|
||||
private LocalDateTime endDate;
|
||||
private List<String> fileMappingId;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.adapters.persistence.model;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CreateArticleHasUploadFilesParam {
|
||||
private Long id;
|
||||
private List<Long> fileMappingIds;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.ports;
|
||||
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface CreateArticlePortIn {
|
||||
|
||||
Optional<CreateArticle> operate(CreateArticleCmd command);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.ports;
|
||||
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface CreateArticlePortOut {
|
||||
|
||||
Optional<CreateArticle> operate(CreateArticleCmd command);
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.ports.application;
|
||||
|
||||
import app.module.core.config.application.annotation.CreateCommand;
|
||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
|
||||
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
|
||||
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class CreateArticleService implements CreateArticlePortIn {
|
||||
|
||||
private final CreateArticlePortOut portOut;
|
||||
|
||||
@Override
|
||||
@CreateCommand
|
||||
public Optional<CreateArticle> operate(CreateArticleCmd command) {
|
||||
return portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateArticle {
|
||||
Integer orderNo;
|
||||
private Long id;
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package app.module.core.usecase.article.createArticle.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateArticleCmd extends AuditCommand {
|
||||
private String title;
|
||||
private String content;
|
||||
private Boolean visible;
|
||||
private LocalDateTime startDate;
|
||||
private LocalDateTime endDate;
|
||||
private List<String> fileMappingId;
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
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;
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleUploadFile;
|
||||
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
|
||||
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;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
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) {
|
||||
GetArticle secArticle = mapper.getArticle(command.getId());
|
||||
|
||||
List<GetArticleUploadFile> setArticleUploadFile =
|
||||
mapper.getUploadFiles(command.getId());
|
||||
|
||||
secArticle.setUploadFiles(
|
||||
setArticleUploadFile.stream()
|
||||
.map(
|
||||
uploadFile -> {
|
||||
// 참조 URL 전달
|
||||
uploadFile.setReferURL(
|
||||
fileUrlPortIn.getInline(
|
||||
FileStorageType.valueOf(uploadStorageType),
|
||||
uploadFile.getPath(),
|
||||
uploadFile.getName()));
|
||||
// attachment URL 전달
|
||||
uploadFile.setAttachmentURL(
|
||||
fileUrlPortIn.getAttachment(
|
||||
FileStorageType.valueOf(uploadStorageType), uploadFile.getId()));
|
||||
|
||||
return uploadFile;
|
||||
})
|
||||
.collect(Collectors.toList()));
|
||||
|
||||
return Optional.of(secArticle);
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticle;
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleUploadFile;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface GetArticleMapper {
|
||||
GetArticle getArticle(Long id);
|
||||
List<GetArticleUploadFile> getUploadFiles(Long id);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports;
|
||||
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticle;
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetArticlePortIn {
|
||||
|
||||
Optional<GetArticle> operate(GetArticleCmd command);
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports;
|
||||
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticle;
|
||||
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface GetArticlePortOut {
|
||||
|
||||
Optional<GetArticle> operate(GetArticleCmd command);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.getArticle.ports.GetArticlePortIn;
|
||||
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;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetArticleService implements GetArticlePortIn {
|
||||
|
||||
private final GetArticlePortOut portOut;
|
||||
|
||||
@Override
|
||||
public Optional<GetArticle> operate(GetArticleCmd command) {
|
||||
return portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports.application.domain;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticle {
|
||||
private Long id;
|
||||
private String title;
|
||||
private String content;
|
||||
private Boolean visible;
|
||||
private LocalDateTime startDate;
|
||||
private LocalDateTime endDate;
|
||||
private Integer orderNo;
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private List<GetArticleUploadFile> uploadFiles;
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleCmd {
|
||||
|
||||
private Long id;
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticle.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile}
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class GetArticleUploadFile implements Serializable {
|
||||
|
||||
private LocalDateTime createdAt;
|
||||
private String createdBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private Long id;
|
||||
private FileUploadType type;
|
||||
private String path;
|
||||
private String name;
|
||||
private String originName;
|
||||
private Long fileLength;
|
||||
private String referURL;
|
||||
private String attachmentURL;
|
||||
}
|
||||
@@ -1,126 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.repository.ArticleRepo;
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import app.module.core.usecase.article.getArticles.adapters.persistence.model.GetArticlesDto;
|
||||
import app.module.core.usecase.article.getArticles.ports.GetArticlesPortOut;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticleFiles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
|
||||
import java.util.Collections;
|
||||
import java.util.stream.Collectors;
|
||||
import org.apache.commons.collections4.ListUtils;
|
||||
import org.springframework.data.domain.PageImpl;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class GetArticlesDao implements GetArticlesPortOut {
|
||||
|
||||
private final GetArticlesMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Page<GetArticles> operate(Pageable pageable, GetArticlesCmd command) {
|
||||
// 게시물 목록 얻기
|
||||
List<GetArticlesDto> contents =
|
||||
ListUtils.emptyIfNull(mapper.getArticles(pageable, command));
|
||||
|
||||
// 대표 이미지 목록 얻기
|
||||
List<GetArticleFiles> uploadFiles =
|
||||
contents.isEmpty()
|
||||
? Collections.emptyList()
|
||||
: ListUtils.emptyIfNull(
|
||||
mapper.getUploadFiles(
|
||||
contents.stream().map(GetArticlesDto::getId)
|
||||
.collect(Collectors.toList()),
|
||||
FileUploadType.PUBLIC));
|
||||
|
||||
return new PageImpl<>(
|
||||
contents.stream()
|
||||
.map(
|
||||
article ->
|
||||
new GetArticles(
|
||||
article.getId(),
|
||||
article.getUpdatedBy(),
|
||||
article.getUpdatedAt(),
|
||||
article.getTitle(),
|
||||
article.getContent(),
|
||||
article.getVisible(),
|
||||
article.getStartDate(),
|
||||
article.getEndDate(),
|
||||
article.getOrderNo(),
|
||||
uploadFiles.stream()
|
||||
.filter(file -> file.getArticleId().equals(article.getId()))
|
||||
.findFirst()
|
||||
.orElse(null)))
|
||||
.collect(Collectors.toList()),
|
||||
pageable,
|
||||
contents.isEmpty() ? 0 : contents.get(0).getTotal());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public List<GetArticles> operateList(GetArticlesCmd command) {
|
||||
/*// 검색조건 초기화
|
||||
Specification<Article> spec = (root, query, criteriaBuilder) -> null;
|
||||
|
||||
// 검색어 - like 검색
|
||||
if (!StringUtils.isEmpty(command.getSearchField())) {
|
||||
spec =
|
||||
spec.and(
|
||||
(root, query, builder) ->
|
||||
builder.like(
|
||||
root.get(command.getSearchField()),
|
||||
"%" + command.getSearchValue() + "%"));
|
||||
}
|
||||
|
||||
// 공개여부 검색
|
||||
if (!StringUtils.isEmpty(command.getSearchOpen())) {
|
||||
spec =
|
||||
spec.and(
|
||||
((root, query, criteriaBuilder) ->
|
||||
criteriaBuilder.equal(
|
||||
root.get("visible"), Boolean.valueOf(command.getSearchOpen()))));
|
||||
}
|
||||
|
||||
List<Article> result = getArticlesRepo.findAll(spec);
|
||||
|
||||
return result.stream()
|
||||
.map(
|
||||
article ->
|
||||
new GetArticles(
|
||||
article.getId(),
|
||||
article.getUpdatedBy(),
|
||||
article.getUpdatedAt(),
|
||||
article.getTitle(),
|
||||
article.getContent(),
|
||||
article.getVisible(),
|
||||
article.getStartDate(),
|
||||
article.getEndDate(),
|
||||
article.getOrderNo(),
|
||||
article.getUploadFiles().stream()
|
||||
// 목록에 보여줄 대표이미지만 담는다
|
||||
.filter(
|
||||
uploadFile -> uploadFile.getType()
|
||||
.equals(FileUploadType.EXAMPLE_REP))
|
||||
.map(
|
||||
uploadFile ->
|
||||
new GetArticleFiles(
|
||||
uploadFile.getId(),
|
||||
uploadFile.getType(),
|
||||
uploadFile.getPath(),
|
||||
uploadFile.getName(),
|
||||
uploadFile.getOriginName(),
|
||||
uploadFile.getFileLength()))
|
||||
.findFirst()
|
||||
.orElse(null)))
|
||||
.collect(Collectors.toList());*/
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import app.module.core.usecase.article.getArticles.adapters.persistence.model.GetArticlesDto;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticleFiles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
@Mapper
|
||||
public interface GetArticlesMapper {
|
||||
List<GetArticlesDto> getArticles(
|
||||
@Param("pageable") Pageable pageable, @Param("cmd") GetArticlesCmd cmd);
|
||||
List<GetArticleFiles> getUploadFiles(
|
||||
@Param("ids") List<Long> ids, @Param("fileUploadType") FileUploadType fileUploadType);
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.adapters.persistence.model;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class GetArticlesDto {
|
||||
private Long id;
|
||||
private String updatedBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String title;
|
||||
private String content;
|
||||
private Boolean visible;
|
||||
private LocalDateTime startDate;
|
||||
private LocalDateTime endDate;
|
||||
private Integer orderNo;
|
||||
private Long total;
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
|
||||
import java.util.List;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetArticlesPortIn {
|
||||
|
||||
Page<GetArticles> operate(Pageable pageable, GetArticlesCmd command);
|
||||
|
||||
List<GetArticles> operateList(GetArticlesCmd command);
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
|
||||
import java.util.List;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
||||
public interface GetArticlesPortOut {
|
||||
|
||||
Page<GetArticles> operate(Pageable pageable, GetArticlesCmd command);
|
||||
|
||||
List<GetArticles> operateList(GetArticlesCmd command);
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.getArticles.ports.GetArticlesPortIn;
|
||||
import app.module.core.usecase.article.getArticles.ports.GetArticlesPortOut;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticles;
|
||||
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class GetArticlesService implements GetArticlesPortIn {
|
||||
|
||||
private final GetArticlesPortOut portOut;
|
||||
|
||||
@Override
|
||||
public Page<GetArticles> operate(Pageable pageable, GetArticlesCmd command) {
|
||||
return portOut.operate(pageable, command);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GetArticles> operateList(GetArticlesCmd command) {
|
||||
return portOut.operateList(command);
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.FileUploadType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticleFiles {
|
||||
private Long articleId;
|
||||
private Long id;
|
||||
private FileUploadType type;
|
||||
private String path;
|
||||
private String name;
|
||||
private String originName;
|
||||
private Long fileLength;
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports.application.domain;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticles {
|
||||
private Long id;
|
||||
private String updatedBy;
|
||||
private LocalDateTime updatedAt;
|
||||
private String title;
|
||||
private String content;
|
||||
private Boolean visible;
|
||||
private LocalDateTime startDate;
|
||||
private LocalDateTime endDate;
|
||||
private Integer orderNo;
|
||||
private GetArticleFiles uploadFile;
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package app.module.core.usecase.article.getArticles.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetArticlesCmd {
|
||||
|
||||
private String searchField;
|
||||
private String searchValue;
|
||||
private String searchOpen;
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.repository.ArticleRepo;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.removeArticles.adapters.persistence.model.RemoveArticlesParam;
|
||||
import app.module.core.usecase.article.removeArticles.ports.RemoveArticlesPortOut;
|
||||
import app.module.core.usecase.article.removeArticles.ports.application.domain.RemoveArticlesCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class RemoveArticlesDao implements RemoveArticlesPortOut {
|
||||
|
||||
private final RemoveArticlesMapper mapper;
|
||||
|
||||
@Override
|
||||
public void operate(RemoveArticlesCmd command) {
|
||||
String loginUser = CommonUtil.getLoginUsername();;
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
mapper.deleteArticleHasFiles(
|
||||
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser));
|
||||
mapper.deleteArticles(
|
||||
new RemoveArticlesParam(command.getRemoveIds(), now, loginUser, now, loginUser));
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.removeArticles.adapters.persistence.model.RemoveArticlesParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface RemoveArticlesMapper {
|
||||
void deleteArticles(RemoveArticlesParam param);
|
||||
void deleteArticleHasFiles(RemoveArticlesParam param);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.adapters.persistence.model;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Set;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class RemoveArticlesParam {
|
||||
private Set<Long> removeIds;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
private LocalDateTime deletedAt;
|
||||
private String deletedBy;
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.removeArticles.ports.application.domain.RemoveArticlesCmd;
|
||||
|
||||
public interface RemoveArticlesPortIn {
|
||||
void operate(RemoveArticlesCmd command);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.removeArticles.ports.application.domain.RemoveArticlesCmd;
|
||||
|
||||
public interface RemoveArticlesPortOut {
|
||||
void operate(RemoveArticlesCmd command);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.removeArticles.ports.RemoveArticlesPortIn;
|
||||
import app.module.core.usecase.article.removeArticles.ports.RemoveArticlesPortOut;
|
||||
import app.module.core.usecase.article.removeArticles.ports.application.domain.RemoveArticlesCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class RemoveArticlesService implements RemoveArticlesPortIn {
|
||||
|
||||
private final RemoveArticlesPortOut portOut;
|
||||
|
||||
@Override
|
||||
public void operate(RemoveArticlesCmd command) {
|
||||
portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package app.module.core.usecase.article.removeArticles.ports.application.domain;
|
||||
|
||||
import java.util.Set;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class RemoveArticlesCmd {
|
||||
private Set<Long> removeIds;
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.Article;
|
||||
import app.module.core.config.adapters.persistence.repository.ArticleRepo;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.sortArticles.adapters.persistence.model.SortArticlesParam;
|
||||
import app.module.core.usecase.article.sortArticles.ports.SortArticlesPortOut;
|
||||
import app.module.core.usecase.article.sortArticles.ports.application.domain.SortArticlesCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class SortArticlesDao implements SortArticlesPortOut {
|
||||
|
||||
private final SortArticlesMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void operate(List<SortArticlesCmd> command) {
|
||||
mapper.updateSort(
|
||||
new SortArticlesParam(command, LocalDateTime.now(), CommonUtil.getLoginUsername()));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.adapters.persistence;
|
||||
|
||||
import app.module.core.usecase.article.sortArticles.adapters.persistence.model.SortArticlesParam;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SortArticlesMapper {
|
||||
void updateSort(SortArticlesParam param);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.adapters.persistence.model;
|
||||
|
||||
import app.module.core.usecase.article.sortArticles.ports.application.domain.SortArticlesCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SortArticlesParam {
|
||||
private List<SortArticlesCmd> sortItems;
|
||||
private LocalDateTime updatedAt;
|
||||
private String updatedBy;
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.sortArticles.ports.application.domain.SortArticlesCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface SortArticlesPortIn {
|
||||
|
||||
void operate(List<SortArticlesCmd> command);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.ports;
|
||||
|
||||
import app.module.core.usecase.article.sortArticles.ports.application.domain.SortArticlesCmd;
|
||||
import java.util.List;
|
||||
|
||||
public interface SortArticlesPortOut {
|
||||
|
||||
void operate(List<SortArticlesCmd> command);
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.ports.application;
|
||||
|
||||
import app.module.core.usecase.article.sortArticles.ports.SortArticlesPortIn;
|
||||
import app.module.core.usecase.article.sortArticles.ports.SortArticlesPortOut;
|
||||
import app.module.core.usecase.article.sortArticles.ports.application.domain.SortArticlesCmd;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class SortArticlesService implements SortArticlesPortIn {
|
||||
|
||||
private final SortArticlesPortOut portOut;
|
||||
|
||||
@Override
|
||||
public void operate(List<SortArticlesCmd> command) {
|
||||
portOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package app.module.core.usecase.article.sortArticles.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class SortArticlesCmd {
|
||||
|
||||
private Long id;
|
||||
private Integer orderNo;
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package app.module.core.usecase.article.updateArticle.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.ArticleHasUploadFile;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.article.updateArticle.adapters.persistence.model.CreateUploadFileParam;
|
||||
import app.module.core.usecase.article.updateArticle.adapters.persistence.model.UpdateArticleDto;
|
||||
import app.module.core.usecase.article.updateArticle.ports.UpdateArticlePortOut;
|
||||
import app.module.core.usecase.article.updateArticle.ports.application.domain.UpdateArticleCmd;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class UpdateArticleDao implements UpdateArticlePortOut {
|
||||
|
||||
private final UpdateArticleMapper mapper;
|
||||
|
||||
@Override
|
||||
public void operate(UpdateArticleCmd command) {
|
||||
mapper.updateArticle(
|
||||
new UpdateArticleDto(
|
||||
command.getId(),
|
||||
command.getTitle(),
|
||||
command.getContent(),
|
||||
command.getVisible(),
|
||||
command.getOrderNo(),
|
||||
command.getStartDate(),
|
||||
command.getEndDate(),
|
||||
command.getFileMappingId(),
|
||||
LocalDateTime.now(),
|
||||
CommonUtil.getLoginUsername()
|
||||
));
|
||||
|
||||
// 첨부파일 초기화
|
||||
mapper.deleteFileUploads(new ArticleHasUploadFile(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()
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user