refactor: library type (#9525)

server/src/repositories/access.repository.ts

@@ -20,7 +20,6 @@ type IActivityAccess = IAccessRepository['activity'];
 type IAlbumAccess = IAccessRepository['album'];
 type IAssetAccess = IAccessRepository['asset'];
 type IAuthDeviceAccess = IAccessRepository['authDevice'];
-type ILibraryAccess = IAccessRepository['library'];
 type ITimelineAccess = IAccessRepository['timeline'];
 type IMemoryAccess = IAccessRepository['memory'];
 type IPersonAccess = IAccessRepository['person'];
@@ -313,28 +312,6 @@ class AuthDeviceAccess implements IAuthDeviceAccess {
   }
 }
 
-class LibraryAccess implements ILibraryAccess {
-  constructor(private libraryRepository: Repository<LibraryEntity>) {}
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID_SET] })
-  @ChunkedSet({ paramIndex: 1 })
-  async checkOwnerAccess(userId: string, libraryIds: Set<string>): Promise<Set<string>> {
-    if (libraryIds.size === 0) {
-      return new Set();
-    }
-
-    return this.libraryRepository
-      .find({
-        select: { id: true },
-        where: {
-          id: In([...libraryIds]),
-          ownerId: userId,
-        },
-      })
-      .then((libraries) => new Set(libraries.map((library) => library.id)));
-  }
-}
-
 class TimelineAccess implements ITimelineAccess {
   constructor(private partnerRepository: Repository<PartnerEntity>) {}
 
@@ -447,7 +424,6 @@ export class AccessRepository implements IAccessRepository {
   album: IAlbumAccess;
   asset: IAssetAccess;
   authDevice: IAuthDeviceAccess;
-  library: ILibraryAccess;
   memory: IMemoryAccess;
   person: IPersonAccess;
   partner: IPartnerAccess;
@@ -469,7 +445,6 @@ export class AccessRepository implements IAccessRepository {
     this.album = new AlbumAccess(albumRepository, sharedLinkRepository);
     this.asset = new AssetAccess(albumRepository, assetRepository, partnerRepository, sharedLinkRepository);
     this.authDevice = new AuthDeviceAccess(sessionRepository);
-    this.library = new LibraryAccess(libraryRepository);
     this.memory = new MemoryAccess(memoryRepository);
     this.person = new PersonAccess(assetFaceRepository, personRepository);
     this.partner = new PartnerAccess(partnerRepository);

server/src/repositories/asset.repository.ts

@@ -5,7 +5,6 @@ import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { PartnerEntity } from 'src/entities/partner.entity';
 import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import {
@@ -292,8 +291,13 @@ export class AssetRepository implements IAssetRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
-  getByChecksum(libraryId: string, checksum: Buffer): Promise<AssetEntity | null> {
-    return this.repository.findOne({ where: { libraryId, checksum } });
+  getByChecksum(libraryId: string | null, checksum: Buffer): Promise<AssetEntity | null> {
+    return this.repository.findOne({
+      where: {
+        libraryId: libraryId || IsNull(),
+        checksum,
+      },
+    });
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
@@ -303,9 +307,7 @@ export class AssetRepository implements IAssetRepository {
       where: {
         ownerId,
         checksum,
-        library: {
-          type: LibraryType.UPLOAD,
-        },
+        library: IsNull(),
       },
       withDeleted: true,
     });

server/src/repositories/library.repository.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { LibraryStatsResponseDto } from 'src/dtos/library.dto';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { ILibraryRepository } from 'src/interfaces/library.interface';
 import { Instrumentation } from 'src/utils/instrumentation';
 import { EntityNotFoundError, IsNull, Not } from 'typeorm';
@@ -40,34 +40,10 @@ export class LibraryRepository implements ILibraryRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getDefaultUploadLibrary(ownerId: string): Promise<LibraryEntity | null> {
-    return this.repository.findOne({
-      where: {
-        ownerId: ownerId,
-        type: LibraryType.UPLOAD,
-      },
-      order: {
-        createdAt: 'ASC',
-      },
-    });
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  getUploadLibraryCount(ownerId: string): Promise<number> {
-    return this.repository.count({
-      where: {
-        ownerId: ownerId,
-        type: LibraryType.UPLOAD,
-      },
-    });
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  getAllByUserId(ownerId: string, type?: LibraryType): Promise<LibraryEntity[]> {
+  getAllByUserId(ownerId: string): Promise<LibraryEntity[]> {
     return this.repository.find({
       where: {
         ownerId,
-        type,
       },
       relations: {
         owner: true,
@@ -79,9 +55,8 @@ export class LibraryRepository implements ILibraryRepository {
   }
 
   @GenerateSql({ params: [] })
-  getAll(withDeleted = false, type?: LibraryType): Promise<LibraryEntity[]> {
+  getAll(withDeleted = false): Promise<LibraryEntity[]> {
     return this.repository.find({
-      where: { type },
       relations: {
         owner: true,
       },

server/src/repositories/user.repository.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import {
   IUserRepository,
@@ -123,10 +122,9 @@ export class UserRepository implements IUserRepository {
     const subQuery = this.assetRepository
       .createQueryBuilder('assets')
       .select('COALESCE(SUM(exif."fileSizeInByte"), 0)')
-      .leftJoin('assets.library', 'library')
       .leftJoin('assets.exifInfo', 'exif')
       .where('assets.ownerId = users.id')
-      .andWhere(`library.type = '${LibraryType.UPLOAD}'`)
+      .andWhere(`assets.libraryId IS NULL`)
       .withDeleted();
 
     const query = this.userRepository