Skip to content

BI-1779 - Import germplasm with unspecified breeding method #251

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

Merged
timparsons merged 3 commits into from
May 9, 2023
Merged

BI-1779 - Import germplasm with unspecified breeding method #251

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
dff2ea1
[BI-1779] Removing ability to enable/disable system breeding methods …
timparsons May 4, 2023
54c3812
[BI-1779] Disabling system breeding method unit tests
timparsons May 4, 2023
91414fb
[BI-1779] Changing annotation used to disable tests
timparsons May 4, 2023
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
4 changes: 3 additions & 1 deletion src/main/java/org/breedinginsight/api/v1/controller/BreedingMethodController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ public HttpResponse<Response<ProgramBreedingMethodEntity>> updateProgramBreeding
}

@Put("programs/{programId}/breeding-methods/enable")
@ProgramSecured(roles = {ProgramSecuredRole.BREEDER})
// BI-1779 - Removing the ability to choose predefined methods for a program until we make the germplasm import template dynamically generated
// @ProgramSecured(roles = {ProgramSecuredRole.BREEDER})
@Secured(SecurityRule.DENY_ALL)
public HttpResponse enableSystemBreedingMethods(@PathVariable UUID programId, @Body List<UUID> systemBreedingMethodIds) throws ApiException, BadRequestException {
log.debug("enabling system breeding methods for program: "+programId);

Expand Down
2 changes: 2 additions & 0 deletions ...t/java/org/breedinginsight/api/v1/controller/BreedingMethodControllerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public void fetchMethodsForNewProgram() {
.collect(Collectors.toList())));
}

@Disabled //BI-1779 - Removing the ability to choose predefined methods for a program until we make the germplasm import template dynamically generated
@Test
public void enableSystemMethods() {
Program program = createProgram("enableProgramBM", "EBM", "ENBM");
Expand Down Expand Up @@ -498,6 +499,7 @@ public void tryDeleteProgramMethodInUse() throws ApiException {
assertThat(programMethods.stream().map(ProgramBreedingMethodEntity::getId).collect(Collectors.toList()), hasItem(createdMethod.getId()));
}

@Disabled //BI-1779 - Removing the ability to choose predefined methods for a program until we make the germplasm import template dynamically generated
@Test
public void tryDisableSystemMethodInUse() {
Program program = createProgram("tryDeleteSystemBM", "TDSBM", "TRDSBM");
Expand Down