refactor: library type (#9525)

server/test/fixtures/asset.stub.ts

@@ -48,8 +48,6 @@ export const assetStub = {
     deletedAt: null,
     isOffline: false,
     isExternal: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duplicateId: null,
   }),
 
@@ -84,8 +82,6 @@ export const assetStub = {
     sidecarPath: null,
     isOffline: false,
     isExternal: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 123_000,
     } as ExifEntity,
@@ -114,8 +110,6 @@ export const assetStub = {
     isFavorite: true,
     isArchived: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     isExternal: false,
@@ -156,8 +150,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -203,8 +195,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -285,8 +275,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: true,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -364,8 +352,6 @@ export const assetStub = {
     isVisible: true,
     livePhotoVideo: null,
     livePhotoVideoId: null,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     isExternal: false,
     isOffline: false,
     tags: [],
@@ -401,8 +387,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -442,8 +426,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -467,8 +449,6 @@ export const assetStub = {
     isVisible: false,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 100_000,
       timeZone: `America/New_York`,
@@ -483,8 +463,6 @@ export const assetStub = {
     isVisible: false,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     previewPath: '/uploads/user-id/thumbs/path.ext',
     thumbnailPath: '/uploads/user-id/webp/path.ext',
     exifInfo: {
@@ -502,8 +480,6 @@ export const assetStub = {
     isVisible: true,
     fileModifiedAt: new Date('2022-06-19T23:41:36.910Z'),
     fileCreatedAt: new Date('2022-06-19T23:41:36.910Z'),
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     exifInfo: {
       fileSizeInByte: 25_000,
       timeZone: `America/New_York`,
@@ -533,8 +509,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -576,8 +550,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -612,8 +584,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -649,8 +619,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -687,8 +655,6 @@ export const assetStub = {
     isArchived: false,
     isExternal: false,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     duration: null,
     isVisible: true,
     livePhotoVideo: null,
@@ -807,8 +773,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -848,8 +812,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',
@@ -891,8 +853,6 @@ export const assetStub = {
     livePhotoVideo: null,
     livePhotoVideoId: null,
     isOffline: false,
-    libraryId: 'library-id',
-    library: libraryStub.uploadLibrary1,
     tags: [],
     sharedLinks: [],
     originalFileName: 'asset-id.jpg',

server/test/fixtures/error.stub.ts

@@ -49,9 +49,4 @@ export const errorStub = {
     statusCode: 400,
     message: 'The server already has an admin',
   },
-  noDeleteUploadLibrary: {
-    error: 'Bad Request',
-    statusCode: 400,
-    message: 'Cannot delete the last upload library',
-  },
 };

server/test/fixtures/library.stub.ts

@@ -1,30 +1,16 @@
 import { join } from 'node:path';
 import { APP_MEDIA_LOCATION } from 'src/constants';
 import { THUMBNAIL_DIR } from 'src/cores/storage.core';
-import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
+import { LibraryEntity } from 'src/entities/library.entity';
 import { userStub } from 'test/fixtures/user.stub';
 
 export const libraryStub = {
-  uploadLibrary1: Object.freeze<LibraryEntity>({
-    id: 'library-id',
-    name: 'test_library',
-    assets: [],
-    owner: userStub.user1,
-    ownerId: 'user-id',
-    type: LibraryType.UPLOAD,
-    importPaths: [],
-    createdAt: new Date('2022-01-01'),
-    updatedAt: new Date('2022-01-01'),
-    refreshedAt: null,
-    exclusionPatterns: [],
-  }),
   externalLibrary1: Object.freeze<LibraryEntity>({
     id: 'library-id',
     name: 'test_library',
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -37,7 +23,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2022-01-01'),
@@ -50,7 +35,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/foo', '/bar'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -63,7 +47,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'admin_id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -76,7 +59,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -89,7 +71,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),
@@ -102,7 +83,6 @@ export const libraryStub = {
     assets: [],
     owner: userStub.admin,
     ownerId: 'user-id',
-    type: LibraryType.EXTERNAL,
     importPaths: [join(THUMBNAIL_DIR, 'library'), '/xyz', join(APP_MEDIA_LOCATION, 'library')],
     createdAt: new Date('2023-01-01'),
     updatedAt: new Date('2023-01-01'),

server/test/fixtures/shared-link.stub.ts

@@ -9,7 +9,6 @@ import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entit
 import { UserEntity } from 'src/entities/user.entity';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { libraryStub } from 'test/fixtures/library.stub';
 import { userStub } from 'test/fixtures/user.stub';
 
 const today = new Date();
@@ -210,8 +209,6 @@ export const sharedLinkStub = {
           isArchived: false,
           isExternal: false,
           isOffline: false,
-          libraryId: 'library-id',
-          library: libraryStub.uploadLibrary1,
           smartInfo: {
             assetId: 'id_1',
             tags: [],

server/test/repositories/access.repository.mock.ts

@@ -7,7 +7,6 @@ export interface IAccessRepositoryMock {
   asset: Mocked<IAccessRepository['asset']>;
   album: Mocked<IAccessRepository['album']>;
   authDevice: Mocked<IAccessRepository['authDevice']>;
-  library: Mocked<IAccessRepository['library']>;
   timeline: Mocked<IAccessRepository['timeline']>;
   memory: Mocked<IAccessRepository['memory']>;
   person: Mocked<IAccessRepository['person']>;
@@ -43,10 +42,6 @@ export const newAccessRepositoryMock = (reset = true): IAccessRepositoryMock =>
       checkOwnerAccess: vitest.fn().mockResolvedValue(new Set()),
     },
 
-    library: {
-      checkOwnerAccess: vitest.fn().mockResolvedValue(new Set()),
-    },
-
     timeline: {
       checkPartnerAccess: vitest.fn().mockResolvedValue(new Set()),
     },

server/test/repositories/library.repository.mock.ts

@@ -10,8 +10,6 @@ export const newLibraryRepositoryMock = (): Mocked<ILibraryRepository> => {
     softDelete: vitest.fn(),
     update: vitest.fn(),
     getStatistics: vitest.fn(),
-    getDefaultUploadLibrary: vitest.fn(),
-    getUploadLibraryCount: vitest.fn(),
     getAssetIds: vitest.fn(),
     getAllDeleted: vitest.fn(),
     getAll: vitest.fn(),