Skip to content

Cleanup #275

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
mlm483 merged 2 commits into from
Jul 18, 2023
Merged

Cleanup #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be73324
[BI-1720] - renamed method
mlm483 Jul 18, 2023
0342789
[BI-1720] - removed unused methods
mlm483 Jul 18, 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
2 changes: 1 addition & 1 deletion src/main/java/org/breedinginsight/brapi/v2/StudyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public StudyController(BrAPIStudyService studyService, StudyQueryMapper studyQue
@Get("/programs/{programId}" + BrapiVersion.BRAPI_V2 + "/studies{?queryParams*}")
@Produces(MediaType.APPLICATION_JSON)
@ProgramSecured(roleGroups = {ProgramSecuredRoleGroup.ALL})
public HttpResponse<Response<DataResponse<List<BrAPIStudy>>>> getStudy(
public HttpResponse<Response<DataResponse<List<BrAPIStudy>>>> getStudies(
@PathVariable("programId") UUID programId,
@QueryValue @QueryValid(using = StudyQueryMapper.class) @Valid StudyQuery queryParams) {
try {
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIStudyDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,36 +163,4 @@ private Map<String,BrAPIStudy> processStudyForDisplay(List<BrAPIStudy> programSt
return programStudyMap;
}

public BrAPIStudy getStudyByUUID(String studyId, UUID programId) throws ApiException, DoesNotExistException {
Map<String, BrAPIStudy> cache = programStudyCache.get(programId);
BrAPIStudy study = null;
if (cache != null) {
study = cache.get(studyId);
}
if (study == null) {
throw new DoesNotExistException("UUID for this study does not exist");
}
return study;
}

public Optional<BrAPIStudy> getStudyByDBID(String studyDbId, UUID programId) throws ApiException {
Map<String, BrAPIStudy> cache = programStudyCache.get(programId);
//key is UUID, want to filter by DBID
BrAPIStudy study = null;
if (cache != null) {
study = cache.values().stream().filter(x -> x.getStudyDbId().equals(studyDbId)).collect(Collectors.toList()).get(0);
}
return Optional.ofNullable(study);
}

public List<BrAPIStudy> getStudiesByDBID(Collection<String> studyDbIds, UUID programId) throws ApiException {
Map<String, BrAPIStudy> cache = programStudyCache.get(programId);
//key is UUID, want to filter by DBID
List<BrAPIStudy> studies = new ArrayList<>();
if (cache != null) {
studies = cache.values().stream().filter(x -> studyDbIds.contains(x.getStudyDbId())).collect(Collectors.toList());
}
return studies;
}

}
9 changes: 0 additions & 9 deletions src/main/java/org/breedinginsight/brapi/v2/services/BrAPIStudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.brapi.client.v2.model.exceptions.ApiException;
import org.brapi.v2.model.core.BrAPIStudy;
import org.breedinginsight.brapi.v2.dao.BrAPIStudyDAO;
import org.breedinginsight.services.exceptions.DoesNotExistException;

import javax.inject.Inject;
import javax.inject.Singleton;
Expand All @@ -48,12 +47,4 @@ public List<BrAPIStudy> getStudies(UUID programId) throws ApiException {
}
}

public BrAPIStudy getStudyByUUID(UUID programId, String studyId) throws DoesNotExistException {
try {
return studyDAO.getStudyByUUID(studyId, programId);
} catch (ApiException e) {
throw new InternalServerException(e.getMessage(), e);
}
}

}