Browse Source

fixes after update

master
gsd 8 months ago
parent
commit
2e1faf90ee
  1. 4
      src/main/java/app/controllers/FileController.java
  2. 4
      src/main/java/app/controllers/user/DetailController.java
  3. 4
      src/main/java/app/controllers/user/PublicController.java
  4. 4
      src/main/java/app/entities/SearchFilter.java
  5. 3
      src/main/java/app/entities/db/CollectableStatistic.java
  6. 8
      src/main/java/app/repositories/BanRepository.java
  7. 8
      src/main/java/app/repositories/DonateStatRepository.java
  8. 8
      src/main/java/app/repositories/FilePSRepository.java

4
src/main/java/app/controllers/FileController.java

@ -127,7 +127,9 @@ public class FileController {
return filePSRepository.getFiles(pageable, return filePSRepository.getFiles(pageable,
steam64_ids.isEmpty(), steam64_ids, steam64_ids.isEmpty(), steam64_ids,
searchFilter.getBeginUnixTime(), searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime()); searchFilter.getEndUnixTime(),
searchFilter.getBeginUnixTime() == 0 ? null : 1L,
searchFilter.getEndUnixTime() == 0 ? null : 1L);
} }
private static String encodeFileName(String fileName) throws UnsupportedEncodingException { private static String encodeFileName(String fileName) throws UnsupportedEncodingException {

4
src/main/java/app/controllers/user/DetailController.java

@ -122,7 +122,9 @@ public class DetailController {
Page<DonateStat> donates = donateStatRepository.getDonate(pageable, Page<DonateStat> donates = donateStatRepository.getDonate(pageable,
ids.isEmpty(), ids, ids.isEmpty(), ids,
searchFilter.getBeginUnixTime(), searchFilter.getBeginUnixTime(),
searchFilter.getEndUnixTime()); searchFilter.getEndUnixTime(),
searchFilter.getBeginUnixTime() == 0?null:1L,
searchFilter.getEndUnixTime() == 0?null:1L);
donates.getContent().forEach((donateStat -> { donates.getContent().forEach((donateStat -> {
donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2())); donateStat.setGametime(gametimeRepository.searchGametimeBySteam2(donateStat.getSteam2()));
})); }));

4
src/main/java/app/controllers/user/PublicController.java

@ -88,7 +88,9 @@ public class PublicController {
banSearchFilter.getBeginUnixTime(), banSearchFilter.getBeginUnixTime(),
banSearchFilter.getEndUnixTime(), banSearchFilter.getEndUnixTime(),
banSearchFilter.getActive(), 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); , HttpStatus.OK);
} }

4
src/main/java/app/entities/SearchFilter.java

@ -81,11 +81,11 @@ public class SearchFilter {
} }
public Long getBeginUnixTime() { 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() { 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() { public String getServerId() {

3
src/main/java/app/entities/db/CollectableStatistic.java

@ -83,6 +83,7 @@ public class CollectableStatistic {
} }
public boolean isStatsRequests() { public boolean isStatsRequests() {
return getPath().equals("/api/stats"); return getPath().equals("/api/stats") ||
(getPath().startsWith("/api/profile/current") && "requests=pohuy&steam64=null".equals(getQuery()));
} }
} }

8
src/main/java/app/repositories/BanRepository.java

@ -15,8 +15,8 @@ public interface BanRepository extends PagingAndSortingRepository<Ban, Long> {
@Query(value = "select b from Ban b where " + @Query(value = "select b from Ban b where " +
"(:ban_ids_non_exists = true or b.id in :ban_ids) and " + "(: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 " + "(: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 " + "(:begin_date_null is null or DATE_PART('EPOCH', b.timestamp) >= :begin_date) and " +
"(:end_date is null or :end_date >= DATE_PART('EPOCH', b.timestamp)) and " + "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', b.timestamp)) and " +
"(:active is null or b.active = :active) and " + "(:active is null or b.active = :active) and " +
"(:admin_ids_non_exists = true or b.banned_by_id in :admin_ids) 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") "(b.ban_reason like :reason) order by b.id desc")
@ -30,5 +30,7 @@ public interface BanRepository extends PagingAndSortingRepository<Ban, Long> {
@Param(value = "active") Boolean active, @Param(value = "active") Boolean active,
@Param(value = "admin_ids_non_exists") Boolean admin_ids_non_exists, @Param(value = "admin_ids_non_exists") Boolean admin_ids_non_exists,
@Param(value = "admin_ids") Iterable<String> admin_ids, @Param(value = "admin_ids") Iterable<String> 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);
} }

8
src/main/java/app/repositories/DonateStatRepository.java

@ -11,11 +11,13 @@ public interface DonateStatRepository extends PagingAndSortingRepository<DonateS
@Query(value = "select d from DonateStat d where " + @Query(value = "select d from DonateStat d where " +
"(:account_ids_non_exists = true or position(d.steam2 in :account_ids) > 0) and " + "(:account_ids_non_exists = true or position(d.steam2 in :account_ids) > 0) and " +
"(:begin_date is null or DATE_PART('EPOCH', d.timestamp) >= :begin_date) and " + "(:begin_date_null 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") "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', d.timestamp)) order by d.id desc")
Page<DonateStat> getDonate(Pageable pageable, Page<DonateStat> getDonate(Pageable pageable,
@Param(value = "account_ids_non_exists") Boolean account_ids_non_exists, @Param(value = "account_ids_non_exists") Boolean account_ids_non_exists,
@Param(value = "account_ids") String account_ids, @Param(value = "account_ids") String account_ids,
@Param(value = "begin_date") Long begin_date, @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);
} }

8
src/main/java/app/repositories/FilePSRepository.java

@ -13,12 +13,14 @@ public interface FilePSRepository extends PagingAndSortingRepository<DbFile, UUI
@Query("select f from DbFile f where (f.deleted = false or f.deleted is null) and " + @Query("select f from DbFile f where (f.deleted = false or f.deleted is null) and " +
"(:steam64_non_exists = true or position(f.uploader in :steam64_ids) > 0) and " + "(:steam64_non_exists = true or position(f.uploader in :steam64_ids) > 0) and " +
"(:begin_date is null or DATE_PART('EPOCH', f.timestamp) >= :begin_date) and " + "(:begin_date_null is null or DATE_PART('EPOCH', f.timestamp) >= :begin_date) and " +
"(:end_date is null or :end_date >= DATE_PART('EPOCH', f.timestamp)) " + "(:end_date_null is null or :end_date >= DATE_PART('EPOCH', f.timestamp)) " +
"order by f.timestamp desc") "order by f.timestamp desc")
Page<DbFile> getFiles(Pageable pageable, Page<DbFile> getFiles(Pageable pageable,
@Param(value = "steam64_non_exists") Boolean steam64_non_exists, @Param(value = "steam64_non_exists") Boolean steam64_non_exists,
@Param(value = "steam64_ids") String steam64_ids, @Param(value = "steam64_ids") String steam64_ids,
@Param(value = "begin_date") Long begin_date, @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);
} }

Loading…
Cancel
Save