atridad/Ascently
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 81 Activity

[iOS & Android] iOS 1.2.3 and Android 1.7.2
All checks were successful
OpenClimb Docker Deploy / build-and-push (push) Successful in 2m32s
Details

Browse Source
This commit is contained in:
Atridad Lahiji
2025-10-05 23:47:48 -06:00
parent cb20efd58d
commit 3b6c3b5ca2
17 changed files with 302 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/test/java/com/atridad/openclimb/BusinessLogicTests.kt
View File

@@ -489,7 +489,8 @@ class BusinessLogicTests {
duration = attempt.duration,
restTime = attempt.restTime,
timestamp = attempt.timestamp,
createdAt = attempt.createdAt
createdAt = attempt.createdAt,
updatedAt = attempt.updatedAt,
)
}
)

6
android/app/src/test/java/com/atridad/openclimb/DataModelTests.kt
View File

@@ -230,7 +230,8 @@ class DataModelTests {
duration = 300,
restTime = 120,
timestamp = "2024-01-01T10:30:00Z",
createdAt = "2024-01-01T10:30:00Z"
createdAt = "2024-01-01T10:30:00Z",
updatedAt = "2024-01-01T10:30:00Z"
)
assertEquals("attempt123", attempt.id)
@@ -555,7 +556,8 @@ class DataModelTests {
duration = 120,
restTime = null,
timestamp = "2024-01-01T10:30:00Z",
createdAt = "2024-01-01T10:30:00Z"
createdAt = "2024-01-01T10:30:00Z",
updatedAt = "2024-01-01T10:30:00Z"
)
// Verify referential integrity

12
android/app/src/test/java/com/atridad/openclimb/SyncMergeLogicTest.kt
View File

@@ -73,7 +73,8 @@ class SyncMergeLogicTest {
duration = 300,
restTime = null,
timestamp = "2024-01-01T10:30:00",
createdAt = "2024-01-01T10:30:00"
createdAt = "2024-01-01T10:30:00",
updatedAt = "2024-01-01T10:30:00"
)
)
@@ -186,7 +187,8 @@ class SyncMergeLogicTest {
duration = 180,
restTime = 60,
timestamp = "2024-01-02T14:30:00",
createdAt = "2024-01-02T14:30:00"
createdAt = "2024-01-02T14:30:00",
updatedAt = "2024-01-02T14:30:00"
)
)
@@ -428,7 +430,11 @@ class SyncMergeLogicTest {
// Add server attempts, preferring newer updates
server.forEach { serverAttempt ->
val localAttempt = merged[serverAttempt.id]
if (localAttempt == null || isNewerThan(serverAttempt.createdAt, localAttempt.createdAt)
if (localAttempt == null ||
isNewerThan(
serverAttempt.updatedAt ?: serverAttempt.createdAt,
localAttempt.updatedAt ?: localAttempt.createdAt
)
) {
merged[serverAttempt.id] = serverAttempt
}