This commit is contained in:
@@ -159,21 +159,14 @@ public class DockViewService {
|
|||||||
List<DockViewResponse> history = new ArrayList<>();
|
List<DockViewResponse> history = new ArrayList<>();
|
||||||
|
|
||||||
for (DockView dockView: dockViews) {
|
for (DockView dockView: dockViews) {
|
||||||
String country = geoCountryService.getCountryByIp(dockView.getViewerIp(), locale);
|
String country = locale.equals("en") ? dockView.getGeoNameEn(): dockView.getGeoNameRu();
|
||||||
String city = geoCountryService.getCityByIp(dockView.getViewerIp(), locale);
|
|
||||||
LocalDateTime createdAt = dockView.getCreatedAt();
|
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()
|
DockViewResponse response = DockViewResponse.builder()
|
||||||
.city(city)
|
|
||||||
.country(country)
|
.country(country)
|
||||||
.viewDate(createdAt)
|
.viewDate(createdAt)
|
||||||
.document(file.getOriginalFileName())
|
.document(dockView.getDocName())
|
||||||
.viewer(viewer == null ? "guest" : viewer.getFullName())
|
.viewer(dockView.getViewerName())
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
history.add(response);
|
history.add(response);
|
||||||
|
|||||||
Reference in New Issue
Block a user