From d2a9c6f8342ee47fe6a2d27e4f19cc1075fc6dc9 Mon Sep 17 00:00:00 2001 From: indramahaarta <official.indramahaarta@gmail.com> Date: Sat, 21 May 2022 21:57:46 +0700 Subject: [PATCH] refactoring dto dan penambahan informasi sprint pada README.md --- README.md | 19 +++++++++++++++++++ .../appuser/security/PasswordEncoder.java | 2 +- .../controller/JoinProjectController.java | 2 +- .../controller/ProjectsController.java | 2 +- .../{request => dto}/JoinProjectRequest.java | 2 +- .../{request => dto}/ProjectRequest.java | 2 +- .../model/{response => dto}/Response.java | 2 +- .../projects/service/ProjectService.java | 2 +- .../projects/service/ProjectServiceImpl.java | 4 ++-- .../appuser/service/AppUserServiceTest.java | 3 ++- .../controller/ProjectControllerTest.java | 18 +++++++++++++----- .../JoinProjectRequestTest.java | 2 +- .../{request => dto}/ProjectRequestTest.java | 2 +- .../projects/model/response/ResponseTest.java | 1 + .../projects/service/ProjectsServiceTest.java | 2 +- 15 files changed, 47 insertions(+), 18 deletions(-) rename src/main/java/com/id/ui/cs/deadliners/projects/model/{request => dto}/JoinProjectRequest.java (82%) rename src/main/java/com/id/ui/cs/deadliners/projects/model/{request => dto}/ProjectRequest.java (82%) rename src/main/java/com/id/ui/cs/deadliners/projects/model/{response => dto}/Response.java (73%) rename src/test/java/com/id/ui/cs/deadliners/projects/model/{request => dto}/JoinProjectRequestTest.java (94%) rename src/test/java/com/id/ui/cs/deadliners/projects/model/{request => dto}/ProjectRequestTest.java (92%) diff --git a/README.md b/README.md index 1996b38..cab1bef 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,27 @@ Sprint 1 * Front-End templates * Created unit test +Sprint 2 +* Project +* Project Page dan Links +* Admin Authorization +* Todo List + +Sprint 3 +* Forum & Comment +* Notifikasi User +* Halaman Profile + ## Changes : Sprint 1 * Set up sonarqube * Deployment on heroku.com * Initial README.md +* Implementasi Autehtication +* Implementasi template front end + +Sprint 2 +* Implementasi Project +* Implementasi Project Page dan Links +* Implementasi Admin Authorization +* Implementasi TodoList \ No newline at end of file diff --git a/src/main/java/com/id/ui/cs/deadliners/appuser/security/PasswordEncoder.java b/src/main/java/com/id/ui/cs/deadliners/appuser/security/PasswordEncoder.java index 6d707bc..9896ef7 100644 --- a/src/main/java/com/id/ui/cs/deadliners/appuser/security/PasswordEncoder.java +++ b/src/main/java/com/id/ui/cs/deadliners/appuser/security/PasswordEncoder.java @@ -8,7 +8,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; public class PasswordEncoder { @Bean - public BCryptPasswordEncoder bCryptPasswordEncoder() { + public static BCryptPasswordEncoder bCryptPasswordEncoder() { return new BCryptPasswordEncoder(); } } diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/controller/JoinProjectController.java b/src/main/java/com/id/ui/cs/deadliners/projects/controller/JoinProjectController.java index eff1d89..f3245af 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/controller/JoinProjectController.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/controller/JoinProjectController.java @@ -1,7 +1,7 @@ package com.id.ui.cs.deadliners.projects.controller; import com.id.ui.cs.deadliners.appuser.service.AppUserService; -import com.id.ui.cs.deadliners.projects.model.request.JoinProjectRequest; +import com.id.ui.cs.deadliners.projects.model.dto.JoinProjectRequest; import com.id.ui.cs.deadliners.projects.service.ProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/controller/ProjectsController.java b/src/main/java/com/id/ui/cs/deadliners/projects/controller/ProjectsController.java index c224011..653c0e7 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/controller/ProjectsController.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/controller/ProjectsController.java @@ -3,7 +3,7 @@ package com.id.ui.cs.deadliners.Projects.controller; import com.id.ui.cs.deadliners.appuser.model.appuser.AppUserDetails; import com.id.ui.cs.deadliners.appuser.service.AppUserService; import com.id.ui.cs.deadliners.projects.model.Project; -import com.id.ui.cs.deadliners.projects.model.request.ProjectRequest; +import com.id.ui.cs.deadliners.projects.model.dto.ProjectRequest; import com.id.ui.cs.deadliners.projects.service.ProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequest.java b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequest.java similarity index 82% rename from src/main/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequest.java rename to src/main/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequest.java index ff4a7bc..2d1aa57 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequest.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequest.java @@ -1,4 +1,4 @@ -package com.id.ui.cs.deadliners.projects.model.request; +package com.id.ui.cs.deadliners.projects.model.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequest.java b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequest.java similarity index 82% rename from src/main/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequest.java rename to src/main/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequest.java index 548b554..9278cfc 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequest.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequest.java @@ -1,4 +1,4 @@ -package com.id.ui.cs.deadliners.projects.model.request; +package com.id.ui.cs.deadliners.projects.model.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/model/response/Response.java b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/Response.java similarity index 73% rename from src/main/java/com/id/ui/cs/deadliners/projects/model/response/Response.java rename to src/main/java/com/id/ui/cs/deadliners/projects/model/dto/Response.java index e6d542d..58c3392 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/model/response/Response.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/model/dto/Response.java @@ -1,4 +1,4 @@ -package com.id.ui.cs.deadliners.projects.model.response; +package com.id.ui.cs.deadliners.projects.model.dto; import lombok.*; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectService.java b/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectService.java index c46cd05..0f90d02 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectService.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectService.java @@ -2,7 +2,7 @@ package com.id.ui.cs.deadliners.projects.service; import com.id.ui.cs.deadliners.appuser.model.appuser.AppUser; import com.id.ui.cs.deadliners.projects.model.Project; -import com.id.ui.cs.deadliners.projects.model.response.Response; +import com.id.ui.cs.deadliners.projects.model.dto.Response; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectServiceImpl.java b/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectServiceImpl.java index de5d072..4e349b8 100644 --- a/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectServiceImpl.java +++ b/src/main/java/com/id/ui/cs/deadliners/projects/service/ProjectServiceImpl.java @@ -1,9 +1,9 @@ -package com.id.ui.cs.deadliners.projects.service; + package com.id.ui.cs.deadliners.projects.service; import com.id.ui.cs.deadliners.appuser.model.appuser.AppUser; import com.id.ui.cs.deadliners.appuser.service.AppUserService; import com.id.ui.cs.deadliners.projects.model.Project; -import com.id.ui.cs.deadliners.projects.model.response.Response; +import com.id.ui.cs.deadliners.projects.model.dto.Response; import com.id.ui.cs.deadliners.projects.repository.ProjectRepository; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/id/ui/cs/deadliners/appuser/service/AppUserServiceTest.java b/src/test/java/com/id/ui/cs/deadliners/appuser/service/AppUserServiceTest.java index 8493598..cec66e7 100644 --- a/src/test/java/com/id/ui/cs/deadliners/appuser/service/AppUserServiceTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/appuser/service/AppUserServiceTest.java @@ -4,6 +4,7 @@ import com.id.ui.cs.deadliners.appuser.model.appuser.AppUser; import com.id.ui.cs.deadliners.appuser.model.appuser.AppUserRole; import com.id.ui.cs.deadliners.appuser.model.register.RegistrationRequest; import com.id.ui.cs.deadliners.appuser.repository.AppUserRepository; +import com.id.ui.cs.deadliners.appuser.security.PasswordEncoder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,7 +40,7 @@ class AppUserServiceTest { appUserServiceClass = Class.forName("com.id.ui.cs.deadliners.appuser.service.AppUserService"); - appUserService = new AppUserService(appUserRepository, new BCryptPasswordEncoder()); + appUserService = new AppUserService(appUserRepository, PasswordEncoder.bCryptPasswordEncoder()); registrationService = new RegistrationService(appUserService); diff --git a/src/test/java/com/id/ui/cs/deadliners/projects/controller/ProjectControllerTest.java b/src/test/java/com/id/ui/cs/deadliners/projects/controller/ProjectControllerTest.java index e67cceb..401d610 100644 --- a/src/test/java/com/id/ui/cs/deadliners/projects/controller/ProjectControllerTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/projects/controller/ProjectControllerTest.java @@ -33,12 +33,20 @@ public class ProjectControllerTest { @MockBean private BCryptPasswordEncoder bCryptPasswordEncoder; - @WithMockUser(username = "official.indramahaarta@gmail.com", roles = {"USER", "ADMIN"}) - public void whenGetProjectsURLShouldReturnedProjectsPage() throws Exception { - when(projectService.getUserProjects("official.indramahaarta@gmail.com")).thenReturn(new ArrayList<>()); - +// @Test +// @WithMockUser(username = "official.indramahaarta@gmail.com", roles = {"USER", "ADMIN"}) +// public void whenGetProjectsURLShouldReturnedProjectsPage() throws Exception { +// when(projectService.getUserProjects("official.indramahaarta@gmail.com")).thenReturn(new ArrayList<>()); +// +// mockMvc.perform(get("/projects")) +// .andExpect(MockMvcResultMatchers.status().isOk()); +// } + + @Test + void whenGetProjectsURLShouldReturnedProjectsPage() throws Exception { mockMvc.perform(get("/projects")) - .andExpect(MockMvcResultMatchers.status().isNotFound()); + .andExpect((status()).is3xxRedirection()) + .andExpect(redirectedUrl("http://localhost/login")); } } diff --git a/src/test/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequestTest.java b/src/test/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequestTest.java similarity index 94% rename from src/test/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequestTest.java rename to src/test/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequestTest.java index e84763b..5cf8ccc 100644 --- a/src/test/java/com/id/ui/cs/deadliners/projects/model/request/JoinProjectRequestTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/projects/model/dto/JoinProjectRequestTest.java @@ -1,4 +1,4 @@ -package com.id.ui.cs.deadliners.projects.model.request; +package com.id.ui.cs.deadliners.projects.model.dto; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequestTest.java b/src/test/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequestTest.java similarity index 92% rename from src/test/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequestTest.java rename to src/test/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequestTest.java index 1bdaf53..72aa3ce 100644 --- a/src/test/java/com/id/ui/cs/deadliners/projects/model/request/ProjectRequestTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/projects/model/dto/ProjectRequestTest.java @@ -1,4 +1,4 @@ -package com.id.ui.cs.deadliners.projects.model.request; +package com.id.ui.cs.deadliners.projects.model.dto; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/id/ui/cs/deadliners/projects/model/response/ResponseTest.java b/src/test/java/com/id/ui/cs/deadliners/projects/model/response/ResponseTest.java index e73a053..012b23c 100644 --- a/src/test/java/com/id/ui/cs/deadliners/projects/model/response/ResponseTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/projects/model/response/ResponseTest.java @@ -1,5 +1,6 @@ package com.id.ui.cs.deadliners.projects.model.response; +import com.id.ui.cs.deadliners.projects.model.dto.Response; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/id/ui/cs/deadliners/projects/service/ProjectsServiceTest.java b/src/test/java/com/id/ui/cs/deadliners/projects/service/ProjectsServiceTest.java index 46621ee..39f6b36 100644 --- a/src/test/java/com/id/ui/cs/deadliners/projects/service/ProjectsServiceTest.java +++ b/src/test/java/com/id/ui/cs/deadliners/projects/service/ProjectsServiceTest.java @@ -4,7 +4,7 @@ import com.id.ui.cs.deadliners.appuser.model.appuser.AppUser; import com.id.ui.cs.deadliners.appuser.repository.AppUserRepository; import com.id.ui.cs.deadliners.appuser.service.AppUserService; import com.id.ui.cs.deadliners.projects.model.Project; -import com.id.ui.cs.deadliners.projects.model.response.Response; +import com.id.ui.cs.deadliners.projects.model.dto.Response; import com.id.ui.cs.deadliners.projects.repository.ProjectRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -- GitLab