This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 79ca168  [DLAB-1510] All resources are stopped with project (#611)
79ca168 is described below

commit 79ca168350915db85b37a84b56f4267891cadd90
Author: Pavel Papou <[email protected]>
AuthorDate: Tue Mar 3 10:39:44 2020 -0500

    [DLAB-1510] All resources are stopped with project (#611)
    
    [DLAB-1510] All resources are stopped with project
---
 .../dlab/backendapi/resources/ProjectResource.java | 23 +----------------
 .../backendapi/resources/ProjectResourceTest.java  | 30 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index a93224c..06833ec 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@ -104,33 +104,12 @@ public class ProjectResource {
        @RolesAllowed("/api/project")
        public Response stopProject(@Parameter(hidden = true) @Auth UserInfo 
userInfo,
                                                                @NotNull @Valid 
ProjectActionFormDTO stopProjectDTO) {
-               projectService.stop(userInfo, stopProjectDTO.getEndpoints(), 
stopProjectDTO.getProjectName());
+               projectService.stopWithResources(userInfo, 
stopProjectDTO.getProjectName());
                return Response
                                .accepted()
                                .build();
        }
 
-       @Operation(summary = "Stop project on Manage environment popup", tags = 
"project")
-       @ApiResponses({
-                       @ApiResponse(responseCode = "202", description = 
"Project is stopping"),
-                       @ApiResponse(responseCode = "400", description = 
"Validation error", content = @Content(mediaType =
-                                       MediaType.APPLICATION_JSON,
-                                       schema = @Schema(implementation = 
ErrorDTO.class)))
-       })
-       @Path("managing/stop/{name}")
-       @POST
-       @Consumes(MediaType.APPLICATION_JSON)
-       @RolesAllowed("/api/project")
-       public Response stopProjectWithResources(@Parameter(hidden = true) 
@Auth UserInfo userInfo,
-                                                                               
         @Parameter(description = "Project name")
-                                                                               
         @PathParam("name") String name) {
-               projectService.stopWithResources(userInfo, name);
-               return Response
-                               .accepted()
-                               .build();
-       }
-
-
        @Operation(summary = "Get project info", tags = "project")
        @ApiResponses({
                        @ApiResponse(responseCode = "200", description = 
"Return information about project",
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
index c1df4c7..77ab8ad 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
@@ -2,6 +2,7 @@ package com.epam.dlab.backendapi.resources;
 
 import com.epam.dlab.auth.UserInfo;
 import com.epam.dlab.backendapi.resources.dto.KeysDTO;
+import com.epam.dlab.backendapi.resources.dto.ProjectActionFormDTO;
 import com.epam.dlab.backendapi.service.AccessKeyService;
 import com.epam.dlab.backendapi.service.ProjectService;
 import com.epam.dlab.exceptions.DlabException;
@@ -17,11 +18,14 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import java.util.Collections;
+
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+
 public class ProjectResourceTest extends TestBase {
     private ProjectService projectService = mock(ProjectService.class);
     private AccessKeyService keyService = mock(AccessKeyService.class);
@@ -30,7 +34,6 @@ public class ProjectResourceTest extends TestBase {
     public final ResourceTestRule resources = getResourceTestRuleInstance(
             new ProjectResource(projectService, keyService));
 
-
     @Before
     public void setup() throws AuthenticationException {
         authSetup();
@@ -51,12 +54,12 @@ public class ProjectResourceTest extends TestBase {
     }
 
     @Test
-    public void stopProjectWithResources() {
+    public void stopProject() {
         final Response response = resources.getJerseyTest()
-                .target("project/managing/stop/" + "projectName")
+                .target("project/stop")
                 .request()
                 .header("Authorization", "Bearer " + TOKEN)
-                .post(Entity.json(""));
+                .post(Entity.json(getProjectActionDTO()));
 
         assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus());
         verify(projectService).stopWithResources(any(UserInfo.class), 
anyString());
@@ -64,6 +67,19 @@ public class ProjectResourceTest extends TestBase {
     }
 
     @Test
+    public void startProject() {
+        final Response response = resources.getJerseyTest()
+                .target("project/start")
+                .request()
+                .header("Authorization", "Bearer " + TOKEN)
+                .post(Entity.json(getProjectActionDTO()));
+
+        assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus());
+        verify(projectService).start(any(UserInfo.class), anyList(), 
anyString());
+        verifyNoMoreInteractions(projectService);
+    }
+
+    @Test
     public void generate() {
         when(keyService.generateKeys(any(UserInfo.class))).thenReturn(new 
KeysDTO("somePublicKey", "somePrivateKey",
                 "user"));
@@ -98,4 +114,8 @@ public class ProjectResourceTest extends TestBase {
         verify(keyService).generateKeys(getUserInfo());
         verifyNoMoreInteractions(keyService);
     }
-}
\ No newline at end of file
+
+    private ProjectActionFormDTO getProjectActionDTO() {
+        return new ProjectActionFormDTO("DLAB", 
Collections.singletonList("https://localhost:8083/";));
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to