High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(mobile): person_api.interface.dart (#19336)
Alex8154ec29dfcc
diff --git a/mobile/lib/interfaces/person_api.interface.dart b/mobile/lib/domain/models/person.model.dartsimilarity index 92%rename from mobile/lib/interfaces/person_api.interface.dartrename to mobile/lib/domain/models/person.model.dartindex 9d127ad765..63b9f5c159 100644--- a/mobile/lib/interfaces/person_api.interface.dart+++ b/mobile/lib/domain/models/person.model.dart@@ -1,11 +1,5 @@-// ignore_for_file: public_member_api_docs, sort_constructors_firstimport 'dart:convert';-abstract interface class IPersonApiRepository {- Future<List<Person>> getAll();- Future<Person> update(String id, {String? name});-}-class Person {Person({required this.id,diff --git a/mobile/lib/models/search/search_filter.model.dart b/mobile/lib/models/search/search_filter.model.dartindex 598b71ef4e..835e6aff8f 100644--- a/mobile/lib/models/search/search_filter.model.dart+++ b/mobile/lib/models/search/search_filter.model.dart@@ -1,8 +1,8 @@// ignore_for_file: public_member_api_docs, sort_constructors_firstimport 'dart:convert';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';class SearchLocationFilter {String? country;diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dartindex 017ced9a19..0ab94df7c8 100644--- a/mobile/lib/pages/search/search.page.dart+++ b/mobile/lib/pages/search/search.page.dart@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';import 'package:flutter_hooks/flutter_hooks.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';import 'package:immich_mobile/models/search/search_filter.model.dart';import 'package:immich_mobile/providers/search/paginated_search.provider.dart';import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';diff --git a/mobile/lib/providers/search/people.provider.dart b/mobile/lib/providers/search/people.provider.dartindex d1370f498f..d03d533aaf 100644--- a/mobile/lib/providers/search/people.provider.dart+++ b/mobile/lib/providers/search/people.provider.dart@@ -1,5 +1,5 @@import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';import 'package:immich_mobile/services/person.service.dart';import 'package:immich_mobile/providers/app_settings.provider.dart';diff --git a/mobile/lib/repositories/person_api.repository.dart b/mobile/lib/repositories/person_api.repository.dartindex d324a03edb..a2a6e2489b 100644--- a/mobile/lib/repositories/person_api.repository.dart+++ b/mobile/lib/repositories/person_api.repository.dart@@ -1,5 +1,5 @@import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/providers/api.provider.dart';import 'package:immich_mobile/repositories/api.repository.dart';import 'package:openapi/api.dart';@@ -8,19 +8,16 @@ final personApiRepositoryProvider = Provider((ref) => PersonApiRepository(ref.watch(apiServiceProvider).peopleApi),);-class PersonApiRepository extends ApiRepository- implements IPersonApiRepository {+class PersonApiRepository extends ApiRepository {final PeopleApi _api;PersonApiRepository(this._api);- @overrideFuture<List<Person>> getAll() async {final dto = await checkNull(_api.getAllPeople());return dto.people.map(_toPerson).toList();}- @overrideFuture<Person> update(String id, {String? name}) async {final dto = await checkNull(_api.updatePerson(id, PersonUpdateDto(name: name)),diff --git a/mobile/lib/services/person.service.dart b/mobile/lib/services/person.service.dartindex a8289ac37d..c329187241 100644--- a/mobile/lib/services/person.service.dart+++ b/mobile/lib/services/person.service.dart@@ -1,8 +1,8 @@import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/interfaces/asset.interface.dart';import 'package:immich_mobile/interfaces/asset_api.interface.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';import 'package:immich_mobile/repositories/asset.repository.dart';import 'package:immich_mobile/repositories/asset_api.repository.dart';import 'package:immich_mobile/repositories/person_api.repository.dart';@@ -20,7 +20,7 @@ PersonService personService(Ref ref) => PersonService(class PersonService {final Logger _log = Logger("PersonService");- final IPersonApiRepository _personApiRepository;+ final PersonApiRepository _personApiRepository;final IAssetApiRepository _assetApiRepository;final IAssetRepository _assetRepository;diff --git a/mobile/lib/widgets/search/search_filter/people_picker.dart b/mobile/lib/widgets/search/search_filter/people_picker.dartindex ed7bcadd79..44d01d274e 100644--- a/mobile/lib/widgets/search/search_filter/people_picker.dart+++ b/mobile/lib/widgets/search/search_filter/people_picker.dart@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter_hooks/flutter_hooks.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/domain/models/person.model.dart';import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';-import 'package:immich_mobile/interfaces/person_api.interface.dart';import 'package:immich_mobile/pages/common/large_leading_tile.dart';import 'package:immich_mobile/providers/search/people.provider.dart';import 'package:immich_mobile/services/api.service.dart';