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 e1a5368  [DLAB-1679] Fixed bug with custom image creation
e1a5368 is described below

commit e1a5368da1805cb2c73f654e76055e7beabdb2c5
Author: Oleh Fuks <[email protected]>
AuthorDate: Thu Apr 2 12:00:13 2020 +0300

    [DLAB-1679] Fixed bug with custom image creation
---
 .../dlab/dto/exploratory/ExploratoryImageDTO.java  |  7 +++++++
 .../service/impl/ImageExploratoryServiceImpl.java  |  8 ++++++--
 .../epam/dlab/backendapi/util/RequestBuilder.java  |  5 +++--
 .../impl/ImageExploratoryServiceImplTest.java      | 24 ++++++++++++++++------
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
index 0dad8e4..b41f432 100644
--- 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
+++ 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryImageDTO.java
@@ -35,6 +35,8 @@ public class ExploratoryImageDTO extends 
ExploratoryActionDTO<ExploratoryImageDT
        private Map<String, String> tags;
        @JsonProperty("endpoint_name")
        private String endpoint;
+       @JsonProperty("conf_shared_image_enabled")
+       private String sharedImageEnabled;
 
        public ExploratoryImageDTO withImageName(String imageName) {
                this.imageName = imageName;
@@ -51,6 +53,11 @@ public class ExploratoryImageDTO extends 
ExploratoryActionDTO<ExploratoryImageDT
                return this;
        }
 
