bad merge

mobile/lib/domain/models/store.model.dart

@@ -65,6 +65,7 @@ enum StoreKey<T> {
 
   // Video settings
   loadOriginalVideo<bool>._(136),
+  manageLocalMediaAndroid<bool>._(137),
 
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000);

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 {}

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 {}
+

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',

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> = T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T;
 
 export type RepositoryInterface<T extends object> = Pick<T, keyof T>;
 
-type IActivityRepository = RepositoryInterface<ActivityRepository>;
-type IApiKeyRepository = RepositoryInterface<ApiKeyRepository>;
-type IMemoryRepository = RepositoryInterface<MemoryRepository>;
-type ISearchRepository = RepositoryInterface<SearchRepository>;
-type ISessionRepository = RepositoryInterface<SessionRepository>;
-
-export type ActivityItem =
-  | Awaited<ReturnType<IActivityRepository['create']>>
-  | Awaited<ReturnType<IActivityRepository['search']>>[0];
-
-export type SearchPlacesItem = Awaited<ReturnType<ISearchRepository['searchPlaces']>>[0];
-
-export type ApiKeyItem =
-  | Awaited<ReturnType<IApiKeyRepository['create']>>
-  | NonNullable<Awaited<ReturnType<IApiKeyRepository['getById']>>>
-  | Awaited<ReturnType<IApiKeyRepository['getByUserId']>>[0];
-
-export type MemoryItem =
-  | Awaited<ReturnType<IMemoryRepository['create']>>
-  | Awaited<ReturnType<IMemoryRepository['search']>>[0];
-
-export type SessionItem = Awaited<ReturnType<ISessionRepository['getByUserId']>>[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;