Skip to content

Return released dates as part of complex details response #31

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

Draft
jmedinaebi wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Return released dates as part of complex details response #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion src/main/java/uk/ac/ebi/intact/service/complex/ws/ComplexManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@
import uk.ac.ebi.intact.dataexchange.psimi.solr.complex.ComplexSearchResults;
import uk.ac.ebi.intact.jami.dao.IntactDao;
import uk.ac.ebi.intact.jami.model.extension.IntactComplex;
import uk.ac.ebi.intact.jami.model.lifecycle.LifeCycleEvent;
import uk.ac.ebi.intact.jami.model.lifecycle.LifeCycleEventType;
import uk.ac.ebi.intact.service.complex.ws.model.ComplexDetails;
import uk.ac.ebi.intact.service.complex.ws.model.ComplexRestResult;
import uk.ac.ebi.intact.service.complex.ws.utils.IntactComplexUtils;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -64,6 +69,7 @@ public <ResultType> search(@PathVariable String <variable>) {
/* Private attributes */
/********************************/

private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");

private final DataProvider dataProvider;
private final IntactDao intactDao;
Expand Down Expand Up @@ -107,7 +113,8 @@ private ComplexDetails newComplexDetails(IntactComplex complex) {
.antagonists(IntactComplexUtils.getAntagonists(complex))
.comments(IntactComplexUtils.getComments(complex))
.predictedComplex(complex.isPredictedComplex())
.evidenceType(IntactComplexUtils.createEvidenceType(complex.getEvidenceType()));
.evidenceType(IntactComplexUtils.createEvidenceType(complex.getEvidenceType()))
.releaseDates(getReleaseDates(complex));
IntactComplexUtils.setParticipants(complex, details);
IntactComplexUtils.setCrossReferences(complex, details);
return details.build();
Expand Down Expand Up @@ -236,4 +243,14 @@ private ComplexFinderResult.PartialMatch<ComplexDetails> mapPartialMatch(
complexMatch.getProteinMissingInComplex(),
newComplexDetails(complexMatch.getComplex()));
}

private List<String> getReleaseDates(IntactComplex complex) {
return complex.getLifecycleEvents().stream()
.filter(event -> LifeCycleEventType.RELEASED.equals(event.getEvent()))
.map(LifeCycleEvent::getWhen)
.sorted()
.map(DATE_FORMAT::format)
.distinct()
.collect(Collectors.toList());
}
}
2 changes: 2 additions & 0 deletions src/main/java/uk/ac/ebi/intact/service/complex/ws/model/ComplexDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import lombok.Value;

import java.util.Collection;
import java.util.List;

/**
* This class is to map the details of a complex retrieved from the DB
Expand Down Expand Up @@ -39,4 +40,5 @@ public class ComplexDetails {
Collection<String> comments;
boolean predictedComplex;
ComplexDetailsEvidenceType evidenceType;
List<String> releaseDates;
}