Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: 회원 가입 시 정책 동의 로직 추가 구현 #141

Merged
merged 4 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.cotato.csquiz.api.auth.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.util.List;
import org.cotato.csquiz.api.policy.dto.CheckPolicyRequest;

public record JoinRequest(
@Email(message = "올바른 형식의 메일 주소를 입력해주세요.")
Expand All @@ -16,6 +19,9 @@ public record JoinRequest(
String name,
@NotNull(message = "전화번호를 입력해주세요.")
@Size(min = 11, max = 11, message = "'-'없이 11자리의 전화번호를 입력해주세요.")
String phoneNumber
String phoneNumber,

@Schema(description = "동의 표시한 정책 목록")
List<CheckPolicyRequest> policies
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@Tag(name = "회원 정책 API")
Expand All @@ -33,12 +32,13 @@ public ResponseEntity<FindMemberPolicyResponse> getUnCheckedPolicies(@Authentica

@Operation(summary = "특정 정책에 대해 동의 여부 체크 API")
@PostMapping("/check")
public ResponseEntity<Void> checkPolicies(@RequestBody @Valid CheckMemberPoliciesRequest request){
policyService.checkPolicies(request);
public ResponseEntity<Void> checkPolicies(@RequestBody @Valid CheckMemberPoliciesRequest request,
@AuthenticationPrincipal Long memberId) {
policyService.checkPolicies(memberId, request.policies());
return ResponseEntity.noContent().build();
}

@Operation(summary = "회원 가입 시 정책 목록 반환 API")
@Operation(summary = "회원 가입 시 보여줘야 할 정책 목록 반환 API")
@GetMapping
public ResponseEntity<PoliciesResponse> getPolicies() {
return ResponseEntity.ok().body(policyService.findPolicies());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.List;

public record CheckMemberPoliciesRequest(
@NotNull(message = "체크할 회원의 id는 필수 입니다.")
Long memberId,
@NotEmpty(message = "체크할 정책을 입력해주세요")
@Valid
List<CheckPolicyRequest> policies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@
import org.cotato.csquiz.api.auth.dto.ReissueResponse;
import org.cotato.csquiz.api.auth.dto.SendEmailRequest;
import org.cotato.csquiz.api.member.dto.MemberEmailResponse;
import org.cotato.csquiz.api.member.dto.MemberInfo;
import org.cotato.csquiz.common.config.jwt.BlackListRepository;
import org.cotato.csquiz.common.config.jwt.JwtTokenProvider;
import org.cotato.csquiz.common.config.jwt.RefreshToken;
import org.cotato.csquiz.common.config.jwt.RefreshTokenRepository;
import org.cotato.csquiz.common.config.jwt.Token;
import org.cotato.csquiz.common.error.ErrorCode;
import org.cotato.csquiz.common.error.exception.AppException;
import org.cotato.csquiz.domain.auth.enums.EmailType;
import org.cotato.csquiz.domain.auth.constant.EmailConstants;
import org.cotato.csquiz.domain.auth.entity.Member;
import org.cotato.csquiz.domain.auth.enums.EmailType;
import org.cotato.csquiz.domain.auth.repository.MemberRepository;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
Expand All @@ -39,6 +38,7 @@ public class AuthService {
private static final int EXPOSED_LENGTH = 4;
private static final String REFRESH_TOKEN = "refreshToken";

private final PolicyService policyService;
private final MemberRepository memberRepository;
private final ValidateService validateService;
private final BCryptPasswordEncoder bCryptPasswordEncoder;
Expand Down Expand Up @@ -69,6 +69,8 @@ public JoinResponse createLoginInfo(JoinRequest request) {
.build();
memberRepository.save(newMember);

policyService.checkPolicies(newMember.getId(), request.policies());

return JoinResponse.from(newMember);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public FindMemberPolicyResponse findUnCheckedPolicies(final Long memberId) {
}

@Transactional
public void checkPolicies(CheckMemberPoliciesRequest request) {
Member findMember = memberService.findById(request.memberId());
public void checkPolicies(Long memberId, List<CheckPolicyRequest> policies) {
Member findMember = memberService.findById(memberId);

List<Long> policyIds = request.policies().stream()
List<Long> policyIds = policies.stream()
.map(CheckPolicyRequest::policyId)
.toList();

Expand All @@ -66,7 +66,7 @@ public void checkPolicies(CheckMemberPoliciesRequest request) {
Map<Long, Policy> policyMap = policyRepository.findAllByIdIn(policyIds).stream()
.collect(Collectors.toMap(Policy::getId, Function.identity()));

List<MemberPolicy> memberPolicies = request.policies().stream()
List<MemberPolicy> memberPolicies = policies.stream()
.map(policyRequest -> MemberPolicy.of(policyRequest.isChecked(), findMember,
policyMap.get(policyRequest.policyId())))
.toList();
Expand Down
Loading