From 8c88eed8579857d613f8eff6653ff89b882e0a08 Mon Sep 17 00:00:00 2001 From: Alexis Li Date: Wed, 19 Jan 2022 11:31:45 -0500 Subject: [PATCH 1/2] should index first_published_at for analysis and file centric --- .../AnalysisCentricElasticSearchAdapter.java | 11 +++++++++-- .../FileCentricElasticSearchAdapter.java | 11 +++++++++-- .../indexing/elasticsearch/SearchAdapterHelper.java | 6 ++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/AnalysisCentricElasticSearchAdapter.java b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/AnalysisCentricElasticSearchAdapter.java index cb027a7..032cc29 100644 --- a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/AnalysisCentricElasticSearchAdapter.java +++ b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/AnalysisCentricElasticSearchAdapter.java @@ -146,17 +146,24 @@ private List getAnalysisCentricDocuments( private UpdateRequest mapAnalysisToUpsertRepositoryQuery( AnalysisCentricDocument analysisCentricDocument) { val mapper = new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + val paramsBuilder = new HashMap(); paramsBuilder.put( "repository", mapper.convertValue(analysisCentricDocument.getRepositories().get(0), Map.class)); paramsBuilder.put("analysis_state", analysisCentricDocument.getAnalysisState()); paramsBuilder.put("updated_at", getDateIso(analysisCentricDocument.getUpdatedAt())); - if (analysisCentricDocument.getPublishedAt() - != null) { // Nullable as may not have been published + + if (analysisCentricDocument.getPublishedAt() != null) { + // Nullable as may not have been published paramsBuilder.put("published_at", getDateIso(analysisCentricDocument.getPublishedAt())); } + if (analysisCentricDocument.getFirstPublishedAt() != null) { + paramsBuilder.put( + "first_published_at", getDateIso(analysisCentricDocument.getFirstPublishedAt())); + } + val parameters = unmodifiableMap(paramsBuilder); val inline = getInline(parameters); diff --git a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/FileCentricElasticSearchAdapter.java b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/FileCentricElasticSearchAdapter.java index a9e25ff..1c66998 100644 --- a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/FileCentricElasticSearchAdapter.java +++ b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/FileCentricElasticSearchAdapter.java @@ -277,12 +277,19 @@ private UpdateRequest mapFileToUpsertRepositoryQuery(FileCentricDocument fileCen "repository", mapper.convertValue(fileCentricDocument.getRepositories().get(0), Map.class)); paramsBuilder.put("analysis_state", fileCentricDocument.getAnalysis().getAnalysisState()); paramsBuilder.put("updated_at", getDateIso(fileCentricDocument.getAnalysis().getUpdatedAt())); - if (fileCentricDocument.getAnalysis().getPublishedAt() - != null) { // Nullable as may not have been published + + if (fileCentricDocument.getAnalysis().getPublishedAt() != null) { + // Nullable as may not have been published paramsBuilder.put( "published_at", getDateIso(fileCentricDocument.getAnalysis().getPublishedAt())); } + if (fileCentricDocument.getAnalysis().getFirstPublishedAt() != null) { + paramsBuilder.put( + "first_published_at", + getDateIso(fileCentricDocument.getAnalysis().getFirstPublishedAt())); + } + val parameters = unmodifiableMap(paramsBuilder); val inline = getInlineForFile(parameters); diff --git a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/SearchAdapterHelper.java b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/SearchAdapterHelper.java index 5bb43a6..0b435d3 100644 --- a/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/SearchAdapterHelper.java +++ b/maestro-app/src/main/java/bio/overture/maestro/app/infra/adapter/outbound/indexing/elasticsearch/SearchAdapterHelper.java @@ -211,7 +211,8 @@ public static Script getInline(Map parameters) { "if (!ctx._source.repositories.contains(params.repository)) { ctx._source.repositories.add(params.repository) } \n" + "ctx._source.analysis_state = params.analysis_state;\n" + "ctx._source.updated_at = ZonedDateTime.parse(params.updated_at).toInstant().toEpochMilli();\n" - + "if (params.published_at != null) { ctx._source.published_at = ZonedDateTime.parse(params.published_at).toInstant().toEpochMilli(); }\n", + + "if (params.published_at != null) { ctx._source.published_at = ZonedDateTime.parse(params.published_at).toInstant().toEpochMilli(); }\n" + + "if (params.first_published_at != null) { ctx._source.first_published_at = ZonedDateTime.parse(params.first_published_at).toInstant().toEpochMilli(); }\n", parameters); return inline; } @@ -224,7 +225,8 @@ public static Script getInlineForFile(Map parameters) { "if (!ctx._source.repositories.contains(params.repository)) { ctx._source.repositories.add(params.repository) }\n" + "ctx._source.analysis.analysis_state = params.analysis_state;\n" + "ctx._source.analysis.updated_at = ZonedDateTime.parse(params.updated_at).toInstant().toEpochMilli();\n" - + "if (params.published_at != null) { ctx._source.analysis.published_at = ZonedDateTime.parse(params.published_at).toInstant().toEpochMilli(); }\n", + + "if (params.published_at != null) { ctx._source.analysis.published_at = ZonedDateTime.parse(params.published_at).toInstant().toEpochMilli(); }\n" + + "if (params.first_published_at != null) { ctx._source.analysis.first_published_at = ZonedDateTime.parse(params.first_published_at).toInstant().toEpochMilli(); }\n", parameters); return inline; } From 77ce2d2c281c385e4bfe14cab4e45e2bdeb34cb0 Mon Sep 17 00:00:00 2001 From: Alexis Li Date: Thu, 20 Jan 2022 16:07:30 -0500 Subject: [PATCH 2/2] Merge Back 3.11.0-SNAPSHOT --- .mvn/maven.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 44342c9..9234037 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,3 +1,3 @@ --Drevision=3.10.0 +-Drevision=3.11.0 -Dsha1= -Dchangelist=-SNAPSHOT