Skip to content

Commit

Permalink
HotFix: 보호자의 회원가입때만 환영 포인트 지급하도록 수정 (#212)
Browse files Browse the repository at this point in the history
feat: 보호자의 회원가입때만 환영 포인트 지급하도록 수정
  • Loading branch information
zzoe2346 authored Nov 10, 2024
1 parent 46fb8d9 commit 8fb6c0d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Optional;

@Service
public class MemberService{
public class MemberService {

private static final int WELCOME_POINT = 10000;

Expand Down Expand Up @@ -80,8 +80,10 @@ public RegisterResponse registerNewMember(String name, String phoneNumber, Strin
Member newMember = new Member(name, phoneNumber, email, isSinitto);
memberRepository.save(newMember);

pointRepository.save(new Point(WELCOME_POINT, newMember));
pointLogRepository.save(new PointLog(PointLog.Content.WELCOME_POINT, newMember, WELCOME_POINT, PointLog.Status.EARN));
if (!isSinitto) {
pointRepository.save(new Point(WELCOME_POINT, newMember));
pointLogRepository.save(new PointLog(PointLog.Content.WELCOME_POINT, newMember, WELCOME_POINT, PointLog.Status.EARN));
}

String accessToken = tokenService.generateAccessToken(email);
String refreshToken = tokenService.generateRefreshToken(email);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.example.sinitto.auth.service.TokenService;
import com.example.sinitto.callback.service.CallbackService;
import com.example.sinitto.common.exception.ConflictException;
import com.example.sinitto.common.exception.NotFoundException;
import com.example.sinitto.helloCall.service.HelloCallService;
import com.example.sinitto.member.dto.RegisterResponse;
import com.example.sinitto.member.entity.Member;
Expand Down Expand Up @@ -49,8 +48,8 @@ public class MemberServiceTest {
PointLogRepository pointLogRepository;

@Test
@DisplayName("registerNewMember 메소드 테스트")
void registerNewMemberTest() {
@DisplayName("registerNewMember 메소드 테스트 - 시니또의 회원가입인 경우 환영 포인트 미지급")
void registerNewMemberTest1() {
//given
String name = "testName";
String phoneNumber = "01000000000";
Expand All @@ -62,6 +61,27 @@ void registerNewMemberTest() {
//when
RegisterResponse result = memberService.registerNewMember(name, phoneNumber, email, isSinitto);

//then
verify(memberRepository, times(1)).save(any(Member.class));
verify(pointRepository, never()).save(any());
verify(pointLogRepository, never()).save(any());
assertEquals(isSinitto, result.isSinitto());
}

@Test
@DisplayName("registerNewMember 메소드 테스트 - 보호자의 회원가입인 경우 환영 포인트 지급")
void registerNewMemberTest2() {
//given
String name = "testName";
String phoneNumber = "01000000000";
String email = "[email protected]";
boolean isSinitto = false;

when(memberRepository.existsByEmail(email)).thenReturn(false);

//when
RegisterResponse result = memberService.registerNewMember(name, phoneNumber, email, isSinitto);

//then
verify(memberRepository, times(1)).save(any(Member.class));
verify(pointRepository, times(1)).save(any());
Expand Down

0 comments on commit 8fb6c0d

Please sign in to comment.