From aefcca2056a1d505176759f511ba58d163b63e40 Mon Sep 17 00:00:00 2001 From: Guillaume Poirier-Morency Date: Wed, 19 Jun 2024 17:03:30 -0700 Subject: [PATCH] Check if the latest event is a BatchInformationFetchingEvent for getDatasetHasBatchInformation() This allows a BatchInformationMissingEvent to take precedence. --- .../src/main/java/ubic/gemma/rest/DatasetsWebService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gemma-rest/src/main/java/ubic/gemma/rest/DatasetsWebService.java b/gemma-rest/src/main/java/ubic/gemma/rest/DatasetsWebService.java index 22ac309550..be9110b1d8 100644 --- a/gemma-rest/src/main/java/ubic/gemma/rest/DatasetsWebService.java +++ b/gemma-rest/src/main/java/ubic/gemma/rest/DatasetsWebService.java @@ -45,6 +45,8 @@ import ubic.gemma.core.search.SearchResult; import ubic.gemma.core.search.lucene.SimpleMarkdownFormatter; import ubic.gemma.model.analysis.expression.diff.DifferentialExpressionAnalysisValueObject; +import ubic.gemma.model.common.auditAndSecurity.AuditEvent; +import ubic.gemma.model.common.auditAndSecurity.eventType.BatchInformationEvent; import ubic.gemma.model.common.auditAndSecurity.eventType.BatchInformationFetchingEvent; import ubic.gemma.model.common.description.AnnotationValueObject; import ubic.gemma.model.common.description.Characteristic; @@ -909,7 +911,10 @@ public ResponseDataObject getDatasetHasBatchInformation( // Params: @PathParam("dataset") DatasetArg datasetArg // Required ) { ExpressionExperiment ee = datasetArgService.getEntity( datasetArg ); - return respond( this.auditEventService.hasEvent( ee, BatchInformationFetchingEvent.class ) ); + // BatchInformationEvent can either be BatchInformationFetchingEvent or BatchInformationMissingEvent, we + // consider the class of the latest one + AuditEvent event = this.auditEventService.getLastEvent( ee, BatchInformationEvent.class ); + return respond( event != null && event.getEventType() instanceof BatchInformationFetchingEvent ); } /**