$$config title: 김상엽_프로젝트_구현_Part keywords: - Spring Boot - 코드 정리 - 생각 정리 $$

## 프로젝트를 진행하면서 한번 더 고민했던 코드 및 생각정리 글 입니다. #### 지금이약 - 구현Part : 회원/공지사항/상품/추천 ## Final Project (지금이약) > 지금이약은 영양제 구매 사이트 입니다.
> 건강기능식품을 구매할 수 있습니다.
> 구매자의 건강/생활습관/취향을 설문하여 커스텀 영양제를 구매할 수 있습니다.
> 진행 기간: 2023.08.01 ~ 2023.08.29

프로젝트 산출물

- [수행 계획서](https://docs.google.com/document/d/1Xz1rPARy-KCWPvELtaEQ6fU-WFUDG2_f-NKiSH0bdtU/edit?usp=sharing) - [요구사항 정의서](https://docs.google.com/spreadsheets/d/1pszMao77zcYlpvppYXBi7X0kyO53bmmI/edit?usp=sharing&ouid=112014038183968571293&rtpof=true&sd=true) - [사용자 화면 정의서(UI/UX)](https://docs.google.com/presentation/d/1WsP8y-RnrM5vKQzKNtHQlKCi1cU8qIfLbdoCPZJfqhE/edit?usp=sharing) - [DB 설계 자료](https://slog.gg/p/12867)

발표 영상

- [발표](https://youtu.be/KQxIbo0OAP0) $$youtube KQxIbo0OAP0 $$
## 목차 - [? 홈페이지 바로가기](https://jigumiyak.com/) - [? 팀 규칙](#-팀-규칙) - [브랜치 전략](#브랜치-전략) - [트렐로](#트렐로) - [시스템 아키텍처](#시스템-아키텍처) - [? 주요 폴더 구조](#-주요-폴더-구조) - [?️ 기술 스택](#기술-스택) - [? DB 설계 자료](#-DB-설계-자료) - [? 서비스 소개](#-서비스-소개) - [? 페이지](#-페이지) - [? 기능 구현](#-기능-구현)
## ? 링크 [지금이약 사이트 링크](https://jigumiyak.com/) [지금이약 Github 링크](https://github.com/cojar/jigumiyak) [지금이약 Trello 링크](https://trello.com/b/GzcTHzmu/2%EC%A1%B0-%EC%A7%80%EA%B8%88%EC%9D%B4%EC%95%BD)
## ? 팀 규칙 ### 브랜치 전략 - upstream에는 main 브랜치만 존재 - 브랜치명: `feature-cl-번호` - ex: `feature-cl-01` - dev 브랜치에서 브랜치 생성 및 작업 후 `origin:dev` 로 PR - 코드리뷰 받고 승인 받으면 `origin:dev`에 merge - dev 브랜치에서 문제없이 실행되면 `origin:main`에 merge
### 트렐로 ![img](https://i.imgur.com/xsKuMwM.png)
### 시스템 아키텍처 ![img](https://i.imgur.com/iV59GIv.jpg)
## ? 주요 폴더 구조 ``` ?jigumiyak ├── ?admin ├── ?board ├── ?cart ├── ?chat ├── ?faq ├── ?file ├── ?inquiry ├── ?notice ├── ?nutrient ├── ?product ├── ?purchase ├── ?security ├── ?survey └── ?user ?resources ├── ?static ├── ?templates └── ?application.properties ```
## ?️ 기술 스택

## ? DB 설계 자료 ### ERD ![img](https://i.imgur.com/GDVpCQt.jpg)
## ? 기능 구현 Part ### ? 회원관리 |**회원관리**| | --- | - 회원가입 및 로그인시 발생할 수 있는 오류를 최소화 시키고자 하였습니다. - Oauth인증을 통한 소셜로그인 기능 - 회원은 총관리자, 관리자, 판매자, 회원, 탈퇴회원, 블랙리스트로 지정해두었고 관리자페이지에서 추후 특정회원만 불러올 경우를 생각하여 eum을 활용해 조회 가능하도록 하였습니다. - 소셜 로그인 시 동일 이메일로 가입할 경우 발생할 수 있는 오류를 방지하기 위해 자동으로 로컬 사이트 계정으로 병합된 채 이용할 수 있도록 하였습니다. - 로컬계정으로 가입 후 마이페이지에서도 소셜로그인 기능을 추가하여 기존의 계정을 유지한 채 더욱 쉽게 로그인 할 수 있도록 하였습니다. - ID, 비밀번호 찾기에는 가입시 입력한 이메일 인증을 통해 잃어버린 계정을 찾을 수 있도록 하였습니다. #### CustomRole ```java @Getter public enum CustomRole { SUPER_ADMIN("super_admin", 0, "총관리자"), ADMIN("admin", 1, "관리자"), SELLER("seller", 2, "판매자"), USER("user", 3, "회원"), WITHDRAWAL_USER("withdrawal_user", 4, "탈퇴회원"), BLACKLIST("blacklist", 5, "블랙리스트"); private String type; private Integer code; private String typeKor; private static final Map codeToType = Stream.of(values()).collect(Collectors.toMap(CustomRole::getCode, CustomRole::getType)); private static final Map typeToCode = Stream.of(values()).collect(Collectors.toMap(CustomRole::getType, CustomRole::getCode)); private static final Map typeToTypeKor = Stream.of(values()).collect(Collectors.toMap(CustomRole::getType, CustomRole::getTypeKor)); CustomRole(String type, Integer code, String typeKor) { this.type = type; this.code = code; this.typeKor = typeKor; } public Integer getDecCode() { return (int) Math.pow(2, this.code); } public static Integer getDecCodeByType(String type) { return (int) Math.pow(2, typeToCode.get(type)); } public static String getTypeByCode(int code) { return codeToType.get(code); } public static String getTypeKorByType(String type) { return typeToTypeKor.get(type); } } ``` #### UserController ```java @Slf4j @RequestMapping("/user") @RequiredArgsConstructor @Controller public class UserController { private final UserService userService; private final AddressService addressService; private final PurchaseService purchaseService; private final InquiryService inquiryService; @GetMapping("/signup") public String signup(UserSignupForm userSignupForm) { return "signup"; } @PostMapping("/signup") @ResponseBody public ResponseEntity signup(@Valid UserSignupForm userSignupForm, BindingResult bindingResult) { log.info("loginId: " + userSignupForm.getLoginId()); log.info("password: " + userSignupForm.getPassword()); log.info("passwordConfirm: " + userSignupForm.getPasswordConfirm()); log.info("email: " + userSignupForm.getEmail()); log.info("inputCode: " + userSignupForm.getInputCode()); log.info("genCode: " + userSignupForm.getGenCode()); log.info("address.zoneCode: " + userSignupForm.getAddress().getZoneCode()); log.info("address.mainAddress: " + userSignupForm.getAddress().getMainAddress()); log.info("address.subAddress: " + userSignupForm.getAddress().getSubAddress()); if (bindingResult.hasErrors()) { List errorList = new ArrayList<>(); for (FieldError fieldError : bindingResult.getFieldErrors()) { log.info("field: " + fieldError.getField()); log.info("code: " + fieldError.getCode()); log.info("message: " + fieldError.getDefaultMessage()); errorList.add(fieldError.getField() + ": " + fieldError.getDefaultMessage()); } return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorList); } if (this.userService.isDuplicatedLoginId(userSignupForm.getLoginId())) { bindingResult.rejectValue("loginId", "Duplicated", "입력한 아이디가 이미 존재합니다."); } if (!userSignupForm.getPassword().equals(userSignupForm.getPasswordConfirm())) { bindingResult.rejectValue("passwordConfirm", "PasswordNotMatch", "입력한 비밀번호가 일치하지 않습니다."); } if (this.userService.isDuplicatedEmail(userSignupForm.getEmail())) { bindingResult.rejectValue("email", "Duplicated", "입력한 이메일이 이미 존재합니다."); } if (!this.userService.isMatched(userSignupForm.getEmail() + userSignupForm.getInputCode(), userSignupForm.getGenCode())) { bindingResult.rejectValue("inputCode", "CodeNotMatch", "입력한 이메일 인증번호가 일치하지 않습니다."); } if (userSignupForm.getAddress().getZoneCode() == null || userSignupForm.getAddress().getMainAddress().equals("")) { bindingResult.rejectValue("address", "NotEmpty", "주소는 필수 항목입니다."); } if (bindingResult.hasErrors()) { List errorList = new ArrayList<>(); for (FieldError fieldError : bindingResult.getFieldErrors()) { log.info("field: " + fieldError.getField()); log.info("code: " + fieldError.getCode()); log.info("message: " + fieldError.getDefaultMessage()); errorList.add(fieldError.getField() + ": " + fieldError.getDefaultMessage()); } return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorList); } Address address = this.addressService.create(userSignupForm.getAddress().getZoneCode(), userSignupForm.getAddress().getMainAddress(), userSignupForm.getAddress().getSubAddress()); SiteUser user = this.userService.create(userSignupForm.getLoginId(), userSignupForm.getPassword(), userSignupForm.getEmail(), address); return ResponseEntity.status(HttpStatus.OK) .body(String.format("%s님 환영합니다.\n확인 버튼을 누르시면 로그인 페이지로 이동합니다.", user.getLoginId())); } @GetMapping("/signup/loginId") @ResponseBody public ResponseEntity checkLoginId(@RequestParam("loginId") String loginId) { log.info("loginId: " + loginId); if (loginId.isEmpty()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "아이디를 입력해주세요", "")); } if (!loginId.matches("(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z0-9]{8,20}")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "영문과 숫자를 조합해서 8자 이상 20자 이하로 입력해주세요", "")); } if (this.userService.isDuplicatedLoginId(loginId)) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-3", "이미 사용중인 아이디입니다", "")); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "사용 가능한 아이디입니다", "")); } @GetMapping("/signup/email") @ResponseBody public ResponseEntity genEmailCode(@RequestParam("email") String email) { log.info("email: " + email); if (email.isEmpty()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "이메일을 입력해주세요", "")); } if (!email.matches("^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,}$")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "올바른 이메일 형식이 아닙니다", "")); } if (this.userService.isDuplicatedEmail(email)) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-3", "이미 사용중인 이메일입니다", "")); } String[] codeBits = this.userService.genSecurityCode(email, 8); if (!this.userService.sendEmail(email, codeBits[0], "이메일 인증코드", "인증코드를")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-4", "이메일 발송 중에 오류가 발생했습니다", "")); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "이메일 인증번호 발송이 완료되었습니다", codeBits[1])); } @GetMapping("/signup/code") @ResponseBody public ResponseEntity checkEmailCode(@RequestParam("email") String email, @RequestParam("inputCode") String inputCode, @RequestParam("genCode") String genCode) { log.info("email: " + email); log.info("inputCode: " + inputCode); log.info("genCode: " + genCode); if (inputCode.isEmpty()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "이메일 인증번호를 입력해주세요", "")); } if (!this.userService.isMatched(email + inputCode, genCode)) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "이메일 인증번호가 일치하지 않습니다", "")); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "이메일 인증이 완료되었습니다", "")); } @GetMapping("/login") public String login(Model model, HttpServletRequest request, @RequestParam(value = "error", defaultValue = "") String error, @RequestParam(value = "field", defaultValue = "") String field) { String refererUri = request.getHeader("Referer"); log.info("referer: " + refererUri); if (refererUri != null && !refererUri.contains("/user/login") && !refererUri.contains("/user/signup") && !refererUri.contains("/user/find")) { request.getSession().setAttribute("refererUri", refererUri); } Map errors = new HashMap<>(); errors.put(field, error); model.addAttribute("errors", errors); return "login"; } @GetMapping("/find") public String findUser() { return "user_find"; } @GetMapping("/find/loginId") @ResponseBody public ResponseEntity findLoginId(@RequestParam("email") String email) { log.info("email: " + email); if (email.isEmpty()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "이메일을 입력해주세요", "")); } if (!email.matches("^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,}$")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "올바른 이메일 형식이 아닙니다", "")); } SiteUser user = this.userService.getUserByEmail(email); if (user == null) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-3", "입력한 이메일로 가입된 통합회원 계정이 없습니다", "")); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", String.format("가입된 통합회원 아이디는 \"%s\" 입니다.", user.getLoginId()), user.getLoginId())); } @PostMapping("/find/password") @ResponseBody public ResponseEntity findPassword(@RequestParam("loginId") String loginId, @RequestParam("email") String email) { log.info("loginId: " + loginId); log.info("email: " + email); Map errors = new HashMap<>(); // 입력 필드 에러 if (loginId.isEmpty()) { errors.put("loginId", new RsData<>("F-1", "아이디를 입력해주세요", "")); } if (email.isEmpty()) { errors.put("email", new RsData<>("F-2", "이메일을 입력해주세요", "")); } if (!email.matches("^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,}$") && !errors.containsKey("email")) { errors.put("email", new RsData<>("F-3", "올바른 이메일 형식이 아닙니다", "")); } if (!errors.isEmpty()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errors); } SiteUser user = this.userService.getUserByLoginIdAndEmail(loginId, email); // 계정 조회 에러 if (user == null) { if (this.userService.getUserByLoginId(loginId) == null) { errors.put("loginId", new RsData<>("F-4", "가입된 통합회원 계정이 아닙니다", "")); } else if (this.userService.getUserByEmail(email) == null) { errors.put("email", new RsData<>("F-5", "이메일을 확인해주세요", "")); } return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errors); } // 조회 성공 후 로직 String[] codeBits = this.userService.genSecurityCode("", 12); if (!this.userService.sendEmail(email, codeBits[0], "임시비밀번호", "임시비밀번호를")) { errors.put("loginId", new RsData<>("F-6", "이메일 발송 중에 오류가 발생했습니다", "")); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errors); } this.userService.modifyPassword(user, codeBits[0], true); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "입력한 이메일로 임시비밀번호를 발송하였습니다", "")); } @PreAuthorize("isAuthenticated()") @GetMapping("/mypage") public String my(Model model, Principal principal) { SiteUser user = this.userService.getUserByLoginId(principal.getName()); model.addAttribute("user", user); List purchaseList = this.purchaseService.getListByPurchaser(user); model.addAttribute("purchaseList", purchaseList); Page paging = this.inquiryService.getList(0, user); model.addAttribute("paging", paging); return "mypage"; } @PreAuthorize("isAuthenticated()") @GetMapping("/modify") public String modify(Model model, Principal principal, UserModifyPasswordForm userModifyPasswordForm) { SiteUser user = this.userService.getUserByLoginId(principal.getName()); model.addAttribute("user", user); return "user_modify"; } @PreAuthorize("isAuthenticated()") @PostMapping("/modify/password") @ResponseBody public ResponseEntity modifyPassword(@Valid UserModifyPasswordForm userModifyPasswordForm, BindingResult bindingResult, Principal principal) { if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "바인딩 에러", "")); } SiteUser user = this.userService.getUserByLoginId(principal.getName()); if (!this.userService.isMatched(userModifyPasswordForm.getOldPassword(), user.getPassword())) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "기존 비밀번호 매칭 에러", "")); } if (!userModifyPasswordForm.getNewPassword().equals(userModifyPasswordForm.getNewPasswordConfirm())) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-3", "신규 비밀번호 매칭 에러", "")); } this.userService.modifyPassword(user, userModifyPasswordForm.getNewPassword(), false); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "비밀번호 변경이 완료되었습니다.\n로그인을 다시 진행해주세요.", "/user/logout")); } @PreAuthorize("isAuthenticated()") @GetMapping("/modify/oldPassword") @ResponseBody public ResponseEntity checkOldPassword(@RequestParam("oldPassword") String oldPassword, Principal principal) { log.info("oldPassword", oldPassword); SiteUser user = this.userService.getUserByLoginId(principal.getName()); if (!this.userService.isMatched(oldPassword, user.getPassword())) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "비밀번호가 일치하지 않습니다", "")); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "비밀번호가 일치합니다", "")); } @PreAuthorize("isAuthenticated()") @PostMapping("/modify/address") @ResponseBody public ResponseEntity modifyAddress(@RequestParam(value = "zoneCode", defaultValue = "-1") Integer zoneCode, @RequestParam(value = "mainAddress", defaultValue = "") String mainAddress, @RequestParam("subAddress") String subAddress, Principal principal) { if (zoneCode == -1 || mainAddress.equals("")) { return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "저장을 완료했습니다", "/user/mypage")); } SiteUser user = this.userService.getUserByLoginId(principal.getName()); Address address = user.getAddress(); if (address != null) { this.addressService.modify(address, zoneCode, mainAddress, subAddress); } else { address = this.addressService.create(zoneCode, mainAddress, subAddress); this.userService.saveAddress(user, address); } return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "저장을 완료했습니다", "/user/mypage")); } @PreAuthorize("hasAuthority('admin')") @GetMapping("/authority") @ResponseBody public ResponseEntity authority(@RequestParam("id") Long id, Principal principal) { SiteUser user = this.userService.getUser(id); SiteUser admin = this.userService.getUserByLoginId(principal.getName()); // checked 권한 Map checkedAttributes = new HashMap<>(); for (GrantedAuthority authority : user.getAuthorities()) { checkedAttributes.put(authority.getAuthority(), "authority_" + authority.getAuthority()); } // disabled 권한 Map disabledAttributes = new HashMap<>(); disabledAttributes.put("super_admin", "authority_super_admin"); disabledAttributes.put("admin", "authority_admin"); disabledAttributes.put("seller", "authority_seller"); disabledAttributes.put("user", "user"); if (admin.getAuthoritiesInline().contains("총관리자")) { if (!user.getAuthoritiesInline().contains("총관리자")) { disabledAttributes.remove("admin"); disabledAttributes.remove("seller"); disabledAttributes.remove("user"); } } else { if (!user.getAuthoritiesInline().contains("총관리자") && !user.getAuthoritiesInline().contains("관리자")) { disabledAttributes.remove("seller"); disabledAttributes.remove("user"); } } Map> attributes = new HashMap<>(); attributes.put("checked", checkedAttributes); attributes.put("disabled", disabledAttributes); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "요청한 회원의 권한 상태를 반환합니다", attributes)); } @PreAuthorize("hasAuthority('admin')") @PostMapping("/authority") @ResponseBody public ResponseEntity authority(@RequestParam("loginId") String loginId, @RequestParam List authority) { SiteUser user = this.userService.getUserByLoginId(loginId); log.info("authority: {}", authority); Integer authorityDec = 0; for (String type : authority) { authorityDec += CustomRole.getDecCodeByType(type); } this.userService.modifyAuthorities(user, authorityDec); Map attributes = new HashMap<>(); attributes.put("id", user.getId().toString()); attributes.put("authoritiesInline", user.getAuthoritiesInline()); log.info("modified authorities: " + user.getAuthoritiesInline()); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "요청한 회원의 권한 상태를 변경했습니다", attributes)); } @PreAuthorize("hasAuthority('admin')") @PostMapping("/withdraw") @ResponseBody public ResponseEntity withdraw(@RequestParam("id") Long id, Principal principal) { SiteUser user = this.userService.getUser(id); SiteUser admin = this.userService.getUserByLoginId(principal.getName()); if (user.getAuthoritiesInline().contains("총관리자")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "탈퇴 처리가 불가능한 회원입니다", "")); } if (!admin.getAuthoritiesInline().contains("총관리자") && admin.getAuthoritiesInline().contains("관리자") && user.getAuthoritiesInline().contains("관리자")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "해당 회원에 대한 탈퇴 처리 권한이 부여되지 않았습니다", "")); } this.userService.withdrawUser(user); Map attributes = new HashMap<>(); attributes.put("id", user.getId().toString()); attributes.put("authoritiesInline", user.getAuthoritiesInline()); log.info("modified authorities: " + user.getAuthoritiesInline()); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "해당 회원 탈퇴 처리를 완료했습니다", attributes)); } @PreAuthorize("hasAuthority('admin')") @PostMapping("/blacklist") @ResponseBody public ResponseEntity blacklist(@RequestParam("id") Long id, Principal principal) { SiteUser user = this.userService.getUser(id); SiteUser admin = this.userService.getUserByLoginId(principal.getName()); if (user.getAuthoritiesInline().contains("총관리자")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "블랙 처리가 불가능한 회원입니다", "")); } if (!admin.getAuthoritiesInline().contains("총관리자") && admin.getAuthoritiesInline().contains("관리자") && user.getAuthoritiesInline().contains("관리자")) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-2", "해당 회원에 대한 블랙 처리 권한이 부여되지 않았습니다", "")); } this.userService.blacklistUser(user); Map attributes = new HashMap<>(); attributes.put("id", user.getId().toString()); attributes.put("authoritiesInline", user.getAuthoritiesInline()); log.info("modified authorities: " + user.getAuthoritiesInline()); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "해당 회원 블랙 처리를 완료했습니다", attributes)); } } ``` #### CustomSecurityService ```java private final UserRepository userRepository; private final SocialAccountRepository socialAccountRepository; @Override public UserDetails loadUserByUsername(String loginId) throws UsernameNotFoundException { SiteUser user = this.userRepository.findByLoginId(loginId) .orElseThrow(() -> new BadCredentialsException("가입된 통합회원 계정이 아닙니다")); if (user.getAuthorities().contains(new SimpleGrantedAuthority(CustomRole.WITHDRAWAL_USER.getType()))) { throw new BadCredentialsException("탈퇴한 계정입니다"); } if (user.getAuthorities().contains(new SimpleGrantedAuthority(CustomRole.BLACKLIST.getType()))) { throw new BadCredentialsException("블랙리스트 계정입니다"); } return new CustomDetails(user); } @Override public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { OAuth2User oAuth2User = super.loadUser(userRequest); Map attributes = new SocialInfo(userRequest, oAuth2User).getAttributes(); SocialAccount socialAccount = this.socialAccountRepository.findByProviderId(attributes.get("providerId")) .orElse(null); if (socialAccount == null) { SiteUser user = this.userRepository.findByEmail(attributes.get("email")) .orElse(null); if (user == null) { user = SiteUser.builder().build(); this.userRepository.save(user); user = user.toBuilder() .authority(CustomRole.USER.getDecCode()) .loginId(attributes.get("provider") + "_" + user.getId()) .password("") .email(attributes.get("email")) .build(); this.userRepository.save(user); } socialAccount = SocialAccount.builder() .provider(attributes.get("provider")) .providerId(attributes.get("providerId")) .email(attributes.get("email")) .name(attributes.get("name")) .parent(user) .build(); this.socialAccountRepository.save(socialAccount); } if (socialAccount.getParent().getAuthorities().contains(new SimpleGrantedAuthority(CustomRole.WITHDRAWAL_USER.getType()))) { throw new InternalAuthenticationServiceException("탈퇴한 계정입니다"); } if (socialAccount.getParent().getAuthorities().contains(new SimpleGrantedAuthority(CustomRole.BLACKLIST.getType()))) { throw new InternalAuthenticationServiceException("블랙리스트 계정입니다"); } return new CustomDetails(socialAccount.getParent()); } ``` ```html user ```
### ? 조회수 |**조회수**| | --- | - 새로고침 시 마다 조회수가 증가되어서는 안된다고 생각하였습니다. #### hitCountJudge ```java private boolean hitCountJudge(Long id, HttpServletRequest request, HttpServletResponse response) { // 요청 이전 url을 확인해서 제대로 된 게시물 접근인지 확인 String refer = request.getHeader("REFERER"); if (refer == null) return false; String path = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort(); String referUri = refer.replaceFirst(path, ""); System.out.println(referUri); // 게시판에서 접근한 경우가 아니면 reject if (!referUri.startsWith("/notice") && !referUri.equals("/index") && !referUri.startsWith("/user/mypage")) return false; Cookie oldCookie = null; Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { if (cookie.getName().equals("noticeHit")) { oldCookie = cookie; } } } // 관련 쿠기가 있다면 if (oldCookie != null) { // 해당 쿠키가 해당 게시물 id를 조회할 때 생성된 쿠기인지 판단 if (!oldCookie.getValue().contains("[" + id + "]")) { // 아니라면 해당 게시물 id를 조회한 결과를 쿠기에 저장 oldCookie.setValue(oldCookie.getValue() + "_[" + id + "]"); oldCookie.setPath("/"); oldCookie.setMaxAge(30); // 지속시간 30초 response.addCookie(oldCookie); // 쿠키를 브라우저에 저장 return true; } // 맞다면 reject return false; } else { // 쿠키가 없다면 새로 생성해서 해당 게시물 id를 조회한 결과를 쿠기에 저장 Cookie newCookie = new Cookie("noticeHit", "[" + id + "]"); newCookie.setPath("/"); newCookie.setMaxAge(30); // 지속시간 30초 response.addCookie(newCookie); // 쿠키를 브라우저에 저장 return true; } } ``` ### ? 상품등록 시 자동완성 |**자동완성**| | --- | - 상품등록시 제품에 해당하는 영양소들을 일일이 찾아서 등록하기 불편하다고 느껴 Ajax를 활용하여 검색된 데이터들을 직접 그려주는 방식으로 자동완성 기능을 추가하였습니다. ```java @ResponseBody @RequestMapping(value = "/searchNutrient_ajax", method = RequestMethod.GET, produces = "text/plain;charset=UTF-8") public String wordSearchShow(HttpServletRequest request) { String searchWord = request.getParameter("searchWord"); Map paraMap = new HashMap<>(); paraMap.put("searchWord", searchWord); List nutrientList = nutrientService.containingNutrientName(paraMap); JSONArray jsonArr = new JSONArray(); if (nutrientList != null) { for (String word : nutrientList) { JSONObject jsonObj = new JSONObject(); jsonObj.put("word", word); jsonArr.add(jsonObj); } } return jsonArr.toString(); } ``` #### Script ```script function _getFileName(_this) { var fileValue = $(_this).val().split("\\"); var fileName = fileValue[fileValue.length - 1]; $(_this).siblings("div.uploaded-file-name").html(fileName); $(_this).siblings("div.uploaded-file-name").addClass("active"); } function searchNutrient() { var element = $("#searchWord"); var wordLength = element.val().trim().length; if (wordLength == 0) { $("#displayList").hide(); } else { $.ajax({ url: "/product/searchNutrient_ajax", type: "get", data: { "searchWord": element.val() }, dataType: "json", success: function(json) { if (json.length > 0) { var html = ""; $.each(json, function(index, item) { var word = item.word; var index = word.toLowerCase().indexOf(element.val().toLowerCase()); var len = element.val().length; var result = word.substr(0, index) + "" + word.substr(index, len) + "" + word.substr(index + len); html += "" + result + "
"; }); var input_width = element.css("width"); $("#displayList").css({ "width": input_width }); $("#displayList").html(html); $("#displayList").show(); } else { $("#displayList").hide(); } }, error: function(request, status, error) { console.log("code: " + request.status + "\n" + "message: " + request.responseText + "\n" + "error: " + error); } }); } } ``` ### ? 설문 |**설문**| | --- | #### 데이터 구조 1. 각 영양소들이 매칭될 눈/장/위/스트레스 등과 같은 카테고리와 섭취시 주의해야할 대상을 1차로 생성 2. api를 활용하여 카테고리에 해당하는 영양소들을 매칭 3. api를 활용하여 주의사항 카테고리에 해당하는 영양소들을 매칭 4. 상품 등록 시 상품에 포함된 영양소 및 주의사항을 등록(자동완성) #### 설문 세팅 1. 눈/장/위/스트레스와 같은 카테고리를 가진 질문을 생성 2. 질문에 해당하는 답변들을 생성 3. 각 답변들은 카테고리에 해당하는 영양소들의 점수를 지님 4. 사용자는 동일한 카테고리의 질문을 통해 설문을 진행 5. 동일한 카테고리에서 선택한 질문의 점수를 통해 위험 기준점을 넘은 영양소를 알려줌 6. 섭취가 필요한 영양소와 설문을 통해 진행한 영양소들을 차트를 통해 알려줌 7. (5번의 기준점을 넘은 영양소)를 포함한 상품을 추천해준다. - 사용자의 설문 내용을 List>의 형태로 받기 위해 json으로 타입을 변경하여 데이터를 전달받았습니다. - 또한 설문마다 페이지가 넘어가는 부분은 localstorege에 저장하였다가 초기화 시키는 방식으로 구현하였습니다. #### SurveyController ```java @GetMapping("/ready") public String beforeSurvey() { return "survey_ready"; } @GetMapping("") public String doSurvey(Model model, SurveyForm surveyForm, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "pageSize", defaultValue = "1") int pageSize) { Page surveyList = surveyService.getSurveyList(page, pageSize); model.addAttribute("surveyList", surveyList); return "survey"; } @PostMapping("/submit") public String submitSurvey(@ModelAttribute("surveyForm") @Valid SurveyForm surveyForm, BindingResult bindingResult, RedirectAttributes redirectAttributes, HttpSession session, HttpServletRequest request) { if (bindingResult.hasErrors()) { return "survey"; } ObjectMapper objectMapper = new ObjectMapper(); Map answerIdMap = new HashMap<>(); try { answerIdMap = objectMapper.readValue(surveyForm.getAnswerIdMap(), new TypeReference>() { }); } catch (IOException e) { e.printStackTrace(); return "errorPage"; } Map avgNutrientMap = surveyService.getAverageScoresByNutrient(answerIdMap); redirectAttributes.addFlashAttribute("avgNutrientMap", avgNutrientMap); List highestNutrients = surveyService.findHighScoringNutrients(avgNutrientMap); redirectAttributes.addFlashAttribute("highestNutrients", highestNutrients); List top3Nutrients = surveyService.findTopHighScoringNutrients(avgNutrientMap, 3); redirectAttributes.addFlashAttribute("top3Nutrients", top3Nutrients); String refererUri = request.getHeader("Referer"); session.setAttribute("refererUri", refererUri); return "redirect:/survey/result"; } @GetMapping("/result") public String success(@ModelAttribute("highestNutrients") ArrayList highestNutrients, @ModelAttribute("avgNutrientMap") Map avgNutrientMap, @ModelAttribute("top3Nutrients") ArrayList top3Nutrients, Model model) { List products = highestNutrients.stream() .map(nutrient -> productService.findProductsByNutrientName(nutrient.getName())) .flatMap(Collection::stream) .distinct() .collect(Collectors.toList()); model.addAttribute("products", products); model.addAttribute("highestNutrients", highestNutrients); model.addAttribute("avgNutrientMap", avgNutrientMap); model.addAttribute("top3Nutrients", top3Nutrients); for (Nutrient nutrient : highestNutrients) { System.out.println(nutrient.getName()); } return "survey_result"; } ``` #### SurveyService - 현재는 임시 데이터를 넣어두었지만 추후에 정밀한 데이터를 얻을 수 있다면 각 항목별 점수를 세분화하여 추가 작업할 예정입니다. ```java public List getNutrientListBySurvey(Long surveyId) { return surveyRepository.findNutrientListBySurveyId(surveyId); } public List getSurveyListByCategory(Long surveyCategoryId) { return surveyRepository.findByNutrientCategoryId(surveyCategoryId); } public Page getSurveyList(int page, int pageSize) { Pageable pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.ASC, "id")); return surveyRepository.findAll(pageable); } public Map getAverageScoresByNutrient(Map answerIdMap) { Map> nutrientScoresMap = groupScoresByNutrient(answerIdMap); return calculateAverageScores(nutrientScoresMap); } private Map> groupScoresByNutrient(Map answerIdMap) { Map> nutrientScoresMap = new HashMap<>(); for (Map.Entry entry : answerIdMap.entrySet()) { Long surveyId = entry.getKey(); Long surveyAnswerId = entry.getValue(); Survey survey = surveyRepository.findById(surveyId).orElse(null); if (survey != null) { List nutrientAnswers = nutrientAnswerService.getAnswerListByAnswer(surveyAnswerId); for (NutrientAnswer nutrientAnswer : nutrientAnswers) { Nutrient nutrient = nutrientAnswer.getNutrient(); double score = nutrientAnswer.getScore(); nutrientScoresMap.computeIfAbsent(nutrient, k -> new ArrayList<>()).add(score); } } } return nutrientScoresMap; } private Map calculateAverageScores(Map> nutrientScoresMap) { Map averageScores = new HashMap<>(); for (Map.Entry> entry : nutrientScoresMap.entrySet()) { Nutrient nutrient = entry.getKey(); List scores = entry.getValue(); double average = calculateAverage(scores); averageScores.put(nutrient, average); } return averageScores; } private double calculateAverage(List scores) { return scores.stream().mapToDouble(Double::doubleValue).average().orElse(0.0); } public List findHighScoringNutrients(Map averageScores) { List highScoringNutrients = new ArrayList<>(); for (Map.Entry entry : averageScores.entrySet()) { Nutrient nutrient = entry.getKey(); Double averageScore = entry.getValue(); if (averageScore >= 2.3) { highScoringNutrients.add(nutrient); } } return highScoringNutrients; } public List findTopHighScoringNutrients(Map averageScores, int topCount) { List highScoringNutrients = new ArrayList<>(); averageScores.entrySet().stream() .filter(entry -> entry.getValue() >= 3.0) .sorted(Map.Entry.comparingByValue().reversed()) .limit(topCount) .map(Map.Entry::getKey) .forEach(highScoringNutrients::add); return highScoringNutrients; } } ``` ### ? 공지사항 |**공지사항**| | --- | #### form 태그 외부의 데이터 - 입력값에 따라 태그안의 내용들이 바뀌는 경우에는 어떤식으로 처리해야하는지 고민했습니다. - hidden 타입 input박스를 선언해두고 스크립트를 통해 값을 업데이트 후 submit하는 방식으로 구현했습니다. ```html ``` ```script ``` ### ? 토스페이먼츠 연동(결제) |**토스 페이먼츠**| | --- | #### PurchaseController ```java @Slf4j @RequestMapping("/purchase") @RequiredArgsConstructor @Controller public class PurchaseController { @Value("${custom.toss.payments.secret-key}") private String secretKey; private final PurchaseService purchaseService; private final PurchaseItemService purchaseItemService; private final CartService cartService; private final CartItemService cartItemService; private final UserService userService; private final AddressService addressService; private final FileService fileService; private final CashLogService cashLogService; @PreAuthorize("isAuthenticated()") @GetMapping("") public String purchase(@RequestParam List cartItemId, PurchaseForm purchaseForm, Model model, Principal principal) { log.info("cartItem size: " + cartItemId.size()); SiteUser purchaser = this.userService.getUserByLoginId(principal.getName()); model.addAttribute("purchaser", purchaser); List cartItemList = new ArrayList<>(); int totalAmount = 0; for (Long id : cartItemId) { CartItem cartItem = this.cartItemService.getCartItem(id); cartItemList.add(this.cartItemService.getCartItem(id)); log.info(cartItem.getProduct().getName() + ": " + cartItem.getCount()); totalAmount += cartItem.getCount() * cartItem.getProduct().getPrice(); } model.addAttribute("cartItemList", cartItemList); log.info(String.format("totalAmount: %,d원", totalAmount)); model.addAttribute("totalAmount", totalAmount); return "purchase/purchase"; } @PreAuthorize("isAuthenticated") @PostMapping("/payment/before") @ResponseBody public ResponseEntity beforePayment(HttpServletRequest request, @Valid PurchaseForm purchaseForm, BindingResult bindingResult, @RequestParam List cartItemId, Principal principal) { // 주문 실패 시 되돌아갈 주문 페이지 쿼리스트링 생성 및 저장 request.getSession().removeAttribute("purchaseQuery"); String purchaseQuery = cartItemId.stream().map(x -> "cartItemId=" + x).collect(Collectors.joining("&")); request.getSession().setAttribute("purchaseQuery", purchaseQuery); log.info("purchaserName: " + purchaseForm.getPurchaserName()); log.info("purchaserPhoneNumber: " + purchaseForm.getPurchaserPhoneNumber()); log.info("receiverName: " + purchaseForm.getReceiverName()); log.info("receiverPhoneNumber: " + purchaseForm.getReceiverPhoneNumber()); log.info("receiverAddress.zoneCode: " + purchaseForm.getReceiverAddress().getZoneCode()); log.info("receiverAddress.mainAddress: " + purchaseForm.getReceiverAddress().getMainAddress()); log.info("receiverAddress.subAddress: " + purchaseForm.getReceiverAddress().getSubAddress()); log.info("deliveryRequest: " + purchaseForm.getDeliveryRequest()); log.info("customDeliveryRequest: " + purchaseForm.getCustomDeliveryRequest()); log.info("cartItemList: " + cartItemId.toString()); // 주문 객체 저장 정보 생성 SiteUser purchaser = this.userService.getUserByLoginId(principal.getName()); String purchaseId = "jigumiyak_" + String.format("%010d", purchaser.getId()) + "_" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss_n")); List cartItemList = new ArrayList<>(); Integer totalAmount = 0; for (Long id : cartItemId) { CartItem cartItem = this.cartItemService.getCartItem(id); cartItemList.add(cartItem); log.info(cartItem.getProduct().getName() + ": " + cartItem.getCount()); totalAmount += cartItem.getCount() * cartItem.getProduct().getPrice(); } String purchaseName = cartItemList.get(0).getProduct().getName(); if (cartItemList.size() > 1) { purchaseName += String.format(" 외 %s건", cartItemList.size() - 1); } Address receiverAddress = this.addressService.create(purchaseForm.getReceiverAddress().getZoneCode(), purchaseForm.getReceiverAddress().getMainAddress(), purchaseForm.getReceiverAddress().getSubAddress()); String deliveryRequest = !purchaseForm.getDeliveryRequest().equals("직접입력") ? purchaseForm.getDeliveryRequest() : purchaseForm.getCustomDeliveryRequest(); // 주문 객체 저장 Purchase purchase = this.purchaseService.create( purchaseId, purchaseName, purchaseForm.getPurchaserName(), "010" + purchaseForm.getPurchaserPhoneNumber(), purchaseForm.getReceiverName(), "010" + purchaseForm.getReceiverPhoneNumber(), receiverAddress, deliveryRequest, totalAmount, purchaser ); // 주문 아이템 객체 저장 for (CartItem cartItem : cartItemList) { PurchaseItem purchaseItem = this.purchaseItemService.create(cartItem, purchase); } // 주문 객체 정보 전달 맵 생성 Map purchaseAttributes = new HashMap<>(); purchaseAttributes.put("amount", purchase.getTotalAmount()); purchaseAttributes.put("orderId", purchase.getPurchaseId()); purchaseAttributes.put("orderName", purchase.getPurchaseName()); purchaseAttributes.put("customerName", purchase.getPurchaserName()); log.info("purchaseAttributes: {}", purchaseAttributes); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "주문 ID를 생성했습니다", purchaseAttributes)); } @PreAuthorize("isAuthenticated") @PostMapping("/payment/cancel") @ResponseBody public ResponseEntity cancelPayment(HttpServletRequest request, @RequestParam("orderId") String purchaseId, Principal principal) { request.getSession().removeAttribute("purchaseQuery"); log.info("payment cancel on purchaseId == " + purchaseId); SiteUser purchaser = this.userService.getUserByLoginId(principal.getName()); Purchase purchase = this.purchaseService.getPurchaseByPurchaserAndPurchaseId(purchaser, purchaseId); if (purchase == null) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "해당 주문 ID가 존재하지 않습니다", "")); } this.purchaseService.delete(purchase); this.addressService.delete(purchase.getReceiverAddress()); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "해당 주문 ID를 삭제했습니다", "")); } @PreAuthorize("isAuthenticated()") @GetMapping("/payment/success") public String successPayment(HttpServletRequest request, @RequestParam("orderId") String purchaseId, @RequestParam("amount") Integer amount, @RequestParam("paymentKey") String paymentKey, Principal principal) throws Exception { request.getSession().removeAttribute("purchaseQuery"); // 결제 승인 처리 Base64.Encoder encoder = Base64.getEncoder(); byte[] encodedBytes = encoder.encode(secretKey.getBytes("UTF-8")); String authorizations = "Basic " + new String(encodedBytes, 0, encodedBytes.length); URL url = new URL("https://api.tosspayments.com/v1/payments/" + paymentKey); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestProperty("Authorization", authorizations); connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestMethod("POST"); connection.setDoOutput(true); JSONObject obj = new JSONObject(); obj.put("orderId", purchaseId); obj.put("amount", amount); OutputStream outputStream = connection.getOutputStream(); outputStream.write(obj.toString().getBytes("UTF-8")); int code = connection.getResponseCode(); boolean isSuccess = code == 200 ? true : false; InputStream responseStream = isSuccess ? connection.getInputStream() : connection.getErrorStream(); Reader reader = new InputStreamReader(responseStream, StandardCharsets.UTF_8); JSONParser parser = new JSONParser(); JSONObject jsonObject = (JSONObject) parser.parse(reader); responseStream.close(); log.info("payment success on purchaseId == " + purchaseId); // 필요 결제 정보 저장 log.info(jsonObject.toJSONString()); String method = jsonObject.get("method").toString(); String approvedAt = jsonObject.get("approvedAt").toString(); ZonedDateTime zonedDateTime = ZonedDateTime.parse(approvedAt); LocalDateTime payDate = zonedDateTime.toLocalDateTime(); Integer suppliedAmount = Integer.parseInt(jsonObject.get("suppliedAmount").toString()); Integer vat = Integer.parseInt(jsonObject.get("vat").toString()); String paymentDetail = ""; if (method.equals("간편결제")) { paymentDetail = ((JSONObject) jsonObject.get("easyPay")).get("provider").toString(); } else if (method.equals("카드")) { String ownerType = ((JSONObject) jsonObject.get("card")).get("ownerType").toString(); String cardType = ((JSONObject) jsonObject.get("card")).get("cardType").toString(); String number = ((JSONObject) jsonObject.get("card")).get("number").toString(); paymentDetail = ownerType + "_" + cardType + "_" + number; } SiteUser purchaser = this.userService.getUserByLoginId(principal.getName()); Purchase purchase = this.purchaseService.getPurchaseByPurchaserAndPurchaseId(purchaser, purchaseId); this.purchaseService.updateSuccess(purchase, paymentKey, method, payDate, suppliedAmount, vat, paymentDetail); // 구매 완료된 장바구니 아이템 삭제 List purchaseItemList = purchase.getPurchaseItemList(); Cart cart = this.cartService.getCartByOwner(purchaser); for (PurchaseItem purchaseItem : purchaseItemList) { CartItem cartItem = this.cartItemService.getCartItemByProductAndCart(purchaseItem.getProduct(), cart); this.cartItemService.delete(cartItem); } return String.format("redirect:/purchase/%s", purchase.getId()); } @PreAuthorize("isAuthenticated()") @GetMapping("/payment/fail") public String failPayment(HttpServletRequest request, Model model, Principal principal, @RequestParam("orderId") String purchaseId, @RequestParam("message") String message, @RequestParam("code") String code) throws Exception { String purchaseQuery = request.getSession().getAttribute("purchaseQuery").toString(); request.getSession().removeAttribute("purchaseQuery"); log.info("payment fail on purchaseId == " + purchaseId); SiteUser purchaser = this.userService.getUserByLoginId(principal.getName()); Purchase purchase = this.purchaseService.getPurchaseByPurchaserAndPurchaseId(purchaser, purchaseId); model.addAttribute("code", code); model.addAttribute("message", message); // 주문 객체 없을 시 잘못된 주문 과정이므로 장바구니로 리턴 if (purchase == null) { model.addAttribute("uri", "/cart"); } this.purchaseService.delete(purchase); this.addressService.delete(purchase.getReceiverAddress()); // 주문 실패 시 실패 창 잠깐 띄우고 바로 주문 페이지로 리턴 model.addAttribute("uri", "/purchase?" + purchaseQuery); return "purchase/fail"; } @PreAuthorize("hasAuthority('admin')") @GetMapping("/detail") @ResponseBody public ResponseEntity getDetail(@RequestParam("id") Long id) { Purchase purchase = this.purchaseService.getPurchase(id); if (purchase == null) { return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("F-1", "해당 주문 ID가 존재하지 않습니다", "")); } Map attributes = new HashMap<>(); attributes.put("purchaseName", purchase.getPurchaseName()); // 주문고객 정보 attributes.put("loginId", purchase.getPurchaser().getLoginId()); attributes.put("email", purchase.getPurchaser().getEmail()); attributes.put("purchaserName", purchase.getPurchaserName()); attributes.put("purchaserPhoneNumber", purchase.getPurchaserPhoneNumber()); // 배송지 정보 attributes.put("receiverName", purchase.getReceiverName()); attributes.put("receiverPhoneNumber", purchase.getReceiverPhoneNumber()); String receiverAddress = String.format("(%s) %s %s", purchase.getReceiverAddress().getZoneCode(), purchase.getReceiverAddress().getMainAddress(), purchase.getReceiverAddress().getSubAddress() != null ? purchase.getReceiverAddress().getSubAddress() : ""); attributes.put("receiverAddress", receiverAddress); attributes.put("deliveryRequest", purchase.getDeliveryRequest()); // 결제 정보 attributes.put("totalAmount", purchase.getTotalAmount()); attributes.put("method", purchase.getMethod()); attributes.put("paymentDetail", purchase.getPaymentDetail()); attributes.put("payDate", purchase.getPayDate()); attributes.put("purchaseState", purchase.getPurchaseState().getStateKor()); // 주문상품 정보 List> purchaseItem = new ArrayList<>(); for (PurchaseItem item : purchase.getPurchaseItemList()) { Map itemAttributes = new HashMap<>(); itemAttributes.put("count", item.getCount()); itemAttributes.put("name", item.getProduct().getName()); itemAttributes.put("price", item.getProduct().getPrice()); itemAttributes.put("imgPath", this.fileService.getFilePath(item.getProduct().getThumbnailImg())); purchaseItem.add(itemAttributes); } attributes.put("purchaseItem", purchaseItem); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "해당 주문 ID에 대한 정보를 반환합니다", attributes)); } @PreAuthorize("isAuthenticated()") @GetMapping("/{id}") public String showDetail(@PathVariable("id") Long id, Model model, Principal principal) { Purchase purchase = this.purchaseService.getPurchase(id); if (!purchase.getPurchaser().getLoginId().equals(principal.getName())) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); } model.addAttribute("purchase", purchase); return "purchase/detail"; } @PreAuthorize("isAuthenticated()") @PostMapping("/confirm") @ResponseBody public ResponseEntity confirm(@RequestParam("id") Long id, Principal principal) { Purchase purchase = this.purchaseService.getPurchase(id); if (!purchase.getPurchaser().getLoginId().equals(principal.getName())) { return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(new RsData<>("F-1", "해당 주문 ID에 대한 접근 권한이 없습니다", "")); } this.purchaseService.updateConfirm(purchase); CashLog cashLog = this.cashLogService.create(purchase); return ResponseEntity.status(HttpStatus.OK) .body(new RsData<>("S-1", "구매확정을 완료했습니다", purchase.getPurchaseState().getStateKor())); } } ``` --- ??감사합니다??