Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,10 @@ class RunnerControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$[0].security.default").value(ROLE_NONE))
.andExpect(jsonPath("$[0].security.accessControlList[0].role").value(ROLE_ADMIN))
.andExpect(jsonPath("$[0].security.accessControlList[0].id").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$[0].datasets.parameters[0].name").value(solutionParameterId2))
.andExpect(jsonPath("$[0].datasets.parameters[0].sourceName").value(TEST_FILE_NAME))
.andExpect(
jsonPath("$[0].datasets.parameters[0].type").value(DatasetPartTypeEnum.File.name))
.andExpect(jsonPath("$[1].id").value(secondRunnerId))
.andExpect(jsonPath("$[1].name").value(secondRunnerName))
.andExpect(jsonPath("$[1].createInfo.userId").value(PLATFORM_ADMIN_EMAIL))
Expand All @@ -487,6 +491,10 @@ class RunnerControllerTests : ControllerTestBase() {
.andExpect(jsonPath("$[1].security.default").value(ROLE_NONE))
.andExpect(jsonPath("$[1].security.accessControlList[0].role").value(ROLE_ADMIN))
.andExpect(jsonPath("$[1].security.accessControlList[0].id").value(PLATFORM_ADMIN_EMAIL))
.andExpect(jsonPath("$[1].datasets.parameters[0].name").value(solutionParameterId2))
.andExpect(jsonPath("$[1].datasets.parameters[0].sourceName").value(TEST_FILE_NAME))
.andExpect(
jsonPath("$[1].datasets.parameters[0].type").value(DatasetPartTypeEnum.File.name))
.andDo(MockMvcResultHandlers.print())
.andDo(document("organizations/{organization_id}/workspaces/{workspace_id}/runners/GET"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.core.io.InputStreamResource
import org.springframework.core.io.ResourceLoader
import org.springframework.http.MediaType
import org.springframework.mock.web.MockMultipartFile
import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.junit.jupiter.SpringExtension
Expand Down Expand Up @@ -348,6 +349,59 @@ class RunnerServiceIntegrationTest : CsmTestBase() {
}
}

@Test
fun `test datasets_parameters is listed into listRunners response`() {
val workspaceDatasetCreateRequest =
makeDataset(
name = "WorkspaceDataset",
parts =
mutableListOf(
DatasetPartCreateRequest(name = "defaultPart", sourceName = "test.txt")))
val workspaceDataset =
datasetApiService.createDataset(
organizationSaved.id,
workspaceSaved.id,
workspaceDatasetCreateRequest,
arrayOf(
MockMultipartFile(
"files",
"test.txt",
MediaType.MULTIPART_FORM_DATA_VALUE,
"test".toByteArray())))
workspaceSaved =
workspaceApiService.updateWorkspace(
organizationSaved.id,
workspaceSaved.id,
WorkspaceUpdateRequest(
solution =
WorkspaceSolution(
solutionId = solutionSaved.id,
datasetId = workspaceDataset.id,
defaultParameterValues =
mutableMapOf("param2" to workspaceDataset.parts[0].id))))
val runnerWithInheritedDatasetParameterCreateRequest =
makeRunnerCreateRequest(
name = "Runner_with_inherited_dataset_parameter",
datasetList = mutableListOf(datasetSaved.id))
val runnerWithInheritedDatasetParameter =
runnerApiService.createRunner(
organizationSaved.id,
workspaceSaved.id,
runnerWithInheritedDatasetParameterCreateRequest)

val runnerList =
runnerApiService.listRunners(organizationSaved.id, workspaceSaved.id, null, null)
assertEquals(3, runnerList.size)

val runnerFromList = runnerList.firstOrNull { it.id == runnerWithInheritedDatasetParameter.id }
assertNotNull(runnerFromList)
val runnerDatasetParameters = runnerFromList.datasets.parameters as MutableList<DatasetPart>
assertNotNull(runnerDatasetParameters)
assertEquals(1, runnerDatasetParameters.size)
assertEquals("test.txt", runnerDatasetParameters[0].sourceName)
assertEquals("param2", runnerDatasetParameters[0].name)
}

@Test
fun `test find All Runners with different pagination params`() {
val numberOfRunners = 20
Expand Down Expand Up @@ -2190,8 +2244,9 @@ class RunnerServiceIntegrationTest : CsmTestBase() {

fun makeDataset(
name: String = "name",
parts: MutableList<DatasetPartCreateRequest> = mutableListOf(),
): DatasetCreateRequest {
return DatasetCreateRequest(name)
return DatasetCreateRequest(name = name, parts = parts)
}

fun makeSolution(organizationId: String = organizationSaved.id): SolutionCreateRequest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,12 @@ class RunnerService(
.toList()
}
runners.forEach { it.security = updateSecurityVisibility(it).security }
runners.forEach { runner ->
val listDatasetParts =
datasetApiService.listDatasetParts(
organization!!.id, workspace!!.id, runner.datasets.parameter, null, null)
runner.apply { datasets.parameters = listDatasetParts as MutableList<Any>? }
}
return runners
}

Expand Down