From 7c7ad61397f707db65b48d80c0c94fb46ba2dc8e Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Fri, 15 May 2026 13:37:15 +0700 Subject: [PATCH] dev add field locale for get info for view doc --- .../nocopy/service/dockview/DockViewService.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java index 2810f9e..f5cdb0c 100644 --- a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java +++ b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java @@ -159,21 +159,14 @@ public class DockViewService { List history = new ArrayList<>(); for (DockView dockView: dockViews) { - String country = geoCountryService.getCountryByIp(dockView.getViewerIp(), locale); - String city = geoCountryService.getCityByIp(dockView.getViewerIp(), locale); + String country = locale.equals("en") ? dockView.getGeoNameEn(): dockView.getGeoNameRu(); LocalDateTime createdAt = dockView.getCreatedAt(); - String fileId = dockView.getFileId(); - - FileEntity file = fileEntityRepository.findByFileId(fileId); - Long viewerId = dockView.getViewerId(); - User viewer = userRepository.findById(viewerId).orElse(null); DockViewResponse response = DockViewResponse.builder() - .city(city) .country(country) .viewDate(createdAt) - .document(file.getOriginalFileName()) - .viewer(viewer == null ? "guest" : viewer.getFullName()) + .document(dockView.getDocName()) + .viewer(dockView.getViewerName()) .build(); history.add(response);