From 24ed724f8869c1947d9e420467856d290ac477c3 Mon Sep 17 00:00:00 2001 From: PyeongGangKim <21500185@handong.edu> Date: Wed, 7 Sep 2022 22:39:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20duplicate=20=EC=8B=9C=20200OK?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=B4=EB=82=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/presentation/ApiMemberController.java | 15 ++++++++------- .../dto/request/DuplicateRequest.java | 12 ++++++++++++ .../member/MemberCreateAcceptanceTest.java | 9 ++++++--- 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 backend/src/main/java/com/handong/rebon/member/presentation/dto/request/DuplicateRequest.java diff --git a/backend/src/main/java/com/handong/rebon/member/presentation/ApiMemberController.java b/backend/src/main/java/com/handong/rebon/member/presentation/ApiMemberController.java index 41e02aac..10c8f2fc 100644 --- a/backend/src/main/java/com/handong/rebon/member/presentation/ApiMemberController.java +++ b/backend/src/main/java/com/handong/rebon/member/presentation/ApiMemberController.java @@ -10,6 +10,7 @@ import com.handong.rebon.member.application.dto.response.MemberCreateResponseDto; import com.handong.rebon.member.application.dto.response.MemberReadResponseDto; import com.handong.rebon.member.presentation.dto.MemberAssembler; +import com.handong.rebon.member.presentation.dto.request.DuplicateRequest; import com.handong.rebon.member.presentation.dto.request.MemberCreateRequest; import com.handong.rebon.member.presentation.dto.request.MemberUpdateRequest; import com.handong.rebon.member.presentation.dto.response.MemberCreateResponse; @@ -35,13 +36,6 @@ public ResponseEntity create(@RequestBody MemberCreateRequ .body(MemberCreateResponse.from(response)); } - @PostMapping("/members/nickname/check-duplicate") - public ResponseEntity nicknameDuplicateCheck(@RequestBody String nickname) { - memberService.checkNicknameDuplicate(nickname); - return ResponseEntity.ok() - .build(); - } - @RequiredLogin @PatchMapping("/members") public ResponseEntity update( @@ -55,6 +49,13 @@ public ResponseEntity update( .build(); } + @PostMapping("/members/nickname/check-duplicate") + public ResponseEntity nicknameDuplicateCheck(@RequestBody DuplicateRequest duplicateRequest) { + memberService.checkNicknameDuplicate(duplicateRequest.getNickname()); + return ResponseEntity.ok() + .build(); + } + @RequiredLogin @GetMapping("/members") public ResponseEntity getMemberInfo(@Login LoginMember loginMember) { diff --git a/backend/src/main/java/com/handong/rebon/member/presentation/dto/request/DuplicateRequest.java b/backend/src/main/java/com/handong/rebon/member/presentation/dto/request/DuplicateRequest.java new file mode 100644 index 00000000..f59fef8f --- /dev/null +++ b/backend/src/main/java/com/handong/rebon/member/presentation/dto/request/DuplicateRequest.java @@ -0,0 +1,12 @@ +package com.handong.rebon.member.presentation.dto.request; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@AllArgsConstructor +@Getter +public class DuplicateRequest { + private String nickname; +} diff --git a/backend/src/test/java/com/handong/rebon/acceptance/member/MemberCreateAcceptanceTest.java b/backend/src/test/java/com/handong/rebon/acceptance/member/MemberCreateAcceptanceTest.java index 6e680a8d..e74f7c0d 100644 --- a/backend/src/test/java/com/handong/rebon/acceptance/member/MemberCreateAcceptanceTest.java +++ b/backend/src/test/java/com/handong/rebon/acceptance/member/MemberCreateAcceptanceTest.java @@ -1,6 +1,7 @@ package com.handong.rebon.acceptance.member; import com.handong.rebon.acceptance.AcceptanceTest; +import com.handong.rebon.member.presentation.dto.request.DuplicateRequest; import com.handong.rebon.member.presentation.dto.request.MemberCreateRequest; import org.springframework.http.HttpStatus; @@ -42,8 +43,9 @@ void saveMember() { void checkDidNotDuplicateNickname() { //given String nickname = "ReBoN"; + DuplicateRequest duplicateRequest = new DuplicateRequest(nickname); //when - ExtractableResponse response = checkDuplicateNickname(nickname); + ExtractableResponse response = checkDuplicateNickname(duplicateRequest); //then assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value()); @@ -54,16 +56,17 @@ void checkDidNotDuplicateNickname() { void checkDuplicatedNickname() { //given String nickname = "test"; + DuplicateRequest duplicateRequest = new DuplicateRequest(nickname); saveMember(new MemberCreateRequest("test@gmail.com", nickname, "google", true)); //when - ExtractableResponse response = checkDuplicateNickname(nickname); + ExtractableResponse response = checkDuplicateNickname(duplicateRequest); //then assertThat(response.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST.value()); } - private ExtractableResponse checkDuplicateNickname(String nickname) { + private ExtractableResponse checkDuplicateNickname(DuplicateRequest nickname) { return RestAssured.given(getRequestSpecification()) .log().all() .contentType(APPLICATION_JSON_VALUE) From 1b76f1dac555241a9e8893fdc78320468a7862d5 Mon Sep 17 00:00:00 2001 From: PyeongGangKim <21500185@handong.edu> Date: Wed, 7 Sep 2022 22:39:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20cors=20localhost:3000=20=EC=97=B4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/security | 2 +- backend/src/main/java/com/handong/rebon/config/WebConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/security b/backend/security index 2c704c60..902679b0 160000 --- a/backend/security +++ b/backend/security @@ -1 +1 @@ -Subproject commit 2c704c6046a2daab0ba9fdeba9f406c3b88d1009 +Subproject commit 902679b08bd39d4d116d020ae9382537074076fd diff --git a/backend/src/main/java/com/handong/rebon/config/WebConfig.java b/backend/src/main/java/com/handong/rebon/config/WebConfig.java index 3f672043..89736217 100644 --- a/backend/src/main/java/com/handong/rebon/config/WebConfig.java +++ b/backend/src/main/java/com/handong/rebon/config/WebConfig.java @@ -23,7 +23,7 @@ public class WebConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedMethods("*") - .allowedOrigins("http://rebon.s3-website.ap-northeast-2.amazonaws.com/", "http://localhost:8080"); + .allowedOrigins("http://rebon.s3-website.ap-northeast-2.amazonaws.com/", "http://localhost:3000", "http://localhost:8080"); } @Override