[SYNC-CONTACT-V2] Format code

linagora · Mar 6, 2025 · fbf3a27 · fbf3a27
1 parent 3043647
commit fbf3a27
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 72 deletions.
diff --git a/lib/di/global/get_it_initializer.dart b/lib/di/global/get_it_initializer.dart
@@ -81,6 +81,7 @@ import 'package:fluffychat/domain/usecase/settings/save_language_interactor.dart
 import 'package:fluffychat/domain/usecase/settings/update_profile_interactor.dart';
 import 'package:fluffychat/domain/usecase/verify_name_interactor.dart';
 import 'package:fluffychat/event/twake_event_dispatcher.dart';
+import 'package:fluffychat/modules/federation_identity_lookup/manager/federation_identity_lookup_manager.dart';
 import 'package:fluffychat/modules/federation_identity_lookup/manager/identity_lookup_manager.dart';
 import 'package:fluffychat/modules/federation_identity_request_token/manager/federation_identity_request_token_manager.dart';
 import 'package:fluffychat/pages/chat/chat_pinned_events/pinned_events_controller.dart';
@@ -372,5 +373,8 @@ class GetItInitializer {
     getIt.registerFactory<FederationIdentityRequestTokenManager>(
       () => FederationIdentityRequestTokenManager(),
     );
+    getIt.registerFactory<FederationIdentityLookupManager>(
+      () => FederationIdentityLookupManager(),
+    );
   }
 }
