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
Expand Up @@ -9,8 +9,6 @@ public record UpdateMemberInfoRequest(
String name,
@NotNull @Schema(description = "이미지 수정이 있을 시에는 false을, 이미지를 삭제할 때에는 true을 보냅니다.")
Boolean isProfileImageDeleted,
@Schema(description = "아지트 알림 수신 여부")
boolean agitNotification,
@Schema(description = "이메일 알림 수신 여부")
boolean emailNotification,
@Schema(description = "카카오 워크 알림 수신 여부")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public record MemberDetailInfoResponse(
NotificationSettingInfoResponse notificationSettingInfo
) {
public static record NotificationSettingInfoResponse(
@Schema(description = "아지트 알림 수신 여부")
boolean agit,
@Schema(description = "이메일 알림 수신 여부")
boolean email,
@Schema(description = "카카오 워크 알림 수신 여부")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class CommandCommentController {
private final EditCommentUsecase editCommentUsecase;
private final DeleteCommentUsecase deleteCommentUsecase;

@Deprecated
@Operation(summary = "댓글 수정")
@Parameter(name = "commentId", description = "수정할 댓글 고유 ID", required = true, in = ParameterIn.PATH)
@PatchMapping("/{commentId}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class ManagementNotificationController {
private final UpdateNotificationUsecase updateNotificationUsecase;
private final UpdateAllNotificationUsecase updateAllNotificationUsecase;
private final EnableKakaoUsecase enableKakaoUsecase;
private final EnableAgitUsecase enableAgitUsecase;
private final EnableEmailUsecase enableEmailUsecase;

@Operation(summary = "알림 목록에서 한 개 눌렀을 때 읽음 처리")
Expand All @@ -40,18 +39,14 @@ public void updateAllNotificationIsRead(@AuthenticationPrincipal SecurityUserDet
updateAllNotificationUsecase.updateAllNotification(userInfo.getUserId());
}

@Deprecated
@Operation(summary = "카카오 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
@PatchMapping("/kakao")
public void enableKaKaoWork(@AuthenticationPrincipal SecurityUserDetails userInfo) {
enableKakaoUsecase.enableKakao(userInfo.getUserId());
}

@Operation(summary = "아지트 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
@PatchMapping("/agit")
public void enableAgit(@AuthenticationPrincipal SecurityUserDetails userInfo) {
enableAgitUsecase.enableAgit(userInfo.getUserId());
}

@Deprecated
@Operation(summary = "이메일 푸시 알림 활성화/비활성화 API", description = "알림 거부였을 시 -> 승인으로 변경, 알림 승인이였을 시 -> 거부로 변경")
@PatchMapping("/email")
public void enableEmail(@AuthenticationPrincipal SecurityUserDetails userInfo) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

@Deprecated
@Tag(name = "SSE 관리 - 회원 등록(최초 접속시)")
@WebAdapter
@RequestMapping("/api/sse")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ public class MemberEntity extends BaseTimeEntity {
@Builder.Default
private Boolean kakaoworkNotificationEnabled = Boolean.TRUE;;

@Column(name = "agit_notification_enabled")
@Builder.Default
private Boolean agitNotificationEnabled = Boolean.TRUE;;

@Column(name = "email_notification_enabled")
@Builder.Default
private Boolean emailNotificationEnabled = Boolean.TRUE;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,11 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)

public static MemberDetailInfoResponse.NotificationSettingInfoResponse toNotificationSettingInfoResponse(Member member) {
return new MemberDetailInfoResponse.NotificationSettingInfoResponse(
member.getAgitNotificationEnabled(),
member.getEmailNotificationEnabled(),
member.getKakaoworkNotificationEnabled()
);

}
public static Member toMember(MemberInfo memberInfo) {
return Member.builder()
.memberInfo(memberInfo)
.agitNotificationEnabled(null)
.emailNotificationEnabled(null)
.kakaoworkNotificationEnabled(null)
.admin(null)
.imageUrl(null)
.status(null)
.password(null)
.build();
}

public static MemberDetailsResponse toMemberDetailsResponse(Member member) {
return new MemberDetailsResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest;

@Deprecated
public interface EditCommentUsecase {

@Deprecated
void editComment(Long memberId, Long commentId, EditCommentRequest request);
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package clap.server.application.port.inbound.notification;

@Deprecated
public interface EnableEmailUsecase {

@Deprecated
void enableEmail(Long memberId);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package clap.server.application.port.inbound.notification;

@Deprecated
public interface EnableKakaoUsecase {

@Deprecated
void enableKakao(Long memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

@Deprecated
public interface SubscribeSseUsecase {

@Deprecated
SseEmitter subscribe(Long memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, Mul
String profileImageUrl = profileImage != null ? s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage) : member.getImageUrl();
member.setImageUrl(profileImageUrl);
}
member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
member.updateMemberInfo(request.name(), request.emailNotification(),
request.kakaoWorkNotification());
commandMemberPort.save(member);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package clap.server.application.service.notification;

import clap.server.application.port.inbound.domain.MemberService;
import clap.server.application.port.inbound.notification.EnableAgitUsecase;
import clap.server.application.port.inbound.notification.EnableEmailUsecase;
import clap.server.application.port.inbound.notification.EnableKakaoUsecase;
import clap.server.application.port.outbound.member.CommandMemberPort;
Expand All @@ -11,26 +10,21 @@

@ApplicationService
@RequiredArgsConstructor
public class UpdateNotificationService implements EnableKakaoUsecase, EnableAgitUsecase, EnableEmailUsecase {
public class UpdateNotificationService implements EnableKakaoUsecase, EnableEmailUsecase {

private final MemberService memberService;
private final CommandMemberPort commandMemberPort;

@Override
public void enableAgit(Long memberId) {
Member member = memberService.findActiveMember(memberId);
member.updateAgitEnabled();
commandMemberPort.save(member);
}

@Override
@Deprecated
public void enableEmail(Long memberId) {
Member member = memberService.findActiveMember(memberId);
member.updateEmailEnabled();
commandMemberPort.save(member);
}

@Override
@Deprecated
public void enableKakao(Long memberId) {
Member member = memberService.findActiveMember(memberId);
member.updateKaKaoEnabled();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

@Deprecated
@ApplicationService
@RequiredArgsConstructor
public class SubscribeSseService implements SubscribeSseUsecase {
Expand Down
18 changes: 2 additions & 16 deletions src/main/java/clap/server/domain/model/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ public class Member extends BaseTime {
private MemberInfo memberInfo;
private Member admin;
private Boolean kakaoworkNotificationEnabled;
private Boolean agitNotificationEnabled;
private Boolean emailNotificationEnabled;
private String imageUrl;
private MemberStatus status;
private String password;
private Department department;

public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
public Member(MemberInfo memberInfo, Boolean emailNotificationEnabled, Boolean kakaoworkNotificationEnabled,
Member admin, String imageUrl, MemberStatus status, String password) {
this.memberInfo = memberInfo;
this.agitNotificationEnabled = agitNotificationEnabled;
this.emailNotificationEnabled = emailNotificationEnabled;
this.kakaoworkNotificationEnabled = kakaoworkNotificationEnabled;
this.admin = admin;
Expand All @@ -40,7 +38,6 @@ public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean em
public static Member createMember(Member admin, MemberInfo memberInfo) {
return Member.builder()
.memberInfo(memberInfo)
.agitNotificationEnabled(false)
.emailNotificationEnabled(false)
.kakaoworkNotificationEnabled(false)
.admin(admin)
Expand All @@ -57,7 +54,6 @@ public void resetPassword(String newEncodedPassword) {
public void resetPasswordAndActivateMember(String newEncodedPassword) {
this.password = newEncodedPassword;
this.status = MemberStatus.ACTIVE;
this.agitNotificationEnabled = true;
this.emailNotificationEnabled = true;
this.kakaoworkNotificationEnabled = true;
}
Expand All @@ -74,9 +70,8 @@ public void changeToApproveRequested() {
this.status = MemberStatus.APPROVAL_REQUEST;
}

public void updateMemberInfo(String name, Boolean agitNotificationEnabled, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled) {
public void updateMemberInfo(String name, Boolean emailNotificationEnabled, Boolean kakaoWorkNotificationEnabled) {
this.memberInfo.updateName(name);
this.agitNotificationEnabled = agitNotificationEnabled;
this.emailNotificationEnabled = emailNotificationEnabled;
this.kakaoworkNotificationEnabled = kakaoWorkNotificationEnabled;
}
Expand All @@ -98,15 +93,6 @@ public void updateKaKaoEnabled() {
}
}

public void updateAgitEnabled() {
if (!this.agitNotificationEnabled) {
this.agitNotificationEnabled = true;
}
else {
this.agitNotificationEnabled = false;
}
}

public void updateEmailEnabled() {
if (!this.emailNotificationEnabled) {
this.emailNotificationEnabled = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alter table member
drop column agit_notification_enabled;
5 changes: 0 additions & 5 deletions src/test/java/clap/server/TestDataFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public static Member createAdmin() {
.memberInfo(createAdminInfo())
.admin(null)
.kakaoworkNotificationEnabled(true)
.agitNotificationEnabled(true)
.emailNotificationEnabled(true)
.imageUrl(null)
.status(MemberStatus.ACTIVE)
Expand All @@ -39,7 +38,6 @@ public static Member createManagerWithReviewer() {
.memberInfo(createManagerWithReviewerInfo())
.admin(createAdmin())
.kakaoworkNotificationEnabled(true)
.agitNotificationEnabled(true)
.emailNotificationEnabled(true)
.imageUrl(null)
.status(MemberStatus.ACTIVE)
Expand All @@ -54,7 +52,6 @@ public static Member createManager() {
.memberInfo(createManagerInfo())
.admin(createAdmin())
.kakaoworkNotificationEnabled(true)
.agitNotificationEnabled(true)
.emailNotificationEnabled(true)
.imageUrl(null)
.status(MemberStatus.ACTIVE)
Expand All @@ -69,7 +66,6 @@ public static Member createUser() {
.memberInfo(createUserInfo())
.admin(createAdmin())
.kakaoworkNotificationEnabled(true)
.agitNotificationEnabled(true)
.emailNotificationEnabled(true)
.imageUrl(null)
.status(MemberStatus.ACTIVE)
Expand All @@ -96,7 +92,6 @@ public static Member createNotApprovedUser() {
.memberInfo(createNotApprovedUserInfo())
.admin(createAdmin())
.kakaoworkNotificationEnabled(true)
.agitNotificationEnabled(true)
.emailNotificationEnabled(true)
.imageUrl(null)
.status(MemberStatus.APPROVAL_REQUEST)
Expand Down