Improved reliability of configuration fetch and event hero storage

insidegui · insidegui · commit 5323553bce47 · 2024-06-04T12:44:27.000-03:00
diff --git a/Packages/ConfCore/ConfCore/AppleAPIClient.swift b/Packages/ConfCore/ConfCore/AppleAPIClient.swift
@@ -196,7 +196,7 @@ public final class AppleAPIClient: Logging, Signposting {
         }
 
         currentConfigRequest?.cancel()
-        currentConfigRequest = configResource.loadIfNeeded()
+        currentConfigRequest = configResource.load()
     }
 
 }
diff --git a/Packages/ConfCore/ConfCore/Storage.swift b/Packages/ConfCore/ConfCore/Storage.swift
@@ -332,19 +332,23 @@ public final class Storage: Logging, Signposting {
             return
         }
         
-        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { backgroundRealm in
+        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { [weak self] backgroundRealm in
+            guard let self else { return }
+
             // We currently only care about whatever the latest event hero is.
             let existingHeroData = backgroundRealm.objects(EventHero.self)
-            backgroundRealm.delete(existingHeroData)
-        }
+            if !existingHeroData.isEmpty {
+                self.log.info("Removing existing event hero")
+                backgroundRealm.delete(existingHeroData)
+            }
 
-        guard let hero = response.eventHero else {
-            log.debug("Config response didn't contain an event hero")
-            return
-        }
+            if let hero = response.eventHero {
+                self.log.info("Storing event hero \(hero.identifier, privacy: .public)")
 
-        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { backgroundRealm in
-            backgroundRealm.add(hero, update: .modified)
+                backgroundRealm.add(hero, update: .modified)
+            } else {
+                self.log.info("Config response had no event hero")
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public final class AppleAPIClient: Logging, Signposting {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`currentConfigRequest?.cancel()`
`199`		`- currentConfigRequest = configResource.loadIfNeeded()`
	`199`	`+ currentConfigRequest = configResource.load()`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`}`