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 @@ -17,13 +17,19 @@
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.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

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

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

private final DataProvider dataProvider;
private final IntactDao intactDao;
Expand Down Expand Up @@ -107,7 +115,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 +245,35 @@ 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(this::getReleaseDate)
.filter(Objects::nonNull)
.sorted()
.map(DATE_FORMAT::format)
.distinct()
.collect(Collectors.toList());
}

private Date getReleaseDate(LifeCycleEvent lifeCycleEvent) {
String dateString = lifeCycleEvent.getNote().replaceAll("release_", "");
Date date = safeParseDate(DATE_FORMAT, dateString);
if (date == null) {
date = safeParseDate(DATE_FORMAT_OLD, dateString);
if (date == null) {
date = lifeCycleEvent.getWhen();
}
}
return date;
}

private Date safeParseDate(DateFormat dateFormat, String dateString) {
try {
return dateFormat.parse(dateString);
} catch (Throwable e1) {
return null;
}
}
}
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;
}