From 2e1faf90eeb53284801d40f445c547f2f7bcef37 Mon Sep 17 00:00:00 2001 From: gsd Date: Mon, 27 Oct 2025 19:47:51 +0300 Subject: [PATCH] fixes after update --- src/main/java/app/controllers/FileController.java | 4 +++- src/main/java/app/controllers/user/DetailController.java | 4 +++- src/main/java/app/controllers/user/PublicController.java | 4 +++- src/main/java/app/entities/SearchFilter.java | 4 ++-- src/main/java/app/entities/db/CollectableStatistic.java | 3 ++- src/main/java/app/repositories/BanRepository.java | 8 +++++--- src/main/java/app/repositories/DonateStatRepository.java | 8 +++++--- src/main/java/app/repositories/FilePSRepository.java | 8 +++++--- 8 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/main/java/app/controllers/FileController.java b/src/main/java/app/controllers/FileController.java index e868e9a..4203fcf 100644 --- a/src/main/java/app/controllers/FileController.java +++ b/src/main/java/app/controllers/FileController.java @@ -127,7 +127,9 @@ public class FileController { return filePSRepository.getFiles(pageable, steam64_ids.isEmpty(), steam64_ids, searchFilter.getBeginUnixTime(), - searchFilter.getEndUnixTime()); + searchFilter.getEndUnixTime(), + searchFilter.getBeginUnixTime() == 0 ? null : 1L, + searchFilter.getEndUnixTime() == 0 ? null : 1L); } private static String encodeFileName(String fileName) throws UnsupportedEncodingException { diff --git a/src/main/java/app/controllers/user/DetailController.java b/src/main/java/app/controllers/user/DetailController.java index c740bfe..ad325e2 100644 --- a/src/main/java/app/controllers/user/DetailController.java +++ b/src/main/java/app/controllers/user/DetailController.java @@ -122,7 +122,9 @@ public class DetailController { Page donates = donateStatRepository.getDonate(pageable, ids.isEmpty(), ids, searchFilter.getBeginUnixTime(), - searchFilter.getEndUnixTime()); + searchFilter.getEndUnixTime(), + searchFilter.getBeginUnixTime() == 0?null:1L, + searchFilter.getEndUnixTime() == 0?null:1L); donates.getContent().forEach((donateStat -> { donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2())); })); diff --git a/src/main/java/app/controllers/user/PublicController.java b/src/main/java/app/controllers/user/PublicController.java index 9dfcb81..50e90ba 100644 --- a/src/main/java/app/controllers/user/PublicController.java +++ b/src/main/java/app/controllers/user/PublicController.java @@ -88,7 +88,9 @@ public class PublicController { banSearchFilter.getBeginUnixTime(), banSearchFilter.getEndUnixTime(), banSearchFilter.getActive(), - admin_ids.isEmpty(), admin_ids, banSearchFilter.getReason()) + admin_ids.isEmpty(), admin_ids, banSearchFilter.getReason(), + banSearchFilter.getBeginUnixTime() == 0 ? null : 1L, + banSearchFilter.getEndUnixTime() == 0 ? null : 1L) , HttpStatus.OK); } diff --git a/src/main/java/app/entities/SearchFilter.java b/src/main/java/app/entities/SearchFilter.java index 6902f50..2ca8cd2 100644 --- a/src/main/java/app/entities/SearchFilter.java +++ b/src/main/java/app/entities/SearchFilter.java @@ -81,11 +81,11 @@ public class SearchFilter { } public Long getBeginUnixTime() { - return begin == null ? null : (Timestamp.valueOf(begin).getTime()/1000) + utc*60; + return begin == null ? 0 : (Timestamp.valueOf(begin).getTime()/1000) + utc*60; } public Long getEndUnixTime() { - return end == null ? null : (Timestamp.valueOf(end).getTime()/1000) + utc*60; + return end == null ? 0 : (Timestamp.valueOf(end).getTime()/1000) + utc*60; } public String getServerId() { diff --git a/src/main/java/app/entities/db/CollectableStatistic.java b/src/main/java/app/entities/db/CollectableStatistic.java index b7414af..908fafe 100644 --- a/src/main/java/app/entities/db/CollectableStatistic.java +++ b/src/main/java/app/entities/db/CollectableStatistic.java @@ -83,6 +83,7 @@ public class CollectableStatistic { } public boolean isStatsRequests() { - return getPath().equals("/api/stats"); + return getPath().equals("/api/stats") || + (getPath().startsWith("/api/profile/current") && "requests=pohuy&steam64=null".equals(getQuery())); } } diff --git a/src/main/java/app/repositories/BanRepository.java b/src/main/java/app/repositories/BanRepository.java index 7f5f58c..9080b32 100644 --- a/src/main/java/app/repositories/BanRepository.java +++ b/src/main/java/app/repositories/BanRepository.java @@ -15,8 +15,8 @@ public interface BanRepository extends PagingAndSortingRepository { @Query(value = "select b from Ban b where " + "(:ban_ids_non_exists = true or b.id in :ban_ids) and " + "(:account_ids_non_exists = true or b.account_id in :account_ids) and " + - "(:begin_date is null or DATE_PART('EPOCH', b.timestamp) >= :begin_date) and " + - "(:end_date is null or :end_date >= DATE_PART('EPOCH', b.timestamp)) and " + + "(:begin_date_null is null or DATE_PART('EPOCH', b.timestamp) >= :begin_date) and " + + "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', b.timestamp)) and " + "(:active is null or b.active = :active) and " + "(:admin_ids_non_exists = true or b.banned_by_id in :admin_ids) and" + "(b.ban_reason like :reason) order by b.id desc") @@ -30,5 +30,7 @@ public interface BanRepository extends PagingAndSortingRepository { @Param(value = "active") Boolean active, @Param(value = "admin_ids_non_exists") Boolean admin_ids_non_exists, @Param(value = "admin_ids") Iterable admin_ids, - @Param(value = "reason") String reason); + @Param(value = "reason") String reason, + @Param(value = "begin_date_null") Long begin_date_null, + @Param(value = "end_date_null") Long end_date_null); } diff --git a/src/main/java/app/repositories/DonateStatRepository.java b/src/main/java/app/repositories/DonateStatRepository.java index da8e002..b6655f7 100644 --- a/src/main/java/app/repositories/DonateStatRepository.java +++ b/src/main/java/app/repositories/DonateStatRepository.java @@ -11,11 +11,13 @@ public interface DonateStatRepository extends PagingAndSortingRepository 0) and " + - "(:begin_date is null or DATE_PART('EPOCH', d.timestamp) >= :begin_date) and " + - "(:end_date is null or :end_date >= DATE_PART('EPOCH', d.timestamp)) order by d.id desc") + "(:begin_date_null is null or DATE_PART('EPOCH', d.timestamp) >= :begin_date) and " + + "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', d.timestamp)) order by d.id desc") Page getDonate(Pageable pageable, @Param(value = "account_ids_non_exists") Boolean account_ids_non_exists, @Param(value = "account_ids") String account_ids, @Param(value = "begin_date") Long begin_date, - @Param(value = "end_date") Long end_date); + @Param(value = "end_date") Long end_date, + @Param(value = "begin_date_null") Long begin_date_null, + @Param(value = "end_date_null") Long end_date_null); } diff --git a/src/main/java/app/repositories/FilePSRepository.java b/src/main/java/app/repositories/FilePSRepository.java index b5d4dc7..cf4c3d5 100644 --- a/src/main/java/app/repositories/FilePSRepository.java +++ b/src/main/java/app/repositories/FilePSRepository.java @@ -13,12 +13,14 @@ public interface FilePSRepository extends PagingAndSortingRepository 0) and " + - "(:begin_date is null or DATE_PART('EPOCH', f.timestamp) >= :begin_date) and " + - "(:end_date is null or :end_date >= DATE_PART('EPOCH', f.timestamp)) " + + "(:begin_date_null is null or DATE_PART('EPOCH', f.timestamp) >= :begin_date) and " + + "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', f.timestamp)) " + "order by f.timestamp desc") Page getFiles(Pageable pageable, @Param(value = "steam64_non_exists") Boolean steam64_non_exists, @Param(value = "steam64_ids") String steam64_ids, @Param(value = "begin_date") Long begin_date, - @Param(value = "end_date") Long end_date); + @Param(value = "end_date") Long end_date, + @Param(value = "begin_date_null") Long begin_date_null, + @Param(value = "end_date_null") Long end_date_null); }