feat: WIP

Lnamw · Matthieu-dgl · commit 2b284918f1f1 · 2024-11-04T08:25:44.000+01:00
diff --git a/Mail/Views/New Message/AutocompletionCell.swift b/Mail/Views/New Message/AutocompletionCell.swift
@@ -23,21 +23,21 @@ import MailResources
 import SwiftUI
 
 struct AutocompletionCell: View {
-    let addRecipient: @MainActor (Recipient) -> Void
-    let recipient: Recipient
+    let addRecipient: @MainActor (any ContactAutocompletable) -> Void
+    let autocompletion: any ContactAutocompletable
     var highlight: String?
     let alreadyAppend: Bool
     let unknownRecipient: Bool
 
     var body: some View {
         HStack(spacing: IKPadding.intermediate) {
             Button {
-                addRecipient(recipient)
+                addRecipient(autocompletion)
             } label: {
-                if unknownRecipient {
-                    UnknownRecipientCell(recipient: recipient)
+                if unknownRecipient, let email = autocompletion.email {
+                    UnknownRecipientCell(email: email)
                 } else {
-                    RecipientCell(recipient: recipient, highlight: highlight)
+                    RecipientCell(contact: autocompletion, highlight: highlight)
                 }
             }
             .allowsHitTesting(!alreadyAppend || unknownRecipient)
@@ -56,7 +56,7 @@ struct AutocompletionCell: View {
 #Preview {
     AutocompletionCell(
         addRecipient: { _ in /* Preview */ },
-        recipient: PreviewHelper.sampleRecipient1,
+        autocompletion: PreviewHelper.sampleMergedContact,
         alreadyAppend: false,
         unknownRecipient: false
     )
diff --git a/Mail/Views/New Message/AutocompletionView.swift b/Mail/Views/New Message/AutocompletionView.swift
@@ -32,23 +32,26 @@ struct AutocompletionView: View {
 
     @ObservedObject var textDebounce: TextDebounce
 
-    @Binding var autocompletion: [Recipient]
+    @Binding var autocompletion: [any ContactAutocompletable]
     @Binding var addedRecipients: RealmSwift.List<Recipient>
 
-    let addRecipient: @MainActor (Recipient) -> Void
+    let addRecipient: @MainActor (any ContactAutocompletable) -> Void
 
     var body: some View {
         LazyVStack(spacing: IKPadding.small) {
-            ForEach(autocompletion) { recipient in
-                let isLastRecipient = autocompletion.last?.isSameCorrespondent(as: recipient) == true
+            // TODO: Fix conformance Identifiable
+            ForEach(autocompletion, id: \.stringId) { contact in
+                let isLastRecipient =
+                    false // TODO: A implémenter -> autocompletion.last?.isSameCorrespondent(as: recipient) == true
                 let isUserProposal = shouldAddUserProposal && isLastRecipient
 
                 VStack(alignment: .leading, spacing: IKPadding.small) {
                     AutocompletionCell(
                         addRecipient: addRecipient,
-                        recipient: recipient,
+                        autocompletion: contact,
                         highlight: textDebounce.text,
-                        alreadyAppend: addedRecipients.contains { $0.isSameCorrespondent(as: recipient) },
+                        alreadyAppend: false,
+                        // TODO: A implémenter -> addedRecipients.contains { $0.isSameCorrespondent(as: recipient) },
                         unknownRecipient: isUserProposal
                     )
 
@@ -77,25 +80,23 @@ struct AutocompletionView: View {
                 fetchLimit: Self.maxAutocompleteCount,
                 sorted: sortByRemoteAndName
             )
-            var autocompleteRecipients = autocompleteContacts.map { Recipient(email: $0.email, name: $0.name) }
 
-        let autocompleteGroupContact = mailboxManager.contactManager.frozenGroupContacts(matching: trimmedSearch, fetchLimit: nil)
+        let autocompleteGroupContacts = mailboxManager.contactManager.frozenGroupContacts(
+            matching: trimmedSearch,
+            fetchLimit: nil
+        )
 
-        // TODO: Find group or organisation name
-        var autocompleteGroupRecipients = autocompleteGroupContact.map { Recipient(
-            email: "Afficher nom groupe ou organisation ?",
-            name: "Groupe/carnet ? \($0.name)"
-        ) }
+        let result: [any ContactAutocompletable] = Array(autocompleteContacts) + Array(autocompleteGroupContacts)
 
-        var result = autocompleteRecipients + autocompleteGroupRecipients
+//    TODO: A implémenter
+//        let realResults = autocompleteRecipients.filter { !addedRecipients.map(\.email).contains($0.email) }
+//
+//        shouldAddUserProposal = !(realResults.count == 1 && realResults.first?.email == textDebounce.text)
+//        if shouldAddUserProposal {
+//            autocompleteRecipients.append(Recipient(email: textDebounce.text, name: ""))
+//        }
 
-        let realResults = autocompleteRecipients.filter { !addedRecipients.map(\.email).contains($0.email) }
-
-            shouldAddUserProposal = !(realResults.count == 1 && realResults.first?.email == textDebounce.text)
-            if shouldAddUserProposal {
-                autocompleteRecipients.append(Recipient(email: textDebounce.text, name: ""))
-            }
-            autocompletion = autocompleteRecipients
+            autocompletion = result
         }
     }
 
diff --git a/Mail/Views/New Message/Header Cells/ComposeMessageCellRecipients.swift b/Mail/Views/New Message/Header Cells/ComposeMessageCellRecipients.swift
@@ -49,7 +49,9 @@ class TextDebounce: ObservableObject {
 struct ComposeMessageCellRecipients: View {
     @StateObject private var textDebounce = TextDebounce()
 
-    @State private var autocompletion = [Recipient]()
+    @EnvironmentObject private var mailboxManager: MailboxManager
+
+    @State private var autocompletion = [any ContactAutocompletable]()
 
     @Binding var recipients: RealmSwift.List<Recipient>
     @Binding var showRecipientsFields: Bool
@@ -130,23 +132,35 @@ struct ComposeMessageCellRecipients: View {
         }
     }
 
-    @MainActor private func addNewRecipient(_ recipient: Recipient) {
+    @MainActor private func addNewRecipient(_ contact: any ContactAutocompletable) {
         matomo.track(eventWithCategory: .newMessage, name: "addNewRecipient")
 
-        guard Constants.isEmailAddress(recipient.email) else {
-            snackbarPresenter.show(message: MailResourcesStrings.Localizable.addUnknownRecipientInvalidEmail)
-            return
-        }
+        if let mergedContact = contact as? MergedContact {
+            $recipients.append(Recipient(email: mergedContact.email ?? "", name: mergedContact.name))
+        } else if let groupeContact = contact as? GroupContact {
+            let groupeContacts = mailboxManager.contactManager.getContacts(with: groupeContact.id)
 
-        guard !recipients.contains(where: { $0.isSameCorrespondent(as: recipient) }) else {
-            snackbarPresenter.show(message: MailResourcesStrings.Localizable.addUnknownRecipientAlreadyUsed)
-            return
+            var groupContactRecipients = groupeContacts.map {
+                $recipients.append(Recipient(email: $0.email ?? "", name: $0.name))
+            }
         }
 
-        withAnimation {
-            recipient.isAddedByMe = true
-            $recipients.append(recipient)
-        }
+        // TODO: à implémenter
+        //        guard Constants.isEmailAddress(recipient.email) else {
+        //            snackbarPresenter.show(message: MailResourcesStrings.Localizable.addUnknownRecipientInvalidEmail)
+        //            return
+        //        }
+        //
+        //        guard !recipients.contains(where: { $0.isSameCorrespondent(as: recipient) }) else {
+        //            snackbarPresenter.show(message: MailResourcesStrings.Localizable.addUnknownRecipientAlreadyUsed)
+        //            return
+        //        }
+        //
+        //        withAnimation {
+        //            recipient.isAddedByMe = true
+        //            $recipients.append(recipient)
+        //        }
+
         textDebounce.text = ""
     }
 }
diff --git a/Mail/Views/New Message/UnknownRecipientCell.swift b/Mail/Views/New Message/UnknownRecipientCell.swift
@@ -22,11 +22,7 @@ import MailResources
 import SwiftUI
 
 public struct UnknownRecipientCell: View {
-    let recipient: Recipient
-
-    public init(recipient: Recipient) {
-        self.recipient = recipient
-    }
+    let email: String
 
     public var body: some View {
         HStack(spacing: 8) {
@@ -36,7 +32,7 @@ public struct UnknownRecipientCell: View {
             VStack(alignment: .leading) {
                 Text(MailResourcesStrings.Localizable.addUnknownRecipientTitle)
                     .textStyle(.bodyMedium)
-                Text(recipient.email)
+                Text(email)
                     .textStyle(.bodySecondary)
             }
         }
@@ -45,5 +41,5 @@ public struct UnknownRecipientCell: View {
 }
 
 #Preview {
-    UnknownRecipientCell(recipient: PreviewHelper.sampleRecipient1)
+    UnknownRecipientCell(email: PreviewHelper.sampleRecipient1.email)
 }
diff --git a/Mail/Views/Search/SearchViewModel.swift b/Mail/Views/Search/SearchViewModel.swift
@@ -148,7 +148,8 @@ final class SearchViewModel: ObservableObject, ThreadListable {
             fetchLimit: nil,
             sorted: nil
         )
-        var autocompleteRecipients = autocompleteContacts.map { Recipient(email: $0.email, name: $0.name).freezeIfNeeded() }
+        // TODO: Handle optional email
+        var autocompleteRecipients = autocompleteContacts.map { Recipient(email: $0.email ?? "", name: $0.name).freezeIfNeeded() }
 
         // Append typed email
         if Constants.isEmailAddress(searchValue) && !frozenContacts
diff --git a/MailCore/Cache/ContactManager/ContactManager+DB.swift b/MailCore/Cache/ContactManager/ContactManager+DB.swift
@@ -45,6 +45,9 @@ public protocol ContactFetchable {
     func getContact(for correspondent: any Correspondent) -> MergedContact?
     func addressBook(with id: Int) -> AddressBook?
     func addContact(recipient: Recipient) async throws
+
+    /// Get a contact from group contact (categories)
+    func getContacts(with groupContactId: Int) -> [MergedContact]
 }
 
 public extension ContactManager {
@@ -139,4 +142,16 @@ public extension ContactManager {
             writableRealm.add(mergedContact, update: .modified)
         }
     }
+
+    func getContacts(with groupContactId: Int) -> [MergedContact] {
+        // TODO: To implement
+//        let frozenContacts = fetchResults(ofType: MergedContact.self) { partial in
+//            partial
+//                .where { $0.groupContactId == groupContactId }
+//                .freezeIfNeeded()
+//        }
+//
+//        return Array(frozenContacts)
+        return []
+    }
 }
diff --git a/MailCore/Cache/ContactManager/ContactManager+Merge.swift b/MailCore/Cache/ContactManager/ContactManager+Merge.swift
@@ -175,7 +175,8 @@ extension ContactManager {
                 continue
             }
 
-            let id = MergedContact.computeId(email: mergedContact.email, name: mergedContact.name)
+            // TODO: Handle optional emai
+            let id = MergedContact.computeId(email: mergedContact.email ?? "", name: mergedContact.name)
             if newMergedContacts[id] == nil {
                 idsToDelete.append(id)
             }
diff --git a/MailCore/Models/Contact/CommonContactCache.swift b/MailCore/Models/Contact/CommonContactCache.swift
@@ -76,6 +76,9 @@ public enum CommonContactCache {
             contact = wrappedContact
         case .emptyContact:
             contact = CommonContact.emptyContact
+        case .groupContact:
+            // TODO: To implement
+            contact = CommonContact.emptyContact
         }
 
         // Store the object in cache
diff --git a/MailCore/Models/Contact/ContactConfiguration.swift b/MailCore/Models/Contact/ContactConfiguration.swift
@@ -28,6 +28,8 @@ public enum ContactConfiguration: CustomDebugStringConvertible {
             return ".user:\(user.displayName) \(user.email)"
         case .contact(let contact):
             return ".contact:\(contact.fullName) \(contact.email)"
+        case .groupContact:
+            return ".groupContact"
         case .emptyContact:
             return ".emptyContact"
         }
@@ -41,6 +43,7 @@ public enum ContactConfiguration: CustomDebugStringConvertible {
     )
     case user(user: UserProfile)
     case contact(contact: CommonContact)
+    case groupContact
     case emptyContact
 
     public func freezeIfNeeded() -> Self {
@@ -82,6 +85,9 @@ extension ContactConfiguration: Identifiable {
             return wrappedContact.id
         case .emptyContact:
             return CommonContact.emptyContact.id
+        case .groupContact:
+            // TODO: To implement
+            return CommonContact.emptyContact.id
         }
     }
 }
diff --git a/MailCore/Models/GroupContact.swift b/MailCore/Models/GroupContact.swift
@@ -20,7 +20,20 @@ import Foundation
 import RealmSwift
 
 // AddressBook Categories
-public class GroupContact: Object, Codable {
+public class GroupContact: Object, Codable, ContactAutocompletable {
     @Persisted public var id: Int
     @Persisted public var name: String
+
+    public var stringId: String {
+        return String(id)
+    }
+
+    public var email: String?
+}
+
+// TODO: A déplacer
+public protocol ContactAutocompletable: Identifiable {
+    var stringId: String { get }
+    var name: String { get }
+    var email: String? { get }
 }
diff --git a/MailCore/Models/MergedContact.swift b/MailCore/Models/MergedContact.swift
@@ -41,12 +41,16 @@ extension CNContact {
     }
 }
 
-public final class MergedContact: Object, Identifiable {
+public final class MergedContact: Object, Identifiable, ContactAutocompletable {
+    public var stringId: String {
+        return id
+    }
+
     private static let contactFormatter = CNContactFormatter()
 
     /// Shared
     @Persisted(primaryKey: true) public var id: String
-    @Persisted public var email: String
+    @Persisted public var email: String?
     @Persisted public var name: String
 
     /// Remote
diff --git a/MailCoreUI/Components/RecipientCell.swift b/MailCoreUI/Components/RecipientCell.swift

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,7 @@ import MailResources`
`22`	`22`	`import SwiftUI`
`23`	`23`
`24`	`24`	`public struct UnknownRecipientCell: View {`
`25`		`- let recipient: Recipient`
`26`		`-`
`27`		`- public init(recipient: Recipient) {`
`28`		`- self.recipient = recipient`
`29`		`- }`
	`25`	`+ let email: String`
`30`	`26`
`31`	`27`	`public var body: some View {`
`32`	`28`	`HStack(spacing: 8) {`
`@@ -36,7 +32,7 @@ public struct UnknownRecipientCell: View {`
`36`	`32`	`VStack(alignment: .leading) {`
`37`	`33`	`Text(MailResourcesStrings.Localizable.addUnknownRecipientTitle)`
`38`	`34`	`.textStyle(.bodyMedium)`
`39`		`- Text(recipient.email)`
	`35`	`+ Text(email)`
`40`	`36`	`.textStyle(.bodySecondary)`
`41`	`37`	`}`
`42`	`38`	`}`
`@@ -45,5 +41,5 @@ public struct UnknownRecipientCell: View {`
`45`	`41`	`}`
`46`	`42`
`47`	`43`	`#Preview {`
`48`		`- UnknownRecipientCell(recipient: PreviewHelper.sampleRecipient1)`
	`44`	`+ UnknownRecipientCell(email: PreviewHelper.sampleRecipient1.email)`
`49`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,8 @@ final class SearchViewModel: ObservableObject, ThreadListable {`
`148`	`148`	`fetchLimit: nil,`
`149`	`149`	`sorted: nil`
`150`	`150`	`)`
`151`		`- var autocompleteRecipients = autocompleteContacts.map { Recipient(email: $0.email, name: $0.name).freezeIfNeeded() }`
	`151`	`+ // TODO: Handle optional email`
	`152`	`+ var autocompleteRecipients = autocompleteContacts.map { Recipient(email: $0.email ?? "", name: $0.name).freezeIfNeeded() }`
`152`	`153`
`153`	`154`	`// Append typed email`
`154`	`155`	`if Constants.isEmailAddress(searchValue) && !frozenContacts`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ extension ContactManager {`
`175`	`175`	`continue`
`176`	`176`	`}`
`177`	`177`
`178`		`- let id = MergedContact.computeId(email: mergedContact.email, name: mergedContact.name)`
	`178`	`+ // TODO: Handle optional emai`
	`179`	`+ let id = MergedContact.computeId(email: mergedContact.email ?? "", name: mergedContact.name)`
`179`	`180`	`if newMergedContacts[id] == nil {`
`180`	`181`	`idsToDelete.append(id)`
`181`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ public enum CommonContactCache {`
`76`	`76`	`contact = wrappedContact`
`77`	`77`	`case .emptyContact:`
`78`	`78`	`contact = CommonContact.emptyContact`
	`79`	`+ case .groupContact:`
	`80`	`+ // TODO: To implement`
	`81`	`+ contact = CommonContact.emptyContact`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`// Store the object in cache`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ public enum ContactConfiguration: CustomDebugStringConvertible {`
`28`	`28`	`return ".user:\(user.displayName) \(user.email)"`
`29`	`29`	`case .contact(let contact):`
`30`	`30`	`return ".contact:\(contact.fullName) \(contact.email)"`
	`31`	`+ case .groupContact:`
	`32`	`+ return ".groupContact"`
`31`	`33`	`case .emptyContact:`
`32`	`34`	`return ".emptyContact"`
`33`	`35`	`}`
`@@ -41,6 +43,7 @@ public enum ContactConfiguration: CustomDebugStringConvertible {`
`41`	`43`	`)`
`42`	`44`	`case user(user: UserProfile)`
`43`	`45`	`case contact(contact: CommonContact)`
	`46`	`+ case groupContact`
`44`	`47`	`case emptyContact`
`45`	`48`
`46`	`49`	`public func freezeIfNeeded() -> Self {`
`@@ -82,6 +85,9 @@ extension ContactConfiguration: Identifiable {`
`82`	`85`	`return wrappedContact.id`
`83`	`86`	`case .emptyContact:`
`84`	`87`	`return CommonContact.emptyContact.id`
	`88`	`+ case .groupContact:`
	`89`	`+ // TODO: To implement`
	`90`	`+ return CommonContact.emptyContact.id`
`85`	`91`	`}`
`86`	`92`	`}`
`87`	`93`	`}`