From b98e9daf77c9e393c203469f170f37810bace5d4 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Mon, 13 Sep 2021 18:44:11 +0900 Subject: [PATCH 01/21] hotfix setter annotation delete --- src/main/java/com/moment/the/improvement/ImprovementDomain.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/moment/the/improvement/ImprovementDomain.java b/src/main/java/com/moment/the/improvement/ImprovementDomain.java index c2a09c8b..c917dd47 100644 --- a/src/main/java/com/moment/the/improvement/ImprovementDomain.java +++ b/src/main/java/com/moment/the/improvement/ImprovementDomain.java @@ -13,7 +13,6 @@ @AllArgsConstructor @Getter @Builder -// No setter!! public class ImprovementDomain { @Id @Column From 45c44af97e69f1ea8cc8a061c2ab9afad90ace3c Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Mon, 13 Sep 2021 18:45:07 +0900 Subject: [PATCH 02/21] Update swagger api method groupname setter variable --- src/main/java/com/moment/the/config/swagger/SwaggerConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moment/the/config/swagger/SwaggerConfig.java b/src/main/java/com/moment/the/config/swagger/SwaggerConfig.java index 93985f41..01ad1210 100644 --- a/src/main/java/com/moment/the/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/moment/the/config/swagger/SwaggerConfig.java @@ -26,7 +26,7 @@ private ApiInfo apiInfo() { @Bean public Docket api() { return new Docket(DocumentationType.SWAGGER_2) - .groupName("EZY") + .groupName("the_moment") .apiInfo(this.apiInfo()) .select() .apis(RequestHandlerSelectors From d78d89d1187257f106718c950703352ecb064885 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Mon, 13 Sep 2021 18:52:05 +0900 Subject: [PATCH 03/21] Delete querydsl setting --- build.gradle | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/build.gradle b/build.gradle index 1a5647df..f83d520d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ plugins { id 'java' id 'org.springframework.boot' version '2.4.2' id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id "com.ewerk.gradle.plugins.querydsl" version '1.0.10' id 'jacoco' } @@ -59,10 +58,6 @@ dependencies { runtimeOnly 'com.h2database:h2' runtimeOnly 'mysql:mysql-connector-java' - // QueryDSL - compileOnly 'com.querydsl:querydsl-jpa' - compileOnly 'com.querydsl:querydsl-apt' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.junit.jupiter:junit-jupiter-params' @@ -137,20 +132,4 @@ jacocoTestCoverageVerification { tasks.withType(JavaCompile) { options.encoding = 'UTF-8' -} - -def querydslDir = "$buildDir/generated/querydsl" - -querydsl { - jpa = true - querydslSourcesDir = querydslDir -} -sourceSets { - main.java.srcDir querydslDir -} -configurations { - querydsl.extendsFrom compileClasspath -} -compileQuerydsl { - options.annotationProcessorPath = configurations.querydsl } \ No newline at end of file From b8b3e8499ae9d8469ace2fca8be5d16d827224d3 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:05:49 +0900 Subject: [PATCH 04/21] Update base url /v1/top10 -> /v1/top30 and edit method naming --- .../moment/the/answer/controller/AnswerController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moment/the/answer/controller/AnswerController.java b/src/main/java/com/moment/the/answer/controller/AnswerController.java index 3fa01da3..b408bfad 100644 --- a/src/main/java/com/moment/the/answer/controller/AnswerController.java +++ b/src/main/java/com/moment/the/answer/controller/AnswerController.java @@ -14,7 +14,7 @@ @RestController -@RequestMapping("/v1/top10") +@RequestMapping("/v1/top30") @RequiredArgsConstructor public class AnswerController { private final AnswerService answerService; @@ -25,7 +25,7 @@ public class AnswerController { @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult save(@RequestBody AnswerDto answerDto, @PathVariable Long boardIdx) throws Exception { + public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long boardIdx) throws Exception { answerService.save(answerDto, boardIdx); return responseService.getSuccessResult(); } @@ -35,13 +35,13 @@ public CommonResult save(@RequestBody AnswerDto answerDto, @PathVariable Long bo @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult update(@RequestBody AnswerDto answerDto, @PathVariable Long answerIdx) throws Exception { + public CommonResult updateThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long answerIdx) throws Exception { answerService.update(answerDto, answerIdx); return responseService.getSuccessResult(); } @GetMapping("/answer/{boardIdx}") - public SingleResult view(@PathVariable Long boardIdx) throws Exception{ + public SingleResult getThisAnswer(@PathVariable Long boardIdx) throws Exception{ return responseService.getSingleResult(answerService.view(boardIdx)); } @@ -50,7 +50,7 @@ public SingleResult view(@PathVariable Long boardIdx) throws Excep @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult delete(@PathVariable Long answerIdx) throws Exception { + public CommonResult deleteThisAnswer(@PathVariable Long answerIdx) throws Exception { answerService.delete(answerIdx); return responseService.getSuccessResult(); } From 582f9f6c0eed90f10ec739ca1a3e0f817c478472 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:10:07 +0900 Subject: [PATCH 05/21] Update method name unification with controller method name --- .../answer/controller/AnswerController.java | 8 +++---- .../the/answer/service/AnswerService.java | 8 +++---- .../moment/the/service/AnswerServiceTest.java | 22 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/moment/the/answer/controller/AnswerController.java b/src/main/java/com/moment/the/answer/controller/AnswerController.java index b408bfad..64f57a4b 100644 --- a/src/main/java/com/moment/the/answer/controller/AnswerController.java +++ b/src/main/java/com/moment/the/answer/controller/AnswerController.java @@ -26,7 +26,7 @@ public class AnswerController { @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long boardIdx) throws Exception { - answerService.save(answerDto, boardIdx); + answerService.createThisAnswer(answerDto, boardIdx); return responseService.getSuccessResult(); } @@ -36,13 +36,13 @@ public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVari @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) public CommonResult updateThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long answerIdx) throws Exception { - answerService.update(answerDto, answerIdx); + answerService.updateThisAnswer(answerDto, answerIdx); return responseService.getSuccessResult(); } @GetMapping("/answer/{boardIdx}") public SingleResult getThisAnswer(@PathVariable Long boardIdx) throws Exception{ - return responseService.getSingleResult(answerService.view(boardIdx)); + return responseService.getSingleResult(answerService.getThisAnswer(boardIdx)); } @DeleteMapping("/answer/{answerIdx}") @@ -51,7 +51,7 @@ public SingleResult getThisAnswer(@PathVariable Long boardIdx) thr @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) public CommonResult deleteThisAnswer(@PathVariable Long answerIdx) throws Exception { - answerService.delete(answerIdx); + answerService.deleteThisAnswer(answerIdx); return responseService.getSuccessResult(); } } diff --git a/src/main/java/com/moment/the/answer/service/AnswerService.java b/src/main/java/com/moment/the/answer/service/AnswerService.java index fe177592..31602aa7 100644 --- a/src/main/java/com/moment/the/answer/service/AnswerService.java +++ b/src/main/java/com/moment/the/answer/service/AnswerService.java @@ -22,7 +22,7 @@ public class AnswerService { final private UncomfortableRepository tableRepo; // 답변 작성하기 - public AnswerDomain save(AnswerDto answerDto, Long boardIdx) { + public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { //예외 처리 UncomfortableEntity uncomfortableEntity = tableFindBy(boardIdx); // table 번호로 찾고 없으면 Exception boolean existAnswer = uncomfortableEntity.getAnswerDomain() != null ? true : false; @@ -42,7 +42,7 @@ public AnswerDomain save(AnswerDto answerDto, Long boardIdx) { // 답변 수정하기 @Transactional - public AnswerDomain update(AnswerDto answerDto, Long answerIdx) { + public AnswerDomain updateThisAnswer(AnswerDto answerDto, Long answerIdx) { AnswerDomain answerDomain = answerFindBy(answerIdx); // 해당하는 answer 찾기 AdminDomain answerAdmin = answerDomain.getAdminDomain(); AdminDomain loginAdmin = adminRepo.findByAdminId(AdminServiceImpl.getUserEmail()); @@ -55,7 +55,7 @@ public AnswerDomain update(AnswerDto answerDto, Long answerIdx) { return answerDomain; } - public AnswerResDto view(Long boardIdx) { + public AnswerResDto getThisAnswer(Long boardIdx) { // 해당 boardIdx를 참조하는 answerDomain 찾기. AnswerDomain answerDomain = answerRepo.findTop1ByUncomfortableEntity_BoardIdx(boardIdx); @@ -71,7 +71,7 @@ public AnswerResDto view(Long boardIdx) { // 답변 삭제하기 @Transactional - public void delete(Long answerIdx) { + public void deleteThisAnswer(Long answerIdx) { // 해당하는 answer 찾기 AnswerDomain answerDomain = answerFindBy(answerIdx); AdminDomain answerAdmin = answerDomain.getAdminDomain(); diff --git a/src/test/java/com/moment/the/service/AnswerServiceTest.java b/src/test/java/com/moment/the/service/AnswerServiceTest.java index 710ccafe..5a055108 100644 --- a/src/test/java/com/moment/the/service/AnswerServiceTest.java +++ b/src/test/java/com/moment/the/service/AnswerServiceTest.java @@ -89,7 +89,7 @@ UncomfortableEntity createTable(){ AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); // When - AnswerDomain savedAnswer = answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); // Then assertEquals(savedAnswer.getAnswerContent(), ANSWER_CONTENT); @@ -112,14 +112,14 @@ UncomfortableEntity createTable(){ //answer 추가 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); // When String ONCE_MORE_ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto onceMoreAnswerDto = new AnswerDto(ONCE_MORE_ANSWER_CONTENT, null); AnswerAlreadyExistsException throwAtSaveMethod = assertThrows(AnswerAlreadyExistsException.class, - () -> answerService.save(onceMoreAnswerDto, uncomfortableEntity.getBoardIdx()) + () -> answerService.createThisAnswer(onceMoreAnswerDto, uncomfortableEntity.getBoardIdx()) ); // then @@ -139,13 +139,13 @@ UncomfortableEntity createTable(){ // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); // When String CHANGE_ANSWER_CONTENT = "그냥 드세요 요구하는게 있으면 잃는것도 있어야지!"; AnswerDto changeAnswerDto = new AnswerDto(CHANGE_ANSWER_CONTENT, null); - answerService.update(changeAnswerDto, savedAnswer.getAnswerIdx()); + answerService.updateThisAnswer(changeAnswerDto, savedAnswer.getAnswerIdx()); System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); // Than @@ -163,11 +163,11 @@ UncomfortableEntity createTable(){ String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); // When - AnswerResDto answerResDto = answerService.view(uncomfortableEntity.getBoardIdx()); + AnswerResDto answerResDto = answerService.getThisAnswer(uncomfortableEntity.getBoardIdx()); //than assertEquals(answerResDto.getAnswerIdx(), savedAnswer.getAnswerIdx()); @@ -193,10 +193,10 @@ UncomfortableEntity createTable(){ // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); // When - answerService.delete(savedAnswer.getAnswerIdx()); + answerService.deleteThisAnswer(savedAnswer.getAnswerIdx()); IllegalArgumentException deleteSuccessException = assertThrows(IllegalArgumentException.class, () -> answerRepo.findById(savedAnswer.getAnswerIdx()) .orElseThrow(() -> new IllegalArgumentException("AnswerDomain을 찾을 수 없으므로 테스트 성공.")) @@ -232,12 +232,12 @@ UncomfortableEntity createTable(){ // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.save(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); // When adminLogin(ADMIN_B_ID, ADMIN_B_PW); AccessNotFoundException deleteFailException = assertThrows(AccessNotFoundException.class - , () -> answerService.delete(savedAnswer.getAnswerIdx())); + , () -> answerService.deleteThisAnswer(savedAnswer.getAnswerIdx())); // Than assertEquals(deleteFailException.getClass(), AccessNotFoundException.class); From ec97c36853430c9a859b3212324a3668e7426243 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:11:17 +0900 Subject: [PATCH 06/21] =?UTF-8?q?Update=20/v1/top30=20->=20/v1/rank=20?= =?UTF-8?q?=EB=8D=94=20=EB=82=98=EC=9D=80=20=ED=99=95=EC=9E=A5=EC=84=B1?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/moment/the/answer/controller/AnswerController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moment/the/answer/controller/AnswerController.java b/src/main/java/com/moment/the/answer/controller/AnswerController.java index 64f57a4b..1519f703 100644 --- a/src/main/java/com/moment/the/answer/controller/AnswerController.java +++ b/src/main/java/com/moment/the/answer/controller/AnswerController.java @@ -14,7 +14,7 @@ @RestController -@RequestMapping("/v1/top30") +@RequestMapping("/v1/rank") @RequiredArgsConstructor public class AnswerController { private final AnswerService answerService; From 2a87754fcc330d47c918869a64a3d7fd3bc5c287 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:12:05 +0900 Subject: [PATCH 07/21] =?UTF-8?q?Delete=20=EC=93=B8=EB=AA=A8=EC=97=86?= =?UTF-8?q?=EB=8A=94throw=20Exception=20=EA=B5=AC=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moment/the/answer/controller/AnswerController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moment/the/answer/controller/AnswerController.java b/src/main/java/com/moment/the/answer/controller/AnswerController.java index 1519f703..3366f998 100644 --- a/src/main/java/com/moment/the/answer/controller/AnswerController.java +++ b/src/main/java/com/moment/the/answer/controller/AnswerController.java @@ -25,7 +25,7 @@ public class AnswerController { @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long boardIdx) throws Exception { + public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long boardIdx) { answerService.createThisAnswer(answerDto, boardIdx); return responseService.getSuccessResult(); } @@ -35,13 +35,13 @@ public CommonResult createThisAnswer(@RequestBody AnswerDto answerDto, @PathVari @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult updateThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long answerIdx) throws Exception { + public CommonResult updateThisAnswer(@RequestBody AnswerDto answerDto, @PathVariable Long answerIdx) { answerService.updateThisAnswer(answerDto, answerIdx); return responseService.getSuccessResult(); } @GetMapping("/answer/{boardIdx}") - public SingleResult getThisAnswer(@PathVariable Long boardIdx) throws Exception{ + public SingleResult getThisAnswer(@PathVariable Long boardIdx) { return responseService.getSingleResult(answerService.getThisAnswer(boardIdx)); } @@ -50,7 +50,7 @@ public SingleResult getThisAnswer(@PathVariable Long boardIdx) thr @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult deleteThisAnswer(@PathVariable Long answerIdx) throws Exception { + public CommonResult deleteThisAnswer(@PathVariable Long answerIdx) { answerService.deleteThisAnswer(answerIdx); return responseService.getSuccessResult(); } From 22b88778d91b082bac7a913079762909f039dbd2 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:25:28 +0900 Subject: [PATCH 08/21] =?UTF-8?q?Update=20=EC=82=BC=ED=95=AD=EC=97=B0?= =?UTF-8?q?=EC=82=B0=EC=9E=90=20=EB=A6=AC=ED=8C=A9=ED=84=B0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/moment/the/answer/service/AnswerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moment/the/answer/service/AnswerService.java b/src/main/java/com/moment/the/answer/service/AnswerService.java index 31602aa7..49c9b491 100644 --- a/src/main/java/com/moment/the/answer/service/AnswerService.java +++ b/src/main/java/com/moment/the/answer/service/AnswerService.java @@ -25,7 +25,7 @@ public class AnswerService { public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { //예외 처리 UncomfortableEntity uncomfortableEntity = tableFindBy(boardIdx); // table 번호로 찾고 없으면 Exception - boolean existAnswer = uncomfortableEntity.getAnswerDomain() != null ? true : false; + boolean existAnswer = uncomfortableEntity.getAnswerDomain() != null; if(existAnswer) throw new AnswerAlreadyExistsException(); //이미 답변이 있으면 Exception AdminDomain adminDomain = adminRepo.findByAdminId(AdminServiceImpl.getUserEmail()); From bf52d62e5c7e7e7a4fcf83188d3cb0a9c2ef70b2 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:27:24 +0900 Subject: [PATCH 09/21] Update 'signup' method and api url to 'join' --- .../com/moment/the/admin/controller/AdminController.java | 6 +++--- .../java/com/moment/the/admin/service/AdminService.java | 2 +- .../java/com/moment/the/admin/service/AdminServiceImpl.java | 2 +- .../the/improvement/service/ImprovementServiceTest.java | 3 +-- .../java/com/moment/the/service/AdminServiceImplTest.java | 2 +- .../java/com/moment/the/service/ImprovementServiceTest.java | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/moment/the/admin/controller/AdminController.java b/src/main/java/com/moment/the/admin/controller/AdminController.java index a19841a7..5070d9d9 100644 --- a/src/main/java/com/moment/the/admin/controller/AdminController.java +++ b/src/main/java/com/moment/the/admin/controller/AdminController.java @@ -43,9 +43,9 @@ public CommonResult logout(){ return responseService.getSuccessResult(); } - @PostMapping("/signup") - public CommonResult signup(@Valid @RequestBody AdminDto adminDto) throws Exception { - adminService.signUp(adminDto); + @PostMapping("/join") + public CommonResult join(@Valid @RequestBody AdminDto adminDto) throws Exception { + adminService.join(adminDto); return responseService.getSuccessResult(); } diff --git a/src/main/java/com/moment/the/admin/service/AdminService.java b/src/main/java/com/moment/the/admin/service/AdminService.java index aad6498c..a4fbfe93 100644 --- a/src/main/java/com/moment/the/admin/service/AdminService.java +++ b/src/main/java/com/moment/the/admin/service/AdminService.java @@ -6,7 +6,7 @@ import java.util.Map; public interface AdminService { - void signUp(AdminDto adminDto) throws Exception; + void join(AdminDto adminDto) throws Exception; Map loginUser(String id, String password) throws Exception; void logout(); void withdrawal(SignInDto SignInDto) throws Exception; diff --git a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java index d4729a6d..9e193f56 100644 --- a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java +++ b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java @@ -28,7 +28,7 @@ public class AdminServiceImpl implements AdminService { private final JwtUtil jwtUtil; @Override - public void signUp(AdminDto adminDto) { + public void join(AdminDto adminDto) { if(adminRepository.findByAdminId(adminDto.getAdminId()) != null){ throw new UserAlreadyExistsException(); } diff --git a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java index 388dd29b..2b6e61b8 100644 --- a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java @@ -16,7 +16,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.transaction.annotation.Transactional; -import java.awt.*; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -40,7 +39,7 @@ void deleteData(){ // test 편의를 위한 회원가입 매서드 void adminSignUp(String adminId, String password, String adminName) throws Exception { AdminDto adminDto = new AdminDto(adminId, password, adminName); - adminService.signUp(adminDto); + adminService.join(adminDto); } // test 편의를 위한 로그인 매서드 diff --git a/src/test/java/com/moment/the/service/AdminServiceImplTest.java b/src/test/java/com/moment/the/service/AdminServiceImplTest.java index dc399b78..94b80dd3 100644 --- a/src/test/java/com/moment/the/service/AdminServiceImplTest.java +++ b/src/test/java/com/moment/the/service/AdminServiceImplTest.java @@ -130,7 +130,7 @@ void GetUserEmail(){ adminDto.setAdminName("jihwan"); //when - adminService.signUp(adminDto); + adminService.join(adminDto); //then assertEquals(adminRepository.findByAdminId("s20062@gsm") != null, true); diff --git a/src/test/java/com/moment/the/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/service/ImprovementServiceTest.java index 619c7c0c..a7ff2e15 100644 --- a/src/test/java/com/moment/the/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/service/ImprovementServiceTest.java @@ -45,7 +45,7 @@ public void cleanUp(){ // test 편의를 위한 회원가입 매서드 void adminSignUp(String adminId, String password, String adminName) throws Exception { AdminDto adminDto = new AdminDto(adminId, password, adminName); - adminService.signUp(adminDto); + adminService.join(adminDto); } From b09563fd7e1f583e8103d94f5f3c091a0b19711f Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:35:37 +0900 Subject: [PATCH 10/21] Update improvement model controller and service method rename --- .../controller/ImprovementController.java | 16 ++++++++-------- .../improvement/service/ImprovementService.java | 8 ++++---- .../service/ImprovementServiceTest.java | 2 +- .../the/service/ImprovementServiceTest.java | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/moment/the/improvement/controller/ImprovementController.java b/src/main/java/com/moment/the/improvement/controller/ImprovementController.java index bbce1a57..6d889fa7 100644 --- a/src/main/java/com/moment/the/improvement/controller/ImprovementController.java +++ b/src/main/java/com/moment/the/improvement/controller/ImprovementController.java @@ -26,15 +26,15 @@ public class ImprovementController { @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult save(@Valid @RequestBody ImprovementDto improvementDto){ - improvementService.save(improvementDto); + public CommonResult createThisImprovement(@Valid @RequestBody ImprovementDto improvementDto){ + improvementService.createThisImprovement(improvementDto); return responseService.getSuccessResult(); } // 개선사례보기 @GetMapping("/solved") - public ListResult view(){ - return responseService.getListResult(improvementService.read()); + public ListResult getThisImprovement(){ + return responseService.getListResult(improvementService.getThisImprovement()); } // 개선사례수정 @@ -43,8 +43,8 @@ public ListResult view(){ @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header"), @ApiImplicitParam(name = "RefreshToken", value = "로그인 성공 후 refresh_token", required = false, dataType = "String", paramType = "header") }) - public CommonResult update(@RequestBody ImprovementDto improvementDto, @PathVariable Long improveIdx) { - improvementService.update(improvementDto, improveIdx); + public CommonResult updateThisImprovement(@RequestBody ImprovementDto improvementDto, @PathVariable Long improveIdx) { + improvementService.updateThisImprovement(improvementDto, improveIdx); return responseService.getSuccessResult(); } @@ -53,8 +53,8 @@ public CommonResult update(@RequestBody ImprovementDto improvementDto, @PathVari @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "로그인 성공 후 access_token", required = true, dataType = "String", paramType = "header") }) - public CommonResult delete(@PathVariable Long improveIdx) { - improvementService.delete(improveIdx); + public CommonResult deleteThisImprovement(@PathVariable Long improveIdx) { + improvementService.deleteThisImprovement(improveIdx); return responseService.getSuccessResult(); } } diff --git a/src/main/java/com/moment/the/improvement/service/ImprovementService.java b/src/main/java/com/moment/the/improvement/service/ImprovementService.java index e72ce6a8..18dd8aa8 100644 --- a/src/main/java/com/moment/the/improvement/service/ImprovementService.java +++ b/src/main/java/com/moment/the/improvement/service/ImprovementService.java @@ -25,7 +25,7 @@ public class ImprovementService { // Create improvement. @Transactional - public ImprovementDomain save(ImprovementDto improvementDto){ + public ImprovementDomain createThisImprovement(ImprovementDto improvementDto){ try { AdminDomain adminDomain = adminRepository.findByAdminId(AdminServiceImpl.getUserEmail()); return improvementRepository.save(improvementDto.ToEntity(adminDomain)); @@ -35,7 +35,7 @@ public ImprovementDomain save(ImprovementDto improvementDto){ } // Read improvement. - public List read(){ + public List getThisImprovement(){ ModelMapper modelMapper = new ModelMapper(); return improvementRepository.findAllByOrderByImproveIdxDesc().stream() .map(m -> modelMapper.map(m, ImprovementViewAllDto.class)) @@ -44,7 +44,7 @@ public List read(){ // Update improvement. @Transactional - public void update(ImprovementDto improvementDto, Long improveIdx){ + public void updateThisImprovement(ImprovementDto improvementDto, Long improveIdx){ // 개선 사례 가져오기 ImprovementDomain improvementDomain = improvementRepository.findByImproveIdx(improveIdx); if(improvementDomain.getAdminDomain().getAdminId().equals(AdminServiceImpl.getUserEmail())){ @@ -56,7 +56,7 @@ public void update(ImprovementDto improvementDto, Long improveIdx){ // Delete improvement. @Transactional - public void delete(Long improveIdx){ + public void deleteThisImprovement(Long improveIdx){ ImprovementDomain selectImprove = improvementRepository.findByImproveIdx(improveIdx); if(selectImprove.getAdminDomain().getAdminId().equals(AdminServiceImpl.getUserEmail())){ improvementRepository.delete(selectImprove); diff --git a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java index 2b6e61b8..9219942a 100644 --- a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java @@ -70,7 +70,7 @@ AdminDomain adminLogin(String adminId, String password) throws Exception { improvementDto.setImproveContent("it's jihwan"); //when - improvementService.save(improvementDto); + improvementService.createThisImprovement(improvementDto); //then assertEquals(false, improvementRepository.findByImproveContent("it's jihwan") == null); diff --git a/src/test/java/com/moment/the/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/service/ImprovementServiceTest.java index a7ff2e15..4c4a619a 100644 --- a/src/test/java/com/moment/the/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/service/ImprovementServiceTest.java @@ -72,7 +72,7 @@ void saveImprovement(String header , String content) throws Exception { adminSignUp("s20062", "1234", "jihwan"); System.out.println("========= saved ========="); adminLogin("s20062", "1234"); - improvementService.save(improvementDto); + improvementService.createThisImprovement(improvementDto); } @Test @@ -87,7 +87,7 @@ void saveImprovement(String header , String content) throws Exception { adminSignUp("s20062", "1234", "jihwan"); System.out.println("========= saved ========="); adminLogin("s20062", "1234"); - improvementService.save(improvementDto); + improvementService.createThisImprovement(improvementDto); //Then assertEquals(improvementRepository.findByImproveContent("this is content")==null, false); @@ -107,10 +107,10 @@ void saveImprovement(String header , String content) throws Exception { improvementRepository.saveAll(improvementDomains); //when - improvementService.read(); + improvementService.getThisImprovement(); //then - assertEquals(20, improvementService.read().size()); + assertEquals(20, improvementService.getThisImprovement().size()); } @Test @@ -127,7 +127,7 @@ void saveImprovement(String header , String content) throws Exception { improvementDto.setImproveContent("이걸로 한다고용"); //When - improvementService.update(improvementDto, currentIdx); + improvementService.updateThisImprovement(improvementDto, currentIdx); System.out.println("============= 업데이트 완료 ============"); //Then @@ -143,7 +143,7 @@ void saveImprovement(String header , String content) throws Exception { Long delIdx = improvementRepository.findByImproveContent("world").getImproveIdx(); //When - improvementService.delete(delIdx); + improvementService.deleteThisImprovement(delIdx); System.out.println("==========삭제 완료==========="); //Then From 9b01caccf63f458240c7ba0806c8cd70e4224649 Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:40:28 +0900 Subject: [PATCH 11/21] Update uncomfortable controller and service method rename --- .../controller/UncomfortableController.java | 12 ++++++------ .../uncomfortable/service/UncomfortableService.java | 6 +++--- .../release/UncomfortableControllerTest.java | 2 +- .../com/moment/the/service/AnswerServiceTest.java | 2 +- .../moment/the/service/UncomfortableServiceTest.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java b/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java index 6bbd2a29..3f19d38b 100644 --- a/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java +++ b/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java @@ -27,8 +27,8 @@ public class UncomfortableController { * @author 전지환, 정시원 */ @PostMapping("/uncomfortable") - public CommonResult addUncomfortable(@Valid @RequestBody UncomfortableSetDto uncomfortableSetDto){ - uncomfortableService.addUncomfortable(uncomfortableSetDto); + public CommonResult createThisUncomfortable(@Valid @RequestBody UncomfortableSetDto uncomfortableSetDto){ + uncomfortableService.createThisUncomfortable(uncomfortableSetDto); return responseService.getSuccessResult(); } @@ -38,8 +38,8 @@ public CommonResult addUncomfortable(@Valid @RequestBody UncomfortableSetDto unc * @author 전지환, 정시원 */ @GetMapping("/uncomfortable/rank") - public ListResult getTop30(){ - return responseService.getListResult(uncomfortableService.getTop30()); + public ListResult getRank(){ + return responseService.getListResult(uncomfortableService.getRank()); } /** @@ -83,8 +83,8 @@ public CommonResult decreaseLike(@PathVariable Long boardIdx){ * @author 전지환, 정시원 */ @DeleteMapping("/uncomfortable/{boardIdx}") - public CommonResult deleteUncomfortable(@PathVariable Long boardIdx){ - uncomfortableService.deleteUncomfortable(boardIdx); + public CommonResult deleteThisUncomfortable(@PathVariable Long boardIdx){ + uncomfortableService.deleteThisUncomfortable(boardIdx); return responseService.getSuccessResult(); } diff --git a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java index 68d6e159..2e28f396 100644 --- a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java +++ b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java @@ -28,7 +28,7 @@ public class UncomfortableService { * @return UncomfortableEntity */ @Transactional - public UncomfortableEntity addUncomfortable(UncomfortableSetDto uncomfortableSetDto){ + public UncomfortableEntity createThisUncomfortable(UncomfortableSetDto uncomfortableSetDto){ return uncomfortableRepository.save(uncomfortableSetDto.toEntity()); } @@ -36,7 +36,7 @@ public UncomfortableEntity addUncomfortable(UncomfortableSetDto uncomfortableSet * 많은 학생들이 공감한 글 상위 30개를 선별하여 가져옵니다. * @return List */ - public List getTop30() { + public List getRank() { return uncomfortableRepository.uncomfortableViewTopBy(PageRequest.of(0,30)); } @@ -79,7 +79,7 @@ public void decreaseLike(Long boardIdx) { * @param boardIdx */ @Transactional - public void deleteUncomfortable(long boardIdx){ + public void deleteThisUncomfortable(long boardIdx){ uncomfortableRepository.deleteById(boardIdx); } diff --git a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java index 6c584993..0cda7d2b 100644 --- a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java +++ b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java @@ -134,7 +134,7 @@ String objectToJson(Object object) throws JsonProcessingException { ).limit(40).collect(Collectors.toList()); tableRepo.saveAll(uncomfortableEntities); - List uncomfortableGetDtos = uncomfortableService.getTop30(); + List uncomfortableGetDtos = uncomfortableService.getRank(); String top30Data = objectToJson(uncomfortableGetDtos); //When diff --git a/src/test/java/com/moment/the/service/AnswerServiceTest.java b/src/test/java/com/moment/the/service/AnswerServiceTest.java index 5a055108..ad93ba4c 100644 --- a/src/test/java/com/moment/the/service/AnswerServiceTest.java +++ b/src/test/java/com/moment/the/service/AnswerServiceTest.java @@ -68,7 +68,7 @@ AdminDomain adminLogin(String adminId, String password) { UncomfortableEntity createTable(){ String TABLE_CONTENT = "급식이 맛이 없어요 급식에 질을 높여주세요!"; UncomfortableSetDto uncomfortableSetDto = new UncomfortableSetDto(TABLE_CONTENT); - UncomfortableEntity uncomfortableEntity = uncomfortableService.addUncomfortable(uncomfortableSetDto); + UncomfortableEntity uncomfortableEntity = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); return uncomfortableEntity; } diff --git a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java index 18f3b1e7..8cfb5bd8 100644 --- a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java +++ b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java @@ -46,7 +46,7 @@ public void cleanUp(){ .build(); // when - UncomfortableEntity writeTable = uncomfortableService.addUncomfortable(uncomfortableSetDto); + UncomfortableEntity writeTable = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); UncomfortableEntity savedTable = tableRepo.findByBoardIdx(writeTable.getBoardIdx()).orElseThrow(() -> new IllegalArgumentException("Table을 찾을 수 없습니다. (테스트실패)")); tableRepo.delete(savedTable); @@ -68,7 +68,7 @@ public void cleanUp(){ // When tableRepo.saveAll(uncomfortableEntities); - List viewTop30 = uncomfortableService.getTop30(); + List viewTop30 = uncomfortableService.getRank(); // Then assertEquals(viewTop30.size(), 30); From df054d30edd404fc93d0381cc5bb5846c5a1522f Mon Sep 17 00:00:00 2001 From: johnjihwan Date: Sun, 19 Sep 2021 15:42:54 +0900 Subject: [PATCH 12/21] Fix top_30 controller test url mapping error --- .../the/controller/release/UncomfortableControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java index 0cda7d2b..18802094 100644 --- a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java +++ b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java @@ -139,7 +139,7 @@ String objectToJson(Object object) throws JsonProcessingException { //When resultActions = mockMvc.perform( - get("/v1/uncomfortable/top30") + get("/v1/uncomfortable/rank") .contentType(MediaType.APPLICATION_JSON) ); From cb28e2a9d0e6417a06a3b8b8f60f56f5e24584c1 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Sun, 19 Sep 2021 16:29:57 +0900 Subject: [PATCH 13/21] Rename UncomfortableGetDto -> UncomfortableResponseDto --- .../controller/UncomfortableController.java | 6 +++--- ...rtableGetDto.java => UncomfortableResponseDto.java} | 4 ++-- .../repository/UncomfortableRepository.java | 10 +++++----- .../uncomfortable/service/UncomfortableService.java | 6 +++--- .../release/UncomfortableControllerTest.java | 6 +++--- .../moment/the/service/UncomfortableServiceTest.java | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) rename src/main/java/com/moment/the/uncomfortable/dto/{UncomfortableGetDto.java => UncomfortableResponseDto.java} (75%) diff --git a/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java b/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java index 3f19d38b..55324905 100644 --- a/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java +++ b/src/main/java/com/moment/the/uncomfortable/controller/UncomfortableController.java @@ -4,8 +4,8 @@ import com.moment.the.response.result.CommonResult; import com.moment.the.response.result.ListResult; import com.moment.the.response.result.SingleResult; +import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; -import com.moment.the.uncomfortable.dto.UncomfortableGetDto; import com.moment.the.uncomfortable.service.UncomfortableService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -38,7 +38,7 @@ public CommonResult createThisUncomfortable(@Valid @RequestBody UncomfortableSet * @author 전지환, 정시원 */ @GetMapping("/uncomfortable/rank") - public ListResult getRank(){ + public ListResult getRank(){ return responseService.getListResult(uncomfortableService.getRank()); } @@ -48,7 +48,7 @@ public ListResult getRank(){ * @author 전지환, 정시원 */ @GetMapping("/uncomfortable") - public ListResult getAllUncomfortable(){ + public ListResult getAllUncomfortable(){ return responseService.getListResult(uncomfortableService.getAllUncomfortable()); } diff --git a/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableGetDto.java b/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableResponseDto.java similarity index 75% rename from src/main/java/com/moment/the/uncomfortable/dto/UncomfortableGetDto.java rename to src/main/java/com/moment/the/uncomfortable/dto/UncomfortableResponseDto.java index 012953dc..6d7c941a 100644 --- a/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableGetDto.java +++ b/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableResponseDto.java @@ -6,14 +6,14 @@ @Builder @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class UncomfortableGetDto { +public class UncomfortableResponseDto { private Long boardIdx; private String content; private int goods; private boolean isAnswer; - public UncomfortableGetDto(Long boardIdx, String content, int goods, AnswerDomain answer){ + public UncomfortableResponseDto(Long boardIdx, String content, int goods, AnswerDomain answer){ this.boardIdx = boardIdx; this.content = content; this.goods = goods; diff --git a/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java b/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java index af10c0ee..00cdef60 100644 --- a/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java +++ b/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java @@ -1,7 +1,7 @@ package com.moment.the.uncomfortable.repository; import com.moment.the.uncomfortable.UncomfortableEntity; -import com.moment.the.uncomfortable.dto.UncomfortableGetDto; +import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -19,15 +19,15 @@ public interface UncomfortableRepository extends JpaRepository uncomfortableViewAll(); + List uncomfortableViewAll(); - @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableGetDto(table.boardIdx, table.content, table.goods, answer)" + + @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableResponseDto(table.boardIdx, table.content, table.goods, answer)" + "FROM UncomfortableEntity table LEFT JOIN table.answerDomain answer " + "ORDER BY table.goods DESC " ) - List uncomfortableViewTopBy(Pageable p); + List uncomfortableViewTopBy(Pageable p); } diff --git a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java index 2e28f396..4a32d63d 100644 --- a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java +++ b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java @@ -3,8 +3,8 @@ import com.moment.the.exceptionAdvice.exception.GoodsNotCancelException; import com.moment.the.exceptionAdvice.exception.NoPostException; import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; -import com.moment.the.uncomfortable.dto.UncomfortableGetDto; import com.moment.the.uncomfortable.repository.UncomfortableRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,7 +36,7 @@ public UncomfortableEntity createThisUncomfortable(UncomfortableSetDto uncomfort * 많은 학생들이 공감한 글 상위 30개를 선별하여 가져옵니다. * @return List */ - public List getRank() { + public List getRank() { return uncomfortableRepository.uncomfortableViewTopBy(PageRequest.of(0,30)); } @@ -44,7 +44,7 @@ public List getRank() { * 학교의 불편함 전체를 가져옵니다. * @return List */ - public List getAllUncomfortable(){ + public List getAllUncomfortable(){ return uncomfortableRepository.uncomfortableViewAll(); } diff --git a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java index 18802094..40952ccb 100644 --- a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java +++ b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java @@ -5,8 +5,8 @@ import com.moment.the.uncomfortable.controller.UncomfortableController; import com.moment.the.uncomfortable.UncomfortableEntity; import com.moment.the.response.ResponseService; +import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; -import com.moment.the.uncomfortable.dto.UncomfortableGetDto; import com.moment.the.uncomfortable.repository.UncomfortableRepository; import com.moment.the.uncomfortable.service.UncomfortableService; import lombok.extern.slf4j.Slf4j; @@ -134,8 +134,8 @@ String objectToJson(Object object) throws JsonProcessingException { ).limit(40).collect(Collectors.toList()); tableRepo.saveAll(uncomfortableEntities); - List uncomfortableGetDtos = uncomfortableService.getRank(); - String top30Data = objectToJson(uncomfortableGetDtos); + List uncomfortableResponseDtos = uncomfortableService.getRank(); + String top30Data = objectToJson(uncomfortableResponseDtos); //When resultActions = mockMvc.perform( diff --git a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java index 8cfb5bd8..07fab13c 100644 --- a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java +++ b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java @@ -2,8 +2,8 @@ import com.moment.the.exceptionAdvice.exception.GoodsNotCancelException; import com.moment.the.uncomfortable.*; +import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; -import com.moment.the.uncomfortable.dto.UncomfortableGetDto; import com.moment.the.uncomfortable.repository.UncomfortableRepository; import com.moment.the.uncomfortable.service.UncomfortableService; import org.junit.jupiter.api.AfterEach; @@ -68,14 +68,14 @@ public void cleanUp(){ // When tableRepo.saveAll(uncomfortableEntities); - List viewTop30 = uncomfortableService.getRank(); + List viewTop30 = uncomfortableService.getRank(); // Then assertEquals(viewTop30.size(), 30); AtomicInteger j = new AtomicInteger(40); // TableService 의 top30View 로직이 올바르게 적용되면 j.get을 했을떄 값이 10이 나와야 한다. // 저장된Table - top30 = 40 - 30 = 10 - for(UncomfortableGetDto v : viewTop30 ) { + for(UncomfortableResponseDto v : viewTop30 ) { assertEquals(v.getGoods(), j.getAndDecrement()); } assertEquals(j.get(), 10); @@ -93,7 +93,7 @@ public void cleanUp(){ // When tableRepo.saveAll(uncomfortableEntities); - List tableViewAll = uncomfortableService.getAllUncomfortable(); + List tableViewAll = uncomfortableService.getAllUncomfortable(); // Then assertEquals(tableViewAll.size(), 10); // 10개를 저장했으므로 tableViewAll 의 개수는 10개여야 한다. From 68d84ca77aa57602aa801438c6754654a5e71936 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Sun, 19 Sep 2021 16:30:42 +0900 Subject: [PATCH 14/21] Rename loginUser -> login --- .../java/com/moment/the/admin/controller/AdminController.java | 2 +- src/main/java/com/moment/the/admin/service/AdminService.java | 2 +- .../java/com/moment/the/admin/service/AdminServiceImpl.java | 2 +- .../java/com/moment/the/service/AdminServiceImplTest.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moment/the/admin/controller/AdminController.java b/src/main/java/com/moment/the/admin/controller/AdminController.java index 5070d9d9..bc64c692 100644 --- a/src/main/java/com/moment/the/admin/controller/AdminController.java +++ b/src/main/java/com/moment/the/admin/controller/AdminController.java @@ -31,7 +31,7 @@ public class AdminController { @PostMapping("/login") public SingleResult> login(@Valid @RequestBody SignInDto signInDto) throws Exception { - return responseService.getSingleResult(adminService.loginUser(signInDto.getAdminId(), signInDto.getAdminPwd())); + return responseService.getSingleResult(adminService.login(signInDto.getAdminId(), signInDto.getAdminPwd())); } @PostMapping("/logout") diff --git a/src/main/java/com/moment/the/admin/service/AdminService.java b/src/main/java/com/moment/the/admin/service/AdminService.java index a4fbfe93..aaef60a8 100644 --- a/src/main/java/com/moment/the/admin/service/AdminService.java +++ b/src/main/java/com/moment/the/admin/service/AdminService.java @@ -7,7 +7,7 @@ public interface AdminService { void join(AdminDto adminDto) throws Exception; - Map loginUser(String id, String password) throws Exception; + Map login(String id, String password) throws Exception; void logout(); void withdrawal(SignInDto SignInDto) throws Exception; } diff --git a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java index 9e193f56..193db842 100644 --- a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java +++ b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java @@ -37,7 +37,7 @@ public void join(AdminDto adminDto) { } @Override - public Map loginUser(String id, String password) { + public Map login(String id, String password) { // 아이디 검증 AdminDomain adminDomain = adminRepository.findByAdminId(id); if (adminDomain == null) throw new UserNotFoundException(); diff --git a/src/test/java/com/moment/the/service/AdminServiceImplTest.java b/src/test/java/com/moment/the/service/AdminServiceImplTest.java index 94b80dd3..9d899255 100644 --- a/src/test/java/com/moment/the/service/AdminServiceImplTest.java +++ b/src/test/java/com/moment/the/service/AdminServiceImplTest.java @@ -148,7 +148,7 @@ void GetUserEmail(){ adminRepository.save(adminDto.toEntity()); //then - assertEquals(adminService.loginUser("s20062@gsmasdf","1234") == null, false); + assertEquals(adminService.login("s20062@gsmasdf","1234") == null, false); } @Test @@ -204,7 +204,7 @@ void GetUserEmail(){ //When try { - adminServiceImpl.loginUser("admin@admin", "134"); + adminServiceImpl.login("admin@admin", "134"); } catch (UserNotFoundException e) { exceptionCatched = true; } From 37c579abb7ff1bcaa7a35dd62f9698c2432e86b1 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Sun, 19 Sep 2021 16:41:59 +0900 Subject: [PATCH 15/21] =?UTF-8?q?Fix=20Deprecated=20=EB=90=9C=20enabled=20?= =?UTF-8?q?=EC=86=8D=EC=84=B1=EC=9D=84=20required=EB=A5=BC=20=ED=86=B5?= =?UTF-8?q?=ED=95=B4=20=EC=84=A4=EC=A0=95=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20build.gradle=2094=20~=2096?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f83d520d..2fb2b2dc 100644 --- a/build.gradle +++ b/build.gradle @@ -91,9 +91,9 @@ jacoco { jacocoTestReport { reports { - html.enabled true - csv.enabled false - xml.enabled false + html.required = true + csv.required = false + xml.required = false } afterEvaluate { classDirectories.from = files(classDirectories.files.collect { From e242ee61a8137e8a03e1582128463bf01556300f Mon Sep 17 00:00:00 2001 From: siwony_ Date: Sun, 19 Sep 2021 17:11:53 +0900 Subject: [PATCH 16/21] =?UTF-8?q?Update=20erd=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20AdminDomin=EB=B3=80=EA=B2=BD,=20AdminDomin=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20Dto,=20Repos?= =?UTF-8?q?itory,=20builder=ED=8C=A8=ED=84=B4=EC=9D=84=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EB=AA=A8?= =?UTF-8?q?=EB=91=90=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/moment/the/admin/AdminDomain.java | 29 ++++---- .../the/admin/controller/AdminController.java | 2 +- .../com/moment/the/admin/dto/AdminDto.java | 22 +++--- .../com/moment/the/admin/dto/SignInDto.java | 8 +-- .../the/admin/repository/AdminRepository.java | 4 +- .../the/admin/service/AdminServiceImpl.java | 16 ++--- .../the/answer/service/AnswerService.java | 8 +-- .../security/auth/MyUserDetailsService.java | 2 +- .../service/ImprovementService.java | 6 +- .../service/ImprovementServiceTest.java | 8 +-- .../the/service/AdminServiceImplTest.java | 72 +++++++++---------- .../moment/the/service/AnswerServiceTest.java | 8 +-- .../the/service/ImprovementServiceTest.java | 6 +- 13 files changed, 93 insertions(+), 98 deletions(-) diff --git a/src/main/java/com/moment/the/admin/AdminDomain.java b/src/main/java/com/moment/the/admin/AdminDomain.java index c58b1f6b..d3a100f7 100644 --- a/src/main/java/com/moment/the/admin/AdminDomain.java +++ b/src/main/java/com/moment/the/admin/AdminDomain.java @@ -1,10 +1,7 @@ package com.moment.the.admin; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -15,23 +12,23 @@ import java.util.List; import java.util.stream.Collectors; -@Entity -@Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor +@Entity @Table(name = "admin") +@Getter @Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class AdminDomain implements UserDetails { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "admin_id") private Long adminIdx; - @Column(name = "name") - private String adminName; - @Column(name = "email") - private String adminId; + private String email; + + @Column(name = "name") + private String name; @Column(name = "password") - private String adminPwd; + private String password; @ElementCollection(fetch = FetchType.EAGER) @Builder.Default @@ -46,13 +43,13 @@ public Collection getAuthorities() { @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @Override public String getPassword() { - return this.adminPwd; + return this.password; } @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @Override public String getUsername() { - return this.adminId; + return this.email; } @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) diff --git a/src/main/java/com/moment/the/admin/controller/AdminController.java b/src/main/java/com/moment/the/admin/controller/AdminController.java index bc64c692..7c8a2c37 100644 --- a/src/main/java/com/moment/the/admin/controller/AdminController.java +++ b/src/main/java/com/moment/the/admin/controller/AdminController.java @@ -31,7 +31,7 @@ public class AdminController { @PostMapping("/login") public SingleResult> login(@Valid @RequestBody SignInDto signInDto) throws Exception { - return responseService.getSingleResult(adminService.login(signInDto.getAdminId(), signInDto.getAdminPwd())); + return responseService.getSingleResult(adminService.login(signInDto.getEmail(), signInDto.getPassword())); } @PostMapping("/logout") diff --git a/src/main/java/com/moment/the/admin/dto/AdminDto.java b/src/main/java/com/moment/the/admin/dto/AdminDto.java index 27943b0a..bfe96f2c 100644 --- a/src/main/java/com/moment/the/admin/dto/AdminDto.java +++ b/src/main/java/com/moment/the/admin/dto/AdminDto.java @@ -9,27 +9,25 @@ import javax.validation.constraints.Size; import java.util.Collections; -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor +@Getter @Setter +@NoArgsConstructor @AllArgsConstructor public class AdminDto { - @Email(message = "Email should be valid") - @NotBlank(message = "id should be valid") - private String adminId; + @Email(message = "email should be valid") + @NotBlank(message = "email should be valid") + private String email; @NotBlank(message = "password should be valid") - private String adminPwd; + private String password; @NotBlank(message = "name should be valid") @Size(min = 3, max = 30) - private String adminName; + private String name; public AdminDomain toEntity() { return AdminDomain.builder() - .adminId(this.getAdminId()) - .adminPwd(this.getAdminPwd()) - .adminName(this.getAdminName()) + .email(this.email) + .password(this.password) + .name(this.name) .roles(Collections.singletonList("ROLE_ADMIN")) .build(); } diff --git a/src/main/java/com/moment/the/admin/dto/SignInDto.java b/src/main/java/com/moment/the/admin/dto/SignInDto.java index 10000835..f8853367 100644 --- a/src/main/java/com/moment/the/admin/dto/SignInDto.java +++ b/src/main/java/com/moment/the/admin/dto/SignInDto.java @@ -11,14 +11,14 @@ @NoArgsConstructor public class SignInDto { @NotBlank(message = "id should be valid") - private String adminId; + private String email; @NotBlank(message = "password should be valid") - private String adminPwd; + private String password; public AdminDomain toEntity(){ return AdminDomain.builder() - .adminId(this.adminId) - .adminPwd(this.adminPwd) + .email(this.email) + .password(this.password) .build(); } } diff --git a/src/main/java/com/moment/the/admin/repository/AdminRepository.java b/src/main/java/com/moment/the/admin/repository/AdminRepository.java index fc6a0bcc..9c23fa79 100644 --- a/src/main/java/com/moment/the/admin/repository/AdminRepository.java +++ b/src/main/java/com/moment/the/admin/repository/AdminRepository.java @@ -6,6 +6,6 @@ @Repository public interface AdminRepository extends JpaRepository { - AdminDomain findByAdminId(String adminId); - AdminDomain findByAdminIdAndAdminPwd(String adminId, String password); + AdminDomain findByEmail(String email); + AdminDomain findByEmailAndPassword(String email, String password); } diff --git a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java index 193db842..b59ccde5 100644 --- a/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java +++ b/src/main/java/com/moment/the/admin/service/AdminServiceImpl.java @@ -29,28 +29,28 @@ public class AdminServiceImpl implements AdminService { @Override public void join(AdminDto adminDto) { - if(adminRepository.findByAdminId(adminDto.getAdminId()) != null){ + if(adminRepository.findByEmail(adminDto.getEmail()) != null){ throw new UserAlreadyExistsException(); } - adminDto.setAdminPwd(passwordEncoder.encode(adminDto.getAdminPwd())); + adminDto.setPassword(passwordEncoder.encode(adminDto.getPassword())); adminRepository.save(adminDto.toEntity()); } @Override public Map login(String id, String password) { // 아이디 검증 - AdminDomain adminDomain = adminRepository.findByAdminId(id); + AdminDomain adminDomain = adminRepository.findByEmail(id); if (adminDomain == null) throw new UserNotFoundException(); // 비밀번호 검증 boolean passwordCheck = passwordEncoder.matches(password, adminDomain.getPassword()); if (!passwordCheck) throw new UserNotFoundException(); - final String accessToken = jwtUtil.generateAccessToken(adminDomain.getAdminId()); - final String refreshJwt = jwtUtil.generateRefreshToken(adminDomain.getAdminId()); + final String accessToken = jwtUtil.generateAccessToken(adminDomain.getEmail()); + final String refreshJwt = jwtUtil.generateRefreshToken(adminDomain.getEmail()); // token 만료 기간 설정 redisUtil.setDataExpire(refreshJwt, adminDomain.getUsername(), JwtUtil.REFRESH_TOKEN_EXPIRATION_TIME); Map map = new HashMap<>(); - map.put("id", adminDomain.getAdminId()); + map.put("id", adminDomain.getEmail()); map.put("accessToken", accessToken); // accessToken 반환 map.put("refreshToken", refreshJwt); // refreshToken 반환 @@ -67,8 +67,8 @@ public void logout() { @Override public void withdrawal(SignInDto signInDto) throws Exception { // 로그인 된 이메일과 내가 삭제하려는 이메일이 같을 때. - if (getUserEmail().equals(signInDto.getAdminId())) { - AdminDomain adminDomain = adminRepository.findByAdminId(signInDto.getAdminId()); + if (getUserEmail().equals(signInDto.getEmail())) { + AdminDomain adminDomain = adminRepository.findByEmail(signInDto.getEmail()); adminRepository.delete(adminDomain); } else { throw new Exception("로그인 후 이용해주세요."); diff --git a/src/main/java/com/moment/the/answer/service/AnswerService.java b/src/main/java/com/moment/the/answer/service/AnswerService.java index 49c9b491..3d7e2370 100644 --- a/src/main/java/com/moment/the/answer/service/AnswerService.java +++ b/src/main/java/com/moment/the/answer/service/AnswerService.java @@ -28,7 +28,7 @@ public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { boolean existAnswer = uncomfortableEntity.getAnswerDomain() != null; if(existAnswer) throw new AnswerAlreadyExistsException(); //이미 답변이 있으면 Exception - AdminDomain adminDomain = adminRepo.findByAdminId(AdminServiceImpl.getUserEmail()); + AdminDomain adminDomain = adminRepo.findByEmail(AdminServiceImpl.getUserEmail()); // AnswerDomain 생성 및 Table 과의 연관관계 맻음 answerDto.setAdminDomain(adminDomain); @@ -45,7 +45,7 @@ public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { public AnswerDomain updateThisAnswer(AnswerDto answerDto, Long answerIdx) { AnswerDomain answerDomain = answerFindBy(answerIdx); // 해당하는 answer 찾기 AdminDomain answerAdmin = answerDomain.getAdminDomain(); - AdminDomain loginAdmin = adminRepo.findByAdminId(AdminServiceImpl.getUserEmail()); + AdminDomain loginAdmin = adminRepo.findByEmail(AdminServiceImpl.getUserEmail()); answerOwnerCheck(answerAdmin, loginAdmin); // 자신이 작성한 답변인지 확인 @@ -63,7 +63,7 @@ public AnswerResDto getThisAnswer(Long boardIdx) { .answerIdx(answerDomain.getAnswerIdx()) .title(answerDomain.getUncomfortableEntity().getContent()) .content(answerDomain.getAnswerContent()) - .writer(answerDomain.getAdminDomain().getAdminName()) + .writer(answerDomain.getAdminDomain().getName()) .build(); return answerResDto; @@ -76,7 +76,7 @@ public void deleteThisAnswer(Long answerIdx) { AnswerDomain answerDomain = answerFindBy(answerIdx); AdminDomain answerAdmin = answerDomain.getAdminDomain(); - AdminDomain loginAdmin = adminRepo.findByAdminId(AdminServiceImpl.getUserEmail()); + AdminDomain loginAdmin = adminRepo.findByEmail(AdminServiceImpl.getUserEmail()); answerOwnerCheck(answerAdmin, loginAdmin); // 자신이 작성한 답변인지 확인 // answer 삭제하기 diff --git a/src/main/java/com/moment/the/config/security/auth/MyUserDetailsService.java b/src/main/java/com/moment/the/config/security/auth/MyUserDetailsService.java index 43b58d03..fcf6a05f 100644 --- a/src/main/java/com/moment/the/config/security/auth/MyUserDetailsService.java +++ b/src/main/java/com/moment/the/config/security/auth/MyUserDetailsService.java @@ -13,6 +13,6 @@ public class MyUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String email) { - return adminRepository.findByAdminId(email); + return adminRepository.findByEmail(email); } } diff --git a/src/main/java/com/moment/the/improvement/service/ImprovementService.java b/src/main/java/com/moment/the/improvement/service/ImprovementService.java index 18dd8aa8..d747c98f 100644 --- a/src/main/java/com/moment/the/improvement/service/ImprovementService.java +++ b/src/main/java/com/moment/the/improvement/service/ImprovementService.java @@ -27,7 +27,7 @@ public class ImprovementService { @Transactional public ImprovementDomain createThisImprovement(ImprovementDto improvementDto){ try { - AdminDomain adminDomain = adminRepository.findByAdminId(AdminServiceImpl.getUserEmail()); + AdminDomain adminDomain = adminRepository.findByEmail(AdminServiceImpl.getUserEmail()); return improvementRepository.save(improvementDto.ToEntity(adminDomain)); } catch (UserNotFoundException e){ throw new UserNotFoundException(); @@ -47,7 +47,7 @@ public List getThisImprovement(){ public void updateThisImprovement(ImprovementDto improvementDto, Long improveIdx){ // 개선 사례 가져오기 ImprovementDomain improvementDomain = improvementRepository.findByImproveIdx(improveIdx); - if(improvementDomain.getAdminDomain().getAdminId().equals(AdminServiceImpl.getUserEmail())){ + if(improvementDomain.getAdminDomain().getEmail().equals(AdminServiceImpl.getUserEmail())){ improvementDomain.update(improvementDto); } else { throw new AccessNotFoundException(); @@ -58,7 +58,7 @@ public void updateThisImprovement(ImprovementDto improvementDto, Long improveIdx @Transactional public void deleteThisImprovement(Long improveIdx){ ImprovementDomain selectImprove = improvementRepository.findByImproveIdx(improveIdx); - if(selectImprove.getAdminDomain().getAdminId().equals(AdminServiceImpl.getUserEmail())){ + if(selectImprove.getAdminDomain().getEmail().equals(AdminServiceImpl.getUserEmail())){ improvementRepository.delete(selectImprove); } else { throw new AccessNotFoundException(); diff --git a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java index 9219942a..faa467ec 100644 --- a/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/improvement/service/ImprovementServiceTest.java @@ -44,10 +44,10 @@ void adminSignUp(String adminId, String password, String adminName) throws Excep // test 편의를 위한 로그인 매서드 AdminDomain adminLogin(String adminId, String password) throws Exception { - AdminDomain adminDomain = adminRepository.findByAdminId(adminId); + AdminDomain adminDomain = adminRepository.findByEmail(adminId); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDomain.getAdminId(), - adminDomain.getAdminPwd(), + adminDomain.getEmail(), + adminDomain.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); @@ -74,7 +74,7 @@ AdminDomain adminLogin(String adminId, String password) throws Exception { //then assertEquals(false, improvementRepository.findByImproveContent("it's jihwan") == null); - assertEquals(true, improvementRepository.findByImproveContent("it's jihwan").getAdminDomain().getAdminId().equals("asdf@gsm")); + assertEquals(true, improvementRepository.findByImproveContent("it's jihwan").getAdminDomain().getEmail().equals("asdf@gsm")); } } \ No newline at end of file diff --git a/src/test/java/com/moment/the/service/AdminServiceImplTest.java b/src/test/java/com/moment/the/service/AdminServiceImplTest.java index 9d899255..ebfea61f 100644 --- a/src/test/java/com/moment/the/service/AdminServiceImplTest.java +++ b/src/test/java/com/moment/the/service/AdminServiceImplTest.java @@ -46,15 +46,15 @@ public void dataClean(){ String pw = "1234"; //when - adminDto.setAdminPwd(passwordEncoder.encode(pw)); - adminDto.setAdminId(email); - adminDto.setAdminName(adminName); + adminDto.setPassword(passwordEncoder.encode(pw)); + adminDto.setEmail(email); + adminDto.setName(adminName); adminRepository.save(adminDto.toEntity()); //then - assertEquals(adminDto.getAdminId(), email); - assertEquals(passwordEncoder.matches(pw,adminDto.getAdminPwd()), true); - assertEquals(adminDto.getAdminName(), "jihwan"); + assertEquals(adminDto.getEmail(), email); + assertEquals(passwordEncoder.matches(pw,adminDto.getPassword()), true); + assertEquals(adminDto.getName(), "jihwan"); } @Test @@ -63,13 +63,13 @@ public void dataClean(){ AdminDto adminDto = new AdminDto(); String alreadyEmail = "asdf@asdf"; String email = "asdf@asdf"; - adminDto.setAdminId(alreadyEmail); + adminDto.setEmail(alreadyEmail); //when adminRepository.save(adminDto.toEntity()); //then - assertEquals(adminRepository.findByAdminId(email) == null , false); + assertEquals(adminRepository.findByEmail(email) == null , false); } @@ -79,19 +79,19 @@ public void dataClean(){ AdminDto adminDto = new AdminDto(); String id = "s20062@gsm"; - adminDto.setAdminId(id); + adminDto.setEmail(id); String pw = "1234"; - adminDto.setAdminPwd(passwordEncoder.encode(pw)); + adminDto.setPassword(passwordEncoder.encode(pw)); adminRepository.save(adminDto.toEntity()); //when - if(adminRepository.findByAdminId(id) == null){ + if(adminRepository.findByEmail(id) == null){ throw new UserNotFoundException(); } else { // then - assertEquals(passwordEncoder.matches(pw, adminDto.getAdminPwd()), true); + assertEquals(passwordEncoder.matches(pw, adminDto.getPassword()), true); } } @@ -101,15 +101,15 @@ void GetUserEmail(){ AdminDto adminDto = new AdminDto(); String userEmail = "s20062@gsm"; String pw = "1234"; - adminDto.setAdminId(userEmail); - adminDto.setAdminPwd(passwordEncoder.encode(pw)); + adminDto.setEmail(userEmail); + adminDto.setPassword(passwordEncoder.encode(pw)); adminRepository.save(adminDto.toEntity()); System.out.println("======== saved ========="); // when login session 발급 UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDto.getAdminId(), - adminDto.getAdminPwd(), + adminDto.getEmail(), + adminDto.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); @@ -125,24 +125,24 @@ void GetUserEmail(){ void 서비스_회원가입() throws Exception { //Given AdminDto adminDto = new AdminDto(); - adminDto.setAdminId("s20062@gsm"); - adminDto.setAdminPwd("1234"); - adminDto.setAdminName("jihwan"); + adminDto.setEmail("s20062@gsm"); + adminDto.setPassword("1234"); + adminDto.setName("jihwan"); //when adminService.join(adminDto); //then - assertEquals(adminRepository.findByAdminId("s20062@gsm") != null, true); + assertEquals(adminRepository.findByEmail("s20062@gsm") != null, true); } @Test @Disabled void 서비스_로그인() throws Exception { //Given AdminDto adminDto = new AdminDto(); - adminDto.setAdminId("s20062@gsmasdf"); - adminDto.setAdminPwd(passwordEncoder.encode("1234")); - adminDto.setAdminName("jihwan"); + adminDto.setEmail("s20062@gsmasdf"); + adminDto.setPassword(passwordEncoder.encode("1234")); + adminDto.setName("jihwan"); //when adminRepository.save(adminDto.toEntity()); @@ -155,22 +155,22 @@ void GetUserEmail(){ void 회원탈퇴() throws Exception { // Given 회원가입 AdminDto adminDto = new AdminDto(); - adminDto.setAdminName("jihwan"); - adminDto.setAdminId("s20062@gsm"); - adminDto.setAdminPwd(passwordEncoder.encode("1234")); + adminDto.setName("jihwan"); + adminDto.setEmail("s20062@gsm"); + adminDto.setPassword(passwordEncoder.encode("1234")); adminRepository.save(adminDto.toEntity()); System.out.println("=========is saved========="); // Given SignInDto SignInDto signInDto = new SignInDto(); - signInDto.setAdminId("s20062@gsm"); - signInDto.setAdminPwd("1234"); + signInDto.setEmail("s20062@gsm"); + signInDto.setPassword("1234"); System.out.println("======== is set ========"); // when login session 발급 UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDto.getAdminId(), - adminDto.getAdminPwd(), + adminDto.getEmail(), + adminDto.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); @@ -198,8 +198,8 @@ void GetUserEmail(){ boolean exceptionCatched = false; AdminDto adminDto = new AdminDto(); - adminDto.setAdminId("admin@admin"); - adminDto.setAdminPwd(passwordEncoder.encode("1234")); + adminDto.setEmail("admin@admin"); + adminDto.setPassword(passwordEncoder.encode("1234")); adminRepository.save(adminDto.toEntity()); //When @@ -219,15 +219,15 @@ void GetUserEmail(){ AdminDto adminDto = new AdminDto(); String userEmail = "s20062@gsm"; String pw = "1234"; - adminDto.setAdminId(userEmail); - adminDto.setAdminPwd(passwordEncoder.encode(pw)); + adminDto.setEmail(userEmail); + adminDto.setPassword(passwordEncoder.encode(pw)); adminRepository.save(adminDto.toEntity()); System.out.println("======== saved ========="); // when login session 발급 UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDto.getAdminId(), - adminDto.getAdminPwd(), + adminDto.getEmail(), + adminDto.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); diff --git a/src/test/java/com/moment/the/service/AnswerServiceTest.java b/src/test/java/com/moment/the/service/AnswerServiceTest.java index ad93ba4c..b651cc12 100644 --- a/src/test/java/com/moment/the/service/AnswerServiceTest.java +++ b/src/test/java/com/moment/the/service/AnswerServiceTest.java @@ -53,10 +53,10 @@ void adminSignUp(String adminId, String password, String adminName) throws Excep //test 편의를 위한 로그인 매서드 AdminDomain adminLogin(String adminId, String password) { - AdminDomain adminDomain = adminRepo.findByAdminIdAndAdminPwd(adminId, password); + AdminDomain adminDomain = adminRepo.findByEmailAndPassword(adminId, password); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDomain.getAdminId(), - adminDomain.getAdminPwd(), + adminDomain.getEmail(), + adminDomain.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); @@ -172,7 +172,7 @@ UncomfortableEntity createTable(){ //than assertEquals(answerResDto.getAnswerIdx(), savedAnswer.getAnswerIdx()); assertEquals(answerResDto.getTitle(), savedAnswer.getUncomfortableEntity().getContent()); - assertEquals(answerResDto.getWriter(), savedAnswer.getAdminDomain().getAdminName()); + assertEquals(answerResDto.getWriter(), savedAnswer.getAdminDomain().getName()); assertEquals(answerResDto.getContent(), savedAnswer.getAnswerContent()); } diff --git a/src/test/java/com/moment/the/service/ImprovementServiceTest.java b/src/test/java/com/moment/the/service/ImprovementServiceTest.java index 4c4a619a..f97def3c 100644 --- a/src/test/java/com/moment/the/service/ImprovementServiceTest.java +++ b/src/test/java/com/moment/the/service/ImprovementServiceTest.java @@ -51,10 +51,10 @@ void adminSignUp(String adminId, String password, String adminName) throws Excep // test 편의를 위한 로그인 매서드 AdminDomain adminLogin(String adminId, String password) throws Exception { - AdminDomain adminDomain = adminRepository.findByAdminId(adminId); + AdminDomain adminDomain = adminRepository.findByEmail(adminId); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( - adminDomain.getAdminId(), - adminDomain.getAdminPwd(), + adminDomain.getEmail(), + adminDomain.getPassword(), List.of(new SimpleGrantedAuthority("ROLE_USER"))); SecurityContext context = SecurityContextHolder.getContext(); context.setAuthentication(token); From 9de9ddaecef52345de83bb72deaf39ca41fc2fca Mon Sep 17 00:00:00 2001 From: siwony_ Date: Mon, 20 Sep 2021 00:05:54 +0900 Subject: [PATCH 17/21] =?UTF-8?q?Rename=20Erd=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20AnswerDomain=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/moment/the/answer/AnswerDomain.java | 32 +++++++------------ .../com/moment/the/answer/dto/AnswerDto.java | 2 +- .../the/answer/service/AnswerService.java | 2 +- .../moment/the/service/AnswerServiceTest.java | 12 +++---- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/moment/the/answer/AnswerDomain.java b/src/main/java/com/moment/the/answer/AnswerDomain.java index 9cc4835b..a4ee3d90 100644 --- a/src/main/java/com/moment/the/answer/AnswerDomain.java +++ b/src/main/java/com/moment/the/answer/AnswerDomain.java @@ -5,43 +5,35 @@ import com.moment.the.admin.AdminDomain; import com.moment.the.answer.dto.AnswerDto; import com.moment.the.uncomfortable.UncomfortableEntity; -import com.sun.istack.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; import javax.persistence.*; import static javax.persistence.FetchType.*; -@Table(name = "Answer") -@Entity -@Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor +@Entity @Table(name = "answer") +@Getter @Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class AnswerDomain { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "answer_id") private Long answerIdx; - @Column(length = 1000, nullable = false) - @NotNull - private String answerContent; + @Column(name = "content", length = 1000, nullable = false) + private String content; - @OneToOne(mappedBy = "answerDomain", fetch = LAZY) - @JoinColumn(name = "boardIdx", nullable = false) + @OneToOne(fetch = LAZY) + @JoinColumn(name = "uncomfortable_id", nullable = false) private UncomfortableEntity uncomfortableEntity; @ManyToOne(fetch = LAZY) - @JoinColumn(name="writer", nullable = false) + @JoinColumn(name="writer_admin_id", nullable = false) private AdminDomain adminDomain; // dirty checking. public void update(AnswerDto answerDto) { - this.answerContent = answerDto.getContent(); + this.content = answerDto.getContent(); } public void updateTableDomain(UncomfortableEntity uncomfortableEntity){ diff --git a/src/main/java/com/moment/the/answer/dto/AnswerDto.java b/src/main/java/com/moment/the/answer/dto/AnswerDto.java index 9238db6d..d5188351 100644 --- a/src/main/java/com/moment/the/answer/dto/AnswerDto.java +++ b/src/main/java/com/moment/the/answer/dto/AnswerDto.java @@ -17,7 +17,7 @@ public class AnswerDto { public AnswerDomain toEntity(){ return AnswerDomain.builder() - .answerContent(this.content) + .content(this.content) .adminDomain(this.adminDomain) .build(); } diff --git a/src/main/java/com/moment/the/answer/service/AnswerService.java b/src/main/java/com/moment/the/answer/service/AnswerService.java index 3d7e2370..fc989152 100644 --- a/src/main/java/com/moment/the/answer/service/AnswerService.java +++ b/src/main/java/com/moment/the/answer/service/AnswerService.java @@ -62,7 +62,7 @@ public AnswerResDto getThisAnswer(Long boardIdx) { AnswerResDto answerResDto = AnswerResDto.builder() .answerIdx(answerDomain.getAnswerIdx()) .title(answerDomain.getUncomfortableEntity().getContent()) - .content(answerDomain.getAnswerContent()) + .content(answerDomain.getContent()) .writer(answerDomain.getAdminDomain().getName()) .build(); diff --git a/src/test/java/com/moment/the/service/AnswerServiceTest.java b/src/test/java/com/moment/the/service/AnswerServiceTest.java index b651cc12..f91a8828 100644 --- a/src/test/java/com/moment/the/service/AnswerServiceTest.java +++ b/src/test/java/com/moment/the/service/AnswerServiceTest.java @@ -92,7 +92,7 @@ UncomfortableEntity createTable(){ AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); // Then - assertEquals(savedAnswer.getAnswerContent(), ANSWER_CONTENT); + assertEquals(savedAnswer.getContent(), ANSWER_CONTENT); assertEquals(savedAnswer.getUncomfortableEntity(), uncomfortableEntity); assertEquals(savedAnswer.getAdminDomain(), adminDomain); } @@ -140,16 +140,16 @@ UncomfortableEntity createTable(){ String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); - System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); + System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getContent()); // When String CHANGE_ANSWER_CONTENT = "그냥 드세요 요구하는게 있으면 잃는것도 있어야지!"; AnswerDto changeAnswerDto = new AnswerDto(CHANGE_ANSWER_CONTENT, null); answerService.updateThisAnswer(changeAnswerDto, savedAnswer.getAnswerIdx()); - System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); + System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getContent()); // Than - assertEquals(savedAnswer.getAnswerContent(), CHANGE_ANSWER_CONTENT); + assertEquals(savedAnswer.getContent(), CHANGE_ANSWER_CONTENT); } @Test @DisplayName("답변 보기 (view) 검증") @@ -164,7 +164,7 @@ UncomfortableEntity createTable(){ String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); - System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); + System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getContent()); // When AnswerResDto answerResDto = answerService.getThisAnswer(uncomfortableEntity.getBoardIdx()); @@ -173,7 +173,7 @@ UncomfortableEntity createTable(){ assertEquals(answerResDto.getAnswerIdx(), savedAnswer.getAnswerIdx()); assertEquals(answerResDto.getTitle(), savedAnswer.getUncomfortableEntity().getContent()); assertEquals(answerResDto.getWriter(), savedAnswer.getAdminDomain().getName()); - assertEquals(answerResDto.getContent(), savedAnswer.getAnswerContent()); + assertEquals(answerResDto.getContent(), savedAnswer.getContent()); } @Test @DisplayName("답변 삭제 (delete) 검증") From fe29b58c1ddbf3895c0431af0a78309ff50dc6ab Mon Sep 17 00:00:00 2001 From: siwony_ Date: Mon, 20 Sep 2021 00:30:17 +0900 Subject: [PATCH 18/21] =?UTF-8?q?Rename=20Erd=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20ImprovementDomain=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../the/improvement/ImprovementDomain.java | 31 +++++++++---------- .../the/improvement/dto/ImprovementDto.java | 18 +++++------ .../repository/ImprovementRepository.java | 2 +- .../service/ImprovementService.java | 2 +- .../service/ImprovementServiceTest.java | 8 ++--- .../the/service/ImprovementServiceTest.java | 24 +++++++------- 6 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/moment/the/improvement/ImprovementDomain.java b/src/main/java/com/moment/the/improvement/ImprovementDomain.java index c917dd47..554c9bfc 100644 --- a/src/main/java/com/moment/the/improvement/ImprovementDomain.java +++ b/src/main/java/com/moment/the/improvement/ImprovementDomain.java @@ -7,31 +7,30 @@ import javax.persistence.*; -@Table(name = "Improvement") -@Entity -@NoArgsConstructor -@AllArgsConstructor -@Getter -@Builder +@Entity @Table(name = "improvement") +@Getter @Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class ImprovementDomain { - @Id - @Column - @GeneratedValue(strategy = GenerationType.IDENTITY) + @JsonIgnore + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "improve_id") private Long improveIdx; - @Column - private String improveHeader; - @Column - private String improveContent; + + @Column(name = "title") + private String title; + + @Column(name = "content") + private String content; // 쿼리한번으로 improvement 정보만 가져오는 방법. @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name="adminIdx") + @JoinColumn(name = "admin_id") private AdminDomain adminDomain; // dirty checking. public void update(ImprovementDto improvementDto) { - this.improveHeader = improvementDto.getImproveHeader(); - this.improveContent = improvementDto.getImproveContent(); + this.title = improvementDto.getTitle(); + this.content = improvementDto.getContent(); } } diff --git a/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java b/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java index c165fcbe..93feb679 100644 --- a/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java +++ b/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java @@ -7,21 +7,21 @@ import javax.validation.constraints.NotBlank; -@Getter -@Setter +@Getter @Setter @Builder -@NoArgsConstructor -@AllArgsConstructor +@NoArgsConstructor @AllArgsConstructor public class ImprovementDto { + @NotBlank - private String improveHeader; + private String title; + @NotBlank - private String improveContent; + private String content; - public ImprovementDomain ToEntity(AdminDomain adminDomain){ + public ImprovementDomain toEntity(AdminDomain adminDomain){ return ImprovementDomain.builder() - .improveHeader(this.getImproveHeader()) - .improveContent(this.getImproveContent()) + .title(this.title) + .content(this.content) .adminDomain(adminDomain) .build(); } diff --git a/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java b/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java index 72405c63..eff69d1f 100644 --- a/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java +++ b/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java @@ -11,7 +11,7 @@ public interface ImprovementRepository extends JpaRepository improvementDomains = Stream.generate( () -> ImprovementDomain.builder() - .improveHeader("hello header") + .title("hello header") .improveContent("hello content") .build() ).limit(20).collect(Collectors.toList()); @@ -119,19 +119,19 @@ void saveImprovement(String header , String content) throws Exception { //Given saveImprovement("hello", "it's me"); System.out.println("======== save 완료 =========="); - Long currentIdx = improvementRepository.findByImproveContent("it's me").getImproveIdx(); + Long currentIdx = improvementRepository.findByTitle("it's me").getImproveIdx(); //Given ImprovementDto improvementDto = new ImprovementDto(); - improvementDto.setImproveHeader("이걸로 바꿀게용"); - improvementDto.setImproveContent("이걸로 한다고용"); + improvementDto.setTitle("이걸로 바꿀게용"); + improvementDto.setContent("이걸로 한다고용"); //When improvementService.updateThisImprovement(improvementDto, currentIdx); System.out.println("============= 업데이트 완료 ============"); //Then - assertEquals(false, improvementRepository.findByImproveContent("이걸로 한다고용") == null); + assertEquals(false, improvementRepository.findByTitle("이걸로 한다고용") == null); } @Test @@ -140,13 +140,13 @@ void saveImprovement(String header , String content) throws Exception { //Given saveImprovement("hello", "world"); System.out.println("========save 완료=========="); - Long delIdx = improvementRepository.findByImproveContent("world").getImproveIdx(); + Long delIdx = improvementRepository.findByTitle("world").getImproveIdx(); //When improvementService.deleteThisImprovement(delIdx); System.out.println("==========삭제 완료==========="); //Then - assertEquals(true, improvementRepository.findByImproveContent("world") == null); + assertEquals(true, improvementRepository.findByTitle("world") == null); } } From 9cc7a620b62529f5003f704236debed17c299c43 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Mon, 20 Sep 2021 01:05:57 +0900 Subject: [PATCH 19/21] . --- src/main/java/com/moment/the/answer/dto/AnswerResDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moment/the/answer/dto/AnswerResDto.java b/src/main/java/com/moment/the/answer/dto/AnswerResDto.java index 5cd650ae..b641772d 100644 --- a/src/main/java/com/moment/the/answer/dto/AnswerResDto.java +++ b/src/main/java/com/moment/the/answer/dto/AnswerResDto.java @@ -10,7 +10,7 @@ public class AnswerResDto { private Long answerIdx; private String title; - @JsonProperty("answerContent") + @JsonProperty("content") private String content; private String writer; From 134f23e09f0d2b1daf32662d1fe0bb7b18a948a1 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Mon, 20 Sep 2021 01:42:38 +0900 Subject: [PATCH 20/21] =?UTF-8?q?Rename=20Erd=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20ImprovementDomain=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../the/improvement/ImprovementDomain.java | 31 +++++++++---------- .../the/improvement/dto/ImprovementDto.java | 18 +++++------ .../dto/ImprovementViewAllDto.java | 4 +-- .../repository/ImprovementRepository.java | 2 +- .../service/ImprovementService.java | 2 +- .../service/ImprovementServiceTest.java | 8 ++--- .../the/service/ImprovementServiceTest.java | 26 ++++++++-------- 7 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/moment/the/improvement/ImprovementDomain.java b/src/main/java/com/moment/the/improvement/ImprovementDomain.java index c917dd47..554c9bfc 100644 --- a/src/main/java/com/moment/the/improvement/ImprovementDomain.java +++ b/src/main/java/com/moment/the/improvement/ImprovementDomain.java @@ -7,31 +7,30 @@ import javax.persistence.*; -@Table(name = "Improvement") -@Entity -@NoArgsConstructor -@AllArgsConstructor -@Getter -@Builder +@Entity @Table(name = "improvement") +@Getter @Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class ImprovementDomain { - @Id - @Column - @GeneratedValue(strategy = GenerationType.IDENTITY) + @JsonIgnore + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "improve_id") private Long improveIdx; - @Column - private String improveHeader; - @Column - private String improveContent; + + @Column(name = "title") + private String title; + + @Column(name = "content") + private String content; // 쿼리한번으로 improvement 정보만 가져오는 방법. @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name="adminIdx") + @JoinColumn(name = "admin_id") private AdminDomain adminDomain; // dirty checking. public void update(ImprovementDto improvementDto) { - this.improveHeader = improvementDto.getImproveHeader(); - this.improveContent = improvementDto.getImproveContent(); + this.title = improvementDto.getTitle(); + this.content = improvementDto.getContent(); } } diff --git a/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java b/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java index c165fcbe..93feb679 100644 --- a/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java +++ b/src/main/java/com/moment/the/improvement/dto/ImprovementDto.java @@ -7,21 +7,21 @@ import javax.validation.constraints.NotBlank; -@Getter -@Setter +@Getter @Setter @Builder -@NoArgsConstructor -@AllArgsConstructor +@NoArgsConstructor @AllArgsConstructor public class ImprovementDto { + @NotBlank - private String improveHeader; + private String title; + @NotBlank - private String improveContent; + private String content; - public ImprovementDomain ToEntity(AdminDomain adminDomain){ + public ImprovementDomain toEntity(AdminDomain adminDomain){ return ImprovementDomain.builder() - .improveHeader(this.getImproveHeader()) - .improveContent(this.getImproveContent()) + .title(this.title) + .content(this.content) .adminDomain(adminDomain) .build(); } diff --git a/src/main/java/com/moment/the/improvement/dto/ImprovementViewAllDto.java b/src/main/java/com/moment/the/improvement/dto/ImprovementViewAllDto.java index 01147af1..968107ed 100644 --- a/src/main/java/com/moment/the/improvement/dto/ImprovementViewAllDto.java +++ b/src/main/java/com/moment/the/improvement/dto/ImprovementViewAllDto.java @@ -12,7 +12,7 @@ public class ImprovementViewAllDto { @NotBlank private String improveIdx; @NotBlank - private String improveHeader; + private String title; @NotBlank - private String improveContent; + private String content; } diff --git a/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java b/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java index 72405c63..af954518 100644 --- a/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java +++ b/src/main/java/com/moment/the/improvement/repository/ImprovementRepository.java @@ -11,7 +11,7 @@ public interface ImprovementRepository extends JpaRepository improvementDomains = Stream.generate( () -> ImprovementDomain.builder() - .improveHeader("hello header") - .improveContent("hello content") + .title("hello header") + .content("hello content") .build() ).limit(20).collect(Collectors.toList()); @@ -119,19 +119,19 @@ void saveImprovement(String header , String content) throws Exception { //Given saveImprovement("hello", "it's me"); System.out.println("======== save 완료 =========="); - Long currentIdx = improvementRepository.findByImproveContent("it's me").getImproveIdx(); + Long currentIdx = improvementRepository.findByContent("it's me").getImproveIdx(); //Given ImprovementDto improvementDto = new ImprovementDto(); - improvementDto.setImproveHeader("이걸로 바꿀게용"); - improvementDto.setImproveContent("이걸로 한다고용"); + improvementDto.setTitle("이걸로 바꿀게용"); + improvementDto.setContent("이걸로 한다고용"); //When improvementService.updateThisImprovement(improvementDto, currentIdx); System.out.println("============= 업데이트 완료 ============"); //Then - assertEquals(false, improvementRepository.findByImproveContent("이걸로 한다고용") == null); + assertEquals(false, improvementRepository.findByContent("이걸로 한다고용") == null); } @Test @@ -140,13 +140,13 @@ void saveImprovement(String header , String content) throws Exception { //Given saveImprovement("hello", "world"); System.out.println("========save 완료=========="); - Long delIdx = improvementRepository.findByImproveContent("world").getImproveIdx(); + Long delIdx = improvementRepository.findByContent("world").getImproveIdx(); //When improvementService.deleteThisImprovement(delIdx); System.out.println("==========삭제 완료==========="); //Then - assertEquals(true, improvementRepository.findByImproveContent("world") == null); + assertEquals(true, improvementRepository.findByContent("world") == null); } } From 79a53829bd03d6d614d7c610311880de35f39221 Mon Sep 17 00:00:00 2001 From: siwony_ Date: Mon, 20 Sep 2021 02:21:09 +0900 Subject: [PATCH 21/21] =?UTF-8?q?Rename=20Erd=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20UncomfortableDomain=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/moment/the/answer/AnswerDomain.java | 10 ++--- .../answer/repository/AnswerRepository.java | 2 +- .../the/answer/service/AnswerService.java | 16 +++---- ...leEntity.java => UncomfortableDomain.java} | 25 ++++++----- .../dto/UncomfortableSetDto.java | 6 +-- .../repository/UncomfortableRepository.java | 20 ++++----- .../service/UncomfortableService.java | 14 +++--- .../release/UncomfortableControllerTest.java | 22 +++++----- .../moment/the/service/AnswerServiceTest.java | 40 ++++++++--------- .../the/service/UncomfortableServiceTest.java | 44 +++++++++---------- 10 files changed, 100 insertions(+), 99 deletions(-) rename src/main/java/com/moment/the/uncomfortable/{UncomfortableEntity.java => UncomfortableDomain.java} (58%) diff --git a/src/main/java/com/moment/the/answer/AnswerDomain.java b/src/main/java/com/moment/the/answer/AnswerDomain.java index 9cc4835b..3d40659f 100644 --- a/src/main/java/com/moment/the/answer/AnswerDomain.java +++ b/src/main/java/com/moment/the/answer/AnswerDomain.java @@ -4,7 +4,7 @@ import com.moment.the.admin.AdminDomain; import com.moment.the.answer.dto.AnswerDto; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.sun.istack.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; @@ -33,7 +33,7 @@ public class AnswerDomain { @OneToOne(mappedBy = "answerDomain", fetch = LAZY) @JoinColumn(name = "boardIdx", nullable = false) - private UncomfortableEntity uncomfortableEntity; + private UncomfortableDomain uncomfortableDomain; @ManyToOne(fetch = LAZY) @JoinColumn(name="writer", nullable = false) @@ -44,8 +44,8 @@ public void update(AnswerDto answerDto) { this.answerContent = answerDto.getContent(); } - public void updateTableDomain(UncomfortableEntity uncomfortableEntity){ - this.uncomfortableEntity = uncomfortableEntity; - this.uncomfortableEntity.updateAnswerDomain(this); + public void updateTableDomain(UncomfortableDomain uncomfortableDomain){ + this.uncomfortableDomain = uncomfortableDomain; + this.uncomfortableDomain.updateAnswerDomain(this); } } diff --git a/src/main/java/com/moment/the/answer/repository/AnswerRepository.java b/src/main/java/com/moment/the/answer/repository/AnswerRepository.java index a1c7c8e9..8ef40f18 100644 --- a/src/main/java/com/moment/the/answer/repository/AnswerRepository.java +++ b/src/main/java/com/moment/the/answer/repository/AnswerRepository.java @@ -14,5 +14,5 @@ public interface AnswerRepository extends JpaRepository { Optional findByAdminDomain(AdminDomain adminDomain); - AnswerDomain findTop1ByUncomfortableEntity_BoardIdx(Long boardIdx); + AnswerDomain findTop1ByUncomfortableDomain_uncomfortableIdx(Long uncomfortableIdx); } diff --git a/src/main/java/com/moment/the/answer/service/AnswerService.java b/src/main/java/com/moment/the/answer/service/AnswerService.java index 3d7e2370..b1088b70 100644 --- a/src/main/java/com/moment/the/answer/service/AnswerService.java +++ b/src/main/java/com/moment/the/answer/service/AnswerService.java @@ -8,7 +8,7 @@ import com.moment.the.answer.dto.AnswerResDto; import com.moment.the.answer.repository.AnswerRepository; import com.moment.the.exceptionAdvice.exception.*; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.moment.the.uncomfortable.repository.UncomfortableRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -24,8 +24,8 @@ public class AnswerService { // 답변 작성하기 public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { //예외 처리 - UncomfortableEntity uncomfortableEntity = tableFindBy(boardIdx); // table 번호로 찾고 없으면 Exception - boolean existAnswer = uncomfortableEntity.getAnswerDomain() != null; + UncomfortableDomain uncomfortableDomain = tableFindBy(boardIdx); // table 번호로 찾고 없으면 Exception + boolean existAnswer = uncomfortableDomain.getAnswerDomain() != null; if(existAnswer) throw new AnswerAlreadyExistsException(); //이미 답변이 있으면 Exception AdminDomain adminDomain = adminRepo.findByEmail(AdminServiceImpl.getUserEmail()); @@ -33,7 +33,7 @@ public AnswerDomain createThisAnswer(AnswerDto answerDto, Long boardIdx) { // AnswerDomain 생성 및 Table 과의 연관관계 맻음 answerDto.setAdminDomain(adminDomain); AnswerDomain saveAnswerDomain = answerDto.toEntity(); - saveAnswerDomain.updateTableDomain(uncomfortableEntity); + saveAnswerDomain.updateTableDomain(uncomfortableDomain); AnswerDomain savedAnswerDomain = answerRepo.save(saveAnswerDomain); @@ -57,11 +57,11 @@ public AnswerDomain updateThisAnswer(AnswerDto answerDto, Long answerIdx) { public AnswerResDto getThisAnswer(Long boardIdx) { // 해당 boardIdx를 참조하는 answerDomain 찾기. - AnswerDomain answerDomain = answerRepo.findTop1ByUncomfortableEntity_BoardIdx(boardIdx); + AnswerDomain answerDomain = answerRepo.findTop1ByUncomfortableDomain_uncomfortableIdx(boardIdx); AnswerResDto answerResDto = AnswerResDto.builder() .answerIdx(answerDomain.getAnswerIdx()) - .title(answerDomain.getUncomfortableEntity().getContent()) + .title(answerDomain.getUncomfortableDomain().getContent()) .content(answerDomain.getAnswerContent()) .writer(answerDomain.getAdminDomain().getName()) .build(); @@ -94,13 +94,13 @@ public AnswerDomain answerFindBy(AdminDomain adminDomain){ } // tableIdx 로 해당 table 찾기 - public UncomfortableEntity tableFindBy(Long tableId){ + public UncomfortableDomain tableFindBy(Long tableId){ return tableRepo.findById(tableId).orElseThrow(NoPostException::new); } public void deleteAnswer(AnswerDomain answerDomain){ Long answerIdx = answerDomain.getAnswerIdx(); - answerDomain.getUncomfortableEntity().updateAnswerDomain(null); // 외래키 제약조건으로 인한 오류 해결 + answerDomain.getUncomfortableDomain().updateAnswerDomain(null); // 외래키 제약조건으로 인한 오류 해결 answerRepo.deleteAllByAnswerIdx(answerIdx); } diff --git a/src/main/java/com/moment/the/uncomfortable/UncomfortableEntity.java b/src/main/java/com/moment/the/uncomfortable/UncomfortableDomain.java similarity index 58% rename from src/main/java/com/moment/the/uncomfortable/UncomfortableEntity.java rename to src/main/java/com/moment/the/uncomfortable/UncomfortableDomain.java index a1c1c052..42c003ab 100644 --- a/src/main/java/com/moment/the/uncomfortable/UncomfortableEntity.java +++ b/src/main/java/com/moment/the/uncomfortable/UncomfortableDomain.java @@ -7,20 +7,21 @@ import static javax.persistence.FetchType.*; -@Table(name = "Board") -@Entity -@Getter -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class UncomfortableEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long boardIdx; - @Column +@Entity @Table(name = "uncomfortable") +@Getter @Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor +public class UncomfortableDomain { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "uncomfortable_id") + private Long uncomfortableIdx; + + @Column(name = "content") private String content; - @Column + + @Column(name = "goods") private int goods; + @OneToOne(fetch = LAZY, cascade = CascadeType.ALL) private AnswerDomain answerDomain; diff --git a/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableSetDto.java b/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableSetDto.java index 230aafe4..330b96a2 100644 --- a/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableSetDto.java +++ b/src/main/java/com/moment/the/uncomfortable/dto/UncomfortableSetDto.java @@ -1,6 +1,6 @@ package com.moment.the.uncomfortable.dto; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -16,8 +16,8 @@ public class UncomfortableSetDto { @NotBlank private String content; - public UncomfortableEntity toEntity(){ - return UncomfortableEntity.builder() + public UncomfortableDomain toEntity(){ + return UncomfortableDomain.builder() .content(this.content) .build(); } diff --git a/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java b/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java index 00cdef60..92e1f725 100644 --- a/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java +++ b/src/main/java/com/moment/the/uncomfortable/repository/UncomfortableRepository.java @@ -1,6 +1,6 @@ package com.moment.the.uncomfortable.repository; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -11,22 +11,22 @@ import java.util.Optional; @Repository -public interface UncomfortableRepository extends JpaRepository{ +public interface UncomfortableRepository extends JpaRepository{ - Optional findByBoardIdx(Long boardIdx); + Optional findByUncomfortableIdx(Long UncomfortableIdx); - @Query(value = "SELECT COUNT(table.boardIdx) " + - "FROM UncomfortableEntity table" ) + @Query(value = "SELECT COUNT(table.uncomfortableIdx) " + + "FROM UncomfortableDomain table" ) Long amountUncomfortable(); - @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableResponseDto(table.boardIdx, table.content, table.goods, answer)" + - "FROM UncomfortableEntity table LEFT JOIN table.answerDomain answer " + - "ORDER BY table.boardIdx DESC " + @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableResponseDto(table.uncomfortableIdx, table.content, table.goods, answer)" + + "FROM UncomfortableDomain table LEFT JOIN table.answerDomain answer " + + "ORDER BY table.uncomfortableIdx DESC " ) List uncomfortableViewAll(); - @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableResponseDto(table.boardIdx, table.content, table.goods, answer)" + - "FROM UncomfortableEntity table LEFT JOIN table.answerDomain answer " + + @Query("SELECT new com.moment.the.uncomfortable.dto.UncomfortableResponseDto(table.uncomfortableIdx, table.content, table.goods, answer)" + + "FROM UncomfortableDomain table LEFT JOIN table.answerDomain answer " + "ORDER BY table.goods DESC " ) List uncomfortableViewTopBy(Pageable p); diff --git a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java index 4a32d63d..8189c1f6 100644 --- a/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java +++ b/src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java @@ -2,7 +2,7 @@ import com.moment.the.exceptionAdvice.exception.GoodsNotCancelException; import com.moment.the.exceptionAdvice.exception.NoPostException; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; import com.moment.the.uncomfortable.repository.UncomfortableRepository; @@ -28,7 +28,7 @@ public class UncomfortableService { * @return UncomfortableEntity */ @Transactional - public UncomfortableEntity createThisUncomfortable(UncomfortableSetDto uncomfortableSetDto){ + public UncomfortableDomain createThisUncomfortable(UncomfortableSetDto uncomfortableSetDto){ return uncomfortableRepository.save(uncomfortableSetDto.toEntity()); } @@ -54,8 +54,8 @@ public List getAllUncomfortable(){ */ @Transactional public void increaseLike(Long boardIdx){ - UncomfortableEntity uncomfortableEntity = uncomfortableRepository.findByBoardIdx(boardIdx).orElseThrow(NoPostException::new); - uncomfortableEntity.updateGoods(uncomfortableEntity.getGoods()+1); + UncomfortableDomain uncomfortableDomain = uncomfortableRepository.findByUncomfortableIdx(boardIdx).orElseThrow(NoPostException::new); + uncomfortableDomain.updateGoods(uncomfortableDomain.getGoods()+1); } /** @@ -64,11 +64,11 @@ public void increaseLike(Long boardIdx){ */ @Transactional public void decreaseLike(Long boardIdx) { - UncomfortableEntity uncomfortableEntity = uncomfortableRepository.findByBoardIdx(boardIdx).orElseThrow(NoPostException::new); - int goodsResult = uncomfortableEntity.getGoods() - 1; + UncomfortableDomain uncomfortableDomain = uncomfortableRepository.findByUncomfortableIdx(boardIdx).orElseThrow(NoPostException::new); + int goodsResult = uncomfortableDomain.getGoods() - 1; if(goodsResult > -1) {//좋야요가 양수일때 - uncomfortableEntity.updateGoods(goodsResult); + uncomfortableDomain.updateGoods(goodsResult); }else{ throw new GoodsNotCancelException(); } diff --git a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java index 40952ccb..5b2766cb 100644 --- a/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java +++ b/src/test/java/com/moment/the/controller/release/UncomfortableControllerTest.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.moment.the.uncomfortable.controller.UncomfortableController; -import com.moment.the.uncomfortable.UncomfortableEntity; import com.moment.the.response.ResponseService; import com.moment.the.uncomfortable.dto.UncomfortableResponseDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; @@ -99,8 +99,8 @@ String objectToJson(Object object) throws JsonProcessingException { .collect(Collectors.toList()); AtomicInteger i = new AtomicInteger(0); - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .goods(0) .content(TABLE_CONTENTS.get(i.getAndIncrement())) .build() @@ -126,8 +126,8 @@ String objectToJson(Object object) throws JsonProcessingException { void top30_검증() throws Exception { //Given AtomicInteger i = new AtomicInteger(1); - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .goods(i.getAndIncrement()) .content(RandomStringUtils.randomAlphabetic(15)) .build() @@ -152,10 +152,10 @@ String objectToJson(Object object) throws JsonProcessingException { @Test @DisplayName("[PUT]/v1/uncomfortable/{boardIdx} goods 추가") void goods_검증() throws Exception { //Given - UncomfortableEntity uncomfortableEntity = UncomfortableEntity.builder() + UncomfortableDomain uncomfortableDomain = UncomfortableDomain.builder() .content("학교 급식이 맛이 없어요") .build(); - Long tableIdx = tableRepo.save(uncomfortableEntity).getBoardIdx(); + Long tableIdx = tableRepo.save(uncomfortableDomain).getUncomfortableIdx(); //When resultActions = mockMvc.perform( @@ -173,11 +173,11 @@ String objectToJson(Object object) throws JsonProcessingException { @Test @DisplayName("[PUT]/v1/uncomfortable/cancel/{boardIdx} goods 감소") void goodCancel_검증() throws Exception { //Given - UncomfortableEntity uncomfortableEntity = UncomfortableEntity.builder() + UncomfortableDomain uncomfortableDomain = UncomfortableDomain.builder() .content("학교 급식이 맛이 없어요") .goods(1) .build(); - Long tableIdx = tableRepo.save(uncomfortableEntity).getBoardIdx(); + Long tableIdx = tableRepo.save(uncomfortableDomain).getUncomfortableIdx(); //When resultActions = mockMvc.perform( @@ -195,8 +195,8 @@ String objectToJson(Object object) throws JsonProcessingException { @Test @DisplayName("[GET]/v1/uncomfortable/amount ") void amountUncomfortable_검증() throws Exception { //Given - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .content(RandomStringUtils.randomAlphabetic(15)) .build() ).limit(8).collect(Collectors.toList()); diff --git a/src/test/java/com/moment/the/service/AnswerServiceTest.java b/src/test/java/com/moment/the/service/AnswerServiceTest.java index b651cc12..1406ff2c 100644 --- a/src/test/java/com/moment/the/service/AnswerServiceTest.java +++ b/src/test/java/com/moment/the/service/AnswerServiceTest.java @@ -9,7 +9,7 @@ import com.moment.the.answer.service.AnswerService; import com.moment.the.config.security.auth.MyUserDetailsService; import com.moment.the.admin.AdminDomain; -import com.moment.the.uncomfortable.UncomfortableEntity; +import com.moment.the.uncomfortable.UncomfortableDomain; import com.moment.the.admin.dto.AdminDto; import com.moment.the.uncomfortable.dto.UncomfortableSetDto; import com.moment.the.admin.repository.AdminRepository; @@ -65,11 +65,11 @@ AdminDomain adminLogin(String adminId, String password) { } //test 편의를 위한 Table 생성 메서드 - UncomfortableEntity createTable(){ + UncomfortableDomain createTable(){ String TABLE_CONTENT = "급식이 맛이 없어요 급식에 질을 높여주세요!"; UncomfortableSetDto uncomfortableSetDto = new UncomfortableSetDto(TABLE_CONTENT); - UncomfortableEntity uncomfortableEntity = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); - return uncomfortableEntity; + UncomfortableDomain uncomfortableDomain = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); + return uncomfortableDomain; } @Test @DisplayName("답변 작성하기 (save) 검증") @@ -82,18 +82,18 @@ UncomfortableEntity createTable(){ AdminDomain adminDomain = adminLogin(USER_ID, USER_PASSWORD); //Table 등록 - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); //answer 입력 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); // When - AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); // Then assertEquals(savedAnswer.getAnswerContent(), ANSWER_CONTENT); - assertEquals(savedAnswer.getUncomfortableEntity(), uncomfortableEntity); + assertEquals(savedAnswer.getUncomfortableDomain(), uncomfortableDomain); assertEquals(savedAnswer.getAdminDomain(), adminDomain); } @@ -107,19 +107,19 @@ UncomfortableEntity createTable(){ AdminDomain adminDomain = adminLogin(USER_ID, USER_PASSWORD); //Table 등록 - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); //answer 추가 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); // When String ONCE_MORE_ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto onceMoreAnswerDto = new AnswerDto(ONCE_MORE_ANSWER_CONTENT, null); AnswerAlreadyExistsException throwAtSaveMethod = assertThrows(AnswerAlreadyExistsException.class, - () -> answerService.createThisAnswer(onceMoreAnswerDto, uncomfortableEntity.getBoardIdx()) + () -> answerService.createThisAnswer(onceMoreAnswerDto, uncomfortableDomain.getUncomfortableIdx()) ); // then @@ -134,12 +134,12 @@ UncomfortableEntity createTable(){ //로그인 adminLogin(USER_ID, USER_PASSWORD); - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); // When @@ -155,7 +155,7 @@ UncomfortableEntity createTable(){ @Test @DisplayName("답변 보기 (view) 검증") void view_검증() throws Exception { // Given - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); // 답변 등록 adminSignUp(USER_ID, USER_PASSWORD, USER_NAME); // 답변 등록을 위한 회원가입 @@ -163,15 +163,15 @@ UncomfortableEntity createTable(){ String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); System.out.println("savedAnswer.getAnswerContent() = " + savedAnswer.getAnswerContent()); // When - AnswerResDto answerResDto = answerService.getThisAnswer(uncomfortableEntity.getBoardIdx()); + AnswerResDto answerResDto = answerService.getThisAnswer(uncomfortableDomain.getUncomfortableIdx()); //than assertEquals(answerResDto.getAnswerIdx(), savedAnswer.getAnswerIdx()); - assertEquals(answerResDto.getTitle(), savedAnswer.getUncomfortableEntity().getContent()); + assertEquals(answerResDto.getTitle(), savedAnswer.getUncomfortableDomain().getContent()); assertEquals(answerResDto.getWriter(), savedAnswer.getAdminDomain().getName()); assertEquals(answerResDto.getContent(), savedAnswer.getAnswerContent()); } @@ -188,12 +188,12 @@ UncomfortableEntity createTable(){ //로그인 adminLogin(USER_ID, USER_PASSWORD); - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); // When answerService.deleteThisAnswer(savedAnswer.getAnswerIdx()); @@ -227,12 +227,12 @@ UncomfortableEntity createTable(){ adminSignUp("adminB", "adminB_PW", "adminB"); - UncomfortableEntity uncomfortableEntity = createTable(); + UncomfortableDomain uncomfortableDomain = createTable(); // 답변 등록 String ANSWER_CONTENT = "급식이 맛이 없는 이유는 삼식이라 어쩔수 없어요~"; AnswerDto answerDto = new AnswerDto(ANSWER_CONTENT, null); - AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableEntity.getBoardIdx()); + AnswerDomain savedAnswer = answerService.createThisAnswer(answerDto, uncomfortableDomain.getUncomfortableIdx()); // When adminLogin(ADMIN_B_ID, ADMIN_B_PW); diff --git a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java index 07fab13c..e62ff1a6 100644 --- a/src/test/java/com/moment/the/service/UncomfortableServiceTest.java +++ b/src/test/java/com/moment/the/service/UncomfortableServiceTest.java @@ -46,8 +46,8 @@ public void cleanUp(){ .build(); // when - UncomfortableEntity writeTable = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); - UncomfortableEntity savedTable = tableRepo.findByBoardIdx(writeTable.getBoardIdx()).orElseThrow(() -> new IllegalArgumentException("Table을 찾을 수 없습니다. (테스트실패)")); + UncomfortableDomain writeTable = uncomfortableService.createThisUncomfortable(uncomfortableSetDto); + UncomfortableDomain savedTable = tableRepo.findByUncomfortableIdx(writeTable.getUncomfortableIdx()).orElseThrow(() -> new IllegalArgumentException("Table을 찾을 수 없습니다. (테스트실패)")); tableRepo.delete(savedTable); // then @@ -59,8 +59,8 @@ public void cleanUp(){ void TableService_top30View_검증(){ // Given AtomicInteger i = new AtomicInteger(1); - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .goods(i.getAndIncrement()) .content("TableService top30 보여주기 테스트") .build() @@ -85,8 +85,8 @@ public void cleanUp(){ @DisplayName("TableService viewAll 검증") void TableService_viewAll_검증(){ // Given - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .content("TableService viewAll 검증") .build() ).limit(10).collect(Collectors.toList()); @@ -105,8 +105,8 @@ public void cleanUp(){ @DisplayName("TableService 전체 개시글 수 보여주기 (amountUncomfortableView)검증") void TableService_amountUncomfortableView_검증(){ // Given - List uncomfortableEntities = Stream.generate( - () -> UncomfortableEntity.builder() + List uncomfortableEntities = Stream.generate( + () -> UncomfortableDomain.builder() .content("TableService amountUncomfortableView 검증") .build() ).limit(10).collect(Collectors.toList()); @@ -137,52 +137,52 @@ public void cleanUp(){ @DisplayName("TableService 좋아요 수 증가 로직 (goods) 검증") void TableService_goods_검증(){ // Given - UncomfortableEntity uncomfortableEntity = UncomfortableEntity.builder() + UncomfortableDomain uncomfortableDomain = UncomfortableDomain.builder() .content("TableService_goods_검증") .build(); // When - UncomfortableEntity savedUncomfortableEntity = tableRepo.save(uncomfortableEntity); - uncomfortableService.increaseLike(savedUncomfortableEntity.getBoardIdx()); - UncomfortableEntity savedGoodsUncomfortableEntity = tableRepo.findByBoardIdx(savedUncomfortableEntity.getBoardIdx()).orElseThrow(() -> new IllegalArgumentException("좋아요를 받은 TableEntity를 찾을 수 없습니다.")); + UncomfortableDomain savedUncomfortableDomain = tableRepo.save(uncomfortableDomain); + uncomfortableService.increaseLike(savedUncomfortableDomain.getUncomfortableIdx()); + UncomfortableDomain savedGoodsUncomfortableDomain = tableRepo.findByUncomfortableIdx(savedUncomfortableDomain.getUncomfortableIdx()).orElseThrow(() -> new IllegalArgumentException("좋아요를 받은 TableEntity를 찾을 수 없습니다.")); // Then - assertEquals(savedGoodsUncomfortableEntity.getGoods(), 1); + assertEquals(savedGoodsUncomfortableDomain.getGoods(), 1); } @Test @DisplayName("TableService 좋아요 수 감소 로직 (cancelGood) 검증") void TableService_cancelGood_검증(){ // Given - UncomfortableEntity uncomfortableEntity = UncomfortableEntity.builder() + UncomfortableDomain uncomfortableDomain = UncomfortableDomain.builder() .content("TableService_goods_검증") .goods(1) // 좋아요 한개 지급 .build(); // When - UncomfortableEntity savedUncomfortableEntity = tableRepo.save(uncomfortableEntity); - uncomfortableService.decreaseLike(savedUncomfortableEntity.getBoardIdx()); - UncomfortableEntity savedCancelGoodUncomfortableEntity = tableRepo.findByBoardIdx(savedUncomfortableEntity.getBoardIdx()).orElseThrow(() -> new IllegalArgumentException("좋아요를 취소한 TableEntity를 찾을 수 없습니다.")); + UncomfortableDomain savedUncomfortableDomain = tableRepo.save(uncomfortableDomain); + uncomfortableService.decreaseLike(savedUncomfortableDomain.getUncomfortableIdx()); + UncomfortableDomain savedCancelGoodUncomfortableDomain = tableRepo.findByUncomfortableIdx(savedUncomfortableDomain.getUncomfortableIdx()).orElseThrow(() -> new IllegalArgumentException("좋아요를 취소한 TableEntity를 찾을 수 없습니다.")); // Given - assertEquals(savedCancelGoodUncomfortableEntity.getGoods(), 0); + assertEquals(savedCancelGoodUncomfortableDomain.getGoods(), 0); } @Test @DisplayName("TableService 좋아요 수 감소 로직 (cancelGood) 음수가 될경우 exception 검증") void TableService_cancelGood_exception_검증() throws Exception { // Given - UncomfortableEntity uncomfortableEntity = UncomfortableEntity.builder() + UncomfortableDomain uncomfortableDomain = UncomfortableDomain.builder() .content("TableService_goods_검증") .goods(0) // 좋아요 0개 .build(); // When - UncomfortableEntity savedUncomfortableEntity = tableRepo.save(uncomfortableEntity); - System.out.println(savedUncomfortableEntity.getBoardIdx()); + UncomfortableDomain savedUncomfortableDomain = tableRepo.save(uncomfortableDomain); + System.out.println(savedUncomfortableDomain.getUncomfortableIdx()); assertThrows(GoodsNotCancelException.class, () ->{ - uncomfortableService.decreaseLike(savedUncomfortableEntity.getBoardIdx()); + uncomfortableService.decreaseLike(savedUncomfortableDomain.getUncomfortableIdx()); }); }