From 9e7f8bcdd8d1ca7e79635c30757247a0b40311d9 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 6 May 2025 13:54:15 +0300 Subject: [PATCH 1/3] SUPPORT-9156: cut duplicate --- .../ru/micord/ervu/journal/JournalDto.java | 10 ++++++++ .../ervu/journal/mapper/JournalDtoMapper.java | 23 +++++++++++-------- .../JournalInMemoryStaticGridLoadService.java | 3 +++ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java index 413d5fd1..6adc2e2f 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java +++ b/backend/src/main/java/ru/micord/ervu/journal/JournalDto.java @@ -2,6 +2,7 @@ package ru.micord.ervu.journal; public class JournalDto { + private String fileId; private String departureDateTime; private String fileName; private Integer filePatternCode; @@ -19,6 +20,15 @@ public class JournalDto { return this; } + public String getFileId() { + return fileId; + } + + public JournalDto setFileId(String fileId) { + this.fileId = fileId; + return this; + } + public String getFileName() { return fileName; } diff --git a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java index 63c3dfec..86bf1ef9 100644 --- a/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java +++ b/backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java @@ -14,15 +14,17 @@ public class JournalDtoMapper { public static JournalDto mapToJournalDto(JournalFileInfo journalFileInfo) { SenderInfo senderInfo = journalFileInfo.getSenderInfo(); return new JournalDto() - .setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString()) - .setFileName(journalFileInfo.getFileName()) - .setFilePatternCode(journalFileInfo.getFilePatternCode()) - .setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(), - senderInfo.getLastName()) - ) - .setStatus(journalFileInfo.getFileStatus().getStatus()) - .setFilesSentCount(journalFileInfo.getRowsCount()) - .setAcceptedFilesCount(journalFileInfo.getRowsSuccess()); + .setFileId(journalFileInfo.getFileId()) + .setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString()) + .setFileName(journalFileInfo.getFileName()) + .setFilePatternCode(journalFileInfo.getFilePatternCode()) + .setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(), + senderInfo.getLastName() + ) + ) + .setStatus(journalFileInfo.getFileStatus().getStatus()) + .setFilesSentCount(journalFileInfo.getRowsCount()) + .setAcceptedFilesCount(journalFileInfo.getRowsSuccess()); } public static JournalDto mapToJournalDto(InteractionLogRecord record) { @@ -33,6 +35,7 @@ public class JournalDtoMapper { .setSenderFio(record.getSender()) .setStatus(record.getStatus()) .setFilesSentCount(record.getRecordsSent()) - .setAcceptedFilesCount(record.getRecordsAccepted()); + .setAcceptedFilesCount(record.getRecordsAccepted()) + .setFileId(record.getFileId()); } } diff --git a/backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java b/backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java index ad4e5aca..43cc0983 100644 --- a/backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java +++ b/backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java @@ -3,6 +3,7 @@ package ru.micord.ervu.service.grid.impl; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import java.util.HashSet; import java.util.Optional; import java.util.stream.Stream; @@ -74,7 +75,9 @@ public class JournalInMemoryStaticGridLoadService implements throw new JsonParsingException("Failed to parse JournalFileDataResponse.", e); } + HashSet seenFileIds = new HashSet<>(); return Stream.concat(dbJournalList.stream(), ervuJournalList.stream()) + .filter(journal -> seenFileIds.add(journal.getFileId())) .sorted(Comparator.comparing(JournalDto::getDepartureDateTime)) .toList(); } From 812965593f7211d00a755b633320f8437ff3d41b Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Tue, 6 May 2025 10:22:08 +0300 Subject: [PATCH 2/3] SUPPORT-9155: fix auth --- frontend/src/ts/modules/security/guard/auth.guard.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/ts/modules/security/guard/auth.guard.ts b/frontend/src/ts/modules/security/guard/auth.guard.ts index 15bef83e..dc5fa3e7 100644 --- a/frontend/src/ts/modules/security/guard/auth.guard.ts +++ b/frontend/src/ts/modules/security/guard/auth.guard.ts @@ -58,6 +58,7 @@ export abstract class AuthGuard implements CanActivate { let consoleError = error + ', error description = ' + errorDescription; this.messageService.error(errorMessage); console.error(consoleError); + return false; } if (code && state) { const params = new HttpParams().set('code', code).set('state', state); From 40ed04a607b15c4827098cce3ca5250d1e5f2a50 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 12 May 2025 17:11:01 +0300 Subject: [PATCH 3/3] SUPPORT-9168 progress bar --- frontend/src/resources/css/inbox-lkrp.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 9a4b45f7..fd236217 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -380,8 +380,8 @@ body.webbpm.ervu_lkrp_ul { .webbpm.ervu_lkrp_ul .loader { font-size: 15px; - left: calc(50% - 50px); - top: calc(50% - 50px); + left: calc(50% - 0.4em); + top: calc(50% - 0.4em); width: 0.8em; height: 0.8em; border-radius: 50%;