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 1 commit
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
@@ -0,0 +1,32 @@
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.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.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,
@Auth final Member loginMember
) {
alarmCommandService.readAlarm(alarmId, loginMember);
return ResponseEntity.ok().build();
}

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

import com.votogether.domain.member.entity.Member;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
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.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 = "알림을 읽을 수 있는 대상이 아닌 경우"
),
Copy link
Collaborator

Choose a reason for hiding this comment

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

alarmId가 1미만인 경우도 적어주면 좋을 것 같아요.

@ApiResponse(
responseCode = "404",
description = "알림이 존재하지 않은 경우"
)
})
ResponseEntity<Void> readAlarm(
@Parameter(description = "알림 ID", example = "1")
@Positive(message = "알림 ID는 양수만 가능합니다.") final Long alarmId,
final Member loginMember
);

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

import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.BDDMockito.any;
import static org.mockito.BDDMockito.anyLong;
import static org.mockito.BDDMockito.willDoNothing;

import com.votogether.domain.alarm.service.AlarmCommandService;
import com.votogether.domain.member.entity.Member;
import com.votogether.test.ControllerTest;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(AlarmCommandController.class)
class AlarmCommandControllerTest extends ControllerTest {

@Autowired
MockMvc mockMvc;

@MockBean
AlarmCommandService alarmCommandService;

@BeforeEach
void setUp() {
RestAssuredMockMvc.mockMvc(mockMvc);
}

@Nested
@DisplayName("알림을 읽을 시")
class ReadAlarm {

@Test
@DisplayName("정상적인 요청이라면 200 응답을 반환한다.")
void readAlarm() throws Exception {
// given
mockingAuthArgumentResolver();
willDoNothing().given(alarmCommandService).readAlarm(anyLong(), any(Member.class));

// when, then
RestAssuredMockMvc
.given().log().all()
.headers(HttpHeaders.AUTHORIZATION, BEARER_TOKEN)
.when().patch("/alarms/{id}", 1L)
.then().log().all()
.status(HttpStatus.OK);
}

@ParameterizedTest
@ValueSource(longs = {-1, 0})
@DisplayName("알림ID가 양수가 아니라면 400 응답을 반환한다.")
void negativeAlarmId(Long alarmId) throws Exception {
// given
mockingAuthArgumentResolver();
willDoNothing().given(alarmCommandService).readAlarm(anyLong(), any(Member.class));

// when, then
RestAssuredMockMvc
.given().log().all()
.headers(HttpHeaders.AUTHORIZATION, BEARER_TOKEN)
.when().patch("/alarms/{id}", alarmId)
.then().log().all()
.status(HttpStatus.BAD_REQUEST)
.body("code", equalTo(201))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Q
이 코드 201은 어디서 나온 코드인가요?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ui 계층에서 발생하는 예외 코드는 GlobalExceptionHandler에서 정의하고 있습니다 😀

.body("message", containsString("알림 ID는 양수만 가능합니다."));
}

}

}
Loading