diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java index 71d7ff6c..c009f62a 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java @@ -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 = "카카오 워크 알림 수신 여부") diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java index cc7d2de2..59a20a9c 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java @@ -23,8 +23,6 @@ public record MemberDetailInfoResponse( NotificationSettingInfoResponse notificationSettingInfo ) { public static record NotificationSettingInfoResponse( - @Schema(description = "아지트 알림 수신 여부") - boolean agit, @Schema(description = "이메일 알림 수신 여부") boolean email, @Schema(description = "카카오 워크 알림 수신 여부") diff --git a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java index 7203d57b..074e468a 100644 --- a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java @@ -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}") diff --git a/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java b/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java index caf3e710..238d5897 100644 --- a/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java +++ b/src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java @@ -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 = "알림 목록에서 한 개 눌렀을 때 읽음 처리") @@ -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) { diff --git a/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java b/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java index aa09476d..0ecb09c2 100644 --- a/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java +++ b/src/main/java/clap/server/adapter/inbound/web/notification/SubscribeEmitterController.java @@ -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") diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java index 40e294a8..10bc90ad 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java @@ -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;; diff --git a/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java b/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java index 39b07923..ec21a431 100644 --- a/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java @@ -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( diff --git a/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java index 8d74a7a4..ee8c33d6 100644 --- a/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java @@ -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); } diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableAgitUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableAgitUsecase.java deleted file mode 100644 index aabf59b6..00000000 --- a/src/main/java/clap/server/application/port/inbound/notification/EnableAgitUsecase.java +++ /dev/null @@ -1,6 +0,0 @@ -package clap.server.application.port.inbound.notification; - -public interface EnableAgitUsecase { - - void enableAgit(Long memberId); -} diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java index 7240fb7d..2fff6a5f 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/EnableEmailUsecase.java @@ -1,6 +1,8 @@ package clap.server.application.port.inbound.notification; +@Deprecated public interface EnableEmailUsecase { + @Deprecated void enableEmail(Long memberId); } diff --git a/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java index 842d4be4..ef323ee2 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/EnableKakaoUsecase.java @@ -1,6 +1,8 @@ package clap.server.application.port.inbound.notification; +@Deprecated public interface EnableKakaoUsecase { + @Deprecated void enableKakao(Long memberId); } diff --git a/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java index 20a270c4..746b3042 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/SubscribeSseUsecase.java @@ -2,7 +2,9 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; +@Deprecated public interface SubscribeSseUsecase { + @Deprecated SseEmitter subscribe(Long memberId); } diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java index 18f465cb..9d1db7c9 100644 --- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java +++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java @@ -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); } diff --git a/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java b/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java index 9bdb84c7..d297165a 100644 --- a/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java +++ b/src/main/java/clap/server/application/service/notification/UpdateNotificationService.java @@ -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; @@ -11,19 +10,13 @@ @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(); @@ -31,6 +24,7 @@ public void enableEmail(Long memberId) { } @Override + @Deprecated public void enableKakao(Long memberId) { Member member = memberService.findActiveMember(memberId); member.updateKaKaoEnabled(); diff --git a/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java b/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java index d18a254d..e9035212 100644 --- a/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java +++ b/src/main/java/clap/server/application/service/webhook/SubscribeSseService.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; +@Deprecated @ApplicationService @RequiredArgsConstructor public class SubscribeSseService implements SubscribeSseUsecase { diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java index 7239cbab..be63e1fa 100644 --- a/src/main/java/clap/server/domain/model/member/Member.java +++ b/src/main/java/clap/server/domain/model/member/Member.java @@ -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; @@ -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) @@ -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; } @@ -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; } @@ -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; diff --git a/src/main/resources/db/migration/dev/V20250209339__Drop_Agit_Notification_Enabled_Column_From_Member.sql b/src/main/resources/db/migration/dev/V20250209339__Drop_Agit_Notification_Enabled_Column_From_Member.sql new file mode 100644 index 00000000..6d59af7c --- /dev/null +++ b/src/main/resources/db/migration/dev/V20250209339__Drop_Agit_Notification_Enabled_Column_From_Member.sql @@ -0,0 +1,2 @@ +alter table member + drop column agit_notification_enabled; \ No newline at end of file diff --git a/src/test/java/clap/server/TestDataFactory.java b/src/test/java/clap/server/TestDataFactory.java index 689d1f0d..62ef0a47 100644 --- a/src/test/java/clap/server/TestDataFactory.java +++ b/src/test/java/clap/server/TestDataFactory.java @@ -24,7 +24,6 @@ public static Member createAdmin() { .memberInfo(createAdminInfo()) .admin(null) .kakaoworkNotificationEnabled(true) - .agitNotificationEnabled(true) .emailNotificationEnabled(true) .imageUrl(null) .status(MemberStatus.ACTIVE) @@ -39,7 +38,6 @@ public static Member createManagerWithReviewer() { .memberInfo(createManagerWithReviewerInfo()) .admin(createAdmin()) .kakaoworkNotificationEnabled(true) - .agitNotificationEnabled(true) .emailNotificationEnabled(true) .imageUrl(null) .status(MemberStatus.ACTIVE) @@ -54,7 +52,6 @@ public static Member createManager() { .memberInfo(createManagerInfo()) .admin(createAdmin()) .kakaoworkNotificationEnabled(true) - .agitNotificationEnabled(true) .emailNotificationEnabled(true) .imageUrl(null) .status(MemberStatus.ACTIVE) @@ -69,7 +66,6 @@ public static Member createUser() { .memberInfo(createUserInfo()) .admin(createAdmin()) .kakaoworkNotificationEnabled(true) - .agitNotificationEnabled(true) .emailNotificationEnabled(true) .imageUrl(null) .status(MemberStatus.ACTIVE) @@ -96,7 +92,6 @@ public static Member createNotApprovedUser() { .memberInfo(createNotApprovedUserInfo()) .admin(createAdmin()) .kakaoworkNotificationEnabled(true) - .agitNotificationEnabled(true) .emailNotificationEnabled(true) .imageUrl(null) .status(MemberStatus.APPROVAL_REQUEST)