Skip to content

[Feat/update egg api] #40

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.

Sign up for GitHub

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

Merged
ekgns33 merged 2 commits into from
Apr 8, 2025
Merged

[Feat/update egg api] #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c991c9
:sparkles: feat : update `/api/v1/users/eggs` api to `/api/v1/users/e…
ekgns33 Apr 8, 2025
7baf82f
:white_check_mark: test : update api test
ekgns33 Apr 8, 2025
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
6 changes: 4 additions & 2 deletions src/main/java/org/runimo/runimo/user/controller/EggController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -84,13 +85,14 @@ public ResponseEntity<SuccessResponse<ItemQueryResponse>> queryMyEggs(
@ApiResponse(responseCode = "400", description = "잘못된 요청 데이터"),
@ApiResponse(responseCode = "401", description = "인증 실패")
})
@PatchMapping
@PatchMapping("{incubatingEggId}")
public ResponseEntity<SuccessResponse<UseLovePointResponse>> useLovePointToEgg(
@UserId Long userId,
@PathVariable Long incubatingEggId,
@Valid @RequestBody UseLovePointRequest request
) {
UseLovePointResponse useLovePointResponse = giveLovePointToEggUsecase.execute(
new UseLovePointCommand(userId, request.incubatingEggId(), request.lovePointAmount())
new UseLovePointCommand(userId, incubatingEggId, request.lovePointAmount())
);
return ResponseEntity.ok().body(
SuccessResponse.of(
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/runimo/runimo/user/controller/request/UseLovePointRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
description = "사랑의 포인트 사용 요청",
example = """
{
"incubating_egg_id": 1,
"love_point_amount": 100
}
""")
public record UseLovePointRequest(
@Schema(description = "부화중인 알 ID", example = "1")
Long incubatingEggId,
@Schema(description = "사용할 사랑의 포인트", example = "100")
Long lovePointAmount
) {
Expand Down
20 changes: 12 additions & 8 deletions src/test/java/org/runimo/runimo/user/api/IncubatingEggAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@ void tearDown() {
@Sql(scripts = "/sql/incubating_egg_test_data.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
void 부화중인_알에_애정을_부여() throws JsonProcessingException {
String token = "Bearer " + jwtTokenFactory.generateAccessToken("test-user-uuid-1");
UseLovePointRequest request = new UseLovePointRequest(1L, 20L);
Long incubatingEggId = 1L;
UseLovePointRequest request = new UseLovePointRequest(20L);
given()
.header("Authorization", token)
.contentType(ContentType.JSON)
.body(objectMapper.writeValueAsString(request))
.when()
.patch("/api/v1/users/eggs")
.patch("/api/v1/users/eggs/{incubatingEggId}", incubatingEggId)
.then()
.log().all()
.statusCode(200)
Expand All @@ -115,6 +116,7 @@ void tearDown() {
// given
String userUuid = "test-user-uuid-1";
String token = "Bearer " + jwtTokenFactory.generateAccessToken(userUuid);
Long incubatingEggId = 1L;

// 사용자의 초기 애정 포인트 조회
Integer initialLovePoint = given()
Expand All @@ -130,15 +132,15 @@ void tearDown() {
// when
// 20포인트의 애정을 부여
Long useLovePointAmount = 20L;
UseLovePointRequest request = new UseLovePointRequest(1L, useLovePointAmount);
UseLovePointRequest request = new UseLovePointRequest(useLovePointAmount);

// 알에 애정 부여 요청
given()
.header("Authorization", token)
.contentType(ContentType.JSON)
.body(objectMapper.writeValueAsString(request))
.when()
.patch("/api/v1/users/eggs")
.patch("/api/v1/users/eggs/{incubatingEggId}", incubatingEggId)
.then()
.log().all()
.statusCode(200)
Expand All @@ -164,6 +166,7 @@ void tearDown() {
// given
String userUuid = "test-user-uuid-1";
String token = "Bearer " + jwtTokenFactory.generateAccessToken(userUuid);
Long incubatingEggId = 1L;

// 사용자의 초기 애정 포인트 조회
given()
Expand All @@ -179,15 +182,15 @@ void tearDown() {
// when
// 20포인트의 애정을 부여
Long useLovePointAmount = 25L;
UseLovePointRequest request = new UseLovePointRequest(1L, useLovePointAmount);
UseLovePointRequest request = new UseLovePointRequest(useLovePointAmount);

// 알에 애정 부여 요청
given()
.header("Authorization", token)
.contentType(ContentType.JSON)
.body(objectMapper.writeValueAsString(request))
.when()
.patch("/api/v1/users/eggs")
.patch("/api/v1/users/eggs/{incubatingEggId}", incubatingEggId)
.then()
.log().all()
.statusCode(400);
Expand All @@ -199,6 +202,7 @@ void tearDown() {
// given
String userUuid = "test-user-uuid-1";
String token = "Bearer " + jwtTokenFactory.generateAccessToken(userUuid);
Long incubatingEggId = 1L;

// 사용자의 초기 애정 포인트 조회
Integer initialLovePoint = given()
Expand All @@ -214,15 +218,15 @@ void tearDown() {
// when
// 20포인트의 애정을 부여
Long useLovePointAmount = 25L;
UseLovePointRequest request = new UseLovePointRequest(1L, useLovePointAmount);
UseLovePointRequest request = new UseLovePointRequest(useLovePointAmount);

// 알에 애정 부여 요청
given()
.header("Authorization", token)
.contentType(ContentType.JSON)
.body(objectMapper.writeValueAsString(request))
.when()
.patch("/api/v1/users/eggs")
.patch("/api/v1/users/eggs/{incubatingEggId}", incubatingEggId)
.then()
.log().all()
.statusCode(400);
Expand Down