Skip to content

Pull request from unit_tests_org_folio_dataexp_service_logs_batch_16256a1f_1 into master #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khandramai merged 4 commits into from
Mar 11, 2026
Merged

Pull request from unit_tests_org_folio_dataexp_service_logs_batch_16256a1f_1 into master #645

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85a95f8
[chore] [mod-data-export] unit tests
aitestmate-epam Mar 6, 2026
ef80331
Merge branch 'master' into unit_tests_org_folio_dataexp_service_logs_…
khandramai Mar 11, 2026
0be7a4b
# Code formatting issues
khandramai Mar 11, 2026
d6c7256
Merge remote-tracking branch 'origin/unit_tests_org_folio_dataexp_ser…
khandramai Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions src/test/java/org/folio/dataexp/service/logs/ErrorLogServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static org.folio.dataexp.service.export.Constants.ID_KEY;
import static org.folio.dataexp.service.export.Constants.TITLE_KEY;
import static org.folio.dataexp.util.ErrorCode.ERROR_MESSAGE_JSON_CANNOT_BE_CONVERTED_TO_MARC;
import static org.folio.dataexp.util.ErrorCode.SOME_UUIDS_NOT_FOUND;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
Expand All @@ -16,6 +17,7 @@
import static org.mockito.Mockito.when;

import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
Expand Down Expand Up @@ -320,4 +322,85 @@ void saveWithAffectedRecordShouldSetEmptyInventoryLinkForDeletedRecord() {
assertEquals(instanceTitle, affectedRecord.getTitle());
verify(configurationService, never()).getValue(anyString());
}

@Test
@TestMate(name = "TestMate-8df560da94786686fc4858ef57a9e5ec")
@SneakyThrows
void saveGeneralErrorWithMessageValuesTest() {
// Given
var jobExecutionId = UUID.fromString("a890b134-736f-4e5a-8351-9c608f3a3a58");
var userId = UUID.fromString("b890b134-736f-4e5a-8351-9c608f3a3a59");
var jobProfileId = UUID.fromString("c890b134-736f-4e5a-8351-9c608f3a3a50");
when(folioExecutionContext.getUserId()).thenReturn(userId);
when(jobExecutionService.getById(jobExecutionId))
.thenReturn(new JobExecution().id(jobExecutionId).jobProfileId(jobProfileId));
when(jobProfileService.jobProfileExists(jobProfileId)).thenReturn(true);
var errorLogCaptor = ArgumentCaptor.forClass(ErrorLog.class);
when(objectMapper.writeValueAsString(errorLogCaptor.capture()))
.thenAnswer(invocation -> new ObjectMapper().writeValueAsString(invocation.getArgument(0)));
var errorMessageCode = ErrorCode.SOME_UUIDS_NOT_FOUND.getCode();
var errorMessageValues = List.of("uuid1", "uuid2");
// When
errorLogService.saveGeneralErrorWithMessageValues(
errorMessageCode, errorMessageValues, jobExecutionId);
// Then
verify(errorLogEntityCqlRepository)
.insertIfNotExists(
isA(UUID.class),
anyString(),
isA(Date.class),
eq(userId.toString()),
eq(jobExecutionId),
eq(jobProfileId));
var capturedErrorLog = errorLogCaptor.getValue();
assertEquals(jobExecutionId, capturedErrorLog.getJobExecutionId());
assertEquals(errorMessageCode, capturedErrorLog.getErrorMessageCode());
assertEquals(errorMessageValues, capturedErrorLog.getErrorMessageValues());
assertEquals(ErrorLog.LogLevelEnum.ERROR, capturedErrorLog.getLogLevel());
}

@Test
@TestMate(name = "TestMate-1da6299af83636050ba587663941e69d")
@SneakyThrows
void populateUuidsNotFoundErrorLogShouldCorrectlyFormatSingleUuid() {
// Given
var jobExecutionId = UUID.fromString("a890b134-736f-4e5a-8351-9c608f3a3a58");
var userId = UUID.fromString("b890b134-736f-4e5a-8351-9c608f3a3a59");
var jobProfileId = UUID.fromString("c890b134-736f-4e5a-8351-9c608f3a3a50");
when(errorLogEntityCqlRepository.getByJobExecutionIdAndErrorCode(
jobExecutionId, SOME_UUIDS_NOT_FOUND.getCode()))
.thenReturn(new ArrayList<>());
when(folioExecutionContext.getUserId()).thenReturn(userId);
when(jobExecutionService.getById(jobExecutionId))
.thenReturn(new JobExecution().id(jobExecutionId).jobProfileId(jobProfileId));
when(jobProfileService.jobProfileExists(jobProfileId)).thenReturn(true);
when(objectMapper.writeValueAsString(any(ErrorLog.class)))
.thenAnswer(
invocation -> {
var realObjectMapper = new ObjectMapper();
return realObjectMapper.writeValueAsString(invocation.getArgument(0));
});
var notFoundUuid = "a1b2c3d4-e5f6-7890-1234-567890abcdef";
var notFoundUuids = List.of(notFoundUuid);
var errorLogCaptor = ArgumentCaptor.forClass(String.class);
// When
errorLogService.populateUuidsNotFoundErrorLog(jobExecutionId, notFoundUuids);
// Then
verify(errorLogEntityCqlRepository)
.getByJobExecutionIdAndErrorCode(jobExecutionId, SOME_UUIDS_NOT_FOUND.getCode());
verify(errorLogEntityCqlRepository)
.insertIfNotExists(
isA(UUID.class),
errorLogCaptor.capture(),
isA(Date.class),
eq(userId.toString()),
eq(jobExecutionId),
eq(jobProfileId));
var realObjectMapper = new ObjectMapper();
var capturedErrorLog = realObjectMapper.readValue(errorLogCaptor.getValue(), ErrorLog.class);
assertEquals(SOME_UUIDS_NOT_FOUND.getCode(), capturedErrorLog.getErrorMessageCode());
assertEquals(jobExecutionId, capturedErrorLog.getJobExecutionId());
assertEquals(1, capturedErrorLog.getErrorMessageValues().size());
assertEquals(notFoundUuid, capturedErrorLog.getErrorMessageValues().get(0));
}
}
Loading