Merge pull request #6 from easydev991/develop-1.4

- Поправил вычисление разницы в днях: теперь сравниваем начало дня, игнорируя часы, минуты и секунды
- Доработал тесты

Author: easydev991

SwiftUI-Days.xcodeproj/project.pbxproj

@@ -532,7 +532,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -578,7 +578,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.oleg991.SwiftUI-Days";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

SwiftUI-Days/Models/Item.swift

@@ -10,6 +10,7 @@ import SwiftData
 
 @Model
 final class Item {
+    private static let calendar = Calendar.current
     var title = ""
     var details = ""
     var timestamp = Date.now
@@ -22,11 +23,10 @@ final class Item {
 
     /// Количество дней с момента события
     func makeDaysCount(to date: Date) -> Int {
-        Calendar.current.dateComponents(
-            [.day],
-            from: timestamp,
-            to: date
-        ).day ?? 0
+        let startDate = Self.calendar.startOfDay(for: timestamp)
+        let endDate = Self.calendar.startOfDay(for: date)
+        let daysCount = Self.calendar.dateComponents([.day], from: startDate, to: endDate).day
+        return daysCount ?? 0
     }
 
     var backupItem: BackupFileDocument.BackupItem {

SwiftUI-DaysTests/SwiftUI_DaysTests.swift

@@ -11,41 +11,79 @@ import Foundation
 
 @Suite("Item tests")
 struct SwiftUI_DaysTests {
+    private let calendar = Calendar.current
+    private let now = Date.now
+    
     /// Тестируем инициализацию объекта Item
-    @Test func itemInitialization() {
+    @Test func itemInitialization() throws {
         let title = "Test Title"
         let details = "Test Details"
-        let oneDayAgo = Date(timeIntervalSinceNow: -86400)
+        let oneDayAgo = try #require(calendar.date(byAdding: .day, value: -1, to: now))
         let item = Item(title: title, details: details, timestamp: oneDayAgo)
         #expect(item.title == title)
         #expect(item.details == details)
         #expect(item.timestamp == oneDayAgo)
     }
 
+
     /// Тестируем `daysCount`, когда событие произошло только что
     @Test func daysCountWithNoDaysPassed() {
-        let item = Item(title: "Recent Event", timestamp: .now)
-        let result = item.makeDaysCount(to: .now)
+        let item = Item(title: "Recent Event", timestamp: now)
+        let result = item.makeDaysCount(to: now)
         #expect(result == 0)
     }
 
     /// Тестируем `daysCount` для события, произошедшего 1 день назад
-    @Test func daysCountWithOneDayPassed() {
+    @Test func daysCountWithOneDayPassed() throws {
+        let oneDayAgo = try #require(calendar.date(byAdding: .day, value: -1, to: now))
         let oneDayOldItem = Item(
             title: "One Day Ago",
-            timestamp: Date(timeIntervalSinceNow: -86400)
+            timestamp: oneDayAgo
         )
-        let result = oneDayOldItem.makeDaysCount(to: .now)
+        let result = oneDayOldItem.makeDaysCount(to: now)
         #expect(result == 1)
     }
-
+    
     /// Тестируем `daysCount` для события, произошедшего 5 дней назад
-    @Test func daysCountWithMultipleDaysPassed() {
+    @Test func daysCountWithMultipleDaysPassed() throws {
+        let fiveDaysAgo = try #require(calendar.date(byAdding: .day, value: -5, to: now))
         let fiveDaysOldItem = Item(
             title: "Five Days Ago",
-            timestamp: Date(timeIntervalSinceNow: -432000)
+            timestamp: fiveDaysAgo
         )
-        let result = fiveDaysOldItem.makeDaysCount(to: .now)
+        let result = fiveDaysOldItem.makeDaysCount(to: now)
         #expect(result == 5)
     }
+
+    @Test(arguments: 1...11)
+    func daysCountSameDay(hoursAgo: Int) throws {
+        let date = try #require(Calendar.current.date(byAdding: .hour, value: -hoursAgo, to: now))
+        let item = Item(title: "Recent Event", timestamp: date)
+        let result = item.makeDaysCount(to: now)
+        #expect(result == 0, "Должно быть 0 дней, так как даты в одном календарном дне")
+    }
+    
+    @Test(arguments: 12...23)
+    func daysCountDifferentDay(hoursAgo: Int) throws {
+        let date = try #require(Calendar.current.date(byAdding: .hour, value: -hoursAgo, to: now))
+        let item = Item(title: "Yesterday Event", timestamp: date)
+        let result = item.makeDaysCount(to: now)
+        #expect(result == 1, "Должен быть 1 день, так как даты в разных календарных днях")
+    }
+    
+    @Test func daysCountAcrossMidnight() throws {
+        let todayStart = calendar.startOfDay(for: now)
+        let justBeforeMidnight = try #require(calendar.date(byAdding: .minute, value: -1, to: todayStart))
+        let justAfterMidnight = try #require(calendar.date(byAdding: .minute, value: 1, to: todayStart))
+        let item = Item(title: "Late Event", timestamp: justBeforeMidnight)
+        let result = item.makeDaysCount(to: justAfterMidnight)
+        #expect(result == 1, "Должен быть 1 день при переходе через полночь")
+    }
+    
+    @Test func daysCountFutureEvent() throws {
+        let futureDate = try #require(calendar.date(byAdding: .day, value: 1, to: now))
+        let item = Item(title: "Future Event", timestamp: futureDate)
+        let result = item.makeDaysCount(to: now)
+        #expect(result <= 0, "Для будущих событий результат должен быть 0 или отрицательным")
+    }
 }