diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java index d27c9fc46d8..52d183080d8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java @@ -247,7 +247,8 @@ public DocumentData getOutputTemplateLocation(String importDocumentId) { final ImportTemplateLocationMapper importTemplateLocationMapper = new ImportTemplateLocationMapper(); final String sql = "select " + importTemplateLocationMapper.schema(); - return this.jdbcTemplate.queryForObject(sql, importTemplateLocationMapper, new Object[] { Integer.parseInt(importDocumentId) }); // NOSONAR + // Changed Integer.parseInt to Long.valueOf to support BIGINT and fix Postgres type mismatch + return this.jdbcTemplate.queryForObject(sql, importTemplateLocationMapper, new Object[] { Long.valueOf(importDocumentId) }); // NOSONAR } @Override @@ -255,7 +256,11 @@ public Response getOutputTemplate(String importDocumentId) { this.securityContext.authenticatedUser(); final ImportTemplateLocationMapper importTemplateLocationMapper = new ImportTemplateLocationMapper(); final String sql = "select " + importTemplateLocationMapper.schema(); - DocumentData documentData = this.jdbcTemplate.queryForObject(sql, importTemplateLocationMapper, new Object[] { importDocumentId }); // NOSONAR + + // Wrapped importDocumentId in Long.valueOf() to prevent Postgres "bigint = character varying" error + DocumentData documentData = this.jdbcTemplate.queryForObject(sql, importTemplateLocationMapper, + new Object[] { Long.valueOf(importDocumentId) }); // NOSONAR + return buildResponse(documentData); } diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImplTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImplTest.java new file mode 100644 index 00000000000..bd0bd9f7a64 --- /dev/null +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImplTest.java @@ -0,0 +1,74 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.infrastructure.bulkimport.service; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.apache.fineract.infrastructure.documentmanagement.data.DocumentData; +import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; + +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) +class BulkImportWorkbookServiceImplTest { + + @Mock + private JdbcTemplate jdbcTemplate; + + @Mock + private PlatformSecurityContext securityContext; + + @InjectMocks + private BulkImportWorkbookServiceImpl bulkImportWorkbookService; + + @Test + void getOutputTemplateLocation_ConvertsToLong() { + String importId = "456"; + Long expectedLongId = 456L; + DocumentData mockData = new DocumentData(null, null, null, null, "test.xls", null, null, "loc", null, null); + when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object[].class))).thenReturn(mockData); + + bulkImportWorkbookService.getOutputTemplateLocation(importId); + + verify(jdbcTemplate).queryForObject(any(String.class), any(RowMapper.class), eq(new Object[] { expectedLongId })); + } + + @Test + void getOutputTemplate_ConvertsToLong() { + String importId = "123"; + Long expectedLongId = 123L; + DocumentData mockData = new DocumentData(null, null, null, null, "test.xls", null, null, "loc", null, null); + when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object[].class))).thenReturn(mockData); + + bulkImportWorkbookService.getOutputTemplate(importId); + + verify(jdbcTemplate).queryForObject(any(String.class), any(RowMapper.class), eq(new Object[] { expectedLongId })); + } +}