High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: clean up memory with locked assets (#18532)
Alex911c877e7215
diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sqlindex e9e7340bf6..a3243025b4 100644--- a/server/src/queries/memory.repository.sql+++ b/server/src/queries/memory.repository.sql@@ -15,6 +15,7 @@ selectinner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"where"memories_assets_assets"."memoriesId" = "memories"."id"+ and "assets"."visibility" = 'timeline'and "assets"."deletedAt" is nullorder by"assets"."fileCreatedAt" asc@@ -43,6 +44,7 @@ selectinner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"where"memories_assets_assets"."memoriesId" = "memories"."id"+ and "assets"."visibility" = 'timeline'and "assets"."deletedAt" is nullorder by"assets"."fileCreatedAt" asc@@ -79,6 +81,7 @@ selectinner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"where"memories_assets_assets"."memoriesId" = "memories"."id"+ and "assets"."visibility" = 'timeline'and "assets"."deletedAt" is nullorder by"assets"."fileCreatedAt" asc@@ -111,6 +114,7 @@ selectinner join "memories_assets_assets" on "assets"."id" = "memories_assets_assets"."assetsId"where"memories_assets_assets"."memoriesId" = "memories"."id"+ and "assets"."visibility" = 'timeline'and "assets"."deletedAt" is nullorder by"assets"."fileCreatedAt" ascdiff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.tsindex 1a1ea2827b..96eb78e6d6 100644--- a/server/src/repositories/memory.repository.ts+++ b/server/src/repositories/memory.repository.ts@@ -1,18 +1,26 @@import { Injectable } from '@nestjs/common';-import { Insertable, Kysely, Updateable } from 'kysely';+import { Insertable, Kysely, sql, Updateable } from 'kysely';import { jsonArrayFrom } from 'kysely/helpers/postgres';import { DateTime } from 'luxon';import { InjectKysely } from 'nestjs-kysely';import { DB, Memories } from 'src/db';import { Chunked, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';import { MemorySearchDto } from 'src/dtos/memory.dto';+import { AssetVisibility } from 'src/enum';import { IBulkAsset } from 'src/types';@Injectable()export class MemoryRepository implements IBulkAsset {constructor(@InjectKysely() private db: Kysely<DB>) {}- cleanup() {+ async cleanup() {+ await this.db+ .deleteFrom('memories_assets_assets')+ .using('assets')+ .whereRef('memories_assets_assets.assetsId', '=', 'assets.id')+ .where('assets.visibility', '!=', AssetVisibility.TIMELINE)+ .execute();+return this.db.deleteFrom('memories').where('createdAt', '<', DateTime.now().minus({ days: 30 }).toJSDate())@@ -36,6 +44,7 @@ export class MemoryRepository implements IBulkAsset {.innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId').whereRef('memories_assets_assets.memoriesId', '=', 'memories.id').orderBy('assets.fileCreatedAt', 'asc')+ .where('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE)).where('assets.deletedAt', 'is', null),).as('assets'),)@@ -138,6 +147,7 @@ export class MemoryRepository implements IBulkAsset {.innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId').whereRef('memories_assets_assets.memoriesId', '=', 'memories.id').orderBy('assets.fileCreatedAt', 'asc')+ .where('assets.visibility', '=', sql.lit(AssetVisibility.TIMELINE)).where('assets.deletedAt', 'is', null),).as('assets'),)