Merge branch 'dev' into 'deploy-dev-front'
Dev See merge request korea-research/korea-research!101
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -2,10 +2,12 @@ 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;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class FrontUser extends User {
|
||||
|
||||
private String nickname;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
|
||||
@@ -8,7 +9,7 @@ import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyExpenseMonthDto {
|
||||
public class DailyExpenseMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package app.module.front.usecase.daily.farming.adapters.persistence.model;
|
||||
|
||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -9,7 +10,7 @@ import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyFarmingMonthDto {
|
||||
public class DailyFarmingMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package app.module.front.usecase.daily.forestry.adapters.persistence.model;
|
||||
|
||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -9,7 +10,7 @@ import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyForestryMonthDto {
|
||||
public class DailyForestryMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
@@ -10,7 +11,7 @@ import java.util.List;
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class DailyIncomeMonthDto {
|
||||
public class DailyIncomeMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
|
||||
@@ -8,7 +9,7 @@ import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyPowerMonthDto {
|
||||
public class DailyPowerMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -70,7 +70,7 @@ public class DailyRecordController {
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/today-none")
|
||||
ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @RequestParam(name = "target", required = true, defaultValue = "") String targetType
|
||||
, @RequestParam(name = "target", defaultValue = "") String targetType
|
||||
, @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) {
|
||||
|
||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||
|
||||
@@ -2,12 +2,14 @@ package app.module.front.usecase.daily.status.adapters.web;
|
||||
|
||||
import app.module.core.config.application.enums.DailySort;
|
||||
import app.module.core.config.application.exception.NoMatchingURIException;
|
||||
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto;
|
||||
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
|
||||
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
|
||||
import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO;
|
||||
import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn;
|
||||
import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO;
|
||||
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
|
||||
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
|
||||
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
|
||||
import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO;
|
||||
@@ -25,6 +27,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@@ -63,29 +68,54 @@ public class DailyStatusUIController {
|
||||
*/
|
||||
@GetMapping(path = "/{step}/{searchMonth}")
|
||||
public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) {
|
||||
if (DailySort.INCOME.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.INCOME);
|
||||
model.addAttribute("list", dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")));
|
||||
} else if (DailySort.WORK.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.WORK);
|
||||
model.addAttribute("list", dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, "")));
|
||||
} else if (DailySort.EXPENSE.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.EXPENSE);
|
||||
model.addAttribute("list", dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, "")));
|
||||
} else if (DailySort.POWER.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.POWER);
|
||||
model.addAttribute("list", dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, "")));
|
||||
} else if (DailySort.FORESTRY.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.FORESTRY);
|
||||
model.addAttribute("list", dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, "")));
|
||||
} else if (DailySort.FARMING.name().equalsIgnoreCase(step)) {
|
||||
model.addAttribute("step", DailySort.FARMING);
|
||||
model.addAttribute("list", dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, "")));
|
||||
} else {
|
||||
throw new NoMatchingURIException("잘못된 접근");
|
||||
switch (DailySort.valueOf(step.toUpperCase())) {
|
||||
case INCOME -> {
|
||||
processStep(model, DailySort.INCOME,
|
||||
dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")));
|
||||
}
|
||||
case WORK -> {
|
||||
processStep(model, DailySort.WORK,
|
||||
dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, "")));
|
||||
}
|
||||
case EXPENSE -> {
|
||||
processStep(model, DailySort.EXPENSE,
|
||||
dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, "")));
|
||||
}
|
||||
case POWER -> {
|
||||
processStep(model, DailySort.POWER,
|
||||
dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, "")));
|
||||
}
|
||||
case FORESTRY -> {
|
||||
processStep(model, DailySort.EXPENSE,
|
||||
dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, "")));
|
||||
}
|
||||
case FARMING -> {
|
||||
processStep(model, DailySort.FARMING,
|
||||
dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, "")));
|
||||
}
|
||||
default -> throw new NoMatchingURIException("잘못된 접근");
|
||||
}
|
||||
|
||||
model.addAttribute("searchMonth", searchMonth);
|
||||
return String.format("status/daily/detail-%s", step);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 입력 현황 상세 화면 처리
|
||||
*
|
||||
* @param model Model
|
||||
* @param step 단계
|
||||
* @param list 데이터 목록
|
||||
* @param <T> 데이터 Model
|
||||
*/
|
||||
private <T extends DailyStatusHasChildren> void processStep(Model model, DailySort step, List<T> list) {
|
||||
int childrenCount = list.stream()
|
||||
.filter(Objects::nonNull)
|
||||
.mapToInt(dto -> dto.getChildren() != null ? dto.getChildren().size() : 0)
|
||||
.sum();
|
||||
|
||||
model.addAttribute("step", step);
|
||||
model.addAttribute("list", list);
|
||||
model.addAttribute("childrenCount", childrenCount);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.front.usecase.daily.status.ports;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface DailyStatusHasChildren {
|
||||
List<?> getChildren();
|
||||
}
|
||||
@@ -1,19 +1,17 @@
|
||||
package app.module.front.usecase.daily.work.adapters.persistence.model;
|
||||
|
||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyWorkMonthDto {
|
||||
public class DailyWorkMonthDto implements DailyStatusHasChildren {
|
||||
private Long dailyRecordSeq;
|
||||
private LocalDate startDate;
|
||||
private LocalDate endDate;
|
||||
|
||||
@@ -12,7 +12,6 @@ import java.util.List;
|
||||
@EqualsAndHashCode
|
||||
public class CreateBankInputReqVO {
|
||||
|
||||
|
||||
// private Boolean status;
|
||||
private Long id;
|
||||
private String transferType;
|
||||
@@ -22,9 +21,4 @@ public class CreateBankInputReqVO {
|
||||
return bankList != null ? bankList : new ArrayList<>();
|
||||
}
|
||||
|
||||
public void setBankList(List<CreateBankInputProductReqVO> bankList) {
|
||||
this.bankList = bankList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -11,8 +11,6 @@ import java.util.List;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateMonthlyReqVO {
|
||||
|
||||
|
||||
private Boolean status;
|
||||
private Long id;
|
||||
private List<CreateMonthlyProductReqVO> productList;
|
||||
@@ -20,10 +18,4 @@ public class CreateMonthlyReqVO {
|
||||
public List<CreateMonthlyProductReqVO> getProductList() {
|
||||
return productList != null ? productList : new ArrayList<>();
|
||||
}
|
||||
|
||||
public void setProductList(List<CreateMonthlyProductReqVO> productList) {
|
||||
this.productList = productList;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports;
|
||||
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface ParseSocialUserPortIn {
|
||||
|
||||
Optional<ParsedUserInfo> operate(ParseSocialUserCmd cmd);
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports.application;
|
||||
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.KakaoUserInfo;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.NaverUserInfo;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
class ParseSocialUserService implements ParseSocialUserPortIn {
|
||||
|
||||
@Override
|
||||
public Optional<ParsedUserInfo> operate(ParseSocialUserCmd cmd) {
|
||||
ParsedUserInfo parsedUserInfo = null;
|
||||
|
||||
switch (cmd.getSocialType()) {
|
||||
case KAKAO -> {
|
||||
parsedUserInfo = new KakaoUserInfo(cmd.getUserNameAttributeName(),
|
||||
cmd.getAttributes());
|
||||
}
|
||||
case NAVER -> {
|
||||
parsedUserInfo = new NaverUserInfo(cmd.getUserNameAttributeName(),
|
||||
cmd.getAttributes());
|
||||
}
|
||||
}
|
||||
|
||||
if (parsedUserInfo != null) {
|
||||
log.info("socialId: {}", parsedUserInfo.getSocialId());
|
||||
log.info("nickname: {}", parsedUserInfo.getNickName());
|
||||
log.info("name: {}", parsedUserInfo.getName());
|
||||
log.info("ci: {}", parsedUserInfo.getCi());
|
||||
log.info("birthday: {}", parsedUserInfo.getBirthday());
|
||||
log.info("email: {}", parsedUserInfo.getEmail());
|
||||
log.info("phone: {}", parsedUserInfo.getPhone());
|
||||
}
|
||||
|
||||
return Optional.ofNullable(parsedUserInfo);
|
||||
}
|
||||
}
|
||||
@@ -1,116 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
public class KakaoUserInfo implements ParsedUserInfo {
|
||||
|
||||
private final String userNameAttribute;
|
||||
private final Map<String, Object> attributes;
|
||||
|
||||
public KakaoUserInfo(String userNameAttribute, Map<String, Object> attributes) {
|
||||
this.userNameAttribute = userNameAttribute;
|
||||
this.attributes = attributes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSocialId() {
|
||||
return String.valueOf(attributes.get(userNameAttribute));
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getNickName() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
Map<String, Object> profile = (Map<String, Object>) account.get("profile");
|
||||
|
||||
return (String) profile.get("nickname");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getName() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
|
||||
if (account == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 카카오 로그인 서비스 인증 전에 이름 정보는 전달되지 않는다.
|
||||
if (account.get("name") == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (String) account.get("name");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getEmail() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
|
||||
if (account == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String email = (String) account.get("email");
|
||||
|
||||
// 카카오 로그인 서비스 인증 전에 이메일 정보는 전달되지 않는다.
|
||||
return Objects.requireNonNullElse(email, "NO-KAKAO-EMAIL@noemail.com");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getPhone() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
|
||||
if (account == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 카카오 로그인 서비스 인증 전에 phone 정보는 전달되지 않는다.
|
||||
if (account.get("phone_number") == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// "0" + s.replaceAll("^\\+\\d{1,3}-?|-", "").trim();
|
||||
return (String) account.get("phone_number");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getBirthday() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
|
||||
if (account == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String birthyear = (String) account.get("birthyear");
|
||||
String birthday = (String) account.get("birthday");
|
||||
|
||||
// 카카오 로그인 서비스 인증 전에 생년월일 정보는 전달되지 않는다.
|
||||
if (birthyear == null || birthday == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return birthyear + birthday;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String getCi() {
|
||||
Map<String, Object> account = (Map<String, Object>) attributes.get("kakao_account");
|
||||
|
||||
if (account == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 카카오 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다.
|
||||
if (account.get("ci") == null || ((String) account.get("ci")).equals("")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (String) account.get("ci");
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain;
|
||||
|
||||
import java.util.Map;
|
||||
import lombok.ToString;
|
||||
|
||||
@ToString
|
||||
public class NaverUserInfo implements ParsedUserInfo {
|
||||
|
||||
private final String userNameAttribute;
|
||||
private final Map<String, Object> attributes;
|
||||
|
||||
public NaverUserInfo(String userNameAttribute, Map<String, Object> attributes) {
|
||||
this.userNameAttribute = userNameAttribute;
|
||||
this.attributes = attributes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSocialId() {
|
||||
return (String) getAttrs().get("id");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getNickName() {
|
||||
return (String) getAttrs().get("nickname");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return (String) getAttrs().get("name");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getEmail() {
|
||||
return (String) getAttrs().get("email");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPhone() {
|
||||
String phone = (String) getAttrs().get("mobile");
|
||||
return phone != null ? phone.replaceAll("-", "") : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBirthday() {
|
||||
String birthYear = (String) getAttrs().get("birthyear");
|
||||
String birthday = (String) getAttrs().get("birthday");
|
||||
return (birthYear + birthday).replaceAll("-", "");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCi() {
|
||||
// 네이버 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다.
|
||||
return (String) getAttrs().get("ci");
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private Map<String, Object> getAttrs() {
|
||||
return (Map<String, Object>) attributes.get(userNameAttribute);
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import java.util.Map;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class ParseSocialUserCmd {
|
||||
|
||||
private SocialType socialType;
|
||||
private String userNameAttributeName;
|
||||
private Map<String, Object> attributes;
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain;
|
||||
|
||||
public interface ParsedUserInfo {
|
||||
|
||||
String getSocialId();
|
||||
|
||||
String getNickName();
|
||||
|
||||
String getName();
|
||||
|
||||
String getEmail();
|
||||
|
||||
String getPhone();
|
||||
|
||||
String getBirthday();
|
||||
|
||||
String getCi();
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.FrontUserSocial;
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import java.util.Optional;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface FrontUserSocialRepo {
|
||||
|
||||
Optional<FrontUserSocial> findBySocialTypeAndSocialId(SocialType socialType, String socialId);
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence;
|
||||
|
||||
import app.module.core.config.adapters.persistence.entity.FrontUserSocial;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd;
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class ProcessSocialLoginDao implements ProcessSocialLoginPortOut {
|
||||
|
||||
private final FrontUserSocialRepo frontUserSocialRepo;
|
||||
|
||||
@Override
|
||||
public Optional<ProcessSocialLogin> operate(ProcessSocialLoginCmd cmd) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<GetUserSocial> findUserSocial(GetUserSocialCmd cmd) {
|
||||
return frontUserSocialRepo
|
||||
.findBySocialTypeAndSocialId(cmd.getSocialType(), cmd.getSocialId())
|
||||
.flatMap(
|
||||
frontSocialUser ->
|
||||
Optional.of(
|
||||
new GetUserSocial(
|
||||
frontSocialUser.getSeq(),
|
||||
frontSocialUser.getUserId(),
|
||||
frontSocialUser.getSocialType(),
|
||||
frontSocialUser.getSocialId(),
|
||||
frontSocialUser.getEmail(),
|
||||
frontSocialUser.getName(),
|
||||
frontSocialUser.getCi())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<GetUserSocial> createUserSocial(CreateUserSocialCmd cmd) {
|
||||
// FrontUserSocial createUserSocial =
|
||||
// frontUserSocialRepo.save(
|
||||
// new FrontUserSocial(
|
||||
// null,
|
||||
// cmd.getUserId(),
|
||||
// cmd.getSocialType(),
|
||||
// cmd.getSocialId(),
|
||||
// cmd.getEmail(),
|
||||
// cmd.getName(),
|
||||
// cmd.getCi()));
|
||||
//
|
||||
// return Optional.of(
|
||||
// new GetUserSocial(
|
||||
// createUserSocial.getSeq(),
|
||||
// createUserSocial.getUserId(),
|
||||
// createUserSocial.getSocialType(),
|
||||
// createUserSocial.getSocialId(),
|
||||
// createUserSocial.getEmail(),
|
||||
// createUserSocial.getName(),
|
||||
// createUserSocial.getCi()));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports;
|
||||
|
||||
import app.module.core.config.adapters.web.security.domain.SocialUser;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface ProcessSocialLoginPortIn {
|
||||
|
||||
Optional<SocialUser> operate(ProcessSocialLoginCmd cmd);
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports;
|
||||
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface ProcessSocialLoginPortOut {
|
||||
|
||||
Optional<ProcessSocialLogin> operate(ProcessSocialLoginCmd cmd);
|
||||
|
||||
Optional<GetUserSocial> findUserSocial(GetUserSocialCmd cmd);
|
||||
|
||||
Optional<GetUserSocial> createUserSocial(CreateUserSocialCmd cmd);
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application;
|
||||
|
||||
import app.module.core.config.adapters.web.security.domain.CorePrivilege;
|
||||
import app.module.core.config.adapters.web.security.domain.CoreRole;
|
||||
import app.module.core.config.adapters.web.security.domain.SocialUser;
|
||||
import app.module.core.config.application.enums.SignUpType;
|
||||
import app.module.core.usecase.user.createUser.ports.CreateUserPortIn;
|
||||
import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd;
|
||||
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 app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd;
|
||||
import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd;
|
||||
import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd;
|
||||
import java.util.Collection;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class ProcessSocialLoginService implements ProcessSocialLoginPortIn {
|
||||
|
||||
private final ProcessSocialLoginPortOut portOut;
|
||||
private final ParseSocialUserPortIn parseSocialUserPortIn;
|
||||
private final FindUserPortIn findUserPortIn;
|
||||
private final CreateUserPortIn createUserPortIn;
|
||||
|
||||
@Override
|
||||
public Optional<SocialUser> operate(ProcessSocialLoginCmd cmd) {
|
||||
|
||||
// SNS Login Provider 가 제공하는 사용자 정보 파싱
|
||||
Optional<ParsedUserInfo> parsedUserInfo =
|
||||
parseSocialUserPortIn.operate(
|
||||
new ParseSocialUserCmd(
|
||||
cmd.getSocialType(), cmd.getUserNameAttributeName(), cmd.getAttributes()));
|
||||
|
||||
if (parsedUserInfo.isPresent()) {
|
||||
ParsedUserInfo parsedUser = parsedUserInfo.get();
|
||||
|
||||
return portOut
|
||||
.findUserSocial(new GetUserSocialCmd(cmd.getSocialType(), parsedUser.getSocialId()))
|
||||
.flatMap(
|
||||
getUserSocial ->
|
||||
findUserPortIn
|
||||
.operate(new FindUserCmd(getUserSocial.getUserId()))
|
||||
.flatMap(findUser -> getSocialUserOpt(findUser, cmd)))
|
||||
.or(
|
||||
() -> {
|
||||
// 신규 회원인 경우,
|
||||
String uuid = UUID.randomUUID().toString();
|
||||
|
||||
return createUserPortIn
|
||||
.operate(
|
||||
new CreateUserCmd(
|
||||
uuid,
|
||||
"NO_PASSWD",
|
||||
parsedUser.getEmail(),
|
||||
parsedUser.getNickName(),
|
||||
SignUpType.SOCIAL,
|
||||
false,
|
||||
0,
|
||||
false,
|
||||
Set.of("ROLE_GENERAL")))
|
||||
.flatMap(
|
||||
createUser ->
|
||||
portOut.createUserSocial(
|
||||
new CreateUserSocialCmd(
|
||||
createUser.getId(),
|
||||
cmd.getSocialType(),
|
||||
parsedUser.getSocialId(),
|
||||
createUser.getEmail(),
|
||||
parsedUser.getName(),
|
||||
parsedUser.getCi())))
|
||||
.flatMap(
|
||||
getUserSocial ->
|
||||
findUserPortIn
|
||||
.operate(new FindUserCmd(getUserSocial.getUserId()))
|
||||
.flatMap(findUser -> getSocialUserOpt(findUser, cmd)));
|
||||
});
|
||||
}
|
||||
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private Optional<SocialUser> getSocialUserOpt(FindUser findUser, ProcessSocialLoginCmd cmd) {
|
||||
boolean accountLocked = Optional.ofNullable(findUser.getAccountLocked()).orElse(false);
|
||||
boolean accountDisabled = Optional.ofNullable(findUser.getAccountDisabled()).orElse(false);
|
||||
|
||||
return Optional.of(
|
||||
new SocialUser(
|
||||
getAuthorities(findUser.getRoles()),
|
||||
cmd.getAttributes(),
|
||||
cmd.getUserNameAttributeName(),
|
||||
findUser.getId(),
|
||||
findUser.getPassword(),
|
||||
!accountDisabled,
|
||||
true,
|
||||
true,
|
||||
!accountLocked,
|
||||
findUser.getNickname(),
|
||||
0L));
|
||||
}
|
||||
|
||||
private Collection<? extends GrantedAuthority> getAuthorities(Collection<CoreRole> roles) {
|
||||
return Stream.concat(getRoles(roles), getPrivileges(roles))
|
||||
.map(SimpleGrantedAuthority::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private Stream<String> getRoles(Collection<CoreRole> roles) {
|
||||
return roles.stream().map(CoreRole::getId);
|
||||
}
|
||||
|
||||
private Stream<String> getPrivileges(Collection<CoreRole> roles) {
|
||||
return roles.stream()
|
||||
.flatMap(roleOutput -> roleOutput.getPrivileges().stream())
|
||||
.map(CorePrivilege::getId);
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class CreateUserSocialCmd {
|
||||
|
||||
private String userId;
|
||||
|
||||
private SocialType socialType;
|
||||
|
||||
private String socialId;
|
||||
|
||||
private String email;
|
||||
|
||||
private String name;
|
||||
|
||||
private String ci;
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetUserSocial {
|
||||
|
||||
private Integer seq;
|
||||
|
||||
private String userId;
|
||||
|
||||
private SocialType socialType;
|
||||
|
||||
private String socialId;
|
||||
|
||||
private String email;
|
||||
|
||||
private String name;
|
||||
|
||||
private String ci;
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class GetUserSocialCmd {
|
||||
|
||||
private SocialType socialType;
|
||||
private String socialId;
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class ProcessSocialLogin {
|
||||
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain;
|
||||
|
||||
import app.module.core.config.application.enums.SocialType;
|
||||
import java.util.Map;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class ProcessSocialLoginCmd {
|
||||
|
||||
private SocialType socialType;
|
||||
private String userNameAttributeName;
|
||||
private Map<String, Object> attributes;
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
where only_day.day <= DATE_PART('day', (date_trunc('MONTH', TO_DATE(#{recordMonth}, 'YYYYMM')) + INTERVAL '1 MONTH - 1 day'))
|
||||
)
|
||||
select count(dg.day) as day_count
|
||||
, (count(dg.day) filter (where dr.all_status = 'DONE')) as done_count
|
||||
, (count(dg.day) filter (where dr.all_status = 'DONE' or dr.all_status = 'TODAY_NONE')) as done_count
|
||||
from day_gorup dg
|
||||
left join
|
||||
daily_record dr on dr.day_group_no = dg.group_no and dr.record_month = to_char(TO_DATE(#{recordMonth}, 'YYYYMM'), 'YYYYMM') and dr.household_seq = #{householdSeq}
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
COUNT(*) OVER () AS total
|
||||
FROM notice a
|
||||
WHERE a.is_deleted = false
|
||||
|
||||
AND now() between a.start_date and a.end_date
|
||||
|
||||
<if test="cmd.searchField != null and cmd.searchField != ''">
|
||||
<choose>
|
||||
<when test="cmd.searchField eq 'titleContent'">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user