diff --git a/NEWS.md b/NEWS.md index b51e27c17..8f36a91b4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -21,6 +21,7 @@ * Fix generation of IDs ranges in Reindex Upload for Subject, Classification and Contributor ([MSEARCH-907](https://folio-org.atlassian.net/browse/MSEARCH-907)) * Remove browse config caching ([MSEARCH-897](https://folio-org.atlassian.net/browse/MSEARCH-897)) * Fix the "Invalid reference" appears after updating ownership ([MSEARCH-915](https://folio-org.atlassian.net/browse/MSEARCH-915)) +* 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 diff --git a/src/main/java/org/folio/search/service/reindex/jdbc/HoldingRepository.java b/src/main/java/org/folio/search/service/reindex/jdbc/HoldingRepository.java index 2bcabd2a4..9abc639a1 100644 --- a/src/main/java/org/folio/search/service/reindex/jdbc/HoldingRepository.java +++ b/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; """; diff --git a/src/main/java/org/folio/search/service/reindex/jdbc/ItemRepository.java b/src/main/java/org/folio/search/service/reindex/jdbc/ItemRepository.java index 1d2183f2d..a281853ff 100644 --- a/src/main/java/org/folio/search/service/reindex/jdbc/ItemRepository.java +++ b/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; """; diff --git a/src/main/java/org/folio/search/service/reindex/jdbc/MergeInstanceRepository.java b/src/main/java/org/folio/search/service/reindex/jdbc/MergeInstanceRepository.java index 0a2c5bb57..7bbf8da63 100644 --- a/src/main/java/org/folio/search/service/reindex/jdbc/MergeInstanceRepository.java +++ b/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> 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); } }