diff --git a/lib/domain/model/extensions/contact/contact_extension.dart b/lib/domain/model/extensions/contact/contact_extension.dart
@@ -75,7 +75,9 @@ extension ContactExtension on Contact {
 
   // Merge two sets of phone numbers, combining properties
   Set<PhoneNumber> _mergePhoneNumbers(
-      Set<PhoneNumber>? phones1, Set<PhoneNumber>? phones2) {
+    Set<PhoneNumber>? phones1,
+    Set<PhoneNumber>? phones2,
+  ) {
     final mergedPhones = <PhoneNumber>{};
     final allPhones = [...?phones1, ...?phones2];
 
@@ -257,7 +259,7 @@ extension SetContactExtension on Set<Contact> {
     final allContacts = [
       ...this,
       ...contactsFromMappings,
-      ...contactsFromThirdParty
+      ...contactsFromThirdParty,
     ];
 
     for (final contact in allContacts) {

diff --git a/lib/domain/usecase/contacts/federation_look_up_phonebook_contact_interactor.dart b/lib/domain/usecase/contacts/federation_look_up_phonebook_contact_interactor.dart
@@ -233,11 +233,12 @@ class FederationLookUpPhonebookContactInteractor {
               contactsFromMappings.addAll(updatedContact);
             }
           } catch (e) {
-            Logs().d(
-                'FederationLookUpPhonebookContactInteractor::execute(): handle mappings failed');
+            Logs().e(
+              'FederationLookUpPhonebookContactInteractor::execute(): handle mappings failed',
+              e,
+            );
           }
 
-          print("DATPH prepare thirdparty");
           try {
             if (response.thirdPartyMappings != null &&
                 response.thirdPartyMappings!.isNotEmpty) {
@@ -256,7 +257,8 @@ class FederationLookUpPhonebookContactInteractor {
             }
           } catch (e) {
             Logs().d(
-                'FederationLookUpPhonebookContactInteractor::execute(): handle third party mappings failed');
+              'FederationLookUpPhonebookContactInteractor::execute(): handle third party mappings failed',
+            );
           }
 
           final combinedContacts = chunkContacts.toSet().combineContacts(
@@ -278,7 +280,8 @@ class FederationLookUpPhonebookContactInteractor {
           );
         } catch (e) {
           Logs().e(
-              'FederationLookUpPhonebookContactInteractor::execute(): one chunk exception $e');
+            'FederationLookUpPhonebookContactInteractor::execute(): one chunk exception $e',
+          );
           progress++;
           updatedContact.addAll(chunkContacts);
           chunkError = TwakeLookupChunkException(e.toString());
@@ -314,7 +317,6 @@ class FederationLookUpPhonebookContactInteractor {
     required List<Contact> newContacts,
     required FederationLookUpArgument argument,
   }) async {
-    print('DATPH start_handleThirdPartyMappings');
     final List<Contact> updatedContact = [];
     for (final server in thirdPartyToHashes.keys) {
       final hashes = thirdPartyToHashes[server]!;
@@ -363,9 +365,7 @@ class FederationLookUpPhonebookContactInteractor {
         contactMaps: contactsNeedToCalculate.toFederationContactMap(),
       );
       final manager = getIt.get<FederationIdentityLookupManager>();
-      print('datph dcmmdd');
       final result = await manager.execute(arguments: arguments);
-      print('dcmmmay');
       result.fold(
         (failure) {
           Logs().e(

diff --git a/test/domain/extensions/contact/contact_extension_test.dart b/test/domain/extensions/contact/contact_extension_test.dart
@@ -101,8 +101,10 @@ void main() {
       final combinedContact = contact1.combine(contact2);
 
       expect(combinedContact.id, 'contact1');
-      expect(combinedContact.displayName,
-          'Contact 1'); // Should keep contact1's name
+      expect(
+        combinedContact.displayName,
+        'Contact 1',
+      ); // Should keep contact1's name
 
       // Should have merged emails
       expect(combinedContact.emails?.length, 2);
@@ -427,7 +429,9 @@ void main() {
 
       expect(emailToHashMap.keys.contains('[email protected]'), true);
       expect(
-          emailToHashMap['[email protected]']?.length, 3); // One for each pepper
+        emailToHashMap['[email protected]']?.length,
+        3,
+      ); // One for each pepper
     });
   });
 

diff --git a/test/domain/model/contact_test.dart b/test/domain/model/contact_test.dart
@@ -97,7 +97,7 @@ void main() {
 
     test('should create a PhoneNumber instance with all fields', () {
       final thirdPartyIdToHashMap = {
-        'phone': ['hash1', 'hash2']
+        'phone': ['hash1', 'hash2'],
       };
 
       final phoneNumber = PhoneNumber(
@@ -122,15 +122,15 @@ void main() {
         matrixId: '@user:example.com',
         status: ThirdPartyStatus.active,
         thirdPartyIdToHashMap: {
-          'phone': ['hash1', 'hash2']
+          'phone': ['hash1', 'hash2'],
         },
       );
 
       expect(updatedPhoneNumber.number, '+1234567890');
       expect(updatedPhoneNumber.matrixId, '@user:example.com');
       expect(updatedPhoneNumber.status, ThirdPartyStatus.active);
       expect(updatedPhoneNumber.thirdPartyIdToHashMap, {
-        'phone': ['hash1', 'hash2']
+        'phone': ['hash1', 'hash2'],
       });
 
       // Original phoneNumber should remain unchanged
@@ -186,7 +186,7 @@ void main() {
 
     test('should create an Email instance with all fields', () {
       final thirdPartyIdToHashMap = {
-        'email': ['hash1', 'hash2']
+        'email': ['hash1', 'hash2'],
       };
 
       final email = Email(
@@ -211,15 +211,15 @@ void main() {
         matrixId: '@user:example.com',
         status: ThirdPartyStatus.active,
         thirdPartyIdToHashMap: {
-          'email': ['hash1', 'hash2']
+          'email': ['hash1', 'hash2'],
         },
       );
 
       expect(updatedEmail.address, '[email protected]');
       expect(updatedEmail.matrixId, '@user:example.com');
       expect(updatedEmail.status, ThirdPartyStatus.active);
       expect(updatedEmail.thirdPartyIdToHashMap, {
-        'email': ['hash1', 'hash2']
+        'email': ['hash1', 'hash2'],
       });
 
       // Original email should remain unchanged

diff --git a/test/domain/usecase/contacts/federation_look_up_phonebook_contact_interactor_test.dart b/test/domain/usecase/contacts/federation_look_up_phonebook_contact_interactor_test.dart
@@ -296,7 +296,7 @@ void main() {
             tokenInformation: tokenInformation,
           ),
         ).thenAnswer(
-              (_) async => const FederationRegisterResponse(
+          (_) async => const FederationRegisterResponse(
             token: 'aB7c9Dz4EfGh5iJkLm3nOp==',
           ),
         );
@@ -1284,22 +1284,6 @@ void main() {
 
         final exception = Exception('Error');
 
-        final expectedContacts = [
-          ContactFixtures.contact1.copyWith(
-            phoneNumbers: {
-              PhoneNumber(
-                number: '(212)555-6789',
-                matrixId: '@alice:matrix.org',
-              ),
-            },
-          ),
-          ContactFixtures.contact2,
-          ContactFixtures.contact3,
-          ContactFixtures.contact4,
-          ContactFixtures.contact5,
-          ContactFixtures.contact6,
-        ];
-
         when(mockRepository.fetchContacts()).thenAnswer((_) async => contacts);
 
         when(
@@ -1490,8 +1474,6 @@ void main() {
           ContactFixtures.contact6,
         ];
 
-        final exception = Exception('Error');
-
         when(mockRepository.fetchContacts()).thenAnswer((_) async => contacts);
 
         when(
@@ -1530,7 +1512,6 @@ void main() {
           ),
         ).thenAnswer((_) async => hashDetails);
 
-        int callCount = 0;
         when(
           mockIdentityLookupManager.lookupMxid(
             federationUrl: anyNamed('federationUrl'),