-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: (#766) 코드 컨벤션 수정 * feat: (#766) 알림 읽음 기능 구현 * refactor: (#766) 알림 리팩터링 * feat: (#766) 알림 대상 검증 기능 구현 * feat: (#766) 알림 읽는 기능 구현 * feat: (#766) 알림 읽기 API 구현 * fix: (#766) 테이블 추가 * fix: (#766) 비동기 테스트를 위한 sleep 추가 * feat: (#766) 알림 타입 추가 * test: (#766) 알림 타입이 없는 경우 테스트 * feat: (#766) 신고 알림 읽는 기능 구현 * feat: (#766) 알림 액션 타입 생성 기능 구현 * feat: (#766) 타입에 따른 알림 읽기 기능 구현 * docs: (#766) 예외 상황 문서화 * chore: (#766) 코드 컨벤션 수정 * docs: (#766) 예외 발생 문서화 * chore: (#766) 코드 컨벤션 수정 * chore: (#766) 개행 컨벤션 수정 * fix: (#766) DB 예약어 수정 * fix: (#766) 이벤트 테스트 임시 수정
- Loading branch information
Showing
38 changed files
with
737 additions
and
111 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
backend/src/main/java/com/votogether/domain/alarm/controller/AlarmCommandController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package com.votogether.domain.alarm.controller; | ||
|
||
import com.votogether.domain.alarm.service.AlarmCommandService; | ||
import com.votogether.domain.member.entity.Member; | ||
import com.votogether.global.jwt.Auth; | ||
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; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@Validated | ||
@RequiredArgsConstructor | ||
@RequestMapping("/alarms") | ||
@RestController | ||
public class AlarmCommandController implements AlarmCommandControllerDocs { | ||
|
||
private final AlarmCommandService alarmCommandService; | ||
|
||
@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 | ||
) { | ||
alarmCommandService.readAlarm(alarmId, type, loginMember); | ||
return ResponseEntity.ok().build(); | ||
} | ||
|
||
} |
51 changes: 51 additions & 0 deletions
51
backend/src/main/java/com/votogether/domain/alarm/controller/AlarmCommandControllerDocs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package com.votogether.domain.alarm.controller; | ||
|
||
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.NotBlank; | ||
import jakarta.validation.constraints.Positive; | ||
import org.springframework.http.ResponseEntity; | ||
|
||
@Tag(name = "알림 커맨드", description = "알림 커맨드 API") | ||
public interface AlarmCommandControllerDocs { | ||
|
||
@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 | ||
); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
backend/src/main/java/com/votogether/domain/alarm/entity/vo/AlarmActionType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)); | ||
} | ||
|
||
} |
23 changes: 23 additions & 0 deletions
23
backend/src/main/java/com/votogether/domain/alarm/exception/AlarmExceptionType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
|
||
} |
20 changes: 0 additions & 20 deletions
20
...d/src/main/java/com/votogether/domain/alarm/exception/ReportActionAlarmExceptionType.java
This file was deleted.
Oops, something went wrong.
28 changes: 28 additions & 0 deletions
28
backend/src/main/java/com/votogether/domain/alarm/service/AlarmCommandService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package com.votogether.domain.alarm.service; | ||
|
||
import com.votogether.domain.alarm.entity.vo.AlarmActionType; | ||
import com.votogether.domain.alarm.service.strategy.AlarmReadStrategy; | ||
import com.votogether.domain.alarm.service.strategy.AlarmReadStrategyProvider; | ||
import com.votogether.domain.member.entity.Member; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
@RequiredArgsConstructor | ||
@Transactional | ||
@Service | ||
public class AlarmCommandService { | ||
|
||
private final AlarmReadStrategyProvider alarmReadStrategyProvider; | ||
|
||
public void readAlarm( | ||
final Long alarmId, | ||
final String type, | ||
final Member loginMember | ||
) { | ||
final AlarmActionType alarmActionType = AlarmActionType.from(type); | ||
final AlarmReadStrategy alarmReadStrategy = alarmReadStrategyProvider.getStrategy(alarmActionType); | ||
alarmReadStrategy.read(alarmId, loginMember); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
backend/src/main/java/com/votogether/domain/alarm/service/strategy/AlarmReadStrategy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package com.votogether.domain.alarm.service.strategy; | ||
|
||
import com.votogether.domain.member.entity.Member; | ||
|
||
public interface AlarmReadStrategy { | ||
|
||
void read(final Long id, final Member member); | ||
|
||
} |
Oops, something went wrong.