we have withDeleted at home

immich-app · May 8, 2024 · fb19328 · fb19328
1 parent 308ebd4
commit fb19328
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/src/prisma/find-non-deleted.ts b/server/src/prisma/find-non-deleted.ts
@@ -3,7 +3,11 @@ import { Prisma } from '@prisma/client';
 const excludeDeleted = ({ args, query }: { args: any; query: any }) => {
   if (args.where === undefined) {
     args.where = { deletedAt: null };
-  } else if (args.where.deletedAt === undefined) {
+  } else if (
+    args.where.deletedAt === undefined &&
+    !args.where.OR?.some(({ deletedAt }: any) => deletedAt !== undefined) &&
+    !args.where.AND?.some(({ deletedAt }: any) => deletedAt !== undefined)
+  ) {
     args.where.deletedAt = null;
   }
 

diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
@@ -747,6 +747,7 @@ export class AssetRepository implements IAssetRepository {
         isVisible: true,
         updatedAt: { lte: updatedUntil },
         AND: [{ fileCreatedAt: { lt: lastCreationDate } }, { id: { lt: lastId } }],
+        OR: [{ deletedAt: null }, { deletedAt: { not: null } }],
       },
       include: {
         exifInfo: true,
@@ -769,6 +770,7 @@ export class AssetRepository implements IAssetRepository {
         ownerId: { in: options.userIds },
         isVisible: true,
         updatedAt: { gt: options.updatedAfter },
+        OR: [{ deletedAt: null }, { deletedAt: { not: null } }],
       },
       include: {
         exifInfo: true,