+       public ExploratoryImageDTO withSharedImageEnabled(String 
sharedImageEnabled) {
+               this.sharedImageEnabled = sharedImageEnabled;
+               return this;
+       }
+
        @Override
        public MoreObjects.ToStringHelper toStringHelper(Object self) {
                return super.toStringHelper(self)
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index 85ce534..5cb3a64 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -24,9 +24,11 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO;
 import com.epam.dlab.backendapi.dao.ExploratoryLibDAO;
 import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
 import com.epam.dlab.backendapi.domain.EndpointDTO;
+import com.epam.dlab.backendapi.domain.ProjectDTO;
 import com.epam.dlab.backendapi.resources.dto.ImageInfoRecord;
 import com.epam.dlab.backendapi.service.EndpointService;
 import com.epam.dlab.backendapi.service.ImageExploratoryService;
+import com.epam.dlab.backendapi.service.ProjectService;
 import com.epam.dlab.backendapi.util.RequestBuilder;
 import com.epam.dlab.constants.ServiceConsts;
 import com.epam.dlab.dto.UserInstanceDTO;
@@ -71,10 +73,12 @@ public class ImageExploratoryServiceImpl implements 
ImageExploratoryService {
        private RequestBuilder requestBuilder;
        @Inject
        private EndpointService endpointService;
+       @Inject
+       private ProjectService projectService;
 
        @Override
        public String createImage(UserInfo user, String project, String 
exploratoryName, String imageName, String imageDescription) {
-
+               ProjectDTO projectDTO = projectService.get(project);
                UserInstanceDTO userInstance = 
exploratoryDAO.fetchRunningExploratoryFields(user.getName(), project, 
exploratoryName);
 
                if (imageExploratoryDao.exist(imageName, 
userInstance.getProject())) {
@@ -105,7 +109,7 @@ public class ImageExploratoryServiceImpl implements 
ImageExploratoryService {
                EndpointDTO endpointDTO = 
endpointService.get(userInstance.getEndpoint());
                return provisioningService.post(endpointDTO.getUrl() + 
ExploratoryAPI.EXPLORATORY_IMAGE,
                                user.getAccessToken(),
-                               requestBuilder.newExploratoryImageCreate(user, 
userInstance, imageName, endpointDTO), String.class);
+                               requestBuilder.newExploratoryImageCreate(user, 
userInstance, imageName, endpointDTO, projectDTO), String.class);
        }
 
        @Override
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index 69aeb6c..afe06cd 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -509,7 +509,7 @@ public class RequestBuilder {
 
        @SuppressWarnings("unchecked")
        public <T extends ExploratoryImageDTO> T 
newExploratoryImageCreate(UserInfo userInfo, UserInstanceDTO userInstance,
-                                                                               
                                                           String imageName, 
EndpointDTO endpointDTO) {
+                                                                               
                                                           String imageName, 
EndpointDTO endpointDTO, ProjectDTO projectDTO) {
                
checkInappropriateCloudProviderOrElseThrowException(endpointDTO.getCloudProvider());
                return (T) newResourceSysBaseDTO(userInfo, 
endpointDTO.getCloudProvider(), ExploratoryImageDTO.class)
                                .withProject(userInstance.getProject())
@@ -519,7 +519,8 @@ public class RequestBuilder {
                                .withNotebookImage(userInstance.getImageName())
                                .withImageName(imageName)
                                .withEndpoint(userInstance.getEndpoint())
-                               .withTags(userInstance.getTags());
+                               .withTags(userInstance.getTags())
+                               
.withSharedImageEnabled(String.valueOf(projectDTO.isSharedImageEnabled()));
        }
 
        @SuppressWarnings("unchecked")
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
index 57d0284..b600879 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
@@ -24,8 +24,10 @@ import com.epam.dlab.backendapi.dao.ExploratoryDAO;
 import com.epam.dlab.backendapi.dao.ExploratoryLibDAO;
 import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
 import com.epam.dlab.backendapi.domain.EndpointDTO;
+import com.epam.dlab.backendapi.domain.ProjectDTO;
 import com.epam.dlab.backendapi.resources.dto.ImageInfoRecord;
 import com.epam.dlab.backendapi.service.EndpointService;
+import com.epam.dlab.backendapi.service.ProjectService;
 import com.epam.dlab.backendapi.util.RequestBuilder;
 import com.epam.dlab.cloud.CloudProvider;
 import com.epam.dlab.dto.UserInstanceDTO;
@@ -91,6 +93,8 @@ public class ImageExploratoryServiceImplTest {
        private RequestBuilder requestBuilder;
        @Mock
        private EndpointService endpointService;
+       @Mock
+       private ProjectService projectService;
 
        @InjectMocks
        private ImageExploratoryServiceImpl imageExploratoryService;
@@ -107,6 +111,7 @@ public class ImageExploratoryServiceImplTest {
 
        @Test
        public void createImage() {
+               
when(projectService.get(anyString())).thenReturn(getProjectDTO());
                when(exploratoryDAO.fetchRunningExploratoryFields(anyString(), 
anyString(), anyString())).thenReturn(userInstance);
                when(imageExploratoryDao.exist(anyString(), 
anyString())).thenReturn(false);
 
@@ -117,7 +122,7 @@ public class ImageExploratoryServiceImplTest {
                ExploratoryImageDTO eiDto = new ExploratoryImageDTO();
                
when(endpointService.get(anyString())).thenReturn(endpointDTO());
                
when(requestBuilder.newExploratoryImageCreate(any(UserInfo.class), 
any(UserInstanceDTO.class), anyString(),
-                               any(EndpointDTO.class))).thenReturn(eiDto);
+                               any(EndpointDTO.class), 
any(ProjectDTO.class))).thenReturn(eiDto);
 
                String expectedUuid = "someUuid";
                when(provisioningService.post(anyString(), anyString(), 
any(ExploratoryImageDTO.class), any()))
@@ -129,15 +134,16 @@ public class ImageExploratoryServiceImplTest {
                assertNotNull(actualUuid);
                assertEquals(expectedUuid, actualUuid);
 
+               verify(projectService).get(PROJECT);
                verify(exploratoryDAO).fetchRunningExploratoryFields(USER, 
PROJECT, EXPLORATORY_NAME);
                
verify(exploratoryDAO).updateExploratoryStatus(any(ExploratoryStatusDTO.class));
                verify(imageExploratoryDao).exist(imageName, PROJECT);
                verify(imageExploratoryDao).save(any(Image.class));
                verify(libDAO).getLibraries(USER, PROJECT, EXPLORATORY_NAME);
-               verify(requestBuilder).newExploratoryImageCreate(userInfo, 
userInstance, imageName, endpointDTO());
+               verify(requestBuilder).newExploratoryImageCreate(userInfo, 
userInstance, imageName, endpointDTO(), getProjectDTO());
                verify(endpointService).get(anyString());
                verify(provisioningService).post(endpointDTO().getUrl() + 
"exploratory/image", TOKEN, eiDto, String.class);
-               verifyNoMoreInteractions(exploratoryDAO, imageExploratoryDao, 
libDAO, requestBuilder, endpointService, provisioningService);
+               verifyNoMoreInteractions(projectService, exploratoryDAO, 
imageExploratoryDao, libDAO, requestBuilder, endpointService, 
provisioningService);
        }
 
        @Test
@@ -170,6 +176,7 @@ public class ImageExploratoryServiceImplTest {
 
        @Test
        public void 
createImageWhenMethodNewExploratoryImageCreateThrowsException() {
+               
when(projectService.get(anyString())).thenReturn(getProjectDTO());
                when(exploratoryDAO.fetchRunningExploratoryFields(anyString(), 
anyString(), anyString())).thenReturn(userInstance);
                when(imageExploratoryDao.exist(anyString(), 
anyString())).thenReturn(false);
 
@@ -178,7 +185,7 @@ public class ImageExploratoryServiceImplTest {
                
when(exploratoryDAO.updateExploratoryStatus(any(ExploratoryStatusDTO.class)))
                                .thenReturn(mock(UpdateResult.class));
                doThrow(new DlabException("Cannot create instance of resource 
class")).when(requestBuilder)
-                               .newExploratoryImageCreate(any(UserInfo.class), 
any(UserInstanceDTO.class), anyString(), any(EndpointDTO.class));
+                               .newExploratoryImageCreate(any(UserInfo.class), 
any(UserInstanceDTO.class), anyString(), any(EndpointDTO.class), 
any(ProjectDTO.class));
                
when(endpointService.get(anyString())).thenReturn(endpointDTO());
 
                String imageName = "someImageName", imageDescription = 
"someDescription";
@@ -188,14 +195,15 @@ public class ImageExploratoryServiceImplTest {
                        assertEquals("Cannot create instance of resource 
class", e.getMessage());
                }
 
+               verify(projectService).get(PROJECT);
                verify(exploratoryDAO).fetchRunningExploratoryFields(USER, 
PROJECT, EXPLORATORY_NAME);
                
verify(exploratoryDAO).updateExploratoryStatus(any(ExploratoryStatusDTO.class));
                verify(imageExploratoryDao).exist(imageName, PROJECT);
                verify(imageExploratoryDao).save(any(Image.class));
                verify(libDAO).getLibraries(USER, PROJECT, EXPLORATORY_NAME);
-               verify(requestBuilder).newExploratoryImageCreate(userInfo, 
userInstance, imageName, endpointDTO());
+               verify(requestBuilder).newExploratoryImageCreate(userInfo, 
userInstance, imageName, endpointDTO(), getProjectDTO());
                verify(endpointService).get(anyString());
-               verifyNoMoreInteractions(exploratoryDAO, imageExploratoryDao, 
libDAO, requestBuilder, endpointService);
+               verifyNoMoreInteractions(projectService, exploratoryDAO, 
imageExploratoryDao, libDAO, requestBuilder, endpointService);
        }
 
        @Test
@@ -337,4 +345,8 @@ public class ImageExploratoryServiceImplTest {
        private EndpointDTO endpointDTO() {
                return new EndpointDTO("test", "url", "", null, 
EndpointDTO.EndpointStatus.ACTIVE, CloudProvider.AWS);
        }
+
+       private ProjectDTO getProjectDTO() {
+               return ProjectDTO.builder().name(PROJECT).build();
+       }
 }


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

Reply via email to