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

알림 읽기 기능 구현 #775

Merged
merged 23 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5096f62
chore: (#766) 코드 컨벤션 수정
woo-chang Oct 18, 2023
d2f942c
feat: (#766) 알림 읽음 기능 구현
woo-chang Oct 18, 2023
3c68733
refactor: (#766) 알림 리팩터링
woo-chang Oct 18, 2023
4966dd2
feat: (#766) 알림 대상 검증 기능 구현
woo-chang Oct 18, 2023
c8244aa
feat: (#766) 알림 읽는 기능 구현
woo-chang Oct 18, 2023
04d5212
feat: (#766) 알림 읽기 API 구현
woo-chang Oct 18, 2023
85fa66d
fix: (#766) 테이블 추가
woo-chang Oct 18, 2023
b3a4d72
fix: (#766) 비동기 테스트를 위한 sleep 추가
woo-chang Oct 18, 2023
289b63c
feat: (#766) 알림 타입 추가
woo-chang Oct 18, 2023
9e6273a
test: (#766) 알림 타입이 없는 경우 테스트
woo-chang Oct 18, 2023
4abffa8
feat: (#766) 신고 알림 읽는 기능 구현
woo-chang Oct 18, 2023
40618e1
feat: (#766) 알림 액션 타입 생성 기능 구현
woo-chang Oct 18, 2023
3998d1d
feat: (#766) 타입에 따른 알림 읽기 기능 구현
woo-chang Oct 18, 2023
0e10b78
docs: (#766) 예외 상황 문서화
woo-chang Oct 18, 2023
0242e3a
chore: (#766) 코드 컨벤션 수정
woo-chang Oct 18, 2023
b3e0ba1
docs: (#766) 예외 발생 문서화
woo-chang Oct 18, 2023
0d9211f
Merge branch 'dev' into feat/#766
woo-chang Oct 18, 2023
b5b54c9
Merge branch 'dev' into feat/#766
woo-chang Oct 18, 2023
a54c9b2
chore: (#766) 코드 컨벤션 수정
woo-chang Oct 18, 2023
6f432d7
chore: (#766) 개행 컨벤션 수정
woo-chang Oct 18, 2023
d6f81ec
Merge branch 'dev' into feat/#766
woo-chang Oct 18, 2023
68e6bec
fix: (#766) DB 예약어 수정
woo-chang Oct 18, 2023
4355004
fix: (#766) 이벤트 테스트 임시 수정
woo-chang Oct 18, 2023
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,15 +1,14 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.service.AlarmService;
import com.votogether.domain.alarm.service.AlarmCommandService;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.jwt.Auth;
import jakarta.validation.constraints.PositiveOrZero;
import java.util.List;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Positive;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
Expand All @@ -21,24 +20,16 @@
@RestController
public class AlarmCommandController implements AlarmCommandControllerDocs {

private final AlarmService alarmService;
private final AlarmCommandService alarmCommandService;

@RequestMapping("/report")
public ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
@RequestParam @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
@Auth final Member member
@PatchMapping("/{id}")
public ResponseEntity<Void> readAlarm(
@PathVariable("id") @Positive(message = "알림 ID는 양수만 가능합니다.") final Long alarmId,
@RequestParam("type") @NotBlank(message = "알림 타입이 공백이거나 존재하지 않습니다.") final String type,
@Auth final Member loginMember
) {
final List<ReportActionAlarmResponse> response = alarmService.getReportActionAlarms(member, page);
return ResponseEntity.ok(response);
}

@RequestMapping("/report/{id}")
public ResponseEntity<ReportActionResponse> getReportActionAlarm(
@PathVariable("id") final Long reportActionAlarmId,
@Auth final Member member
) {
final ReportActionResponse response = alarmService.getReportActionAlarm(reportActionAlarmId, member);
return ResponseEntity.ok(response);
alarmCommandService.readAlarm(alarmId, type, loginMember);
return ResponseEntity.ok().build();
}

}
Original file line number Diff line number Diff line change
@@ -1,32 +1,51 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.exception.ExceptionResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.PositiveOrZero;
import java.util.List;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Positive;
import org.springframework.http.ResponseEntity;

@Tag(name = "알림", description = "알림 API")
@Tag(name = "알림 커맨드", description = "알림 커맨드 API")
public interface AlarmCommandControllerDocs {

@Operation(summary = "신고조치알림 조회", description = "신고조치알림목록을 조회한다.")
@ApiResponse(responseCode = "201", description = "조회 성공")
ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
@Parameter(description = "현재 페이지 위치", example = "0")
@PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
final Member member
);

@Operation(summary = "신고조치알림 상세 조회", description = "신고조치알림를 상세 조회한다.")
@ApiResponse(responseCode = "201", description = "조회 성공")
public ResponseEntity<ReportActionResponse> getReportActionAlarm(
@Parameter(description = "신고조치알림 ID", example = "1") final Long reportActionAlarmId,
final Member member
@Operation(
summary = "알림 읽기",
description = "알림을 읽을 수 있는 대상이라면 알림을 읽습니다."
)
@ApiResponses({
@ApiResponse(
responseCode = "200",
description = "알림 읽기 성공"
),
@ApiResponse(
responseCode = "400",
description = """
1.알림 ID가 양수가 아닌 경우

2.알림을 읽을 수 있는 대상이 아닌 경우
""",
content = @Content(schema = @Schema(implementation = ExceptionResponse.class))
),
@ApiResponse(
responseCode = "404",
description = "알림이 존재하지 않은 경우",
content = @Content(schema = @Schema(implementation = ExceptionResponse.class))
)
})
ResponseEntity<Void> readAlarm(
@Parameter(description = "알림 ID", example = "1")
@Positive(message = "알림 ID는 양수만 가능합니다.") final Long alarmId,
@Parameter(description = "알림 타입", example = "CONTENT")
@NotBlank(message = "알림 타입이 공백이거나 존재하지 않습니다.") final String alarmType,
final Member loginMember
);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.alarm.service.AlarmQueryService;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.jwt.Auth;
import jakarta.validation.constraints.PositiveOrZero;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@Validated
@RequiredArgsConstructor
@RequestMapping("/alarms")
@RestController
public class AlarmQueryController implements AlarmQueryControllerDocs {

private final AlarmQueryService alarmQueryService;

@GetMapping("/content")
public ResponseEntity<List<PostAlarmResponse>> getPostAlarm(
@RequestParam @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page
) {
final List<PostAlarmResponse> postAlarmResponses = alarmQueryService.getPostAlarm(page);
return ResponseEntity.ok(postAlarmResponses);
}

@GetMapping("/report")
public ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
@RequestParam @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
@Auth final Member member
) {
final List<ReportActionAlarmResponse> response = alarmQueryService.getReportActionAlarms(member, page);
return ResponseEntity.ok(response);
}

@GetMapping("/report/{id}")
public ResponseEntity<ReportActionResponse> getReportActionAlarm(
@PathVariable("id") final Long reportActionAlarmId,
@Auth final Member member
) {
final ReportActionResponse response = alarmQueryService.getReportActionAlarm(reportActionAlarmId, member);
return ResponseEntity.ok(response);
}

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.exception.ExceptionResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
Expand All @@ -12,10 +16,13 @@
import java.util.List;
import org.springframework.http.ResponseEntity;

@Tag(name = "알림", description = "알림 API")
@Tag(name = "알림 조회", description = "알림 조회 API")
public interface AlarmQueryControllerDocs {

@Operation(summary = "게시글 내역 알림 조회", description = "게시글 내역 알림을 조회한다.")
@Operation(
summary = "게시글 내역 알림 조회",
description = "게시글 내역 알림을 조회한다."
)
@ApiResponses({
@ApiResponse(
responseCode = "200",
Expand All @@ -31,4 +38,38 @@ ResponseEntity<List<PostAlarmResponse>> getPostAlarm(
@PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page
);

@Operation(
summary = "신고조치알림 조회",
description = "신고조치알림목록을 조회한다."
)
@ApiResponses({
@ApiResponse(
responseCode = "201",
description = "신고조치알림 조회 성공"
),
@ApiResponse(
responseCode = "400",
description = "페이지가 0이상 정수가 아닌 경우",
content = @Content(schema = @Schema(implementation = ExceptionResponse.class))
)
})
ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
@Parameter(description = "현재 페이지 위치", example = "0")
@PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
final Member member
);

@Operation(
summary = "신고조치알림 상세 조회",
description = "신고조치알림를 상세 조회한다."
)
@ApiResponse(
responseCode = "201",
description = "신고조치알림 상세 조회 성공"
)
ResponseEntity<ReportActionResponse> getReportActionAlarm(
@Parameter(description = "신고조치알림 ID", example = "1") final Long reportActionAlarmId,
final Member member
);

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.votogether.domain.alarm.entity;

import com.votogether.domain.alarm.entity.vo.AlarmType;
import com.votogether.domain.alarm.exception.AlarmExceptionType;
import com.votogether.domain.common.BaseEntity;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.exception.BadRequestException;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
Expand All @@ -13,6 +15,7 @@
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import java.util.Objects;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.EqualsAndHashCode;
Expand Down Expand Up @@ -61,4 +64,14 @@ private Alarm(
this.isChecked = isChecked;
}

public void read() {
this.isChecked = true;
}

public void checkOwner(final Member member) {
if (!Objects.equals(this.member.getId(), member.getId())) {
throw new BadRequestException(AlarmExceptionType.NOT_OWNER);
}
}
Comment on lines +71 to +75
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q
자신 것이 아닌 알람을 읽을 수 있는 경우는 어떤 상황에 있을 수 있는지 궁금합니다

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

알림 ID가 노출되어 다른 회원이 해당 ID로 API를 요청하는 것을 방지하기 위한 방어 코드입니다 :)


}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.votogether.domain.alarm.entity;

import com.votogether.domain.alarm.exception.AlarmExceptionType;
import com.votogether.domain.common.BaseEntity;
import com.votogether.domain.member.entity.Member;
import com.votogether.domain.report.entity.vo.ReportType;
import com.votogether.global.exception.BadRequestException;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
Expand All @@ -13,6 +15,7 @@
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import java.util.Objects;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.EqualsAndHashCode;
Expand Down Expand Up @@ -61,4 +64,14 @@ private ReportActionAlarm(
this.isChecked = isChecked;
}

public void read() {
this.isChecked = true;
}

public void checkOwner(final Member member) {
if (!Objects.equals(this.member.getId(), member.getId())) {
throw new BadRequestException(AlarmExceptionType.NOT_OWNER);
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.votogether.domain.alarm.entity.vo;

import com.votogether.domain.alarm.exception.AlarmExceptionType;
import com.votogether.global.exception.BadRequestException;
import java.util.Arrays;

public enum AlarmActionType {

CONTENT,
REPORT,
;

public static AlarmActionType from(final String actionType) {
return Arrays.stream(AlarmActionType.values())
.filter(alarmActionType -> alarmActionType.name().equals(actionType))
.findFirst()
.orElseThrow(() -> new BadRequestException(AlarmExceptionType.NOT_FOUND_ACTION_TYPE));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.votogether.domain.alarm.exception;

import com.votogether.global.exception.ExceptionType;
import lombok.Getter;

@Getter
public enum AlarmExceptionType implements ExceptionType {

NOT_FOUND_ACTION(1300, "신고조치알림이 존재하지 않습니다."),
NOT_FOUND(1301, "알림이 존재하지 않습니다."),
NOT_OWNER(1302, "알림을 읽을 대상이 아닙니다."),
NOT_FOUND_ACTION_TYPE(1303, "등록되지 않은 알림 동작입니다."),
;

private final int code;
private final String message;

AlarmExceptionType(final int code, final String message) {
this.code = code;
this.message = message;
}

}
Loading