From f60ba1a4b00683d7d1d23261b78327f1afaef882 Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Thu, 10 Apr 2025 01:37:59 +0000 Subject: [PATCH] bad merge --- mobile/lib/domain/models/store.model.dart | 1 + mobile/test/repository.mocks.dart | 7 +---- mobile/test/service.mocks.dart | 9 +++--- server/src/dtos/search.dto.ts | 6 +--- server/src/types.ts | 37 ----------------------- 5 files changed, 7 insertions(+), 53 deletions(-) diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dart index e6d9ecaf48..8a5a908e0d 100644 --- a/mobile/lib/domain/models/store.model.dart +++ b/mobile/lib/domain/models/store.model.dart @@ -65,6 +65,7 @@ enum StoreKey { // Video settings loadOriginalVideo._(136), + manageLocalMediaAndroid._(137), // Experimental stuff photoManagerCustomFilter._(1000); diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dart index 7d444a66b6..d2f0da4231 100644 --- a/mobile/test/repository.mocks.dart +++ b/mobile/test/repository.mocks.dart @@ -4,13 +4,13 @@ import 'package:immich_mobile/interfaces/album_api.interface.dart'; import 'package:immich_mobile/interfaces/album_media.interface.dart'; import 'package:immich_mobile/interfaces/asset.interface.dart'; import 'package:immich_mobile/interfaces/asset_api.interface.dart'; -import 'package:immich_mobile/interfaces/asset_api.interface.dart'; import 'package:immich_mobile/interfaces/asset_media.interface.dart'; import 'package:immich_mobile/interfaces/auth.interface.dart'; import 'package:immich_mobile/interfaces/auth_api.interface.dart'; import 'package:immich_mobile/interfaces/backup_album.interface.dart'; import 'package:immich_mobile/interfaces/etag.interface.dart'; import 'package:immich_mobile/interfaces/file_media.interface.dart'; +import 'package:immich_mobile/interfaces/local_files_manager.interface.dart'; import 'package:immich_mobile/interfaces/partner.interface.dart'; import 'package:immich_mobile/interfaces/partner_api.interface.dart'; import 'package:mocktail/mocktail.dart'; @@ -32,11 +32,6 @@ class MockBackupAlbumRepository extends Mock class MockAssetApiRepository extends Mock implements IAssetApiRepository {} -class MockBackupAlbumRepository extends Mock - implements IBackupAlbumRepository {} - -class MockAssetApiRepository extends Mock implements IAssetApiRepository {} - class MockAssetMediaRepository extends Mock implements IAssetMediaRepository {} class MockFileMediaRepository extends Mock implements IFileMediaRepository {} diff --git a/mobile/test/service.mocks.dart b/mobile/test/service.mocks.dart index 34d80aac9d..e1b8df40a3 100644 --- a/mobile/test/service.mocks.dart +++ b/mobile/test/service.mocks.dart @@ -1,6 +1,6 @@ import 'package:immich_mobile/services/album.service.dart'; -import 'package:immich_mobile/services/album.service.dart'; import 'package:immich_mobile/services/api.service.dart'; +import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:immich_mobile/services/background.service.dart'; import 'package:immich_mobile/services/backup.service.dart'; import 'package:immich_mobile/services/entity.service.dart'; @@ -16,10 +16,6 @@ class MockAlbumService extends Mock implements AlbumService {} class MockBackupService extends Mock implements BackupService {} -class MockAlbumService extends Mock implements AlbumService {} - -class MockBackupService extends Mock implements BackupService {} - class MockSyncService extends Mock implements SyncService {} class MockHashService extends Mock implements HashService {} @@ -30,4 +26,7 @@ class MockNetworkService extends Mock implements NetworkService {} class MockSearchApi extends Mock implements SearchApi {} +class MockAppSettingService extends Mock implements AppSettingsService {} + class MockBackgroundService extends Mock implements BackgroundService {} + diff --git a/server/src/dtos/search.dto.ts b/server/src/dtos/search.dto.ts index 4330d2a6bf..a7633dce78 100644 --- a/server/src/dtos/search.dto.ts +++ b/server/src/dtos/search.dto.ts @@ -6,7 +6,6 @@ import { PropertyLifecycle } from 'src/decorators'; import { AlbumResponseDto } from 'src/dtos/album.dto'; import { AssetResponseDto } from 'src/dtos/asset-response.dto'; import { AssetOrder, AssetType } from 'src/enum'; -import { SearchPlacesItem } from 'src/types'; import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation'; class BaseSearchDto { @@ -227,19 +226,16 @@ export class PlacesResponseDto { admin2name?: string; } -export function mapPlaces(place: SearchPlacesItem): PlacesResponseDto { +export function mapPlaces(place: Place): PlacesResponseDto { return { name: place.name, latitude: place.latitude, longitude: place.longitude, admin1name: place.admin1Name ?? undefined, admin2name: place.admin2Name ?? undefined, - admin1name: place.admin1Name ?? undefined, - admin2name: place.admin2Name ?? undefined, }; } - export enum SearchSuggestionType { COUNTRY = 'country', STATE = 'state', diff --git a/server/src/types.ts b/server/src/types.ts index b79bc3546b..88ba644739 100644 --- a/server/src/types.ts +++ b/server/src/types.ts @@ -15,48 +15,11 @@ import { UserMetadataKey, VideoCodec, } from 'src/enum'; -import { ActivityRepository } from 'src/repositories/activity.repository'; -import { ApiKeyRepository } from 'src/repositories/api-key.repository'; -import { MemoryRepository } from 'src/repositories/memory.repository'; -import { SearchRepository } from 'src/repositories/search.repository'; -import { SessionRepository } from 'src/repositories/session.repository'; export type DeepPartial = T extends object ? { [K in keyof T]?: DeepPartial } : T; export type RepositoryInterface = Pick; -type IActivityRepository = RepositoryInterface; -type IApiKeyRepository = RepositoryInterface; -type IMemoryRepository = RepositoryInterface; -type ISearchRepository = RepositoryInterface; -type ISessionRepository = RepositoryInterface; - -export type ActivityItem = - | Awaited> - | Awaited>[0]; - -export type SearchPlacesItem = Awaited>[0]; - -export type ApiKeyItem = - | Awaited> - | NonNullable>> - | Awaited>[0]; - -export type MemoryItem = - | Awaited> - | Awaited>[0]; - -export type SessionItem = Awaited>[0]; - -export type TagItem = { - id: string; - value: string; - createdAt: Date; - updatedAt: Date; - color: string | null; - parentId: string | null; -}; - export interface CropOptions { top: number; left: number;