refactor: remove user entity (#17498)

server/test/fixtures/asset.stub.ts

@@ -41,7 +41,6 @@ export const stackStub = (stackId: string, assets: AssetEntity[]): StackEntity =
   return {
     id: stackId,
     assets,
-    owner: assets[0].owner,
     ownerId: assets[0].ownerId,
     primaryAsset: assets[0],
     primaryAssetId: assets[0].id,

server/test/fixtures/person.stub.ts

@@ -7,7 +7,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: '',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail.jpg',
@@ -22,7 +21,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: '',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail.jpg',
@@ -37,7 +35,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: 'Person 1',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail.jpg',
@@ -52,7 +49,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: 'Person 1',
     birthDate: '1976-06-30',
     thumbnailPath: '/path/to/thumbnail.jpg',
@@ -67,7 +63,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: '',
     birthDate: null,
     thumbnailPath: '',
@@ -82,7 +77,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: '',
     birthDate: null,
     thumbnailPath: '/new/path/to/thumbnail.jpg',
@@ -97,7 +91,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: 'Person 1',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail',
@@ -112,7 +105,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: 'Person 2',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail',
@@ -127,7 +119,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: '',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail',
@@ -142,7 +133,6 @@ export const personStub = {
     createdAt: new Date('2021-01-01'),
     updatedAt: new Date('2021-01-01'),
     ownerId: userStub.admin.id,
-    owner: userStub.admin,
     name: 'Person 1',
     birthDate: null,
     thumbnailPath: '/path/to/thumbnail.jpg',

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

@@ -1,10 +1,10 @@
+import { UserAdmin } from 'src/database';
 import { AlbumResponseDto } from 'src/dtos/album.dto';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { ExifResponseDto } from 'src/dtos/exif.dto';
 import { SharedLinkResponseDto } from 'src/dtos/shared-link.dto';
 import { mapUser } from 'src/dtos/user.dto';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
-import { UserEntity } from 'src/entities/user.entity';
 import { AssetOrder, AssetStatus, AssetType, SharedLinkType } from 'src/enum';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
@@ -106,7 +106,6 @@ export const sharedLinkStub = {
   individual: Object.freeze({
     id: '123',
     userId: authStub.admin.user.id,
-    user: userStub.admin,
     key: sharedLinkBytes,
     type: SharedLinkType.INDIVIDUAL,
     createdAt: today,
@@ -154,7 +153,6 @@ export const sharedLinkStub = {
   readonlyNoExif: Object.freeze<SharedLinkEntity>({
     id: '123',
     userId: authStub.admin.user.id,
-    user: userStub.admin,
     key: sharedLinkBytes,
     type: SharedLinkType.ALBUM,
     createdAt: today,
@@ -185,7 +183,7 @@ export const sharedLinkStub = {
         {
           id: 'id_1',
           status: AssetStatus.ACTIVE,
-          owner: undefined as unknown as UserEntity,
+          owner: undefined as unknown as UserAdmin,
           ownerId: 'user_id_1',
           deviceAssetId: 'device_asset_id_1',
           deviceId: 'device_id_1',
@@ -253,7 +251,6 @@ export const sharedLinkStub = {
   passwordRequired: Object.freeze<SharedLinkEntity>({
     id: '123',
     userId: authStub.admin.user.id,
-    user: userStub.admin,
     key: sharedLinkBytes,
     type: SharedLinkType.ALBUM,
     createdAt: today,

server/test/fixtures/user.stub.ts

@@ -1,13 +1,12 @@
-import { UserEntity } from 'src/entities/user.entity';
+import { UserAdmin } from 'src/database';
 import { UserAvatarColor, UserMetadataKey, UserStatus } from 'src/enum';
 import { authStub } from 'test/fixtures/auth.stub';
 
 export const userStub = {
-  admin: Object.freeze<UserEntity>({
+  admin: <UserAdmin>{
     ...authStub.admin.user,
     status: UserStatus.ACTIVE,
     profileChangedAt: new Date('2021-01-01'),
-    password: 'admin_password',
     name: 'admin_name',
     id: 'admin_id',
     storageLabel: 'admin',
@@ -17,16 +16,14 @@ export const userStub = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
-    assets: [],
     metadata: [],
     quotaSizeInBytes: null,
     quotaUsageInBytes: 0,
-  }),
-  user1: Object.freeze<UserEntity>({
+  },
+  user1: <UserAdmin>{
     ...authStub.user1.user,
     status: UserStatus.ACTIVE,
     profileChangedAt: new Date('2021-01-01'),
-    password: 'immich_password',
     name: 'immich_name',
     storageLabel: null,
     oauthId: '',
@@ -35,7 +32,6 @@ export const userStub = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
-    assets: [],
     metadata: [
       {
         key: UserMetadataKey.PREFERENCES,
@@ -44,13 +40,12 @@ export const userStub = {
     ],
     quotaSizeInBytes: null,
     quotaUsageInBytes: 0,
-  }),
-  user2: Object.freeze<UserEntity>({
+  },
+  user2: <UserAdmin>{
     ...authStub.user2.user,
     status: UserStatus.ACTIVE,
     profileChangedAt: new Date('2021-01-01'),
     metadata: [],
-    password: 'immich_password',
     name: 'immich_name',
     storageLabel: null,
     oauthId: '',
@@ -59,16 +54,14 @@ export const userStub = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
-    assets: [],
     quotaSizeInBytes: null,
     quotaUsageInBytes: 0,
-  }),
-  storageLabel: Object.freeze<UserEntity>({
+  },
+  storageLabel: <UserAdmin>{
     ...authStub.user1.user,
     status: UserStatus.ACTIVE,
     profileChangedAt: new Date('2021-01-01'),
     metadata: [],
-    password: 'immich_password',
     name: 'immich_name',
     storageLabel: 'label-1',
     oauthId: '',
@@ -77,16 +70,14 @@ export const userStub = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
-    assets: [],
     quotaSizeInBytes: null,
     quotaUsageInBytes: 0,
-  }),
-  profilePath: Object.freeze<UserEntity>({
+  },
+  profilePath: <UserAdmin>{
     ...authStub.user1.user,
     status: UserStatus.ACTIVE,
     profileChangedAt: new Date('2021-01-01'),
     metadata: [],
-    password: 'immich_password',
     name: 'immich_name',
     storageLabel: 'label-1',
     oauthId: '',
@@ -95,8 +86,7 @@ export const userStub = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
-    assets: [],
     quotaSizeInBytes: null,
     quotaUsageInBytes: 0,
-  }),
+  },
 };