Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ibp 4552 fix missing env parameters #1123

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ibp 4552 fix missing env parameters #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a78e43
IBP-4552: fixed missing environment parameters in brapi request
lik-83 Aug 24, 2021
156964a
Merge branch 'master' of github.com:IntegratedBreedingPlatform/Middle…
lik-83 Aug 25, 2021
4a7e71f
IBP-4552: fixed unit test
lik-83 Aug 25, 2021
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
27 changes: 27 additions & 0 deletions src/main/java/org/generationcp/middleware/api/brapi/StudyServiceBrapiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ public List<StudyInstanceDto> getStudyInstancesWithMetadata(final StudySearchFil

environmentParameterVariables.addAll(this.createGeolocationVariables(environmentVariables, studyDbId));

this.addEnvironmentParameterVariablesWithoutValues(environmentParameterVariables, environmentVariables);

final List<EnvironmentParameter> environmentParameters = environmentParameterVariables.stream()
.map(EnvironmentParameter::new).collect(Collectors.toList());
studyInstanceDto.setEnvironmentParameters(environmentParameters);
Expand Down Expand Up @@ -599,4 +601,29 @@ private List<UserDto> getUsersForEnvironment(final Integer instanceId) {
return Collections.emptyList();
}

private void addEnvironmentParameterVariablesWithoutValues(final List<MeasurementVariable> environmentParameterVariables,
final List<MeasurementVariable> environmentVariables) {
// Filter standard environment factors
final List<Integer> filterVariables = Lists.newArrayList(
TermId.LOCATION_ID.getId(),
TermId.TRIAL_INSTANCE_FACTOR.getId(),
TermId.EXPERIMENT_DESIGN_FACTOR.getId());
//filter the variables already added
filterVariables.addAll(environmentParameterVariables.stream().map(MeasurementVariable::getTermId).collect(Collectors.toList()));

final List<MeasurementVariable> variables = environmentVariables
.stream()
.filter(measurementVariable -> !filterVariables.contains(measurementVariable.getTermId()))
.map(measurementVariable -> {
if (measurementVariable.getValue() == null) {
measurementVariable.setValue("");
}
return measurementVariable;
})
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(variables)) {
environmentParameterVariables.addAll(variables);
}
}

}
8 changes: 7 additions & 1 deletion src/test/java/org/generationcp/middleware/brapi/StudyServiceBrapiImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
import org.generationcp.middleware.service.api.study.EnvironmentParameter;
import org.generationcp.middleware.service.api.study.StudyDetailsDto;
import org.generationcp.middleware.service.api.study.StudyInstanceDto;
import org.generationcp.middleware.service.api.study.StudySearchFilter;
import org.generationcp.middleware.utils.test.IntegrationTestDataInitializer;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
Expand Down Expand Up @@ -182,7 +184,11 @@ public void testSaveStudyInstances_WithValidVariableHavingInvalidVariableValue()
.saveStudyInstances(this.cropType.getCropName(), Collections.singletonList(dto), this.testUser.getUserid()).get(0);
Assert.assertEquals(dto.getTrialDbId(), savedInstance.getTrialDbId());
Assert.assertEquals(dto.getLocationDbId(), savedInstance.getLocationDbId());
Assert.assertTrue(CollectionUtils.isEmpty(savedInstance.getEnvironmentParameters()));

assertThat(savedInstance.getEnvironmentParameters(), hasSize(1));
final EnvironmentParameter environmentParameter = savedInstance.getEnvironmentParameters().get(0);
assertThat(environmentParameter.getParameterPUI(), is(numericVariable.getCvTermId().toString()));
assertThat(environmentParameter.getValue(), is(""));
}

@Test
Expand Down