This commit is contained in:
@@ -159,21 +159,14 @@ public class DockViewService {
|
||||
List<DockViewResponse> 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);
|
||||
|
||||
Reference in New Issue
Block a user