Merge pull request #154 from aodn/bugs/5916-fix-fail-ingest

Fix bug on report incorrect status
aodn · Oct 18, 2024 · e91cbe9 · e91cbe9
2 parents 7e87e70 + 26be87f
commit e91cbe9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java b/indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java
@@ -485,7 +485,7 @@ public BulkResponse executeBulk(BulkRequest.Builder bulkRequest, Callback callba
     protected BulkResponse reduceResponse(BulkResponse in) {
         List<BulkResponseItem> errors = in.items()
                 .stream()
-                .filter(p -> p.status() != HttpStatus.CREATED.value())
+                .filter(p -> p.status() != HttpStatus.CREATED.value() || p.status() != HttpStatus.OK.value())
                 .toList();
 
         return errors.isEmpty() ?

diff --git a/indexer/src/test/java/au/org/aodn/esindexer/service/StacCollectionMapperServiceTests.java b/indexer/src/test/java/au/org/aodn/esindexer/service/StacCollectionMapperServiceTests.java
@@ -324,7 +324,7 @@ public void verifyPolygonMissingDimensionAttributeWorks() throws IOException, JS
     @Test
     public void verifyProviderNameNullWorks() throws IOException, JSONException {
         String xml = readResourceFile("classpath:canned/sample16.xml");
-        String expected = readResourceFile("classpath:canned/sample16.json");
+        String expected = readResourceFile("classpath:canned/sample16_stac.json");
         indexerService.indexMetadata(xml);
 
         verify(expected);
@@ -333,7 +333,7 @@ public void verifyProviderNameNullWorks() throws IOException, JSONException {
     @Test
     public void verifyCiRoleCodeNullWorks() throws IOException, JSONException {
         String xml = readResourceFile("classpath:canned/sample17.xml");
-        String expected = readResourceFile("classpath:canned/sample17.json");
+        String expected = readResourceFile("classpath:canned/sample17_stac.json");
         indexerService.indexMetadata(xml);
 
         verify(expected);

diff --git a/...r/src/test/resources/canned/sample16.json → .../test/resources/canned/sample16_stac.json b/...r/src/test/resources/canned/sample16.json → .../test/resources/canned/sample16_stac.json
diff --git a/...r/src/test/resources/canned/sample17.json → .../test/resources/canned/sample17_stac.json b/...r/src/test/resources/canned/sample17.json → .../test/resources/canned/sample17_stac.json