From ef90973ef8dead8f46639002919639119f41d707 Mon Sep 17 00:00:00 2001
From: Selim Mustafaev <selim@fastmail.fm>
Date: Thu, 22 Sep 2022 23:55:33 +0300
Subject: [PATCH] Fixing date search params

---
 AutoCat.xcodeproj/project.pbxproj           |  4 ++--
 AutoCat/Controllers/FiltersController.swift | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj
index b48e508..fb7b834 100644
--- a/AutoCat.xcodeproj/project.pbxproj
+++ b/AutoCat.xcodeproj/project.pbxproj
@@ -1080,7 +1080,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 91;
+				CURRENT_PROJECT_VERSION = 94;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -1105,7 +1105,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 91;
+				CURRENT_PROJECT_VERSION = 94;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
diff --git a/AutoCat/Controllers/FiltersController.swift b/AutoCat/Controllers/FiltersController.swift
index 57a3f23..260c71a 100644
--- a/AutoCat/Controllers/FiltersController.swift
+++ b/AutoCat/Controllers/FiltersController.swift
@@ -122,14 +122,14 @@ class FiltersController: FormViewController {
                 row.noValueDisplayText = NSLocalizedString("Beginning", comment: "")
                 row.value = self.filter.fromDateUpdated
             }
-            .onChange { self.filter.fromDateUpdated = $0.value }
+            .onChange { self.filter.fromDateUpdated = self.nullifyTime(of: $0.value) }
             .cellUpdate(self.update(cell:row:))
             <<< DateInlineRow("ToDateUpdated") { row in
                 row.title = NSLocalizedString("To", comment: "")
                 row.noValueDisplayText = NSLocalizedString("Now", comment: "")
                 row.value = self.filter.toDateUpdated
             }
-            .onChange { self.filter.toDateUpdated = $0.value }
+            .onChange { self.filter.toDateUpdated = self.nullifyTime(of: $0.value) }
             .cellUpdate(self.update(cell:row:))
         
         form +++ Section(NSLocalizedString("Added time", comment: ""))
@@ -138,14 +138,14 @@ class FiltersController: FormViewController {
                 row.noValueDisplayText = NSLocalizedString("Beginning", comment: "")
                 row.value = self.filter.fromDate
             }
-            .onChange { self.filter.fromDate = $0.value }
+            .onChange { self.filter.fromDate = self.nullifyTime(of: $0.value) }
             .cellUpdate(self.update(cell:row:))
             <<< DateInlineRow("ToDate") { row in
                 row.title = NSLocalizedString("To", comment: "")
                 row.noValueDisplayText = NSLocalizedString("Now", comment: "")
                 row.value = self.filter.toDate
             }
-            .onChange { self.filter.toDate = $0.value }
+            .onChange { self.filter.toDate = self.nullifyTime(of: $0.value) }
             .cellUpdate(self.update(cell:row:))
         
         form +++ Section(NSLocalizedString("Sort", comment: "Header section. Noun."))
@@ -236,4 +236,12 @@ class FiltersController: FormViewController {
         row.baseCell.accessoryView = nil
         row.baseCell.update()
     }
+    
+    func nullifyTime(of date: Date?) -> Date? {
+        guard let date else {
+            return nil
+        }
+        
+        return Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: date)
+    }
 }