Merge pull request #4327 from anyproto/ios-5454-sorting-chats-by-last-message-dates-not-working-on-ios

IOS-5454 Fix chat sorting by adding auto-enrichment for date sorts

Author: ignatovv

Anytype/Sources/PresentationLayer/TextEditor/Set/Subscriptions/Set/SetSubscriptionData.swift

@@ -45,8 +45,7 @@ struct SetSubscriptionData: Hashable {
         if sorts.isEmpty {
             sorts.append(SearchHelper.sort(
                 relation: .createdDate,
-                type: .desc,
-                includeTime: true
+                type: .desc
             ))
         }
         self.sorts = sorts

Anytype/Sources/ServiceLayer/ChatStorage/ChatDetailsSubscriptionBuilder.swift

@@ -18,10 +18,6 @@ final class ChatDetailsSubscriptionBuilder: ChatDetailsSubscriptionBuilderProtoc
     }
 
     func build() -> SubscriptionData {
-        let sorts: [DataviewSort] = .builder {
-            SearchHelper.sort(relation: .lastMessageDate, type: .desc)
-        }
-
         let filters: [DataviewFilter] = .builder {
             SearchHelper.layoutFilter([.chatDerived])
         }

Anytype/Sources/ServiceLayer/Object/Search/SearchService.swift

@@ -152,8 +152,7 @@ final class SearchService: SearchServiceProtocol, Sendable {
     func searchRelations(text: String, excludedIds: [String], spaceId: String) async throws -> [PropertyDetails] {
         let sort = SearchHelper.sort(
             relation: BundledPropertyKey.lastUsedDate,
-            type: .desc,
-            includeTime: true
+            type: .desc
         )
 
         let spaceUxType = spaceViewsStorage.spaceView(spaceId: spaceId)?.uxType

Anytype/Sources/ServiceLayer/Subscriptions/RecentSubscriptionService.swift

@@ -85,14 +85,12 @@ final class RecentSubscriptionService: RecentSubscriptionServiceProtocol {
         case .recentEdit:
             return SearchHelper.sort(
                 relation: BundledPropertyKey.lastModifiedDate,
-                type: .desc,
-                includeTime: true
+                type: .desc
             )
         case .recentOpen:
             return SearchHelper.sort(
                 relation: BundledPropertyKey.lastOpenedDate,
-                type: .desc,
-                includeTime: true
+                type: .desc
             )
         }
     }

Modules/Services/Sources/Models/Common/BundledPropertyKey+InculdeType.swift

@@ -3,25 +3,32 @@ import AnytypeCore
 import ProtobufMessages
 
 public extension BundledPropertyKey {
-    static let sortIncudeTimeKeys: [BundledPropertyKey] = [
-        .lastOpenedDate,
+    static let dateKeys: [BundledPropertyKey] = [
+        .createdDate,
         .lastModifiedDate,
-        .createdDate
+        .lastOpenedDate,
+        .lastMessageDate,
+        .dueDate,
+        .addedDate,
+        .lastUsedDate,
+        .syncDate,
+        .spaceJoinDate,
+        .toBeDeletedDate
     ]
 }
 
 // MARK: - Helpers
 
 public extension DataviewSort {
     func fixIncludeTime() -> Self {
-        let rawKeys = BundledPropertyKey.sortIncudeTimeKeys.map(\.rawValue)
-        
+        let rawKeys = BundledPropertyKey.dateKeys.map(\.rawValue)
+
         if rawKeys.contains(relationKey) {
             var newSort = self
             newSort.includeTime = true
             return newSort
         }
-        
+
         return self
     }
 }