Merge branch 'refs/heads/dev' into first_open_fetch

# Conflicts:
#	core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java
This commit is contained in:
주수현
2025-07-21 10:11:56 +09:00
1593 changed files with 21739 additions and 47968 deletions

View File

@@ -3,16 +3,14 @@ package app.module.front.config;
import app.module.core.config.adapters.web.interceptor.URIAuthorizeInterceptor;
import app.module.core.config.application.enums.PublicAccess;
import app.module.front.config.adapters.web.interceptor.FrontURIInterceptor;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.LocaleResolver;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -20,6 +18,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
@Configuration
@RequiredArgsConstructor
public class FrontWebMvcConfig implements WebMvcConfigurer {
@@ -81,4 +84,14 @@ public class FrontWebMvcConfig implements WebMvcConfigurer {
lci.setParamName("lang");
return lci;
}
@Bean
public RestTemplate restTemplate() {
SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
factory.setConnectTimeout(5000);
factory.setReadTimeout(10000);
RestTemplate restTemplate = new RestTemplate();
restTemplate.setRequestFactory(factory);
return restTemplate;
}
}

View File

@@ -11,7 +11,6 @@ import app.module.core.usecase.uri.toptier.ports.URITopTierPortIn;
import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -19,6 +18,8 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import java.util.stream.Collectors;
@Component
@RequiredArgsConstructor
@Slf4j

View File

@@ -0,0 +1,34 @@
package app.module.front.config.application.bean;
import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class JasyptConfig {
@Value("${jasypt.encryptor.password}")
private String jasyptPassword;
@Value("${jasypt.encryptor.algorithm}")
private String jasyptAlgorithm;
@Bean("jasyptStringEncryptor")
public StringEncryptor stringEncryptor() {
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
config.setPassword(jasyptPassword); // 암호화할 때 사용하는 키
config.setPoolSize("1"); // 인스턴스 pool
config.setAlgorithm(jasyptAlgorithm); // 암호화 알고리즘
config.setStringOutputType("base64"); // 인코딩 방식
config.setKeyObtentionIterations("1000"); // 반복할 해싱 회수
config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); // salt 생성 클래스
config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
encryptor.setConfig(config);
return encryptor;
}
}

View File

@@ -0,0 +1,66 @@
package app.module.front.config.application.bean;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.sql.DataSource;
import java.io.IOException;
@Slf4j
@Configuration
@MapperScan(
basePackages = { "app.module.front.**.persistence", "app.module.core.**.persistence" },
annotationClass = org.apache.ibatis.annotations.Mapper.class,
sqlSessionFactoryRef = "kriSqlSessionFactory")
@EnableTransactionManagement
public class KRIConfig {
@Value("${mybatis.mapper-locations.kri}")
private String mybatisMapper;
@Primary
@Bean(name = "kriDataSource")
@ConfigurationProperties(prefix = "spring.datasource.kri")
public DataSource kriDataSource() {
return DataSourceBuilder.create().build();
}
@Primary
@Bean(name = "kriSqlSessionFactory")
public SqlSessionFactory kriSqlSessionFactory(@Qualifier("kriDataSource") DataSource dataSource) throws Exception {
SqlSessionFactoryBean sessionFactoryBean = new SqlSessionFactoryBean();
sessionFactoryBean.setVfs(SpringBootVFS.class);
configureSqlSessionFactory(sessionFactoryBean, dataSource);
return sessionFactoryBean.getObject();
}
protected void configureSqlSessionFactory(SqlSessionFactoryBean sessionFactoryBean, DataSource dataSource) throws IOException {
sessionFactoryBean.setDataSource(dataSource);
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
sessionFactoryBean.setMapperLocations(resolver.getResources(mybatisMapper));
org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
configuration.setMapUnderscoreToCamelCase(true);
sessionFactoryBean.setConfiguration(configuration);
}
@Primary
@Bean(name = "kriSqlSessionTemplate")
public SqlSessionTemplate kriSqlSessionTemplate(@Qualifier("kriSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory);
return sqlSessionTemplate;
}
}

View File

@@ -1,48 +0,0 @@
package app.module.front.config.application.security;
import app.module.core.config.application.enums.SocialType;
import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn;
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd;
import java.util.Arrays;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
@Slf4j
public class CustomOAuth2UserService implements OAuth2UserService<OAuth2UserRequest, OAuth2User> {
private final ProcessSocialLoginPortIn processSocialLoginPortIn;
@Override
public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
OAuth2UserService<OAuth2UserRequest, OAuth2User> delegate = new DefaultOAuth2UserService();
OAuth2User oAuth2User = delegate.loadUser(userRequest);
String registrationId = userRequest.getClientRegistration().getRegistrationId();
SocialType socialType =
Arrays.stream(SocialType.values())
.filter(type -> type.getRegistrationId().equals(registrationId))
.findFirst()
.orElseThrow(() -> new RuntimeException("Social type not found"));
String userNameAttributeName =
userRequest
.getClientRegistration()
.getProviderDetails()
.getUserInfoEndpoint()
.getUserNameAttributeName();
Map<String, Object> attributes = oAuth2User.getAttributes();
return processSocialLoginPortIn
.operate(new ProcessSocialLoginCmd(socialType, userNameAttributeName, attributes))
.orElseThrow();
}
}

View File

