Merge pull request #158 from waifuvault/ignore-expired-entries

make the filename on system default in table
waifuvault · Jun 21, 2024 · a19ced7 · a19ced7
2 parents 5d841b2 + 7cbb9dc
commit a19ced7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/controllers/rest/impl/security/AdminController.ts b/src/controllers/rest/impl/security/AdminController.ts
@@ -53,8 +53,8 @@ export class AdminController extends BaseRestController {
     }
 
     @Get("/statsData")
-    public async getStatsData(): Promise<unknown> {
-        return this.adminService.getStatsData(await this.adminService.getAllEntries());
+    public getStatsData(): Promise<unknown> {
+        return this.adminService.getStatsData();
     }
 
     @Get("/blockedIps")

diff --git a/src/db/dao/FileDao.ts b/src/db/dao/FileDao.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from "@tsed/di";
 import { AbstractDao } from "./AbstractDao.js";
 import { FileUploadModel } from "../../model/db/FileUpload.model.js";
 import { SQLITE_DATA_SOURCE } from "../../model/di/tokens.js";
-import { DataSource, EntityManager, In, Like } from "typeorm";
+import { DataSource, EntityManager, In, IsNull, Like, MoreThan } from "typeorm";
 import { FindOperator } from "typeorm/find-options/FindOperator.js";
 
 @Injectable()
@@ -44,7 +44,14 @@ export class FileDao extends AbstractDao<FileUploadModel> {
     }
 
     public getTotalFileSize(transaction?: EntityManager): Promise<number | null> {
-        return this.getRepository(transaction).sum("fileSize");
+        return this.getRepository(transaction).sum("fileSize", [
+            {
+                expires: IsNull(),
+            },
+            {
+                expires: MoreThan(Date.now()),
+            },
+        ]);
     }
 
     public getAllEntriesOrdered(
@@ -78,7 +85,16 @@ export class FileDao extends AbstractDao<FileUploadModel> {
     }
 
     public getRecordCount(transaction?: EntityManager): Promise<number> {
-        return this.getRepository(transaction).count();
+        return this.getRepository(transaction).count({
+            where: [
+                {
+                    expires: IsNull(),
+                },
+                {
+                    expires: MoreThan(Date.now()),
+                },
+            ],
+        });
     }
 
     public getSearchRecordCount(search: string, transaction?: EntityManager): Promise<number> {

diff --git a/src/services/AdminService.ts b/src/services/AdminService.ts
@@ -20,13 +20,14 @@ export class AdminService {
     @Constant(GlobalEnv.BASE_URL)
     private readonly baseUrl: string;
 
-    public getStatsData(entries: FileEntryDto[]): Promise<StatsDto> {
+    public async getStatsData(): Promise<StatsDto> {
+        const entries = await this.getAllEntries();
         return StatsDto.buildStats(entries);
     }
 
     public async getAllEntries(): Promise<FileEntryDto[]> {
         const allEntries = await this.repo.getAllEntries();
-        return this.buildFileEntryDtos(allEntries);
+        return this.buildFileEntryDtos(allEntries.filter(entry => !entry.hasExpired));
     }
 
     public async getPagedEntries(
@@ -37,7 +38,7 @@ export class AdminService {
         search?: string,
     ): Promise<FileEntryDto[]> {
         const entries = await this.repo.getAllEntriesOrdered(start, length, sortColumn, sortDir, search);
-        return this.buildFileEntryDtos(entries);
+        return this.buildFileEntryDtos(entries.filter(entry => !entry.hasExpired));
     }
 
     private async buildFileEntryDtos(entries: FileUploadModel[]): Promise<FileEntryDto[]> {