refactor: infra folder (#8138)

server/src/repositories/access.repository.ts

@@ -9,8 +9,8 @@ import { PartnerEntity } from 'src/entities/partner.entity';
 import { PersonEntity } from 'src/entities/person.entity';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { UserTokenEntity } from 'src/entities/user-token.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IAccessRepository } from 'src/interfaces/access.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Brackets, In, Repository } from 'typeorm';
 
 type IActivityAccess = IAccessRepository['activity'];

server/src/repositories/activity.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { ActivityEntity } from 'src/entities/activity.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IActivityRepository } from 'src/interfaces/activity.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { IsNull, Repository } from 'typeorm';
 
 export interface ActivitySearch {

server/src/repositories/album.repository.ts

@@ -1,11 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import _ from 'lodash';
+import { dataSource } from 'src/database.config';
 import { Chunked, ChunkedArray, DATABASE_PARAMETER_CHUNK_SIZE, DummyValue, GenerateSql } from 'src/decorators';
 import { AlbumEntity } from 'src/entities/album.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { dataSource } from 'src/infra/database.config';
-import { Instrumentation } from 'src/infra/instrumentation';
 import {
   AlbumAsset,
   AlbumAssetCount,
@@ -13,7 +12,8 @@ import {
   AlbumInfoOptions,
   IAlbumRepository,
 } from 'src/interfaces/album.repository';
-import { setUnion } from 'src/utils';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { setUnion } from 'src/utils/set';
 import { DataSource, FindOptionsOrder, FindOptionsRelations, In, IsNull, Not, Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/api-key.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { APIKeyEntity } from 'src/entities/api-key.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IKeyRepository } from 'src/interfaces/api-key.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/asset-stack.repository.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { AssetStackEntity } from 'src/entities/asset-stack.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/asset.repository.ts

@@ -8,8 +8,6 @@ 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 { SmartInfoEntity } from 'src/entities/smart-info.entity';
-import { OptionalBetween, paginate, paginatedBuilder, searchAssetBuilder } from 'src/infra/infra.utils';
-import { Instrumentation } from 'src/infra/instrumentation';
 import {
   AssetBuilderOptions,
   AssetCreate,
@@ -32,7 +30,9 @@ import {
   WithoutProperty,
 } from 'src/interfaces/asset.repository';
 import { AssetSearchOptions, SearchExploreItem } from 'src/interfaces/search.repository';
-import { Paginated, PaginationMode, PaginationOptions } from 'src/utils';
+import { OptionalBetween, searchAssetBuilder } from 'src/utils/database';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { Paginated, PaginationMode, PaginationOptions, paginate, paginatedBuilder } from 'src/utils/pagination';
 import {
   Brackets,
   FindOptionsRelations,

server/src/repositories/audit.repository.ts

@@ -1,7 +1,7 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import { AuditEntity } from 'src/entities/audit.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { AuditSearch, IAuditRepository } from 'src/interfaces/audit.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { LessThan, MoreThan, Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/communication.repository.ts

@@ -7,8 +7,6 @@ import {
   WebSocketServer,
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import {
   ClientEvent,
   ICommunicationRepository,
@@ -18,6 +16,8 @@ import {
   ServerEvent,
 } from 'src/interfaces/communication.repository';
 import { AuthService } from 'src/services/auth.service';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
 
 @Instrumentation()
 @WebSocketGateway({

server/src/repositories/crypto.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { compareSync, hash } from 'bcrypt';
 import { createHash, randomBytes, randomUUID } from 'node:crypto';
 import { createReadStream } from 'node:fs';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { ICryptoRepository } from 'src/interfaces/crypto.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 
 @Instrumentation()
 @Injectable()

server/src/repositories/database.repository.ts

@@ -1,10 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import AsyncLock from 'async-lock';
-import { Version, VersionType } from 'src/domain/domain.constant';
-import { vectorExt } from 'src/infra/database.config';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
+import { vectorExt } from 'src/database.config';
 import {
   DatabaseExtension,
   DatabaseLock,
@@ -14,6 +11,9 @@ import {
   VectorUpdateResult,
   extName,
 } from 'src/interfaces/database.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+import { Version, VersionType } from 'src/utils/version';
 import { isValidInteger } from 'src/validation';
 import { DataSource, EntityManager, QueryRunner } from 'typeorm';
 

server/src/repositories/filesystem.provider.ts

@@ -4,10 +4,7 @@ import { glob, globStream } from 'fast-glob';
 import { constants, createReadStream, existsSync, mkdirSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { mimeTypes } from 'src/domain/domain.constant';
 import { CrawlOptionsDto } from 'src/dtos/library.dto';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import {
   DiskUsage,
   IStorageRepository,
@@ -16,6 +13,9 @@ import {
   StorageEventType,
   WatchEvents,
 } from 'src/interfaces/storage.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+import { mimeTypes } from 'src/utils/mime-types';
 
 @Instrumentation()
 export class FilesystemProvider implements IStorageRepository {

server/src/repositories/job.repository.ts

@@ -6,10 +6,78 @@ import { Job, JobsOptions, Processor, Queue, Worker, WorkerOptions } from 'bullm
 import { CronJob, CronTime } from 'cron';
 import { setTimeout } from 'node:timers/promises';
 import { bullConfig } from 'src/config';
-import { JOBS_TO_QUEUE, JobName, QueueName } from 'src/domain/job/job.constants';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
-import { IJobRepository, JobCounts, JobItem, QueueCleanType, QueueStatus } from 'src/interfaces/job.repository';
+import {
+  IJobRepository,
+  JobCounts,
+  JobItem,
+  JobName,
+  QueueCleanType,
+  QueueName,
+  QueueStatus,
+} from 'src/interfaces/job.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+
+export const JOBS_TO_QUEUE: Record<JobName, QueueName> = {
+  // misc
+  [JobName.ASSET_DELETION]: QueueName.BACKGROUND_TASK,
+  [JobName.ASSET_DELETION_CHECK]: QueueName.BACKGROUND_TASK,
+  [JobName.USER_DELETE_CHECK]: QueueName.BACKGROUND_TASK,
+  [JobName.USER_DELETION]: QueueName.BACKGROUND_TASK,
+  [JobName.DELETE_FILES]: QueueName.BACKGROUND_TASK,
+  [JobName.CLEAN_OLD_AUDIT_LOGS]: QueueName.BACKGROUND_TASK,
+  [JobName.PERSON_CLEANUP]: QueueName.BACKGROUND_TASK,
+  [JobName.USER_SYNC_USAGE]: QueueName.BACKGROUND_TASK,
+
+  // conversion
+  [JobName.QUEUE_VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
+  [JobName.VIDEO_CONVERSION]: QueueName.VIDEO_CONVERSION,
+
+  // thumbnails
+  [JobName.QUEUE_GENERATE_THUMBNAILS]: QueueName.THUMBNAIL_GENERATION,
+  [JobName.GENERATE_JPEG_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
+  [JobName.GENERATE_WEBP_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
+  [JobName.GENERATE_THUMBHASH_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
+  [JobName.GENERATE_PERSON_THUMBNAIL]: QueueName.THUMBNAIL_GENERATION,
+
+  // metadata
+  [JobName.QUEUE_METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
+  [JobName.METADATA_EXTRACTION]: QueueName.METADATA_EXTRACTION,
+  [JobName.LINK_LIVE_PHOTOS]: QueueName.METADATA_EXTRACTION,
+
+  // storage template
+  [JobName.STORAGE_TEMPLATE_MIGRATION]: QueueName.STORAGE_TEMPLATE_MIGRATION,
+  [JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE]: QueueName.STORAGE_TEMPLATE_MIGRATION,
+
+  // migration
+  [JobName.QUEUE_MIGRATION]: QueueName.MIGRATION,
+  [JobName.MIGRATE_ASSET]: QueueName.MIGRATION,
+  [JobName.MIGRATE_PERSON]: QueueName.MIGRATION,
+
+  // facial recognition
+  [JobName.QUEUE_FACE_DETECTION]: QueueName.FACE_DETECTION,
+  [JobName.FACE_DETECTION]: QueueName.FACE_DETECTION,
+  [JobName.QUEUE_FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
+  [JobName.FACIAL_RECOGNITION]: QueueName.FACIAL_RECOGNITION,
+
+  // smart search
+  [JobName.QUEUE_SMART_SEARCH]: QueueName.SMART_SEARCH,
+  [JobName.SMART_SEARCH]: QueueName.SMART_SEARCH,
+
+  // XMP sidecars
+  [JobName.QUEUE_SIDECAR]: QueueName.SIDECAR,
+  [JobName.SIDECAR_DISCOVERY]: QueueName.SIDECAR,
+  [JobName.SIDECAR_SYNC]: QueueName.SIDECAR,
+  [JobName.SIDECAR_WRITE]: QueueName.SIDECAR,
+
+  // Library management
+  [JobName.LIBRARY_SCAN_ASSET]: QueueName.LIBRARY,
+  [JobName.LIBRARY_SCAN]: QueueName.LIBRARY,
+  [JobName.LIBRARY_DELETE]: QueueName.LIBRARY,
+  [JobName.LIBRARY_REMOVE_OFFLINE]: QueueName.LIBRARY,
+  [JobName.LIBRARY_QUEUE_SCAN_ALL]: QueueName.LIBRARY,
+  [JobName.LIBRARY_QUEUE_CLEANUP]: QueueName.LIBRARY,
+};
 
 @Instrumentation()
 @Injectable()

server/src/repositories/library.repository.ts

@@ -3,8 +3,8 @@ 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 { Instrumentation } from 'src/infra/instrumentation';
 import { ILibraryRepository } from 'src/interfaces/library.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { IsNull, Not } from 'typeorm';
 import { Repository } from 'typeorm/repository/Repository.js';
 

server/src/repositories/machine-learning.repository.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { readFile } from 'node:fs/promises';
 import { CLIPConfig, ModelConfig, RecognitionConfig } from 'src/dtos/model-config.dto';
-import { Instrumentation } from 'src/infra/instrumentation';
 import {
   CLIPMode,
   DetectFaceResult,
@@ -10,6 +9,7 @@ import {
   TextModelInput,
   VisionModelInput,
 } from 'src/interfaces/machine-learning.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 
 const errorPrefix = 'Machine learning request';
 

server/src/repositories/media.repository.ts

@@ -4,8 +4,6 @@ import { Writable } from 'node:stream';
 import { promisify } from 'node:util';
 import sharp from 'sharp';
 import { Colorspace } from 'src/entities/system-config.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import {
   CropOptions,
   IMediaRepository,
@@ -13,7 +11,9 @@ import {
   TranscodeOptions,
   VideoInfo,
 } from 'src/interfaces/media.repository';
-import { handlePromiseError } from 'src/utils';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+import { handlePromiseError } from 'src/utils/misc';
 
 const probe = promisify<string, FfprobeData>(ffmpeg.ffprobe);
 sharp.concurrency(0);

server/src/repositories/metadata.repository.ts

@@ -6,21 +6,15 @@ import { getName } from 'i18n-iso-countries';
 import { createReadStream, existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import readLine from 'node:readline';
+import { citiesFile, geodataAdmin1Path, geodataAdmin2Path, geodataCities500Path, geodataDatePath } from 'src/constants';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import {
-  citiesFile,
-  geodataAdmin1Path,
-  geodataAdmin2Path,
-  geodataCities500Path,
-  geodataDatePath,
-} from 'src/domain/domain.constant';
 import { ExifEntity } from 'src/entities/exif.entity';
 import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
 import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import { GeoPoint, IMetadataRepository, ImmichTags, ReverseGeocodeResult } from 'src/interfaces/metadata.repository';
 import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
 import { DataSource, QueryRunner, Repository } from 'typeorm';
 import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
 

server/src/repositories/move.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { MoveEntity, PathType } from 'src/entities/move.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IMoveRepository, MoveCreate } from 'src/interfaces/move.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/partner.repository.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { PartnerEntity } from 'src/entities/partner.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IPartnerRepository, PartnerIds } from 'src/interfaces/partner.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { DeepPartial, Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/person.repository.ts

@@ -4,8 +4,6 @@ import { ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { PersonEntity } from 'src/entities/person.entity';
-import { asVector, paginate } from 'src/infra/infra.utils';
-import { Instrumentation } from 'src/infra/instrumentation';
 import {
   AssetFaceId,
   IPersonRepository,
@@ -15,7 +13,9 @@ import {
   PersonStatistics,
   UpdateFacesData,
 } from 'src/interfaces/person.repository';
-import { Paginated, PaginationOptions } from 'src/utils';
+import { asVector } from 'src/utils/database';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { Paginated, PaginationOptions, paginate } from 'src/utils/pagination';
 import { FindManyOptions, FindOptionsRelations, FindOptionsSelect, In, Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/search.repository.ts

@@ -1,16 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { vectorExt } from 'src/database.config';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { getCLIPModelInfo } from 'src/domain/smart-info/smart-info.constant';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity, AssetType } 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 { vectorExt } from 'src/infra/database.config';
-import { asVector, paginatedBuilder, searchAssetBuilder } from 'src/infra/infra.utils';
-import { Instrumentation } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import { DatabaseExtension } from 'src/interfaces/database.repository';
 import {
   AssetSearchOptions,
@@ -21,7 +17,11 @@ import {
   SearchPaginationOptions,
   SmartSearchOptions,
 } from 'src/interfaces/search.repository';
-import { Paginated, PaginationMode, PaginationResult } from 'src/utils';
+import { asVector, searchAssetBuilder } from 'src/utils/database';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
+import { getCLIPModelInfo } from 'src/utils/misc';
+import { Paginated, PaginationMode, PaginationResult, paginatedBuilder } from 'src/utils/pagination';
 import { isValidInteger } from 'src/validation';
 import { Repository, SelectQueryBuilder } from 'typeorm';
 

server/src/repositories/server-info.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { GitHubRelease, IServerInfoRepository } from 'src/interfaces/server-info.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 
 @Instrumentation()
 @Injectable()

server/src/repositories/shared-link.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/system-config.repository.ts

@@ -2,8 +2,8 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { readFile } from 'node:fs/promises';
 import { Chunked, DummyValue, GenerateSql } from 'src/decorators';
 import { SystemConfigEntity } from 'src/entities/system-config.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { In, Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/system-metadata.repository.ts

@@ -1,7 +1,7 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import { SystemMetadata, SystemMetadataEntity } from 'src/entities/system-metadata.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/tag.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { TagEntity } from 'src/entities/tag.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { ITagRepository } from 'src/interfaces/tag.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/user-token.repository.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { UserTokenEntity } from 'src/entities/user-token.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import { IUserTokenRepository } from 'src/interfaces/user-token.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { Repository } from 'typeorm';
 
 @Instrumentation()

server/src/repositories/user.repository.ts

@@ -3,13 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { UserEntity } from 'src/entities/user.entity';
-import { Instrumentation } from 'src/infra/instrumentation';
 import {
   IUserRepository,
   UserFindOptions,
   UserListFilter,
   UserStatsQueryResponse,
 } from 'src/interfaces/user.repository';
+import { Instrumentation } from 'src/utils/instrumentation';
 import { IsNull, Not, Repository } from 'typeorm';
 
 @Instrumentation()