@@ -2,18 +2,9 @@ package app.module.front.config.application.security;
import app.module.core.config.adapters.web.security.domain.CorePrivilege;
import app.module.core.config.adapters.web.security.domain.CoreRole;
import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
import app.module.core.usecase.user.findUser.ports.FindUserPortIn;
import app.module.core.usecase.user.findUser.ports.application.domain.FindUser;
import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.GrantedAuthority;
@@ -23,6 +14,11 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service
@RequiredArgsConstructor
public class FrontDetailService implements UserDetailsService {

View File

@@ -1,10 +1,13 @@
package app.module.front.config.application.security;
import java.util.Collection;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.User;
import java.util.Collection;
@Setter
@Getter
public class FrontHouseholdUser extends User {

View File

@@ -3,11 +3,11 @@ package app.module.front.config.application.security;
import java.util.ArrayList;
import java.util.List;
public class FrontPublicAccess {
public final class FrontPublicAccess {
private static final FrontPublicAccess INSTANCE = new FrontPublicAccess();
private List<String> publicAccessURIs = new ArrayList<>();
private final List<String> publicAccessURIs = new ArrayList<>();
private FrontPublicAccess() {
}

View File

@@ -2,10 +2,6 @@ package app.module.front.config.application.security;
import app.module.core.config.adapters.web.security.entrypoint.CustomAuthenticationEntryPoint;
import app.module.core.config.application.enums.PublicAccess;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.sql.DataSource;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
@@ -23,6 +19,10 @@ import org.springframework.security.web.authentication.rememberme.PersistentToke
import org.springframework.security.web.session.HttpSessionEventPublisher;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import javax.sql.DataSource;
import java.util.Arrays;
import java.util.List;
@Configuration
@EnableWebSecurity
@RequiredArgsConstructor
@@ -31,7 +31,6 @@ public class FrontSecurityConfig {
private final FrontDetailService frontDetailService;
private final DataSource dataSource;
private final BCryptPasswordEncoder passwordEncoder;
private final CustomOAuth2UserService customOAuth2UserService;
private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint;
@Value("${app.front.session.maximum.num}")
private Integer maxSessionNum;
@@ -69,7 +68,7 @@ public class FrontSecurityConfig {
List<String> publicAccess =
Arrays.stream(PublicAccess.values())
.map(PublicAccess::getPath)
.collect(Collectors.toList());
.toList();
// front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다)
FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**"));
@@ -104,13 +103,7 @@ public class FrontSecurityConfig {
session -> session.maximumSessions(maxSessionNum).maxSessionsPreventsLogin(false).expiredUrl("/login"))
.sessionManagement(
session -> session.invalidSessionUrl("/login"))
.oauth2Login(
config ->
config
.loginPage("/login")
.userInfoEndpoint(
userInfoEndpointConfig ->
userInfoEndpointConfig.userService(customOAuth2UserService)));
;
return http.build();
}

View File

@@ -1,11 +1,14 @@
package app.module.front.config.application.security;
import java.util.Collection;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.User;
import java.util.Collection;
@Getter
@Setter
public class FrontUser extends User {
private String nickname;

View File

@@ -2,7 +2,7 @@ package app.module.front.config.application.util;
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
public class AuditUtil {
public final class AuditUtil {
private AuditUtil() {}
public static <T extends FrontAuditCommand> T create(T cmd) {

View File

@@ -1,11 +1,9 @@
package app.module.front.config.application.util;
import app.module.core.config.adapters.web.security.domain.SocialUser;
import app.module.front.config.application.security.FrontHouseholdUser;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
import org.springframework.stereotype.Component;
@Component

View File

@@ -1,17 +0,0 @@
package app.module.front.config.constants;
public class CommonConstants {
private CommonConstants() {
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
}
/**
* 단위의 직접입력 코드
*/
public static final String UNIT_CODE_SELF = "code.record.unit.self";
/**
* 작업 면적의 직접입력 코드
*/
public static final String AREA_CODE_OTHER = "code.record.area.self";
}

View File

@@ -1,35 +0,0 @@
package app.module.front.usecase.article.comment.createArticleComment.adapter.web;
import app.module.core.usecase.article.comment.createArticleComment.ports.CreateArticleCommentPortIn;
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 app.module.front.usecase.article.comment.createArticleComment.adapter.web.model.CreateArticleCommentReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class CreateArticleCommentController {
private final CreateArticleCommentPortIn createArticleCommentPortIn;
@PostMapping(path = "/api/front/board/articles/comment/create")
ResponseEntity<?> operate(@Valid CreateArticleCommentReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
CreateArticleComment comment =
createArticleCommentPortIn.operate(
new CreateArticleCommentCmd(reqVO.getArticleId(), reqVO.getCommentContent()))
.orElseThrow();
return ResponseEntity.status(HttpStatus.OK).body(comment);
}
}

View File

@@ -1,23 +0,0 @@
package app.module.front.usecase.article.comment.createArticleComment.adapter.web.model;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.text.StringEscapeUtils;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateArticleCommentReqVO {
private Long articleId;
@NotBlank(message = "{valid.article.comment.required}")
private String commentContent;
public String getCommentContent() {
return StringEscapeUtils.escapeHtml4(commentContent);
}
}

View File

@@ -1,34 +0,0 @@
package app.module.front.usecase.article.comment.getArticleComments.adapter.web;
import app.module.core.usecase.article.comment.getArticleComments.ports.GetArticleCommentsPortIn;
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 app.module.front.usecase.article.comment.getArticleComments.adapter.web.model.GetArticleCommentsReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetArticleCommentsController {
private final GetArticleCommentsPortIn getArticleCommentsPortIn;
@GetMapping(path = "/api/front/board/articles/comments")
ResponseEntity<?> operate(
@PageableDefault(sort = "id", direction = Sort.Direction.DESC, page = 0, size = 10) Pageable pageable,
GetArticleCommentsReqVO reqVO) {
Page<GetArticleComments> comments =
getArticleCommentsPortIn.operate(pageable,
new GetArticleCommentsCmd(reqVO.getArticleId()));
return ResponseEntity.status(HttpStatus.OK).body(comments);
}
}

View File

@@ -1,15 +0,0 @@
package app.module.front.usecase.article.comment.getArticleComments.adapter.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetArticleCommentsReqVO {
private Long articleId;
}

View File

@@ -1,31 +0,0 @@
package app.module.front.usecase.article.comment.removeArticleComment.adapter.web;
import app.module.core.usecase.article.comment.removeArticleComment.ports.RemoveArticleCommentPortIn;
import app.module.core.usecase.article.comment.removeArticleComment.ports.application.domain.RemoveArticleCommentCmd;
import app.module.front.usecase.article.comment.removeArticleComment.adapter.web.model.RemoveArticleCommentReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class RemoveArticleCommentController {
private final RemoveArticleCommentPortIn removeArticleCommentPortIn;
@DeleteMapping(path = "/api/front/board/articles/comment/remove")
ResponseEntity<?> operate(@Valid RemoveArticleCommentReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
removeArticleCommentPortIn.operate(new RemoveArticleCommentCmd(reqVO.getRemoveId()));
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}
}

View File

@@ -1,15 +0,0 @@
package app.module.front.usecase.article.comment.removeArticleComment.adapter.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class RemoveArticleCommentReqVO {
private Long removeId;
}

View File

@@ -1,38 +0,0 @@
package app.module.front.usecase.article.comment.updateArticleComment.adapter.web;
import app.module.core.usecase.article.comment.updateArticleComment.ports.UpdateArticleCommentPortIn;
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 app.module.front.usecase.article.comment.updateArticleComment.adapter.web.model.UpdateArticleCommentReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class UpdateArticleCommentController {
private final UpdateArticleCommentPortIn updateArticleCommentPortIn;
@PutMapping(path = "/api/front/board/articles/comment/update")
ResponseEntity<?> operate(@Valid UpdateArticleCommentReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
UpdateArticleComment comment =
updateArticleCommentPortIn.operate(
new UpdateArticleCommentCmd(
reqVO.getCommentId(),
reqVO.getCommentContent(),
reqVO.getArticleId()))
.orElseThrow();
return ResponseEntity.status(HttpStatus.OK).body(comment);
}
}

View File

@@ -1,24 +0,0 @@
package app.module.front.usecase.article.comment.updateArticleComment.adapter.web.model;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.text.StringEscapeUtils;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateArticleCommentReqVO {
private Long commentId;
@NotBlank(message = "{valid.article.comment.required}")
private String commentContent;
private Long articleId;
public String getCommentContent() {
return StringEscapeUtils.escapeHtml4(commentContent);
}
}

View File

@@ -1,46 +0,0 @@
package app.module.front.usecase.article.createArticle.adapters.web;
import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn;
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle;
import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd;
import app.module.front.usecase.article.createArticle.adapters.web.model.CreateArticleReqVO;
import app.module.front.usecase.article.createArticle.adapters.web.validator.CreateArticleValidator;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class CreateArticleController {
private final CreateArticlePortIn createArticlePortIn;
private final CreateArticleValidator createArticleValidator;
@PostMapping(path = "/api/front/board/articles/create")
ResponseEntity<?> operate(@Valid CreateArticleReqVO reqVO, BindingResult bindingResult) {
createArticleValidator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
CreateArticle article =
createArticlePortIn
.operate(
new CreateArticleCmd(
reqVO.getTitle(),
reqVO.getContent(),
reqVO.getVisible(),
reqVO.getStartDate(),
reqVO.getEndDate(),
reqVO.getFileMappingId()))
.orElseThrow();
return ResponseEntity.status(HttpStatus.OK).body(article);
}
}

View File

@@ -1,43 +0,0 @@
package app.module.front.usecase.article.createArticle.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.text.StringEscapeUtils;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateArticleReqVO {
@NotBlank(message = "{valid.common.required}")
private String title;
@NotBlank(message = "{valid.common.required}")
private String content;
@NotNull(message = "{valid.common.required}")
private Boolean visible;
@NotNull(message = "{valid.common.required}")
private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}")
private LocalDateTime endDate;
private List<String> fileMappingId;
public String getTitle() {
return StringEscapeUtils.escapeHtml4(title);
}
public String getContent() {
return StringEscapeUtils.escapeHtml4(content);
}
}

View File

@@ -1,55 +0,0 @@
package app.module.front.usecase.article.createArticle.adapters.web.validator;
import app.module.core.config.application.util.MessageUtil;
import app.module.front.usecase.article.createArticle.adapters.web.model.CreateArticleReqVO;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
@RequiredArgsConstructor
public class CreateArticleValidator implements Validator {
private final MessageUtil messageUtil;
@Override
public boolean supports(Class<?> clazz) {
return CreateArticleReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
CreateArticleReqVO vo = (CreateArticleReqVO) target;
LocalDateTime startDate = vo.getStartDate();
LocalDateTime endDate = vo.getEndDate();
// 게시일 날짜 체크
if (startDate == null) {
errors.rejectValue(
"startDate", "valid.common.required",
messageUtil.getMessage("valid.common.required"));
}
if (endDate == null) {
errors.rejectValue(
"endDate", "valid.common.required",
messageUtil.getMessage("valid.common.required"));
}
if (startDate != null && endDate != null) {
if (!startDate.isBefore(endDate)) {
errors.rejectValue(
"startDate",
"valid.common.date.invalid",
messageUtil.getMessage("valid.common.date.invalid"));
errors.rejectValue(
"endDate",
"valid.common.date.invalid",
messageUtil.getMessage("valid.common.date.invalid"));
}
}
}
}

View File

@@ -1,21 +0,0 @@
package app.module.front.usecase.article.createArticleUI;
import app.module.front.usecase.article.createArticleUI.model.CreateArticleUIReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@Controller
@RequiredArgsConstructor
class CreateArticleUIController {
@GetMapping(path = "/board/articles/create")
String operate(
Model model,
@ModelAttribute("reqVO") CreateArticleUIReqVO reqVO) {
return "board/articles/create";
}
}

View File

@@ -1,14 +0,0 @@
package app.module.front.usecase.article.createArticleUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateArticleUIReqVO {
}

View File

@@ -1,23 +0,0 @@
package app.module.front.usecase.article.getArticle.adapters.web;
import app.module.core.usecase.article.getArticle.ports.GetArticlePortIn;
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetArticleController {
private final GetArticlePortIn getArticlePortIn;
@GetMapping(path = "/api/front/board/articles/{id}")
ResponseEntity<?> operate(@PathVariable Long id) {
return ResponseEntity.status(HttpStatus.OK)
.body(getArticlePortIn.operate(new GetArticleCmd(id)).orElseThrow());
}
}

View File

@@ -1,37 +0,0 @@
package app.module.front.usecase.article.getArticleUI.adapters.web;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.article.getArticle.ports.GetArticlePortIn;
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.front.usecase.article.getArticleUI.adapters.web.model.GetArticleUIReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
@Controller
@RequiredArgsConstructor
class GetArticleUIController {
private final GetArticlePortIn getArticlePortIn;
@GetMapping(path = "/board/articles/{id}")
String operate(
Model model,
@PathVariable @ModelAttribute("id") Long id,
@ModelAttribute("reqVO") GetArticleUIReqVO reqVO) {
GetArticle getArticle =
getArticlePortIn.operate(new GetArticleCmd(id)).orElseThrow();
// 로그인 사용자와 게시물 작성자가 동일한지 체크
model.addAttribute("isAuthor",
getArticle.getCreatedBy().equals(CommonUtil.getLoginUsername()));
model.addAttribute("article", getArticle);
return "board/articles/{id}";
}
}

View File

@@ -1,14 +0,0 @@
package app.module.front.usecase.article.getArticleUI.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetArticleUIReqVO {
}

View File

@@ -1,32 +0,0 @@
package app.module.front.usecase.article.getArticles.adapters.web;
import app.module.core.usecase.article.getArticles.ports.GetArticlesPortIn;
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticles;
import app.module.core.usecase.article.getArticles.ports.application.domain.GetArticlesCmd;
import app.module.front.usecase.article.getArticles.adapters.web.model.GetArticlesReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetArticlesController {
private final GetArticlesPortIn getArticlesPortIn;
@GetMapping(path = "/api/board/articles")
ResponseEntity<?> operate(@PageableDefault Pageable pageable, GetArticlesReqVO reqVO) {
Page<GetArticles> articles =
getArticlesPortIn.operate(
pageable,
new GetArticlesCmd(
reqVO.getSearchField(), reqVO.getSearchValue(), reqVO.getSearchOpen()));
return ResponseEntity.status(HttpStatus.OK).body(articles);
}
}

View File

@@ -1,17 +0,0 @@
package app.module.front.usecase.article.getArticles.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetArticlesReqVO {
private String searchField;
private String searchValue;
private String searchOpen;
}

View File

@@ -1,26 +0,0 @@
package app.module.front.usecase.article.getArticlesUI;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.article.getArticlesUI.model.GetArticlesUIReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
@Controller
@RequiredArgsConstructor
class GetArticlesUIController {
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/board/articles")
String operate(
Model model,
@ModelAttribute("reqVO") GetArticlesUIReqVO reqVO) {
model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows"));
return "board/articles";
}
}

View File

@@ -1,36 +0,0 @@
package app.module.front.usecase.article.getArticlesUI.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.thymeleaf.util.StringUtils;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetArticlesUIReqVO {
private Integer page;
private String sort;
private Integer size;
private String searchField;
private String searchValue;
private String searchOpen;
public Integer getPage() {
// 요청 페이지 넘버 - 초기값 `0`
return page != null ? page : 0;
}
public String getSort() {
// 정렬 값 - 초기값 `orderNo 내림차순`
return StringUtils.isEmpty(sort) ? "orderNo,DESC" : sort;
}
public Integer getSize() {
// 페이지 당 아이템 수 - 초기값 `10`
return size != null ? size : 10;
}
}

View File

@@ -1,31 +0,0 @@
package app.module.front.usecase.article.removeArticles.adapters.web;
import app.module.core.usecase.article.removeArticles.ports.RemoveArticlesPortIn;
import app.module.core.usecase.article.removeArticles.ports.application.domain.RemoveArticlesCmd;
import app.module.front.usecase.article.removeArticles.adapters.web.model.RemoveArticlesReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class RemoveArticlesController {
private final RemoveArticlesPortIn removeArticlesPortIn;
@DeleteMapping(path = "/api/front/board/articles/remove")
ResponseEntity<?> operate(@Valid RemoveArticlesReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
removeArticlesPortIn.operate(new RemoveArticlesCmd(reqVO.getSelectIds()));
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}
}

View File

@@ -1,16 +0,0 @@
package app.module.front.usecase.article.removeArticles.adapters.web.model;
import java.util.Set;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class RemoveArticlesReqVO {
private Set<Long> selectIds;
}

View File

@@ -1,46 +0,0 @@
package app.module.front.usecase.article.updateArticle.adapters.web;
import app.module.core.usecase.article.updateArticle.ports.UpdateArticlePortIn;
import app.module.core.usecase.article.updateArticle.ports.application.domain.UpdateArticleCmd;
import app.module.front.usecase.article.updateArticle.adapters.web.model.UpdateArticleReqVO;
import app.module.front.usecase.article.updateArticle.adapters.web.validator.UpdateArticleValidator;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
@Slf4j
class UpdateArticleController {
private final UpdateArticlePortIn updateArticlePortIn;
private final UpdateArticleValidator updateArticleValidator;
@PutMapping(path = "/api/front/board/articles/update")
ResponseEntity<?> operate(@Valid UpdateArticleReqVO reqVO, BindingResult bindingResult) {
updateArticleValidator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
updateArticlePortIn.operate(
new UpdateArticleCmd(
reqVO.getId(),
reqVO.getTitle(),
reqVO.getContent(),
reqVO.getVisible(),
reqVO.getOrderNo(),
reqVO.getStartDate(),
reqVO.getEndDate(),
reqVO.getFileMappingId()));
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}
}

View File

@@ -1,49 +0,0 @@
package app.module.front.usecase.article.updateArticle.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.text.StringEscapeUtils;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateArticleReqVO {
@NotNull(message = "{valid.common.required}")
private Long id;
@NotBlank(message = "{valid.common.required}")
private String title;
@NotBlank(message = "{valid.common.required}")
private String content;
@NotNull(message = "{valid.common.required}")
private Boolean visible;
@NotNull(message = "{valid.common.required}")
private Integer orderNo;
@NotNull(message = "{valid.common.required}")
private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}")
private LocalDateTime endDate;
private List<String> fileMappingId;
public String getTitle() {
return StringEscapeUtils.escapeHtml4(title);
}
public String getContent() {
return StringEscapeUtils.escapeHtml4(content);
}
}

View File

@@ -1,55 +0,0 @@
package app.module.front.usecase.article.updateArticle.adapters.web.validator;
import app.module.core.config.application.util.MessageUtil;
import app.module.front.usecase.article.updateArticle.adapters.web.model.UpdateArticleReqVO;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
@RequiredArgsConstructor
public class UpdateArticleValidator implements Validator {
private final MessageUtil messageUtil;
@Override
public boolean supports(Class<?> clazz) {
return UpdateArticleReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
UpdateArticleReqVO vo = (UpdateArticleReqVO) target;
LocalDateTime startDate = vo.getStartDate();
LocalDateTime endDate = vo.getEndDate();
// 게시일 날짜 체크
if (startDate == null) {
errors.rejectValue(
"startDate", "valid.common.required",
messageUtil.getMessage("valid.common.required"));
}
if (endDate == null) {
errors.rejectValue(
"endDate", "valid.common.required",
messageUtil.getMessage("valid.common.required"));
}
if (startDate != null && endDate != null) {
if (!startDate.isBefore(endDate)) {
errors.rejectValue(
"startDate",
"valid.common.date.invalid",
messageUtil.getMessage("valid.common.date.invalid"));
errors.rejectValue(
"endDate",
"valid.common.date.invalid",
messageUtil.getMessage("valid.common.date.invalid"));
}
}
}
}

View File

@@ -1,32 +0,0 @@
package app.module.front.usecase.article.updateArticleUI.adapters.web;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.article.getArticle.ports.GetArticlePortIn;
import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd;
import app.module.front.usecase.article.updateArticleUI.adapters.web.model.UpdateArticleUIReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
@Controller
@RequiredArgsConstructor
class UpdateArticleUIController {
private final GetArticlePortIn getArticlePortIn;
@GetMapping(path = "/board/articles/update/{id}")
String operate(
Model model,
@PathVariable @ModelAttribute("id") Long id,
@ModelAttribute("reqVO") UpdateArticleUIReqVO reqVO) {
getArticlePortIn.operate(new GetArticleCmd(id))
.filter(article -> article.getCreatedBy().equals(CommonUtil.getLoginUsername()))
.orElseThrow(() -> new RuntimeException("수정 권한이 없는 사용자입니다."));
return "board/articles/update/{id}";
}
}

View File

@@ -1,14 +0,0 @@
package app.module.front.usecase.article.updateArticleUI.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class UpdateArticleUIReqVO {
}

View File

@@ -4,15 +4,16 @@ import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.config.application.enums.MonthStatus;
import app.module.core.config.application.util.DailyUtil;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -21,6 +22,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
@Repository
@@ -34,7 +36,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
public List<RecordCalendar> operate(RecordCalendarCmd command) {
List<DailyRecordCalendarDto> calendarList = this.getCalendarList(command);
List<DailyRecordStatusDto> statusList = this.getDailyRecordStatus(command);
MonthlyStatusDto monthlyStatus = this.getBankExist(command);
MonthlyStatusDto monthlyStatus = this.getMonthlyStatus(command);
String pathFormat = "/record/%s/%s/%s";
@@ -65,6 +67,16 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate()));
refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate()));
if (calendar.getGroupNo() == 1) {
Long carryOver = this.getMonthlyCarryOver(command);
if (!LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth()) && carryOver == null) {
carryOver = 0L;
}
refine.setCarryOver(carryOver);
}
DailyRecordStatusDto findStatus = statusList.stream()
.filter(f -> Objects.equals(calendar.getDailyId(), f.getDailyId()))
.findFirst().orElse(null);
@@ -83,7 +95,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.INCOME.getDesc(),
findStatus.getIncomeStatus(),
findStatus.getIncomeCount(),
String.format(pathFormat, DailySort.INCOME.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.INCOME.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (!DailyTargetStatus.NONE.equals(findStatus.getWorkStatus())) {
childList.add(new CalendarChildren(
@@ -91,7 +103,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.WORK.getDesc(),
findStatus.getWorkStatus(),
findStatus.getWorkCount(),
String.format(pathFormat, DailySort.WORK.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.WORK.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (!DailyTargetStatus.NONE.equals(findStatus.getExpenseStatus())) {
childList.add(new CalendarChildren(
@@ -99,7 +111,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.EXPENSE.getDesc(),
findStatus.getExpenseStatus(),
findStatus.getExpenseCount(),
String.format(pathFormat, DailySort.EXPENSE.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.EXPENSE.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (!DailyTargetStatus.NONE.equals(findStatus.getPowerStatus())) {
childList.add(new CalendarChildren(
@@ -107,7 +119,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.POWER.getDesc(),
findStatus.getPowerStatus(),
findStatus.getPowerCount(),
String.format(pathFormat, DailySort.POWER.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.POWER.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (!DailyTargetStatus.NONE.equals(findStatus.getForestryStatus())) {
childList.add(new CalendarChildren(
@@ -115,7 +127,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.FORESTRY.getDesc(),
findStatus.getForestryStatus(),
findStatus.getForestryCount(),
String.format(pathFormat, DailySort.FORESTRY.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.FORESTRY.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
if (!DailyTargetStatus.NONE.equals(findStatus.getFarmingStatus())) {
childList.add(new CalendarChildren(
@@ -123,7 +135,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
DailySort.FARMING.getDesc(),
findStatus.getFarmingStatus(),
findStatus.getFarmingCount(),
String.format(pathFormat, DailySort.FARMING.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo())));
String.format(pathFormat, DailySort.FARMING.name().toLowerCase(Locale.ROOT), command.getSearchMonth(), findStatus.getDayGroupNo())));
}
}
@@ -136,9 +148,18 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
}
@Override
public int getDataNoneCountBySomeDayAfter(Long householdSeq) {
public MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command) {
MonthlyStatusDto detail = recordCalendarMapper.getMonthlyStatus(command);
return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq);
return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail;
}
@Override
public int getDataNoneCountBySomeDayAfter(Long householdSeq) {
// 검색 당일을 제외하여 -1 처리
int limitDay = DailyRecordConstants.REGISTER_LIMIT_DAY - 1;
return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq, limitDay);
}
@Override
@@ -174,6 +195,17 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
return refineList;
}
/**
* 특정월의 월초이월금 조회
*
* @param command 검색 조건
* @return 월초이월금
*/
private Long getMonthlyCarryOver(RecordCalendarCmd command) {
return recordCalendarMapper.getMonthlyCarryOver(command);
}
/**
* 특정월의 일계부 등록 상태 조회
*
@@ -189,18 +221,6 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
return statusList;
}
/**
* 특정월의 월별 작성 상태 조회
*
* @param command 검색 조건
* @return true=등록완료, false=미등록
*/
private MonthlyStatusDto getBankExist(RecordCalendarCmd command) {
MonthlyStatusDto detail = recordCalendarMapper.getMonthlyStatus(command);
return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail;
}
/**
* 미작성 목록 조회
*

View File

@@ -1,10 +1,11 @@
package app.module.front.usecase.daily.calendar.adapters.persistence;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,6 +19,13 @@ public interface RecordCalendarMapper {
*/
List<DailyRecordCalendarDto> getCalendarByDailyRecord(RecordCalendarCmd command);
/**
* 특정월의 월초이월금 조회
* @param command 검색 조건
* @return 월초이월금
*/
Long getMonthlyCarryOver(RecordCalendarCmd command);
/**
* 특정월의 월별 작성 상태 조회
*
@@ -27,12 +35,13 @@ public interface RecordCalendarMapper {
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
/**
* 3일전 ~ 15일전 미등록된 데이터 개수 조회
* 등록가능 기간에 미등록된 데이터 개수 조회
*
* @param householdSeq 임가회원 일련번호
* @param limitDay 전일로부터 x일전 검색 일
* @return 미등록 건 수
*/
Integer getDataNoneCountBySomeDayAfter(Long householdSeq);
Integer getDataNoneCountBySomeDayAfter(@Param("householdSeq") Long householdSeq, @Param("limitDay") Integer limitDay);
/**
* 최신 등록일 데이터 조회

View File

@@ -27,6 +27,6 @@ public class MonthlyStatusDto {
*/
public boolean isBankNone() {
return (MonthStatus.NONE.equals(bankInput) || bankInput == null)
&& (MonthStatus.NONE.equals(bankOutput) || bankOutput == null);
|| (MonthStatus.NONE.equals(bankOutput) || bankOutput == null);
}
}

View File

@@ -28,7 +28,7 @@ public class RecordCalendarUIController {
model.addAttribute("reqVO", reqVO);
model.addAttribute("dailyDataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter());
model.addAttribute("dailyDataNone", recordCalendarPortIn.getDailyNone(reqVO));
return "record/calendar";
}

View File

@@ -30,6 +30,7 @@ public class RecordCalendarUIReqVO extends DailyUIReqVO {
*/
private LocalDate searchDate;
@Override
public void setSearchMonth(String searchMonth) {
if (!StringUtils.isBlank(searchMonth) && searchMonth.length() == 7) {
searchMonth = searchMonth + "-01";

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.calendar.ports;
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
@@ -17,9 +18,10 @@ public interface RecordCalendarPortIn {
/**
* 특정기간의 데이터 미등록 여부 조회
*
* @return true=미등록 데이터 있음, false=없음
* @param reqVO 검색 조건
* @return 미등록 데이터
*/
boolean getDataNoneCountBySomeDayAfter();
String getDailyNone(RecordCalendarUIReqVO reqVO);
/**
* 일계부 최신 데이터 등록일 조회

View File

@@ -1,14 +1,17 @@
package app.module.front.usecase.daily.calendar.ports;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import java.util.List;
public interface RecordCalendarPortOut {
List<RecordCalendar> operate(RecordCalendarCmd command);
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
int getDataNoneCountBySomeDayAfter(Long householdSeq);
DailyRecordStatusDto getLatestDate(Long householdSeq);

View File

@@ -1,11 +1,13 @@
package app.module.front.usecase.daily.calendar.ports.application;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto;
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -25,10 +27,26 @@ public class RecordCalendarService implements RecordCalendarPortIn {
}
@Override
public boolean getDataNoneCountBySomeDayAfter() {
int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq());
public String getDailyNone(RecordCalendarUIReqVO reqVO) {
RecordCalendarCmd command = new RecordCalendarCmd(
reqVO.getSearchMonth(),
reqVO.getHouseholdSeq());
return dataNoneCount != 0;
int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(command.getHouseholdSeq());
MonthlyStatusDto monthly = portOut.getMonthlyStatus(command);
String returnValue;
if (dataNoneCount != 0) {
returnValue = "DATA_NONE";
} else if (monthly != null && monthly.isForestNone()) {
returnValue = "FOREST_NONE";
} else if (monthly != null && monthly.isBankNone()) {
returnValue = "BANK_NONE";
} else {
returnValue = "DONE";
}
return returnValue;
}
@Override

View File

@@ -16,8 +16,7 @@ public class RecordCalendar {
private Integer no;
private Integer start;
private Integer end;
//TODO : JsonIgnore
// @JsonIgnore
@JsonIgnore
private LocalDate startDate;
@JsonIgnore
private LocalDate endDate;
@@ -25,4 +24,8 @@ public class RecordCalendar {
private boolean isModifiable;
private List<CalendarChildren> children;
private List<CalendarChildren> monthly;
/**
* 월초이월금
*/
private Long carryOver;
}

View File

@@ -1,6 +1,8 @@
package app.module.front.usecase.daily.calendar.ports.application.domain;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter

View File

@@ -1,48 +1,56 @@
package app.module.front.usecase.daily.expense.adapters.persistence;
import app.module.core.config.application.logging.SafeLogger;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
import java.util.List;
@Slf4j
@Repository
@RequiredArgsConstructor
public class DailyExpenseDao implements DailyExpensePortOut {
private final DailyExpenseMapper dailyExpenseMapper;
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyExpenseDao.class));
private final DailyExpenseMapper mapper;
@Override
public List<DailyExpenseDto> list(GetDailyExpenseCmd command) {
return dailyExpenseMapper.getDailyExpenseList(command);
return mapper.getDailyExpenseList(command);
}
@Override
public List<DailyExpenseDto> monthList(GetDailyExpenseCmd command) {
return mapper.getDailyExpenseMonthList(command);
}
@Override
public void create(GetDailyExpenseCmd findCmd, CreateDailyExpenseCmd command) {
Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyExpenseMapper.createDailyExpense(command);
mapper.createDailyExpense(command);
log.debug("[CreateDailyExpense] record={}", command);
safeLogger.debug("[CreateDailyExpense] record={}", command);
} else {
dailyExpenseMapper.updateDailyExpense(command);
mapper.updateDailyExpense(command);
log.debug("[UpdateDailyExpense] record={}", command);
safeLogger.debug("[UpdateDailyExpense] record={}", command);
}
}
@Override
public void remove(GetDailyExpenseCmd findCmd, RemoveDailyExpenseCmd command) {
Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount != 0) {
dailyExpenseMapper.removeDailyExpense(command);
mapper.removeDailyExpense(command);
mapper.removeDailyExpenseReceipt(command);
log.debug("[RemoveDailyExpense] record={}", command);
safeLogger.debug("[RemoveDailyExpense] record={}", command);
}
}
}

View File

@@ -1,10 +1,9 @@
package app.module.front.usecase.daily.expense.adapters.persistence;
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.CreateDailyExpenseCmd;
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 org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -12,13 +11,21 @@ import java.util.List;
@Mapper
public interface DailyExpenseMapper {
/**
* 일계부 지출 목록 조회
* 특정 그룹일의 일계부 지출 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
*/
List<DailyExpenseDto> getDailyExpenseList(GetDailyExpenseCmd command);
/**
* 특정월의 일계부 지출 목록 조회
*
* @param command 검색 조건
* @return 지출 목록
*/
List<DailyExpenseDto> getDailyExpenseMonthList(GetDailyExpenseCmd command);
/**
* 일계부 지출 데이터 존재 여부
*
@@ -47,4 +54,11 @@ public interface DailyExpenseMapper {
* @param command 삭제 데이터
*/
void removeDailyExpense(RemoveDailyExpenseCmd command);
/**
* 일계부 지출 영수증 삭제
*
* @param command 삭제 데이터
*/
void removeDailyExpenseReceipt(RemoveDailyExpenseCmd command);
}

View File

@@ -4,6 +4,8 @@ import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
@Getter
@Setter
public class DailyExpenseDto {
@@ -19,6 +21,8 @@ public class DailyExpenseDto {
private String unitSelf;
private Long price;
private Long estimatedValue;
private LocalDate startDate;
private LocalDate endDate;
/**
* 수정 가능 여부

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.daily.expense.adapters.persistence.model;
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
public class DailyExpenseMonthDto implements DailyStatusHasChildren {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;
private List<DailyExpenseDto> children;
}

View File

@@ -2,13 +2,13 @@ package app.module.front.usecase.daily.expense.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
import app.module.front.usecase.daily.expense.adapters.web.validator.CreateDailyExpenseValidator;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,14 +1,14 @@
package app.module.front.usecase.daily.expense.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;

View File

@@ -1,6 +1,6 @@
package app.module.front.usecase.daily.expense.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.core.config.constants.CommonConstants;
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.expense.ports;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto;
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
@@ -9,13 +10,21 @@ import java.util.List;
public interface DailyExpensePortIn {
/**
* 일계부 지출 조회
* 특정 그룹일의 일계부 지출 조회
*
* @param reqVO 검색 조건
* @return 지출 목록
*/
List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO);
/**
* 특정월의 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 목록
*/
List<DailyExpenseMonthDto> monthList(DailyExpenseUIReqVO reqVO);
/**
* 일계부 지출 조회
*

View File

@@ -16,6 +16,14 @@ public interface DailyExpensePortOut {
*/
List<DailyExpenseDto> list(GetDailyExpenseCmd command);
/**
* 일계부 지출 조회
*
* @param command 검색 조건
* @return 지출 목록
*/
List<DailyExpenseDto> monthList(GetDailyExpenseCmd command);
/**
* 일계부 지출 등록
*

View File

@@ -1,11 +1,13 @@
package app.module.front.usecase.daily.expense.ports.application;
import app.module.core.config.constants.CommonConstants;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto;
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO;
@@ -14,11 +16,13 @@ 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 app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -29,12 +33,30 @@ public class DailyExpenseService implements DailyExpensePortIn {
@Override
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
return this.getRefineList(reqVO);
return this.getRefineList(reqVO, true);
}
@Override
public List<DailyExpenseMonthDto> monthList(DailyExpenseUIReqVO reqVO) {
List<DailyExpenseDto> list = this.getRefineList(reqVO, false);
List<DailyExpenseMonthDto> monthList = new ArrayList<>();
List<Long> recordSeqList = list.stream().map(DailyExpenseDto::getDailyRecordSeq).distinct().toList();
for (Long seq : recordSeqList) {
DailyExpenseMonthDto month = new DailyExpenseMonthDto();
month.setDailyRecordSeq(seq);
month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyExpenseDto::getStartDate).findFirst().orElse(null));
month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyExpenseDto::getEndDate).findFirst().orElse(null));
month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList()));
monthList.add(month);
}
return monthList;
}
@Override
public DailyExpenseDto detail(DailyExpenseUIReqVO reqVO) {
List<DailyExpenseDto> list = this.getRefineList(reqVO);
List<DailyExpenseDto> list = this.getRefineList(reqVO, true);
if (list.isEmpty()) {
return null;
}
@@ -45,14 +67,17 @@ public class DailyExpenseService implements DailyExpensePortIn {
/**
* 목록 데이터 조회
*
* @param reqVO 검색 조건
* @param reqVO 검색 조건
* @param dayGroup 일 그룹 조건(true=일, false=월)
* @return 공통 처리된 목록
*/
private List<DailyExpenseDto> getRefineList(DailyExpenseUIReqVO reqVO) {
List<DailyExpenseDto> list = portOut.list(new GetDailyExpenseCmd(reqVO.getSearchMonth(),
private List<DailyExpenseDto> getRefineList(DailyExpenseUIReqVO reqVO, boolean dayGroup) {
GetDailyExpenseCmd command = new GetDailyExpenseCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId()));
reqVO.getId());
List<DailyExpenseDto> list = dayGroup ? portOut.list(command) : portOut.monthList(command);
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
@@ -98,8 +123,8 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getId(),
formVO.getDailyRecordSeq(),
formVO.getInputType(),
"2", // [정책] 2 고정
(formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재
DailyRecordConstants.EXPENSE_CATEGORY,
(formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null),
formVO.getCredit(),
formVO.getExpenseKind(),
formVO.getSourcePurpose(),
@@ -110,7 +135,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
formVO.setId(command.getId());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}

View File

@@ -22,6 +22,11 @@ public class DailyFarmingDao implements DailyFarmingPortOut {
return mapper.getDailyFarmingList(command);
}
@Override
public List<DailyFarmingDto> monthList(GetDailyFarmingCmd command) {
return mapper.getDailyFarmingMonthList(command);
}
@Override
public void create(GetDailyFarmingCmd findCmd, CreateDailyFarmingCmd command) {
Integer existCount = mapper.getRecordExistCount(findCmd);

View File

@@ -11,13 +11,21 @@ import java.util.List;
@Mapper
public interface DailyFarmingMapper {
/**
* 일계부 자가농업 목록 조회
* 특정 그룹일의 일계부 자가농업 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
* @return 자가농업 목록
*/
List<DailyFarmingDto> getDailyFarmingList(GetDailyFarmingCmd command);
/**
* 특정월의 일계부 자가농업 목록 조회
*
* @param command 검색 조건
* @return 자가농업 목록
*/
List<DailyFarmingDto> getDailyFarmingMonthList(GetDailyFarmingCmd command);
/**
* 일계부 자가농업 데이터 존재 여부
*

View File

@@ -3,6 +3,8 @@ package app.module.front.usecase.daily.farming.adapters.persistence.model;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
@Getter
@Setter
public class DailyFarmingDto {
@@ -17,6 +19,8 @@ public class DailyFarmingDto {
private String unitLabel;
private String unitSelf;
private Long estimatedValue;
private LocalDate startDate;
private LocalDate endDate;
/**
* 수정 가능 여부

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.daily.farming.adapters.persistence.model;
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
public class DailyFarmingMonthDto implements DailyStatusHasChildren {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;
private List<DailyFarmingDto> children;
}

View File

@@ -2,13 +2,13 @@ package app.module.front.usecase.daily.farming.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator;
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,14 +1,14 @@
package app.module.front.usecase.daily.farming.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;

View File

@@ -1,6 +1,6 @@
package app.module.front.usecase.daily.farming.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.core.config.constants.CommonConstants;
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;

View File

@@ -2,6 +2,7 @@ package app.module.front.usecase.daily.farming.ports;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto;
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
@@ -10,13 +11,21 @@ import java.util.List;
public interface DailyFarmingPortIn {
/**
* 일계부 자가농업 조회
* 특정 그룹일의 일계부 자가농업 조회
*
* @param reqVO 검색 조건
* @return 자가농업 목록
*/
List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO);
/**
* 특정월의 일계부 자가농업 조회
*
* @param reqVO 검색 조건
* @return 자가농업 목록
*/
List<DailyFarmingMonthDto> monthList(DailyFarmingUIReqVO reqVO);
/**
* 일계부 자가농업 조회
*

View File

@@ -17,6 +17,14 @@ public interface DailyFarmingPortOut {
*/
List<DailyFarmingDto> list(GetDailyFarmingCmd command);
/**
* 일계부 자가농업 조회
*
* @param command 검색 조건
* @return 자가농업 목록
*/
List<DailyFarmingDto> monthList(GetDailyFarmingCmd command);
/**
* 일계부 자가농업 등록
*

View File

@@ -1,11 +1,13 @@
package app.module.front.usecase.daily.farming.ports.application;
import app.module.core.config.application.util.DailyUtil;
import app.module.core.config.constants.CommonConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto;
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO;
@@ -18,24 +20,47 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@Service
@RequiredArgsConstructor
public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyUtil dailyUtil;
@Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
return this.getRefineList(reqVO);
return this.getRefineList(reqVO, true);
}
@Override
public List<DailyFarmingMonthDto> monthList(DailyFarmingUIReqVO reqVO) {
List<DailyFarmingDto> list = this.getRefineList(reqVO, false);
List<DailyFarmingMonthDto> monthList = new ArrayList<>();
List<Long> recordSeqList = list.stream().map(DailyFarmingDto::getDailyRecordSeq).distinct().toList();
for (Long seq : recordSeqList) {
DailyFarmingMonthDto month = new DailyFarmingMonthDto();
month.setDailyRecordSeq(seq);
month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyFarmingDto::getStartDate).findFirst().orElse(null));
month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyFarmingDto::getEndDate).findFirst().orElse(null));
month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList()));
monthList.add(month);
}
return monthList;
}
@Override
public DailyFarmingDto detail(DailyFarmingUIReqVO reqVO) {
List<DailyFarmingDto> list = this.getRefineList(reqVO);
List<DailyFarmingDto> list = this.getRefineList(reqVO, true);
if (list.isEmpty()) {
return null;
}
@@ -46,14 +71,17 @@ public class DailyFarmingService implements DailyFarmingPortIn {
/**
* 목록 데이터 조회
*
* @param reqVO 검색 조건
* @param reqVO 검색 조건
* @param dayGroup 일 그룹 조건(true=일, false=월)
* @return 공통 처리된 목록
*/
private List<DailyFarmingDto> getRefineList(DailyFarmingUIReqVO reqVO) {
List<DailyFarmingDto> list = portOut.list(new GetDailyFarmingCmd(reqVO.getSearchMonth(),
private List<DailyFarmingDto> getRefineList(DailyFarmingUIReqVO reqVO, boolean dayGroup) {
GetDailyFarmingCmd command = new GetDailyFarmingCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId()));
reqVO.getId());
List<DailyFarmingDto> list = dayGroup ? portOut.list(command) : portOut.monthList(command);
List<UICodeElement> recordFarming = uiCodeListPortIn.connect("code.record.farming");
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
@@ -101,30 +129,14 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getHouseholdSeq(),
formVO.getId());
String incomeMark = null;
String expenseMark = null;
if (!"code.record.farming.self".equals(formVO.getProductCode())) {
List<UICodeElement> recordFarming = uiCodeListPortIn.connect("code.record.farming");
String returnValue = null;
for (UICodeElement codeSetup : recordFarming) {
if (codeSetup.getId().equalsIgnoreCase(formVO.getProductCode())) {
returnValue = codeSetup.getCodeValue();
break;
}
}
if (returnValue != null) {
incomeMark = returnValue.split(",")[0];
expenseMark = returnValue.split(",")[1];
}
}
HashMap<String, String> markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode());
CreateDailyFarmingCmd command = AuditUtil.create(
new CreateDailyFarmingCmd(
formVO.getId(),
formVO.getDailyRecordSeq(),
incomeMark,
expenseMark,
markMap.get("incomeMark"),
markMap.get("expenseMark"),
formVO.getProductCode(),
formVO.getProductSelf(),
formVO.getUsage(),

View File

@@ -22,6 +22,11 @@ public class DailyForestryDao implements DailyForestryPortOut {
return mapper.getDailyForestryList(command);
}
@Override
public List<DailyForestryDto> monthList(GetDailyForestryCmd command) {
return mapper.getDailyForestryMonthList(command);
}
@Override
public void create(GetDailyForestryCmd findCmd, CreateDailyForestryCmd command) {
Integer existCount = mapper.getRecordExistCount(findCmd);

View File

@@ -12,13 +12,21 @@ import java.util.List;
@Mapper
public interface DailyForestryMapper {
/**
* 일계부 자가임업 목록 조회
* 특정 그룹일의 일계부 자가임업 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
* @return 자가임업 목록
*/
List<DailyForestryDto> getDailyForestryList(GetDailyForestryCmd command);
/**
* 특정월의 일계부 자가임업 목록 조회
*
* @param command 검색 조건
* @return 자가임업 목록
*/
List<DailyForestryDto> getDailyForestryMonthList(GetDailyForestryCmd command);
/**
* 일계부 자가임업 데이터 존재 여부
*

View File

@@ -3,6 +3,8 @@ package app.module.front.usecase.daily.forestry.adapters.persistence.model;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
@Getter
@Setter
public class DailyForestryDto {
@@ -15,6 +17,8 @@ public class DailyForestryDto {
private String unitLabel;
private String unitSelf;
private Long estimatedValue;
private LocalDate startDate;
private LocalDate endDate;
/**
* 수정 가능 여부

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.daily.forestry.adapters.persistence.model;
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
public class DailyForestryMonthDto implements DailyStatusHasChildren {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;
private List<DailyForestryDto> children;
}

View File

@@ -2,13 +2,13 @@ package app.module.front.usecase.daily.forestry.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.validator.CreateDailyForestryValidator;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,14 +1,14 @@
package app.module.front.usecase.daily.forestry.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;

View File

@@ -1,6 +1,6 @@
package app.module.front.usecase.daily.forestry.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.core.config.constants.CommonConstants;
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.forestry.ports;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto;
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
@@ -9,13 +10,21 @@ import java.util.List;
public interface DailyForestryPortIn {
/**
* 일계부 자가임업 조회
* 특정 그룹일의 일계부 자가임업 조회
*
* @param reqVO 검색 조건
* @return 자가임업 목록
*/
List<DailyForestryDto> list(DailyForestryUIReqVO reqVO);
/**
* 특정월의 일계부 자가임업 조회
*
* @param reqVO 검색 조건
* @return 자가임업 목록
*/
List<DailyForestryMonthDto> monthList(DailyForestryUIReqVO reqVO);
/**
* 일계부 자가임업 조회
*

View File

@@ -16,6 +16,14 @@ public interface DailyForestryPortOut {
*/
List<DailyForestryDto> list(GetDailyForestryCmd command);
/**
* 일계부 자가임업 조회
*
* @param command 검색 조건
* @return 자가임업 목록
*/
List<DailyForestryDto> monthList(GetDailyForestryCmd command);
/**
* 일계부 자가임업 등록
*

View File

@@ -1,11 +1,13 @@
package app.module.front.usecase.daily.forestry.ports.application;
import app.module.core.config.constants.CommonConstants;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto;
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO;
@@ -14,12 +16,14 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut;
import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@Service
@@ -31,12 +35,30 @@ public class DailyForestryService implements DailyForestryPortIn {
@Override
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
return this.getRefineList(reqVO);
return this.getRefineList(reqVO, false);
}
@Override
public List<DailyForestryMonthDto> monthList(DailyForestryUIReqVO reqVO) {
List<DailyForestryDto> list = this.getRefineList(reqVO, false);
List<DailyForestryMonthDto> monthList = new ArrayList<>();
List<Long> recordSeqList = list.stream().map(DailyForestryDto::getDailyRecordSeq).distinct().toList();
for (Long seq : recordSeqList) {
DailyForestryMonthDto month = new DailyForestryMonthDto();
month.setDailyRecordSeq(seq);
month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyForestryDto::getStartDate).findFirst().orElse(null));
month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyForestryDto::getEndDate).findFirst().orElse(null));
month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList()));
monthList.add(month);
}
return monthList;
}
@Override
public DailyForestryDto detail(DailyForestryUIReqVO reqVO) {
List<DailyForestryDto> list = this.getRefineList(reqVO);
List<DailyForestryDto> list = this.getRefineList(reqVO, true);
if (list.isEmpty()) {
return null;
}
@@ -48,13 +70,16 @@ public class DailyForestryService implements DailyForestryPortIn {
* 목록 데이터 조회
*
* @param reqVO 검색 조건
* @param dayGroup 일 그룹 조건(true=일, false=월)
* @return 공통 처리된 목록
*/
private List<DailyForestryDto> getRefineList(DailyForestryUIReqVO reqVO) {
List<DailyForestryDto> list = portOut.list(new GetDailyForestryCmd(reqVO.getSearchMonth(),
private List<DailyForestryDto> getRefineList(DailyForestryUIReqVO reqVO, boolean dayGroup) {
GetDailyForestryCmd command = new GetDailyForestryCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId()));
reqVO.getId());
List<DailyForestryDto> list = dayGroup ? portOut.list(command) : portOut.monthList(command);
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
@@ -99,7 +124,7 @@ public class DailyForestryService implements DailyForestryPortIn {
new CreateDailyForestryCmd(
formVO.getId(),
formVO.getDailyRecordSeq(),
"81011", // [정책] 81011 고정
DailyRecordConstants.FORESTRY_EXPENSE_MARK,
formVO.getProductName(),
formVO.getUsage(),
formVO.getQuantity(),

View File

@@ -15,22 +15,27 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class DailyIncomeDao implements DailyIncomePortOut {
private final DailyIncomeMapper dailyIncomeMapper;
private final DailyIncomeMapper mapper;
@Override
public List<DailyIncomeDto> list(GetDailyIncomeCmd command) {
return dailyIncomeMapper.getDailyIncomeList(command);
return mapper.getDailyIncomeList(command);
}
@Override
public List<DailyIncomeDto> monthList(GetDailyIncomeCmd command) {
return mapper.getDailyIncomeMonthList(command);
}
@Override
public void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyIncomeMapper.createDailyIncome(command);
mapper.createDailyIncome(command);
log.debug("[CreateDailyIncome] record={}", command);
} else {
dailyIncomeMapper.updateDailyIncome(command);
mapper.updateDailyIncome(command);
log.debug("[UpdateDailyIncome] record={}", command);
}
@@ -38,9 +43,10 @@ public class DailyIncomeDao implements DailyIncomePortOut {
@Override
public void remove(GetDailyIncomeCmd findCmd, RemoveDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount != 0) {
dailyIncomeMapper.removeDailyIncome(command);
mapper.removeDailyIncome(command);
mapper.removeDailyIncomeReceipt(command);
log.debug("[RemoveDailyIncome] record={}", command);
}

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.income.adapters.persistence;
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.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import org.apache.ibatis.annotations.Mapper;
@@ -11,13 +11,21 @@ import java.util.List;
@Mapper
public interface DailyIncomeMapper {
/**
* 일계부 수입 목록 조회
* 특정 그룹일의 일계부 수입 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
*/
List<DailyIncomeDto> getDailyIncomeList(GetDailyIncomeCmd command);
/**
* 특정월의 일계부 수입 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
*/
List<DailyIncomeDto> getDailyIncomeMonthList(GetDailyIncomeCmd command);
/**
* 일계부 수입 데이터 존재 여부
*
@@ -46,4 +54,11 @@ public interface DailyIncomeMapper {
* @param command 삭제 데이터
*/
void removeDailyIncome(RemoveDailyIncomeCmd command);
/**
* 일계부 수입 영수증 삭제
*
* @param command 삭제 데이터
*/
void removeDailyIncomeReceipt(RemoveDailyIncomeCmd command);
}

View File

@@ -3,9 +3,13 @@ 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;
import lombok.ToString;
import java.time.LocalDate;
@Getter
@Setter
@ToString
public class DailyIncomeDto {
private Long id;
private Long dailyRecordSeq;
@@ -21,6 +25,8 @@ public class DailyIncomeDto {
private String unitSelf;
private Long price;
private Long estimatedValue;
private LocalDate startDate;
private LocalDate endDate;
/**
* 수정 가능 여부

View File

@@ -0,0 +1,19 @@
package app.module.front.usecase.daily.income.adapters.persistence.model;
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
@ToString
public class DailyIncomeMonthDto implements DailyStatusHasChildren {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;
private List<DailyIncomeDto> children;
}

View File

@@ -2,13 +2,13 @@ package app.module.front.usecase.daily.income.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.validator.CreateDailyIncomeValidator;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,14 +1,14 @@
package app.module.front.usecase.daily.income.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

View File

@@ -1,8 +1,5 @@
package app.module.front.usecase.daily.income.adapters.web.model;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
public enum DailyInputType {
/**
* 직접 입력
@@ -12,5 +9,4 @@ public enum DailyInputType {
* 영수증 입력
*/
OCR,
;
}

View File

@@ -0,0 +1,16 @@
package app.module.front.usecase.daily.income.adapters.web.model;
import app.module.front.usecase.daily.receipt.adapters.web.model.ReceiptItem;
import lombok.Data;
import java.util.List;
@Data
public class ReceiptReqVO {
private String date;
private String cardOrCash;
private String storeName;
private List<ReceiptItem> items;
private int totalPrice;
private String responseBody;
}

View File

@@ -2,7 +2,9 @@ package app.module.front.usecase.daily.income.adapters.web.model;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.constraints.NotBlank;
import lombok.*;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter

View File

@@ -1,6 +1,6 @@
package app.module.front.usecase.daily.income.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.core.config.constants.CommonConstants;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.income.ports;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -9,13 +10,21 @@ import java.util.List;
public interface DailyIncomePortIn {
/**
* 일계부 수입 조회
* 특정 그룹일의 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 목록
*/
List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO);
/**
* 특정월의 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 목록
*/
List<DailyIncomeMonthDto> monthList(DailyIncomeUIReqVO reqVO);
/**
* 일계부 수입 조회
*

View File

@@ -16,6 +16,14 @@ public interface DailyIncomePortOut {
*/
List<DailyIncomeDto> list(GetDailyIncomeCmd command);
/**
* 일계부 수입 조회
*
* @param command 검색 조건
* @return 수입 목록
*/
List<DailyIncomeDto> monthList(GetDailyIncomeCmd command);
/**
* 일계부 수입 등록
*

View File

@@ -1,12 +1,13 @@
package app.module.front.usecase.daily.income.ports.application;
import app.module.core.config.constants.CommonConstants;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -15,11 +16,13 @@ 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 app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -30,12 +33,30 @@ public class DailyIncomeService implements DailyIncomePortIn {
@Override
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
return this.getRefineList(reqVO);
return this.getRefineList(reqVO, true);
}
@Override
public List<DailyIncomeMonthDto> monthList(DailyIncomeUIReqVO reqVO) {
List<DailyIncomeDto> list = this.getRefineList(reqVO, false);
List<DailyIncomeMonthDto> monthList = new ArrayList<>();
List<Long> recordSeqList = list.stream().map(DailyIncomeDto::getDailyRecordSeq).distinct().toList();
for (Long seq : recordSeqList) {
DailyIncomeMonthDto month = new DailyIncomeMonthDto();
month.setDailyRecordSeq(seq);
month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getStartDate).findFirst().orElse(null));
month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getEndDate).findFirst().orElse(null));
month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList()));
monthList.add(month);
}
return monthList;
}
@Override
public DailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
List<DailyIncomeDto> list = this.getRefineList(reqVO);
List<DailyIncomeDto> list = this.getRefineList(reqVO, true);
if (list.isEmpty()) {
return null;
}
@@ -46,14 +67,17 @@ public class DailyIncomeService implements DailyIncomePortIn {
/**
* 목록 데이터 조회
*
* @param reqVO 검색 조건
* @param reqVO 검색 조건
* @param dayGroup 일 그룹 조건(true=일, false=월)
* @return 공통 처리된 목록
*/
private List<DailyIncomeDto> getRefineList(DailyIncomeUIReqVO reqVO) {
List<DailyIncomeDto> list = portOut.list(new GetDailyIncomeCmd(reqVO.getSearchMonth(),
private List<DailyIncomeDto> getRefineList(DailyIncomeUIReqVO reqVO, boolean dayGroup) {
GetDailyIncomeCmd command = new GetDailyIncomeCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId()));
reqVO.getId());
List<DailyIncomeDto> list = dayGroup ? portOut.list(command) : portOut.monthList(command);
List<UICodeElement> recordCrop = uiCodeListPortIn.connect("code.record.crop");
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
@@ -114,7 +138,9 @@ public class DailyIncomeService implements DailyIncomePortIn {
formVO.getPrice(),
formVO.getEstimatedValue()));
portOut.create(findCmd, command);
formVO.setId(command.getId());
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}

View File

@@ -1,6 +1,5 @@
package app.module.front.usecase.daily.power.adapters.persistence;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
import app.module.front.usecase.daily.power.ports.DailyPowerPortOut;
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
@@ -16,22 +15,27 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class DailyPowerDao implements DailyPowerPortOut {
private final DailyPowerMapper dailyPowerMapper;
private final DailyPowerMapper mapper;
@Override
public List<DailyPowerDto> list(GetDailyPowerCmd command) {
return dailyPowerMapper.getDailyPowerList(command);
return mapper.getDailyPowerList(command);
}
@Override
public List<DailyPowerDto> monthList(GetDailyPowerCmd command) {
return mapper.getDailyPowerMonthList(command);
}
@Override
public void create(GetDailyPowerCmd findCmd, CreateDailyPowerCmd command) {
Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyPowerMapper.createDailyPower(command);
mapper.createDailyPower(command);
log.debug("[CreateDailyPower] record={}", command);
} else {
dailyPowerMapper.updateDailyPower(command);
mapper.updateDailyPower(command);
log.debug("[UpdateDailyPower] record={}", command);
}
@@ -39,9 +43,9 @@ public class DailyPowerDao implements DailyPowerPortOut {
@Override
public void remove(GetDailyPowerCmd findCmd, RemoveDailyPowerCmd command) {
Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd);
Integer existCount = mapper.getRecordExistCount(findCmd);
if (existCount != 0) {
dailyPowerMapper.removeDailyPower(command);
mapper.removeDailyPower(command);
log.debug("[RemoveDailyPower] record={}", command);
}

View File

@@ -1,10 +1,9 @@
package app.module.front.usecase.daily.power.adapters.persistence;
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd;
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -12,13 +11,21 @@ import java.util.List;
@Mapper
public interface DailyPowerMapper {
/**
* 일계부 동력 사용시간 목록 조회
* 특정 그룹일의 일계부 동력 사용시간 목록 조회
*
* @param command 검색 조건
* @return 동력 사용시간 목록
*/
List<DailyPowerDto> getDailyPowerList(GetDailyPowerCmd command);
/**
* 특정월의 일계부 동력 사용시간 목록 조회
*
* @param command 검색 조건
* @return 동력 사용시간 목록
*/
List<DailyPowerDto> getDailyPowerMonthList(GetDailyPowerCmd command);
/**
* 일계부 동력 사용시간 데이터 존재 여부
*

View File

@@ -3,6 +3,8 @@ package app.module.front.usecase.daily.power.adapters.persistence.model;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
@Getter
@Setter
public class DailyPowerDto {
@@ -11,6 +13,8 @@ public class DailyPowerDto {
private String equipmentName;
private String ownedHours;
private String leasedHours;
private LocalDate startDate;
private LocalDate endDate;
/**
* 수정 가능 여부

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.daily.power.adapters.persistence.model;
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
public class DailyPowerMonthDto implements DailyStatusHasChildren {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;
private List<DailyPowerDto> children;
}

View File

@@ -2,13 +2,13 @@ package app.module.front.usecase.daily.power.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO;
import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

View File

@@ -1,13 +1,13 @@
package app.module.front.usecase.daily.power.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto;
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.config.application.enums.DailySort;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;

View File

@@ -2,7 +2,6 @@ package app.module.front.usecase.daily.power.adapters.web.validator;
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;

Some files were not shown because too many files have changed in this diff Show More