feat(indexing): Update tenant_id in database during event processing (#…

…730)

Closes: MSEARCH-877

(cherry picked from commit 3e306ed)

NEWS.md

@@ -1,7 +1,10 @@
 ## v4.0.6 2025-01-08
+### Bug fixes
+* Update tenant_id in database during event processing ([MSEARCH-877](https://folio-org.atlassian.net/browse/MSEARCH-877))
+* Fix an issue with interrupting the batch event processing due to SystemUserAuthorizationException ([MSEARCH-925](https://folio-org.atlassian.net/browse/MSEARCH-925))
+
 ### Tech Dept
 * Recreate upload ranges each upload execution ([MSEARCH-934](https://folio-org.atlassian.net/browse/MSEARCH-934))
-* Fix an issue with interrupting the batch event processing due to SystemUserAuthorizationException ([MSEARCH-925](https://folio-org.atlassian.net/browse/MSEARCH-925))
 
 ## v4.0.5 2025-01-03
 ### Bug fixes

src/main/java/org/folio/search/service/reindex/jdbc/HoldingRepository.java

@@ -20,6 +20,7 @@ public class HoldingRepository extends MergeRangeRepository {
       ON CONFLICT (id, tenant_id)
       DO UPDATE SET
       instance_id = EXCLUDED.instance_id,
+      tenant_id = EXCLUDED.tenant_id,
       json = EXCLUDED.json;
     """;
 

src/main/java/org/folio/search/service/reindex/jdbc/ItemRepository.java

@@ -21,6 +21,7 @@ ON CONFLICT (id, tenant_id)
       DO UPDATE SET
       instance_id = EXCLUDED.instance_id,
       holding_id = EXCLUDED.holding_id,
+      tenant_id = EXCLUDED.tenant_id,
       json = EXCLUDED.json;
     """;
 

src/main/java/org/folio/search/service/reindex/jdbc/MergeInstanceRepository.java

@@ -23,6 +23,7 @@ public class MergeInstanceRepository extends MergeRangeRepository {
       VALUES (?::uuid, ?, ?, ?, ?::jsonb)
       ON CONFLICT (id)
       DO UPDATE SET shared = EXCLUDED.shared,
+      tenant_id = EXCLUDED.tenant_id,
       is_bound_with = EXCLUDED.is_bound_with,
       json = EXCLUDED.json;
     """;
@@ -79,6 +80,6 @@ public void saveEntities(String tenantId, List<Map<String, Object>> entities) {
   public void updateBoundWith(String tenantId, String id, boolean bound) {
     var fullTableName = getFullTableName(context, entityTable());
     var sql = UPDATE_BOUND_WITH_SQL.formatted(fullTableName);
-    jdbcTemplate.update(sql, bound /*? "true" : "false"*/, id);
+    jdbcTemplate.update(sql, bound, id);
   }
 }