Skip to content

High performance self-hosted photo and video management solution.

refactor(server): enums (#11809)

Jason Rasmussenb288241a5c5f
diff --git a/server/src/cores/access.core.ts b/server/src/cores/access.core.ts
index e857e9b5cc..aba13e5acf 100644
--- a/server/src/cores/access.core.ts
+++ b/server/src/cores/access.core.ts
@@ -1,53 +1,10 @@
import { BadRequestException, UnauthorizedException } from '@nestjs/common';
import { AuthDto } from 'src/dtos/auth.dto';
-import { AlbumUserRole } from 'src/entities/album-user.entity';
import { SharedLinkEntity } from 'src/entities/shared-link.entity';
+import { AlbumUserRole, Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { setDifference, setIsEqual, setUnion } from 'src/utils/set';
-export enum Permission {
- ACTIVITY_CREATE = 'activity.create',
- ACTIVITY_DELETE = 'activity.delete',
-
- // ASSET_CREATE = 'asset.create',
- ASSET_READ = 'asset.read',
- ASSET_UPDATE = 'asset.update',
- ASSET_DELETE = 'asset.delete',
- ASSET_RESTORE = 'asset.restore',
- ASSET_SHARE = 'asset.share',
- ASSET_VIEW = 'asset.view',
- ASSET_DOWNLOAD = 'asset.download',
- ASSET_UPLOAD = 'asset.upload',
-
- // ALBUM_CREATE = 'album.create',
- ALBUM_READ = 'album.read',
- ALBUM_UPDATE = 'album.update',
- ALBUM_DELETE = 'album.delete',
- ALBUM_ADD_ASSET = 'album.addAsset',
- ALBUM_REMOVE_ASSET = 'album.removeAsset',
- ALBUM_SHARE = 'album.share',
- ALBUM_DOWNLOAD = 'album.download',
-
- AUTH_DEVICE_DELETE = 'authDevice.delete',
-
- ARCHIVE_READ = 'archive.read',
-
- TIMELINE_READ = 'timeline.read',
- TIMELINE_DOWNLOAD = 'timeline.download',
-
- MEMORY_READ = 'memory.read',
- MEMORY_WRITE = 'memory.write',
- MEMORY_DELETE = 'memory.delete',
-
- PERSON_READ = 'person.read',
- PERSON_WRITE = 'person.write',
- PERSON_MERGE = 'person.merge',
- PERSON_CREATE = 'person.create',
- PERSON_REASSIGN = 'person.reassign',
-
- PARTNER_UPDATE = 'partner.update',
-}
-
let instance: AccessCore | null;
export class AccessCore {
diff --git a/server/src/cores/system-config.core.ts b/server/src/cores/system-config.core.ts
index 10fdb45637..7c1434004a 100644
--- a/server/src/cores/system-config.core.ts
+++ b/server/src/cores/system-config.core.ts
@@ -7,7 +7,7 @@ import * as _ from 'lodash';
import { Subject } from 'rxjs';
import { SystemConfig, defaults } from 'src/config';
import { SystemConfigDto } from 'src/dtos/system-config.dto';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { DatabaseLock } from 'src/interfaces/database.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 21eb649e11..8f5c996cae 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -5,8 +5,8 @@ import _ from 'lodash';
import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
-import { AlbumUserRole } from 'src/entities/album-user.entity';
-import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
+import { AlbumEntity } from 'src/entities/album.entity';
+import { AlbumUserRole, AssetOrder } from 'src/enum';
import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
export class AlbumInfoDto {
diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
index 03fa2f8b3d..4238fd3490 100644
--- a/server/src/dtos/asset-response.dto.ts
+++ b/server/src/dtos/asset-response.dto.ts
@@ -11,8 +11,9 @@ import {
import { TagResponseDto, mapTag } from 'src/dtos/tag.dto';
import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { SmartInfoEntity } from 'src/entities/smart-info.entity';
+import { AssetType } from 'src/enum';
import { mimeTypes } from 'src/utils/mime-types';
export class SanitizedAssetResponseDto {
diff --git a/server/src/dtos/asset.dto.ts b/server/src/dtos/asset.dto.ts
index 8b438992d3..9bc007543a 100644
--- a/server/src/dtos/asset.dto.ts
+++ b/server/src/dtos/asset.dto.ts
@@ -14,7 +14,7 @@ import {
ValidateIf,
} from 'class-validator';
import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
-import { AssetType } from 'src/entities/asset.entity';
+import { AssetType } from 'src/enum';
import { AssetStats } from 'src/interfaces/asset.interface';
import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
diff --git a/server/src/dtos/audit.dto.ts b/server/src/dtos/audit.dto.ts
index e83efca768..dcace5a551 100644
--- a/server/src/dtos/audit.dto.ts
+++ b/server/src/dtos/audit.dto.ts
@@ -1,8 +1,8 @@
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { IsArray, IsEnum, IsString, IsUUID, ValidateNested } from 'class-validator';
-import { EntityType } from 'src/entities/audit.entity';
import { AssetPathType, PathType, PersonPathType, UserPathType } from 'src/entities/move.entity';
+import { EntityType } from 'src/enum';
import { Optional, ValidateDate, ValidateUUID } from 'src/validation';
const PathEnum = Object.values({ ...AssetPathType, ...PersonPathType, ...UserPathType });
diff --git a/server/src/dtos/memory.dto.ts b/server/src/dtos/memory.dto.ts
index c9db4b04e0..5d2e13a9ad 100644
--- a/server/src/dtos/memory.dto.ts
+++ b/server/src/dtos/memory.dto.ts
@@ -2,7 +2,8 @@ import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { IsEnum, IsInt, IsObject, IsPositive, ValidateNested } from 'class-validator';
import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
-import { MemoryEntity, MemoryType } from 'src/entities/memory.entity';
+import { MemoryEntity } from 'src/entities/memory.entity';
+import { MemoryType } from 'src/enum';
import { ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
class MemoryBaseDto {
diff --git a/server/src/dtos/search.dto.ts b/server/src/dtos/search.dto.ts
index b81321b873..9e36cfee80 100644
--- a/server/src/dtos/search.dto.ts
+++ b/server/src/dtos/search.dto.ts
@@ -4,9 +4,8 @@ import { IsEnum, IsInt, IsNotEmpty, IsString, Max, Min } from 'class-validator';
import { PropertyLifecycle } from 'src/decorators';
import { AlbumResponseDto } from 'src/dtos/album.dto';
import { AssetResponseDto } from 'src/dtos/asset-response.dto';
-import { AssetOrder } from 'src/entities/album.entity';
-import { AssetType } from 'src/entities/asset.entity';
import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
+import { AssetOrder, AssetType } from 'src/enum';
import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
class BaseSearchDto {
diff --git a/server/src/dtos/shared-link.dto.ts b/server/src/dtos/shared-link.dto.ts
index 9a90901d27..b97791db58 100644
--- a/server/src/dtos/shared-link.dto.ts
+++ b/server/src/dtos/shared-link.dto.ts
@@ -3,7 +3,8 @@ import { IsEnum, IsString } from 'class-validator';
import _ from 'lodash';
import { AlbumResponseDto, mapAlbumWithoutAssets } from 'src/dtos/album.dto';
import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
-import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entity';
+import { SharedLinkEntity } from 'src/entities/shared-link.entity';
+import { SharedLinkType } from 'src/enum';
import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
export class SharedLinkCreateDto {
diff --git a/server/src/dtos/time-bucket.dto.ts b/server/src/dtos/time-bucket.dto.ts
index a551260136..8803f24fc4 100644
--- a/server/src/dtos/time-bucket.dto.ts
+++ b/server/src/dtos/time-bucket.dto.ts
@@ -1,6 +1,6 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { AssetOrder } from 'src/entities/album.entity';
+import { AssetOrder } from 'src/enum';
import { TimeBucketSize } from 'src/interfaces/asset.interface';
import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
diff --git a/server/src/dtos/user-preferences.dto.ts b/server/src/dtos/user-preferences.dto.ts
index 3305e1cce1..c3b2c051af 100644
--- a/server/src/dtos/user-preferences.dto.ts
+++ b/server/src/dtos/user-preferences.dto.ts
@@ -1,7 +1,8 @@
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import { IsDateString, IsEnum, IsInt, IsPositive, ValidateNested } from 'class-validator';
-import { UserAvatarColor, UserPreferences } from 'src/entities/user-metadata.entity';
+import { UserPreferences } from 'src/entities/user-metadata.entity';
+import { UserAvatarColor } from 'src/enum';
import { Optional, ValidateBoolean } from 'src/validation';
class AvatarUpdate {
diff --git a/server/src/dtos/user.dto.ts b/server/src/dtos/user.dto.ts
index 54020a7397..f7cd70ee74 100644
--- a/server/src/dtos/user.dto.ts
+++ b/server/src/dtos/user.dto.ts
@@ -1,8 +1,9 @@
import { ApiProperty } from '@nestjs/swagger';
import { Transform } from 'class-transformer';
import { IsBoolean, IsEmail, IsNotEmpty, IsNumber, IsPositive, IsString } from 'class-validator';
-import { UserAvatarColor, UserMetadataEntity, UserMetadataKey } from 'src/entities/user-metadata.entity';
-import { UserEntity, UserStatus } from 'src/entities/user.entity';
+import { UserMetadataEntity } from 'src/entities/user-metadata.entity';
+import { UserEntity } from 'src/entities/user.entity';
+import { UserAvatarColor, UserMetadataKey, UserStatus } from 'src/enum';
import { getPreferences } from 'src/utils/preferences';
import { Optional, ValidateBoolean, toEmail, toSanitized } from 'src/validation';
diff --git a/server/src/entities/album-user.entity.ts b/server/src/entities/album-user.entity.ts
index 66ed58c4f1..e75b3cd43e 100644
--- a/server/src/entities/album-user.entity.ts
+++ b/server/src/entities/album-user.entity.ts
@@ -1,12 +1,8 @@
import { AlbumEntity } from 'src/entities/album.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { AlbumUserRole } from 'src/enum';
import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
-export enum AlbumUserRole {
- EDITOR = 'editor',
- VIEWER = 'viewer',
-}
-
@Entity('albums_shared_users_users')
// Pre-existing indices from original album <--> user ManyToMany mapping
@Index('IDX_427c350ad49bd3935a50baab73', ['album'])
diff --git a/server/src/entities/album.entity.ts b/server/src/entities/album.entity.ts
index 39d5b72bf2..e5d2c98814 100644
--- a/server/src/entities/album.entity.ts
+++ b/server/src/entities/album.entity.ts
@@ -2,6 +2,7 @@ import { AlbumUserEntity } from 'src/entities/album-user.entity';
import { AssetEntity } from 'src/entities/asset.entity';
import { SharedLinkEntity } from 'src/entities/shared-link.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { AssetOrder } from 'src/enum';
import {
Column,
CreateDateColumn,
@@ -15,12 +16,6 @@ import {
UpdateDateColumn,
} from 'typeorm';
-// ran into issues when importing the enum from `asset.dto.ts`
-export enum AssetOrder {
- ASC = 'asc',
- DESC = 'desc',
-}
-
@Entity('albums')
export class AlbumEntity {
@PrimaryGeneratedColumn('uuid')
diff --git a/server/src/entities/asset.entity.ts b/server/src/entities/asset.entity.ts
index ca486fb471..f4ea5eafdd 100644
--- a/server/src/entities/asset.entity.ts
+++ b/server/src/entities/asset.entity.ts
@@ -9,6 +9,7 @@ import { SmartSearchEntity } from 'src/entities/smart-search.entity';
import { StackEntity } from 'src/entities/stack.entity';
import { TagEntity } from 'src/entities/tag.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { AssetType } from 'src/enum';
import {
Column,
CreateDateColumn,
@@ -175,10 +176,3 @@ export class AssetEntity {
@Column({ type: 'uuid', nullable: true })
duplicateId!: string | null;
}
-
-export enum AssetType {
- IMAGE = 'IMAGE',
- VIDEO = 'VIDEO',
- AUDIO = 'AUDIO',
- OTHER = 'OTHER',
-}
diff --git a/server/src/entities/audit.entity.ts b/server/src/entities/audit.entity.ts
index be5e14891c..7f51e17585 100644
--- a/server/src/entities/audit.entity.ts
+++ b/server/src/entities/audit.entity.ts
@@ -1,16 +1,6 @@
+import { DatabaseAction, EntityType } from 'src/enum';
import { Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-export enum DatabaseAction {
- CREATE = 'CREATE',
- UPDATE = 'UPDATE',
- DELETE = 'DELETE',
-}
-
-export enum EntityType {
- ASSET = 'ASSET',
- ALBUM = 'ALBUM',
-}
-
@Entity('audit')
@Index('IDX_ownerId_createdAt', ['ownerId', 'createdAt'])
export class AuditEntity {
diff --git a/server/src/entities/memory.entity.ts b/server/src/entities/memory.entity.ts
index d7dcff4b80..c8121dd32e 100644
--- a/server/src/entities/memory.entity.ts
+++ b/server/src/entities/memory.entity.ts
@@ -1,5 +1,6 @@
import { AssetEntity } from 'src/entities/asset.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { MemoryType } from 'src/enum';
import {
Column,
CreateDateColumn,
@@ -12,11 +13,6 @@ import {
UpdateDateColumn,
} from 'typeorm';
-export enum MemoryType {
- /** pictures taken on this day X years ago */
- ON_THIS_DAY = 'on_this_day',
-}
-
export type OnThisDayData = { year: number };
export interface MemoryData {
diff --git a/server/src/entities/shared-link.entity.ts b/server/src/entities/shared-link.entity.ts
index f328192f7f..1fed44b301 100644
--- a/server/src/entities/shared-link.entity.ts
+++ b/server/src/entities/shared-link.entity.ts
@@ -1,6 +1,7 @@
import { AlbumEntity } from 'src/entities/album.entity';
import { AssetEntity } from 'src/entities/asset.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { SharedLinkType } from 'src/enum';
import {
Column,
CreateDateColumn,
@@ -62,13 +63,3 @@ export class SharedLinkEntity {
@Column({ type: 'varchar', nullable: true })
albumId!: string | null;
}
-
-export enum SharedLinkType {
- ALBUM = 'ALBUM',
-
- /**
- * Individual asset
- * or group of assets that are not in an album
- */
- INDIVIDUAL = 'INDIVIDUAL',
-}
diff --git a/server/src/entities/system-metadata.entity.ts b/server/src/entities/system-metadata.entity.ts
index 72aca4c72b..ae01c47b84 100644
--- a/server/src/entities/system-metadata.entity.ts
+++ b/server/src/entities/system-metadata.entity.ts
@@ -1,4 +1,5 @@
import { SystemConfig } from 'src/config';
+import { SystemMetadataKey } from 'src/enum';
import { Column, DeepPartial, Entity, PrimaryColumn } from 'typeorm';
@Entity('system_metadata')
@@ -10,15 +11,6 @@ export class SystemMetadataEntity<T extends keyof SystemMetadata = SystemMetadat
value!: SystemMetadata[T];
}
-export enum SystemMetadataKey {
- REVERSE_GEOCODING_STATE = 'reverse-geocoding-state',
- FACIAL_RECOGNITION_STATE = 'facial-recognition-state',
- ADMIN_ONBOARDING = 'admin-onboarding',
- SYSTEM_CONFIG = 'system-config',
- VERSION_CHECK_STATE = 'version-check-state',
- LICENSE = 'license',
-}
-
export type VersionCheckMetadata = { checkedAt: string; releaseVersion: string };
export interface SystemMetadata extends Record<SystemMetadataKey, Record<string, any>> {
diff --git a/server/src/entities/user-metadata.entity.ts b/server/src/entities/user-metadata.entity.ts
index 73eb9e04aa..2dcb570935 100644
--- a/server/src/entities/user-metadata.entity.ts
+++ b/server/src/entities/user-metadata.entity.ts
@@ -1,4 +1,5 @@
import { UserEntity } from 'src/entities/user.entity';
+import { UserAvatarColor, UserMetadataKey } from 'src/enum';
import { HumanReadableSize } from 'src/utils/bytes';
import { Column, DeepPartial, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
@@ -17,19 +18,6 @@ export class UserMetadataEntity<T extends keyof UserMetadata = UserMetadataKey>
value!: UserMetadata[T];
}
-export enum UserAvatarColor {
- PRIMARY = 'primary',
- PINK = 'pink',
- RED = 'red',
- YELLOW = 'yellow',
- BLUE = 'blue',
- GREEN = 'green',
- PURPLE = 'purple',
- ORANGE = 'orange',
- GRAY = 'gray',
- AMBER = 'amber',
-}
-
export interface UserPreferences {
rating: {
enabled: boolean;
@@ -85,11 +73,6 @@ export const getDefaultPreferences = (user: { email: string }): UserPreferences
};
};
-export enum UserMetadataKey {
- PREFERENCES = 'preferences',
- LICENSE = 'license',
-}
-
export interface UserMetadata extends Record<UserMetadataKey, Record<string, any>> {
[UserMetadataKey.PREFERENCES]: DeepPartial<UserPreferences>;
[UserMetadataKey.LICENSE]: { licenseKey: string; activationKey: string; activatedAt: Date };
diff --git a/server/src/entities/user.entity.ts b/server/src/entities/user.entity.ts
index 6878292ab0..9cacad315b 100644
--- a/server/src/entities/user.entity.ts
+++ b/server/src/entities/user.entity.ts
@@ -1,6 +1,7 @@
import { AssetEntity } from 'src/entities/asset.entity';
import { TagEntity } from 'src/entities/tag.entity';
import { UserMetadataEntity } from 'src/entities/user-metadata.entity';
+import { UserStatus } from 'src/enum';
import {
Column,
CreateDateColumn,
@@ -11,12 +12,6 @@ import {
UpdateDateColumn,
} from 'typeorm';
-export enum UserStatus {
- ACTIVE = 'active',
- REMOVING = 'removing',
- DELETED = 'deleted',
-}
-
@Entity('users')
export class UserEntity {
@PrimaryGeneratedColumn('uuid')
diff --git a/server/src/enum.ts b/server/src/enum.ts
new file mode 100644
index 0000000000..04f59e5a98
--- /dev/null
+++ b/server/src/enum.ts
@@ -0,0 +1,118 @@
+export enum AssetType {
+ IMAGE = 'IMAGE',
+ VIDEO = 'VIDEO',
+ AUDIO = 'AUDIO',
+ OTHER = 'OTHER',
+}
+
+export enum AlbumUserRole {
+ EDITOR = 'editor',
+ VIEWER = 'viewer',
+}
+
+export enum AssetOrder {
+ ASC = 'asc',
+ DESC = 'desc',
+}
+
+export enum DatabaseAction {
+ CREATE = 'CREATE',
+ UPDATE = 'UPDATE',
+ DELETE = 'DELETE',
+}
+
+export enum EntityType {
+ ASSET = 'ASSET',
+ ALBUM = 'ALBUM',
+}
+
+export enum MemoryType {
+ /** pictures taken on this day X years ago */
+ ON_THIS_DAY = 'on_this_day',
+}
+
+export enum Permission {
+ ACTIVITY_CREATE = 'activity.create',
+ ACTIVITY_DELETE = 'activity.delete',
+
+ // ASSET_CREATE = 'asset.create',
+ ASSET_READ = 'asset.read',
+ ASSET_UPDATE = 'asset.update',
+ ASSET_DELETE = 'asset.delete',
+ ASSET_RESTORE = 'asset.restore',
+ ASSET_SHARE = 'asset.share',
+ ASSET_VIEW = 'asset.view',
+ ASSET_DOWNLOAD = 'asset.download',
+ ASSET_UPLOAD = 'asset.upload',
+
+ // ALBUM_CREATE = 'album.create',
+ ALBUM_READ = 'album.read',
+ ALBUM_UPDATE = 'album.update',
+ ALBUM_DELETE = 'album.delete',
+ ALBUM_ADD_ASSET = 'album.addAsset',
+ ALBUM_REMOVE_ASSET = 'album.removeAsset',
+ ALBUM_SHARE = 'album.share',
+ ALBUM_DOWNLOAD = 'album.download',
+
+ AUTH_DEVICE_DELETE = 'authDevice.delete',
+
+ ARCHIVE_READ = 'archive.read',
+
+ TIMELINE_READ = 'timeline.read',
+ TIMELINE_DOWNLOAD = 'timeline.download',
+
+ MEMORY_READ = 'memory.read',
+ MEMORY_WRITE = 'memory.write',
+ MEMORY_DELETE = 'memory.delete',
+
+ PERSON_READ = 'person.read',
+ PERSON_WRITE = 'person.write',
+ PERSON_MERGE = 'person.merge',
+ PERSON_CREATE = 'person.create',
+ PERSON_REASSIGN = 'person.reassign',
+
+ PARTNER_UPDATE = 'partner.update',
+}
+
+export enum SharedLinkType {
+ ALBUM = 'ALBUM',
+
+ /**
+ * Individual asset
+ * or group of assets that are not in an album
+ */
+ INDIVIDUAL = 'INDIVIDUAL',
+}
+
+export enum SystemMetadataKey {
+ REVERSE_GEOCODING_STATE = 'reverse-geocoding-state',
+ FACIAL_RECOGNITION_STATE = 'facial-recognition-state',
+ ADMIN_ONBOARDING = 'admin-onboarding',
+ SYSTEM_CONFIG = 'system-config',
+ VERSION_CHECK_STATE = 'version-check-state',
+ LICENSE = 'license',
+}
+
+export enum UserMetadataKey {
+ PREFERENCES = 'preferences',
+ LICENSE = 'license',
+}
+
+export enum UserAvatarColor {
+ PRIMARY = 'primary',
+ PINK = 'pink',
+ RED = 'red',
+ YELLOW = 'yellow',
+ BLUE = 'blue',
+ GREEN = 'green',
+ PURPLE = 'purple',
+ ORANGE = 'orange',
+ GRAY = 'gray',
+ AMBER = 'amber',
+}
+
+export enum UserStatus {
+ ACTIVE = 'active',
+ REMOVING = 'removing',
+ DELETED = 'deleted',
+}
diff --git a/server/src/interfaces/access.interface.ts b/server/src/interfaces/access.interface.ts
index 6b408c263e..cf5ebbd005 100644
--- a/server/src/interfaces/access.interface.ts
+++ b/server/src/interfaces/access.interface.ts
@@ -1,4 +1,4 @@
-import { AlbumUserRole } from 'src/entities/album-user.entity';
+import { AlbumUserRole } from 'src/enum';
export const IAccessRepository = 'IAccessRepository';
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
index 37115a6e3a..aca45f3dc7 100644
--- a/server/src/interfaces/asset.interface.ts
+++ b/server/src/interfaces/asset.interface.ts
@@ -1,7 +1,7 @@
-import { AssetOrder } from 'src/entities/album.entity';
import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
+import { AssetOrder, AssetType } from 'src/enum';
import { AssetSearchOptions, SearchExploreItem } from 'src/interfaces/search.interface';
import { Paginated, PaginationOptions } from 'src/utils/pagination';
import { FindOptionsOrder, FindOptionsRelations, FindOptionsSelect } from 'typeorm';
diff --git a/server/src/interfaces/audit.interface.ts b/server/src/interfaces/audit.interface.ts
index b023d00d56..0b9f19d8db 100644
--- a/server/src/interfaces/audit.interface.ts
+++ b/server/src/interfaces/audit.interface.ts
@@ -1,4 +1,4 @@
-import { DatabaseAction, EntityType } from 'src/entities/audit.entity';
+import { DatabaseAction, EntityType } from 'src/enum';
export const IAuditRepository = 'IAuditRepository';
diff --git a/server/src/interfaces/search.interface.ts b/server/src/interfaces/search.interface.ts
index d77cd62cd1..0226e3663c 100644
--- a/server/src/interfaces/search.interface.ts
+++ b/server/src/interfaces/search.interface.ts
@@ -1,6 +1,7 @@
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
+import { AssetType } from 'src/enum';
import { Paginated } from 'src/utils/pagination';
export const ISearchRepository = 'ISearchRepository';
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index 9dd294cc21..438424ab78 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
import { ActivityEntity } from 'src/entities/activity.entity';
-import { AlbumUserRole } from 'src/entities/album-user.entity';
import { AlbumEntity } from 'src/entities/album.entity';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
import { AssetEntity } from 'src/entities/asset.entity';
@@ -12,6 +11,7 @@ import { PartnerEntity } from 'src/entities/partner.entity';
import { PersonEntity } from 'src/entities/person.entity';
import { SessionEntity } from 'src/entities/session.entity';
import { SharedLinkEntity } from 'src/entities/shared-link.entity';
+import { AlbumUserRole } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { Instrumentation } from 'src/utils/instrumentation';
import { Brackets, In, Repository } from 'typeorm';
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index cc9fac4652..1029b8d8da 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -1,11 +1,11 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
-import { AssetOrder } from 'src/entities/album.entity';
import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
import { SmartInfoEntity } from 'src/entities/smart-info.entity';
+import { AssetOrder, AssetType } from 'src/enum';
import {
AssetBuilderOptions,
AssetCreate,
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index 80b3fd7854..555f1042bb 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -8,7 +8,7 @@ import { citiesFile, resourcePaths } from 'src/constants';
import { AssetEntity } from 'src/entities/asset.entity';
import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
import { NaturalEarthCountriesEntity } from 'src/entities/natural-earth-countries.entity';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import {
GeoPoint,
diff --git a/server/src/repositories/search.repository.ts b/server/src/repositories/search.repository.ts
index 9abe62a12d..40f87ddf24 100644
--- a/server/src/repositories/search.repository.ts
+++ b/server/src/repositories/search.repository.ts
@@ -3,10 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { getVectorExtension } from 'src/database.config';
import { DummyValue, GenerateSql } from 'src/decorators';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
import { SmartInfoEntity } from 'src/entities/smart-info.entity';
import { SmartSearchEntity } from 'src/entities/smart-search.entity';
+import { AssetType } from 'src/enum';
import { DatabaseExtension } from 'src/interfaces/database.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import {
diff --git a/server/src/services/activity.service.ts b/server/src/services/activity.service.ts
index 7589fb8ccc..c1b2e1b4d0 100644
--- a/server/src/services/activity.service.ts
+++ b/server/src/services/activity.service.ts
@@ -1,5 +1,5 @@
import { Inject, Injectable } from '@nestjs/common';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import {
ActivityCreateDto,
ActivityDto,
@@ -13,6 +13,7 @@ import {
} from 'src/dtos/activity.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { ActivityEntity } from 'src/entities/activity.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IActivityRepository } from 'src/interfaces/activity.interface';
diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index 56ea787be9..41f8930733 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -1,7 +1,7 @@
import { BadRequestException } from '@nestjs/common';
import _ from 'lodash';
import { BulkIdErrorReason } from 'src/dtos/asset-ids.response.dto';
-import { AlbumUserRole } from 'src/entities/album-user.entity';
+import { AlbumUserRole } from 'src/enum';
import { IAlbumUserRepository } from 'src/interfaces/album-user.interface';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 9cd750e6b1..f8108ad065 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -1,5 +1,5 @@
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import {
AddUsersDto,
AlbumCountResponseDto,
@@ -17,6 +17,7 @@ import { AuthDto } from 'src/dtos/auth.dto';
import { AlbumUserEntity } from 'src/entities/album-user.entity';
import { AlbumEntity } from 'src/entities/album.entity';
import { AssetEntity } from 'src/entities/asset.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAlbumUserRepository } from 'src/interfaces/album-user.interface';
import { AlbumAssetCount, AlbumInfoOptions, IAlbumRepository } from 'src/interfaces/album.interface';
diff --git a/server/src/services/asset-media.service.spec.ts b/server/src/services/asset-media.service.spec.ts
index 3990b4c3de..978f98cf10 100644
--- a/server/src/services/asset-media.service.spec.ts
+++ b/server/src/services/asset-media.service.spec.ts
@@ -2,7 +2,8 @@ import { BadRequestException, NotFoundException, UnauthorizedException } from '@
import { Stats } from 'node:fs';
import { AssetMediaStatus, AssetRejectReason, AssetUploadAction } from 'src/dtos/asset-media-response.dto';
import { AssetMediaCreateDto, AssetMediaReplaceDto, UploadFieldName } from 'src/dtos/asset-media.dto';
-import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity } from 'src/entities/asset.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { IEventRepository } from 'src/interfaces/event.interface';
import { IJobRepository, JobName } from 'src/interfaces/job.interface';
diff --git a/server/src/services/asset-media.service.ts b/server/src/services/asset-media.service.ts
index 8895e1c369..b8a43b34ec 100644
--- a/server/src/services/asset-media.service.ts
+++ b/server/src/services/asset-media.service.ts
@@ -7,7 +7,7 @@ import {
} from '@nestjs/common';
import { extname } from 'node:path';
import sanitize from 'sanitize-filename';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { StorageCore, StorageFolder } from 'src/cores/storage.core';
import {
AssetBulkUploadCheckResponseDto,
@@ -27,7 +27,8 @@ import {
UploadFieldName,
} from 'src/dtos/asset-media.dto';
import { AuthDto } from 'src/dtos/auth.dto';
-import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity } from 'src/entities/asset.entity';
+import { AssetType, Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
diff --git a/server/src/services/asset.service.spec.ts b/server/src/services/asset.service.spec.ts
index 3385427c29..95a80ab4da 100755
--- a/server/src/services/asset.service.spec.ts
+++ b/server/src/services/asset.service.spec.ts
@@ -1,7 +1,8 @@
import { BadRequestException } from '@nestjs/common';
import { mapAsset } from 'src/dtos/asset-response.dto';
import { AssetJobName, AssetStatsResponseDto } from 'src/dtos/asset.dto';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
+import { AssetType } from 'src/enum';
import { AssetStats, IAssetRepository } from 'src/interfaces/asset.interface';
import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
import { IJobRepository, JobName } from 'src/interfaces/job.interface';
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index a34349498b..bbbc2bb407 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -1,7 +1,7 @@
import { BadRequestException, Inject } from '@nestjs/common';
import _ from 'lodash';
import { DateTime, Duration } from 'luxon';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
import {
AssetResponseDto,
@@ -22,6 +22,7 @@ import { AuthDto } from 'src/dtos/auth.dto';
import { MemoryLaneDto } from 'src/dtos/search.dto';
import { UpdateStackParentDto } from 'src/dtos/stack.dto';
import { AssetEntity } from 'src/entities/asset.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
diff --git a/server/src/services/audit.service.spec.ts b/server/src/services/audit.service.spec.ts
index 8557677f92..ef685f4a87 100644
--- a/server/src/services/audit.service.spec.ts
+++ b/server/src/services/audit.service.spec.ts
@@ -1,4 +1,4 @@
-import { DatabaseAction, EntityType } from 'src/entities/audit.entity';
+import { DatabaseAction, EntityType } from 'src/enum';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { IAuditRepository } from 'src/interfaces/audit.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
diff --git a/server/src/services/audit.service.ts b/server/src/services/audit.service.ts
index bfff09c0bc..225bd11061 100644
--- a/server/src/services/audit.service.ts
+++ b/server/src/services/audit.service.ts
@@ -2,7 +2,7 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
import { DateTime } from 'luxon';
import { resolve } from 'node:path';
import { AUDIT_LOG_MAX_DURATION } from 'src/constants';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { StorageCore, StorageFolder } from 'src/cores/storage.core';
import {
AuditDeletesDto,
@@ -13,8 +13,8 @@ import {
PathEntityType,
} from 'src/dtos/audit.dto';
import { AuthDto } from 'src/dtos/auth.dto';
-import { DatabaseAction } from 'src/entities/audit.entity';
import { AssetPathType, PersonPathType, UserPathType } from 'src/entities/move.entity';
+import { DatabaseAction, Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { IAuditRepository } from 'src/interfaces/audit.interface';
diff --git a/server/src/services/download.service.ts b/server/src/services/download.service.ts
index 11e4de83d9..157142d906 100644
--- a/server/src/services/download.service.ts
+++ b/server/src/services/download.service.ts
@@ -1,10 +1,11 @@
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
import { parse } from 'node:path';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { AssetIdsDto } from 'src/dtos/asset.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { DownloadArchiveInfo, DownloadInfoDto, DownloadResponseDto } from 'src/dtos/download.dto';
import { AssetEntity } from 'src/entities/asset.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/job.service.ts b/server/src/services/job.service.ts
index f232c4ac77..aa84ef4f40 100644
--- a/server/src/services/job.service.ts
+++ b/server/src/services/job.service.ts
@@ -3,7 +3,7 @@ import { snakeCase } from 'lodash';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { mapAsset } from 'src/dtos/asset-response.dto';
import { AllJobStatusResponseDto, JobCommandDto, JobStatusDto } from 'src/dtos/job.dto';
-import { AssetType } from 'src/entities/asset.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
import {
diff --git a/server/src/services/library.service.spec.ts b/server/src/services/library.service.spec.ts
index 4aad2d3d58..7f81fd44aa 100644
--- a/server/src/services/library.service.spec.ts
+++ b/server/src/services/library.service.spec.ts
@@ -3,8 +3,8 @@ import { Stats } from 'node:fs';
import { SystemConfig } from 'src/config';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { mapLibrary } from 'src/dtos/library.dto';
-import { AssetType } from 'src/entities/asset.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IDatabaseRepository } from 'src/interfaces/database.interface';
diff --git a/server/src/services/library.service.ts b/server/src/services/library.service.ts
index 6cded14775..f0d7fe8cd4 100644
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@@ -17,8 +17,8 @@ import {
ValidateLibraryResponseDto,
mapLibrary,
} from 'src/dtos/library.dto';
-import { AssetType } from 'src/entities/asset.entity';
import { LibraryEntity } from 'src/entities/library.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository, WithProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';
diff --git a/server/src/services/media.service.spec.ts b/server/src/services/media.service.spec.ts
index 7bb201f78f..d9d5948cea 100644
--- a/server/src/services/media.service.spec.ts
+++ b/server/src/services/media.service.spec.ts
@@ -8,8 +8,8 @@ import {
TranscodePolicy,
VideoCodec,
} from 'src/config';
-import { AssetType } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
diff --git a/server/src/services/media.service.ts b/server/src/services/media.service.ts
index 9d5b4ed858..5264da9fe9 100644
--- a/server/src/services/media.service.ts
+++ b/server/src/services/media.service.ts
@@ -13,8 +13,9 @@ import {
import { GeneratedImageType, StorageCore, StorageFolder } from 'src/cores/storage.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { AssetPathType } from 'src/entities/move.entity';
+import { AssetType } from 'src/enum';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import {
diff --git a/server/src/services/memory.service.spec.ts b/server/src/services/memory.service.spec.ts
index cee3113f00..ba184daa80 100644
--- a/server/src/services/memory.service.spec.ts
+++ b/server/src/services/memory.service.spec.ts
@@ -1,5 +1,5 @@
import { BadRequestException } from '@nestjs/common';
-import { MemoryType } from 'src/entities/memory.entity';
+import { MemoryType } from 'src/enum';
import { IMemoryRepository } from 'src/interfaces/memory.interface';
import { MemoryService } from 'src/services/memory.service';
import { authStub } from 'test/fixtures/auth.stub';
diff --git a/server/src/services/memory.service.ts b/server/src/services/memory.service.ts
index 0164dd0b96..02fdacc355 100644
--- a/server/src/services/memory.service.ts
+++ b/server/src/services/memory.service.ts
@@ -1,9 +1,10 @@
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { MemoryCreateDto, MemoryResponseDto, MemoryUpdateDto, mapMemory } from 'src/dtos/memory.dto';
import { AssetEntity } from 'src/entities/asset.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IMemoryRepository } from 'src/interfaces/memory.interface';
import { addAssets, removeAssets } from 'src/utils/asset.util';
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 3adae86377..522e1320fd 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -2,8 +2,8 @@ import { BinaryField } from 'exiftool-vendored';
import { randomBytes } from 'node:crypto';
import { Stats } from 'node:fs';
import { constants } from 'node:fs/promises';
-import { AssetType } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
+import { AssetType } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 7e940744e7..041b35c02c 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -8,8 +8,9 @@ import path from 'node:path';
import { SystemConfig } from 'src/config';
import { StorageCore } from 'src/cores/storage.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
+import { AssetType } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
diff --git a/server/src/services/notification.service.spec.ts b/server/src/services/notification.service.spec.ts
index 293cc11657..f10c79c579 100644
--- a/server/src/services/notification.service.spec.ts
+++ b/server/src/services/notification.service.spec.ts
@@ -1,6 +1,6 @@
import { defaults, SystemConfig } from 'src/config';
import { AlbumUserEntity } from 'src/entities/album-user.entity';
-import { UserMetadataKey } from 'src/entities/user-metadata.entity';
+import { UserMetadataKey } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
diff --git a/server/src/services/partner.service.ts b/server/src/services/partner.service.ts
index d26149dceb..c20d43db5d 100644
--- a/server/src/services/partner.service.ts
+++ b/server/src/services/partner.service.ts
@@ -1,9 +1,10 @@
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { AuthDto } from 'src/dtos/auth.dto';
import { PartnerResponseDto, PartnerSearchDto, UpdatePartnerDto } from 'src/dtos/partner.dto';
import { mapUser } from 'src/dtos/user.dto';
import { PartnerEntity } from 'src/entities/partner.entity';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IPartnerRepository, PartnerDirection, PartnerIds } from 'src/interfaces/partner.interface';
diff --git a/server/src/services/person.service.spec.ts b/server/src/services/person.service.spec.ts
index 8a2e88b276..70e043cc7f 100644
--- a/server/src/services/person.service.spec.ts
+++ b/server/src/services/person.service.spec.ts
@@ -3,7 +3,7 @@ import { Colorspace } from 'src/config';
import { BulkIdErrorReason } from 'src/dtos/asset-ids.response.dto';
import { PersonResponseDto, mapFaces, mapPerson } from 'src/dtos/person.dto';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
diff --git a/server/src/services/person.service.ts b/server/src/services/person.service.ts
index 261c771b0d..8ffae5bf05 100644
--- a/server/src/services/person.service.ts
+++ b/server/src/services/person.service.ts
@@ -1,7 +1,7 @@
import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';
import { ImageFormat } from 'src/config';
import { FACE_THUMBNAIL_SIZE } from 'src/constants';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { StorageCore } from 'src/cores/storage.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { BulkIdErrorReason, BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
@@ -23,10 +23,10 @@ import {
mapPerson,
} from 'src/dtos/person.dto';
import { AssetFaceEntity } from 'src/entities/asset-face.entity';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { PersonPathType } from 'src/entities/move.entity';
import { PersonEntity } from 'src/entities/person.entity';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { AssetType, Permission, SystemMetadataKey } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
diff --git a/server/src/services/search.service.ts b/server/src/services/search.service.ts
index 1d746a03d8..6af42ac1f3 100644
--- a/server/src/services/search.service.ts
+++ b/server/src/services/search.service.ts
@@ -14,8 +14,8 @@ import {
SmartSearchDto,
mapPlaces,
} from 'src/dtos/search.dto';
-import { AssetOrder } from 'src/entities/album.entity';
import { AssetEntity } from 'src/entities/asset.entity';
+import { AssetOrder } from 'src/enum';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
diff --git a/server/src/services/server.service.spec.ts b/server/src/services/server.service.spec.ts
index 6c7ef03627..799ec2c5a3 100644
--- a/server/src/services/server.service.spec.ts
+++ b/server/src/services/server.service.spec.ts
@@ -1,4 +1,4 @@
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import { IServerInfoRepository } from 'src/interfaces/server-info.interface';
diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.ts
index 22196c4e26..67e19eda78 100644
--- a/server/src/services/server.service.ts
+++ b/server/src/services/server.service.ts
@@ -14,7 +14,7 @@ import {
ServerStorageResponseDto,
UsageByUserDto,
} from 'src/dtos/server.dto';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { OnEvents } from 'src/interfaces/event.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/session.service.ts b/server/src/services/session.service.ts
index f72bf194c1..01cf3a5c09 100644
--- a/server/src/services/session.service.ts
+++ b/server/src/services/session.service.ts
@@ -1,8 +1,9 @@
import { Inject, Injectable } from '@nestjs/common';
import { DateTime } from 'luxon';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { AuthDto } from 'src/dtos/auth.dto';
import { SessionResponseDto, mapSession } from 'src/dtos/session.dto';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { JobStatus } from 'src/interfaces/job.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/shared-link.service.spec.ts b/server/src/services/shared-link.service.spec.ts
index f0b42b0153..0fd47b612e 100644
--- a/server/src/services/shared-link.service.spec.ts
+++ b/server/src/services/shared-link.service.spec.ts
@@ -2,7 +2,7 @@ import { BadRequestException, ForbiddenException, UnauthorizedException } from '
import _ from 'lodash';
import { DEFAULT_EXTERNAL_DOMAIN } from 'src/constants';
import { AssetIdErrorReason } from 'src/dtos/asset-ids.response.dto';
-import { SharedLinkType } from 'src/entities/shared-link.entity';
+import { SharedLinkType } from 'src/enum';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
diff --git a/server/src/services/shared-link.service.ts b/server/src/services/shared-link.service.ts
index 773e42ce8c..4b6768e028 100644
--- a/server/src/services/shared-link.service.ts
+++ b/server/src/services/shared-link.service.ts
@@ -1,6 +1,6 @@
import { BadRequestException, ForbiddenException, Inject, Injectable, UnauthorizedException } from '@nestjs/common';
import { DEFAULT_EXTERNAL_DOMAIN } from 'src/constants';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { AssetIdErrorReason, AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
import { AssetIdsDto } from 'src/dtos/asset.dto';
@@ -14,7 +14,8 @@ import {
mapSharedLinkWithoutMetadata,
} from 'src/dtos/shared-link.dto';
import { AssetEntity } from 'src/entities/asset.entity';
-import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entity';
+import { SharedLinkEntity } from 'src/entities/shared-link.entity';
+import { Permission, SharedLinkType } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.ts
index e067252553..599f5e10a5 100644
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -15,8 +15,9 @@ import {
} from 'src/constants';
import { StorageCore, StorageFolder } from 'src/cores/storage.core';
import { SystemConfigCore } from 'src/cores/system-config.core';
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { AssetPathType } from 'src/entities/move.entity';
+import { AssetType } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
diff --git a/server/src/services/sync.service.ts b/server/src/services/sync.service.ts
index 1a7a74d699..6af43d6ebc 100644
--- a/server/src/services/sync.service.ts
+++ b/server/src/services/sync.service.ts
@@ -1,11 +1,11 @@
import { Inject } from '@nestjs/common';
import { DateTime } from 'luxon';
import { AUDIT_LOG_MAX_DURATION } from 'src/constants';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { AssetDeltaSyncDto, AssetDeltaSyncResponseDto, AssetFullSyncDto } from 'src/dtos/sync.dto';
-import { DatabaseAction, EntityType } from 'src/entities/audit.entity';
+import { DatabaseAction, EntityType, Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { IAuditRepository } from 'src/interfaces/audit.interface';
diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.ts
index a3b0011d0c..bb0e706d61 100644
--- a/server/src/services/system-config.service.spec.ts
+++ b/server/src/services/system-config.service.spec.ts
@@ -13,7 +13,7 @@ import {
VideoContainer,
defaults,
} from 'src/config';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { IEventRepository, ServerEvent } from 'src/interfaces/event.interface';
import { QueueName } from 'src/interfaces/job.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/system-metadata.service.spec.ts b/server/src/services/system-metadata.service.spec.ts
index 9d11c1c72a..5799ee859d 100644
--- a/server/src/services/system-metadata.service.spec.ts
+++ b/server/src/services/system-metadata.service.spec.ts
@@ -1,4 +1,4 @@
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
import { SystemMetadataService } from 'src/services/system-metadata.service';
import { newSystemMetadataRepositoryMock } from 'test/repositories/system-metadata.repository.mock';
diff --git a/server/src/services/system-metadata.service.ts b/server/src/services/system-metadata.service.ts
index e8fddfc13c..c2c9a4fdfc 100644
--- a/server/src/services/system-metadata.service.ts
+++ b/server/src/services/system-metadata.service.ts
@@ -4,7 +4,7 @@ import {
AdminOnboardingUpdateDto,
ReverseGeocodingStateResponseDto,
} from 'src/dtos/system-metadata.dto';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
@Injectable()
diff --git a/server/src/services/timeline.service.ts b/server/src/services/timeline.service.ts
index b82a16f139..44f1136da1 100644
--- a/server/src/services/timeline.service.ts
+++ b/server/src/services/timeline.service.ts
@@ -1,8 +1,9 @@
import { BadRequestException, Inject } from '@nestjs/common';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { AssetResponseDto, SanitizedAssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
import { TimeBucketAssetDto, TimeBucketDto, TimeBucketResponseDto } from 'src/dtos/time-bucket.dto';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository, TimeBucketOptions } from 'src/interfaces/asset.interface';
import { IPartnerRepository } from 'src/interfaces/partner.interface';
diff --git a/server/src/services/trash.service.ts b/server/src/services/trash.service.ts
index 0c64332941..7e2582fd24 100644
--- a/server/src/services/trash.service.ts
+++ b/server/src/services/trash.service.ts
@@ -1,8 +1,9 @@
import { Inject } from '@nestjs/common';
import { DateTime } from 'luxon';
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface';
import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
diff --git a/server/src/services/user-admin.service.spec.ts b/server/src/services/user-admin.service.spec.ts
index 2479b9826d..8e80aa4dc1 100644
--- a/server/src/services/user-admin.service.spec.ts
+++ b/server/src/services/user-admin.service.spec.ts
@@ -1,6 +1,6 @@
import { BadRequestException, ForbiddenException } from '@nestjs/common';
import { mapUserAdmin } from 'src/dtos/user.dto';
-import { UserStatus } from 'src/entities/user.entity';
+import { UserStatus } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IEventRepository } from 'src/interfaces/event.interface';
diff --git a/server/src/services/user-admin.service.ts b/server/src/services/user-admin.service.ts
index ba829947dc..76ae3dd23a 100644
--- a/server/src/services/user-admin.service.ts
+++ b/server/src/services/user-admin.service.ts
@@ -11,8 +11,7 @@ import {
UserAdminUpdateDto,
mapUserAdmin,
} from 'src/dtos/user.dto';
-import { UserMetadataKey } from 'src/entities/user-metadata.entity';
-import { UserStatus } from 'src/entities/user.entity';
+import { UserMetadataKey, UserStatus } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IEventRepository } from 'src/interfaces/event.interface';
diff --git a/server/src/services/user.service.spec.ts b/server/src/services/user.service.spec.ts
index 007b56b212..0ac0ea6dbc 100644
--- a/server/src/services/user.service.spec.ts
+++ b/server/src/services/user.service.spec.ts
@@ -1,6 +1,6 @@
import { BadRequestException, InternalServerErrorException, NotFoundException } from '@nestjs/common';
-import { UserMetadataKey } from 'src/entities/user-metadata.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { UserMetadataKey } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IJobRepository, JobName } from 'src/interfaces/job.interface';
diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.ts
index 03aee5c00b..92404a6958 100644
--- a/server/src/services/user.service.ts
+++ b/server/src/services/user.service.ts
@@ -9,8 +9,9 @@ import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';
import { UserPreferencesResponseDto, UserPreferencesUpdateDto, mapPreferences } from 'src/dtos/user-preferences.dto';
import { CreateProfileImageResponseDto, mapCreateProfileImageResponse } from 'src/dtos/user-profile.dto';
import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto, mapUser, mapUserAdmin } from 'src/dtos/user.dto';
-import { UserMetadataEntity, UserMetadataKey } from 'src/entities/user-metadata.entity';
+import { UserMetadataEntity } from 'src/entities/user-metadata.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { UserMetadataKey } from 'src/enum';
import { IAlbumRepository } from 'src/interfaces/album.interface';
import { ICryptoRepository } from 'src/interfaces/crypto.interface';
import { IEntityJob, IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
diff --git a/server/src/services/version.service.spec.ts b/server/src/services/version.service.spec.ts
index 74489e04ea..02dfe7588f 100644
--- a/server/src/services/version.service.spec.ts
+++ b/server/src/services/version.service.spec.ts
@@ -1,6 +1,6 @@
import { DateTime } from 'luxon';
import { serverVersion } from 'src/constants';
-import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { IEventRepository } from 'src/interfaces/event.interface';
import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/services/version.service.ts b/server/src/services/version.service.ts
index 8408e53bfe..42e2b50ab5 100644
--- a/server/src/services/version.service.ts
+++ b/server/src/services/version.service.ts
@@ -5,7 +5,8 @@ import { isDev, serverVersion } from 'src/constants';
import { SystemConfigCore } from 'src/cores/system-config.core';
import { OnServerEvent } from 'src/decorators';
import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { SystemMetadataKey, VersionCheckMetadata } from 'src/entities/system-metadata.entity';
+import { VersionCheckMetadata } from 'src/entities/system-metadata.entity';
+import { SystemMetadataKey } from 'src/enum';
import { ClientEvent, IEventRepository, OnEvents, ServerEvent, ServerEventMap } from 'src/interfaces/event.interface';
import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
import { ILoggerRepository } from 'src/interfaces/logger.interface';
diff --git a/server/src/subscribers/audit.subscriber.ts b/server/src/subscribers/audit.subscriber.ts
index 3d65507aec..8c2ad3e18d 100644
--- a/server/src/subscribers/audit.subscriber.ts
+++ b/server/src/subscribers/audit.subscriber.ts
@@ -1,6 +1,7 @@
import { AlbumEntity } from 'src/entities/album.entity';
import { AssetEntity } from 'src/entities/asset.entity';
-import { AuditEntity, DatabaseAction, EntityType } from 'src/entities/audit.entity';
+import { AuditEntity } from 'src/entities/audit.entity';
+import { DatabaseAction, EntityType } from 'src/enum';
import { EntitySubscriberInterface, EventSubscriber, RemoveEvent } from 'typeorm';
@EventSubscriber()
diff --git a/server/src/utils/asset.util.ts b/server/src/utils/asset.util.ts
index 76a8dc06b0..aa77a0b144 100644
--- a/server/src/utils/asset.util.ts
+++ b/server/src/utils/asset.util.ts
@@ -1,6 +1,7 @@
-import { AccessCore, Permission } from 'src/cores/access.core';
+import { AccessCore } from 'src/cores/access.core';
import { BulkIdErrorReason, BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
import { AuthDto } from 'src/dtos/auth.dto';
+import { Permission } from 'src/enum';
import { IAccessRepository } from 'src/interfaces/access.interface';
import { IPartnerRepository } from 'src/interfaces/partner.interface';
diff --git a/server/src/utils/mime-types.ts b/server/src/utils/mime-types.ts
index 495efc9ebc..6b59d2cd41 100644
--- a/server/src/utils/mime-types.ts
+++ b/server/src/utils/mime-types.ts
@@ -1,5 +1,5 @@
import { extname } from 'node:path';
-import { AssetType } from 'src/entities/asset.entity';
+import { AssetType } from 'src/enum';
const raw: Record<string, string[]> = {
'.3fr': ['image/3fr', 'image/x-hasselblad-3fr'],
diff --git a/server/src/utils/preferences.ts b/server/src/utils/preferences.ts
index f3561fa7b6..beaeb472ec 100644
--- a/server/src/utils/preferences.ts
+++ b/server/src/utils/preferences.ts
@@ -1,7 +1,8 @@
import _ from 'lodash';
import { UserPreferencesUpdateDto } from 'src/dtos/user-preferences.dto';
-import { UserMetadataKey, UserPreferences, getDefaultPreferences } from 'src/entities/user-metadata.entity';
+import { UserPreferences, getDefaultPreferences } from 'src/entities/user-metadata.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { UserMetadataKey } from 'src/enum';
import { getKeysDeep } from 'src/utils/misc';
import { DeepPartial } from 'typeorm';
diff --git a/server/test/fixtures/album.stub.ts b/server/test/fixtures/album.stub.ts
index 4105b01978..c2c59a8007 100644
--- a/server/test/fixtures/album.stub.ts
+++ b/server/test/fixtures/album.stub.ts
@@ -1,5 +1,5 @@
-import { AlbumUserRole } from 'src/entities/album-user.entity';
-import { AlbumEntity, AssetOrder } from 'src/entities/album.entity';
+import { AlbumEntity } from 'src/entities/album.entity';
+import { AlbumUserRole, AssetOrder } from 'src/enum';
import { assetStub } from 'test/fixtures/asset.stub';
import { authStub } from 'test/fixtures/auth.stub';
import { userStub } from 'test/fixtures/user.stub';
diff --git a/server/test/fixtures/asset.stub.ts b/server/test/fixtures/asset.stub.ts
index aa141a9964..23df5e4f56 100644
--- a/server/test/fixtures/asset.stub.ts
+++ b/server/test/fixtures/asset.stub.ts
@@ -1,6 +1,7 @@
-import { AssetEntity, AssetType } from 'src/entities/asset.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
import { ExifEntity } from 'src/entities/exif.entity';
import { StackEntity } from 'src/entities/stack.entity';
+import { AssetType } from 'src/enum';
import { authStub } from 'test/fixtures/auth.stub';
import { fileStub } from 'test/fixtures/file.stub';
import { libraryStub } from 'test/fixtures/library.stub';
diff --git a/server/test/fixtures/audit.stub.ts b/server/test/fixtures/audit.stub.ts
index bca1d33491..3e79a60819 100644
--- a/server/test/fixtures/audit.stub.ts
+++ b/server/test/fixtures/audit.stub.ts
@@ -1,4 +1,5 @@
-import { AuditEntity, DatabaseAction, EntityType } from 'src/entities/audit.entity';
+import { AuditEntity } from 'src/entities/audit.entity';
+import { DatabaseAction, EntityType } from 'src/enum';
import { authStub } from 'test/fixtures/auth.stub';
export const auditStub = {
diff --git a/server/test/fixtures/memory.stub.ts b/server/test/fixtures/memory.stub.ts
index bb84a8f1df..50872d8ac1 100644
--- a/server/test/fixtures/memory.stub.ts
+++ b/server/test/fixtures/memory.stub.ts
@@ -1,4 +1,5 @@
-import { MemoryEntity, MemoryType } from 'src/entities/memory.entity';
+import { MemoryEntity } from 'src/entities/memory.entity';
+import { MemoryType } from 'src/enum';
import { assetStub } from 'test/fixtures/asset.stub';
import { userStub } from 'test/fixtures/user.stub';
diff --git a/server/test/fixtures/shared-link.stub.ts b/server/test/fixtures/shared-link.stub.ts
index 1120e15e94..1635f8d24f 100644
--- a/server/test/fixtures/shared-link.stub.ts
+++ b/server/test/fixtures/shared-link.stub.ts
@@ -3,10 +3,9 @@ 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 { AssetOrder } from 'src/entities/album.entity';
-import { AssetType } from 'src/entities/asset.entity';
-import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entity';
+import { SharedLinkEntity } from 'src/entities/shared-link.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { AssetOrder, AssetType, SharedLinkType } from 'src/enum';
import { assetStub } from 'test/fixtures/asset.stub';
import { authStub } from 'test/fixtures/auth.stub';
import { userStub } from 'test/fixtures/user.stub';
diff --git a/server/test/fixtures/user.stub.ts b/server/test/fixtures/user.stub.ts
index cb82dfe26c..6f3a819eef 100644
--- a/server/test/fixtures/user.stub.ts
+++ b/server/test/fixtures/user.stub.ts
@@ -1,5 +1,5 @@
-import { UserAvatarColor, UserMetadataKey } from 'src/entities/user-metadata.entity';
import { UserEntity } from 'src/entities/user.entity';
+import { UserAvatarColor, UserMetadataKey } from 'src/enum';
import { authStub } from 'test/fixtures/auth.stub';
export const userDto = {