Skip to content
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,7 +1,6 @@
package deepple.deepple.member.command.application.member;

import deepple.deepple.member.command.application.member.exception.MemberNotFoundException;
import deepple.deepple.member.command.domain.member.ActivityStatus;
import deepple.deepple.member.command.domain.member.Grade;
import deepple.deepple.member.command.domain.member.Member;
import deepple.deepple.member.command.domain.member.MemberCommandRepository;
Expand All @@ -19,12 +18,9 @@ public class AdminMemberService {
@Transactional
public void updateMemberSetting(long memberId, AdminMemberSettingUpdateRequest request) {
Grade grade = Grade.from(request.grade());
ActivityStatus activityStatus = ActivityStatus.from(request.activityStatus());
Member member = getMember(memberId);
member.updateSetting(
grade,
request.isProfilePublic(),
activityStatus,
request.isVip(),
request.isPushNotificationEnabled()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,10 @@ public void updateGrade(@NonNull Grade grade) {

public void updateSetting(
@NonNull Grade grade,
boolean isProfilePublic,
@NonNull ActivityStatus activityStatus,
boolean isVip,
boolean isPushNotificationEnabled
) {
this.grade = grade;
this.isProfilePublic = isProfilePublic;
changeActivityStatus(activityStatus);
this.isVip = isVip;
Events.raise(MemberSettingUpdatedEvent.of(id, isPushNotificationEnabled));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package deepple.deepple.member.presentation.member.dto;

import deepple.deepple.member.command.domain.member.ActivityStatus;
import deepple.deepple.member.command.domain.member.Grade;
import io.swagger.v3.oas.annotations.media.Schema;

public record AdminMemberSettingUpdateRequest(
@Schema(implementation = Grade.class)
String grade,
boolean isProfilePublic,
@Schema(implementation = ActivityStatus.class)
String activityStatus,
boolean isVip,
boolean isPushNotificationEnabled
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package deepple.deepple.member.command.application.member;

import deepple.deepple.member.command.application.member.exception.MemberNotFoundException;
import deepple.deepple.member.command.domain.member.ActivityStatus;
import deepple.deepple.member.command.domain.member.Grade;
import deepple.deepple.member.command.domain.member.Member;
import deepple.deepple.member.command.domain.member.MemberCommandRepository;
Expand Down Expand Up @@ -33,7 +32,7 @@ void updateMemberSetting() {
// given
long memberId = 1L;
AdminMemberSettingUpdateRequest request = new AdminMemberSettingUpdateRequest(
Grade.SILVER.name(), true, ActivityStatus.ACTIVE.name(), true, true
Grade.SILVER.name(), true, true
);
final Member member = mock(Member.class);
when(memberCommandRepository.findById(memberId)).thenReturn(Optional.of(member));
Expand All @@ -42,8 +41,7 @@ void updateMemberSetting() {
adminMemberService.updateMemberSetting(memberId, request);

// then
verify(member).updateSetting(Grade.from(request.grade()), request.isProfilePublic(),
ActivityStatus.from(request.activityStatus()), request.isVip(), request.isPushNotificationEnabled());
verify(member).updateSetting(Grade.from(request.grade()), request.isVip(), request.isPushNotificationEnabled());
}

@Test
Expand All @@ -52,12 +50,12 @@ void updateMemberSetting_MemberNotFound() {
// given
long memberId = 1L;
AdminMemberSettingUpdateRequest request = new AdminMemberSettingUpdateRequest(
Grade.SILVER.name(), true, ActivityStatus.ACTIVE.name(), true, true
Grade.SILVER.name(), true, true
);
when(memberCommandRepository.findById(memberId)).thenReturn(Optional.empty());

// when & then
assertThatThrownBy(() -> adminMemberService.updateMemberSetting(memberId, request))
.isInstanceOf(MemberNotFoundException.class);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import deepple.deepple.heart.command.domain.hearttransaction.vo.HeartAmount;
import deepple.deepple.heart.command.domain.hearttransaction.vo.HeartBalance;
import deepple.deepple.member.command.domain.member.event.MemberProfileInitializedEvent;
import deepple.deepple.member.command.domain.member.event.MemberSettingUpdatedEvent;
import deepple.deepple.member.command.domain.member.vo.KakaoId;
import deepple.deepple.member.command.domain.member.vo.MemberProfile;
import deepple.deepple.member.command.domain.member.vo.Nickname;
Expand Down Expand Up @@ -172,24 +173,27 @@ class UpdateSettingMethodTest {
@Test
@DisplayName("멤버의 설정을 업데이트합니다.")
void shouldUpdateMemberSettings() {
// Given
Member member = Member.fromPhoneNumber("01012345678");
Long memberId = 1L;
setField(member, "id", memberId);
Grade grade = Grade.GOLD;
final boolean isProfilePublic = true;
ActivityStatus activityStatus = ActivityStatus.DORMANT;
final boolean isVip = true;
final boolean isPushNotificationEnabled = false;
try (MockedStatic<Events> eventsMock = mockStatic(Events.class)) {
// Given
Member member = Member.fromPhoneNumber("01012345678");
Long memberId = 1L;
setField(member, "id", memberId);
Grade grade = Grade.GOLD;
final boolean isVip = true;
final boolean isPushNotificationEnabled = false;

// When
member.updateSetting(grade, isProfilePublic, activityStatus, isVip, isPushNotificationEnabled);
// When
member.updateSetting(grade, isVip, isPushNotificationEnabled);

// Then
Assertions.assertThat(member.getGrade()).isEqualTo(grade);
Assertions.assertThat(member.isProfilePublic()).isEqualTo(isProfilePublic);
Assertions.assertThat(member.getActivityStatus()).isEqualTo(activityStatus);
Assertions.assertThat(member.isVip()).isEqualTo(isVip);
// Then
Assertions.assertThat(member.getGrade()).isEqualTo(grade);
Assertions.assertThat(member.isVip()).isEqualTo(isVip);
eventsMock.verify(() -> Events.raise(argThat(event ->
event instanceof MemberSettingUpdatedEvent &&
((MemberSettingUpdatedEvent) event).getMemberId() == memberId &&
!((MemberSettingUpdatedEvent) event).isPushNotificationEnabled()
Comment thread
hainho marked this conversation as resolved.
)));
}
}
}

Expand Down
Loading