This commit is contained in:
@@ -31,6 +31,15 @@ public class DockView {
|
|||||||
@Column(name = "file_id")
|
@Column(name = "file_id")
|
||||||
private String fileId;
|
private String fileId;
|
||||||
|
|
||||||
|
@Column(name = "geo_name_ru")
|
||||||
|
private String geoNameRu;
|
||||||
|
|
||||||
|
@Column(name = "geo_name_en")
|
||||||
|
private String geoNameEn;
|
||||||
|
|
||||||
|
@Column(name = "viewer_name")
|
||||||
|
private String viewerName;
|
||||||
|
|
||||||
@Column(name = "created_at",updatable = false)
|
@Column(name = "created_at",updatable = false)
|
||||||
private LocalDateTime createdAt = LocalDateTime.now();
|
private LocalDateTime createdAt = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,11 +39,20 @@ public class DockViewService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public DockView createDockView(DocViewerRequest request, Long userId) {
|
public DockView createDockView(DocViewerRequest request, Long userId) {
|
||||||
DockView dockView = new DockView();
|
DockView dockView = new DockView();
|
||||||
|
String geoEnName = geoCountryService.getCityByIp(request.getIp(), "en") + "/" +
|
||||||
|
geoCountryService.getCountryByIp(request.getIp(), "en");
|
||||||
|
String geoRuName = geoCountryService.getCityByIp(request.getIp(), "ru") + "/" +
|
||||||
|
geoCountryService.getCountryByIp(request.getIp(), "ru");
|
||||||
|
User user = userRepository.findById(userId).orElse(null);
|
||||||
|
|
||||||
dockView.setViewerId(userId);
|
dockView.setViewerId(userId);
|
||||||
dockView.setViewerIp(request.getIp() != null ? request.getIp() : "-");
|
dockView.setViewerIp(request.getIp() != null ? request.getIp() : "-");
|
||||||
dockView.setUserAgent(request.getUserAgent() != null ? request.getUserAgent() : "-");
|
dockView.setUserAgent(request.getUserAgent() != null ? request.getUserAgent() : "-");
|
||||||
dockView.setFileId(request.getFileId());
|
dockView.setFileId(request.getFileId());
|
||||||
dockView.setCreatedAt(LocalDateTime.now());
|
dockView.setCreatedAt(LocalDateTime.now());
|
||||||
|
dockView.setGeoNameEn(geoEnName);
|
||||||
|
dockView.setGeoNameRu(geoRuName);
|
||||||
|
dockView.setViewerName(user == null ? "guest" : user.getFullName());
|
||||||
|
|
||||||
DockView saved = dockViewRepository.save(dockView);
|
DockView saved = dockViewRepository.save(dockView);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user