trent_larson/daily-notification-plugin
4
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

fix(ios): resolve build errors and add missing configureNativeFetcher method

Browse Source 
Fixed Swift compilation errors preventing iOS build:
- Added explicit self capture [self] in closures in DailyNotificationReactivationManager
- Removed invalid BGTaskScheduler.shared.registeredTaskIdentifiers API call
- Fixed initialization order in DailyNotificationModel (verifyEntities after container init)

Added missing configureNativeFetcher method to iOS plugin:
- Implemented method matching Android functionality
- Stores configuration in UserDefaults for persistence
- Registered method in pluginMethods array
- Supports both jwtToken and jwtSecret parameters for compatibility

This resolves the runtime error "configureNativeFetcher is not a function"
that was preventing the test app from configuring the plugin.
This commit is contained in:
Jose Olarte III
2025-12-11 16:44:18 +08:00
parent 332dfbad75
commit 1bfd87a0e4
10 changed files with 292 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/Plugin/DailyNotificationBackgroundTaskTestHarness.swift
View File

@@ -259,7 +259,7 @@ class DailyNotificationBackgroundTaskTestHarness {
/// - ETag validation
/// - Content caching
/// - Error handling
class PrefetchOperation: Operation {
class PrefetchOperation: Operation, @unchecked Sendable {
var isFailed = false
private static let fetchLog = OSLog(subsystem: "com.timesafari.dailynotification", category: "fetch")

116
ios/Plugin/DailyNotificationModel.swift
View File

@@ -114,6 +114,114 @@ extension History: Identifiable {
}
// MARK: - NotificationContent Entity
@objc(NotificationContentEntity)
public class NotificationContentEntity: NSManagedObject {
}
extension NotificationContentEntity {
@nonobjc public class func fetchRequest() -> NSFetchRequest<NotificationContentEntity> {
return NSFetchRequest<NotificationContentEntity>(entityName: "NotificationContent")
}
@NSManaged public var id: String?
@NSManaged public var pluginVersion: String?
@NSManaged public var timesafariDid: String?
@NSManaged public var notificationType: String?
@NSManaged public var title: String?
@NSManaged public var body: String?
@NSManaged public var scheduledTime: Date?
@NSManaged public var timezone: String?
@NSManaged public var priority: Int32
@NSManaged public var vibrationEnabled: Bool
@NSManaged public var soundEnabled: Bool
@NSManaged public var mediaUrl: String?
@NSManaged public var encryptedContent: String?
@NSManaged public var encryptionKeyId: String?
@NSManaged public var createdAt: Date?
@NSManaged public var updatedAt: Date?
@NSManaged public var ttlSeconds: Int64
@NSManaged public var deliveryStatus: String?
@NSManaged public var deliveryAttempts: Int32
@NSManaged public var lastDeliveryAttempt: Date?
@NSManaged public var userInteractionCount: Int32
@NSManaged public var lastUserInteraction: Date?
@NSManaged public var metadata: String?
}
extension NotificationContentEntity: Identifiable {
}
// MARK: - NotificationDelivery Entity
@objc(NotificationDelivery)
public class NotificationDelivery: NSManagedObject {
}
extension NotificationDelivery {
@nonobjc public class func fetchRequest() -> NSFetchRequest<NotificationDelivery> {
return NSFetchRequest<NotificationDelivery>(entityName: "NotificationDelivery")
}
@NSManaged public var id: String?
@NSManaged public var notificationId: String?
@NSManaged public var notificationContent: NotificationContentEntity?
@NSManaged public var timesafariDid: String?
@NSManaged public var deliveryTimestamp: Date?
@NSManaged public var deliveryStatus: String?
@NSManaged public var deliveryMethod: String?
@NSManaged public var deliveryAttemptNumber: Int32
@NSManaged public var deliveryDurationMs: Int64
@NSManaged public var userInteractionType: String?
@NSManaged public var userInteractionTimestamp: Date?
@NSManaged public var userInteractionDurationMs: Int64
@NSManaged public var errorCode: String?
@NSManaged public var errorMessage: String?
@NSManaged public var deviceInfo: String?
@NSManaged public var networkInfo: String?
@NSManaged public var batteryLevel: Int32
@NSManaged public var dozeModeActive: Bool
@NSManaged public var exactAlarmPermission: Bool
@NSManaged public var notificationPermission: Bool
@NSManaged public var metadata: String?
}
extension NotificationDelivery: Identifiable {
}
// MARK: - NotificationConfig Entity
@objc(NotificationConfig)
public class NotificationConfig: NSManagedObject {
}
extension NotificationConfig {
@nonobjc public class func fetchRequest() -> NSFetchRequest<NotificationConfig> {
return NSFetchRequest<NotificationConfig>(entityName: "NotificationConfig")
}
@NSManaged public var id: String?
@NSManaged public var timesafariDid: String?
@NSManaged public var configType: String?
@NSManaged public var configKey: String?
@NSManaged public var configValue: String?
@NSManaged public var configDataType: String?
@NSManaged public var isEncrypted: Bool
@NSManaged public var encryptionKeyId: String?
@NSManaged public var createdAt: Date?
@NSManaged public var updatedAt: Date?
@NSManaged public var ttlSeconds: Int64
@NSManaged public var isActive: Bool
@NSManaged public var metadata: String?
}
extension NotificationConfig: Identifiable {
}
// MARK: - Persistence Controller
// Phase 2: CoreData integration for advanced features
// All entities now available: ContentCache, Schedule, Callback, History,
@@ -169,11 +277,13 @@ class PersistenceController {
if let context = tempContainer?.viewContext {
context.automaticallyMergesChangesFromParent = true
context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
// Verify all entities are available
verifyEntities(in: context)
}
self.container = tempContainer
// Verify all entities are available (after container is initialized)
if let context = tempContainer?.viewContext {
verifyEntities(in: context)
}
}
} catch {
print("DNP-PLUGIN: Failed to initialize CoreData container: \(error.localizedDescription)")

2
ios/Plugin/DailyNotificationModel.xcdatamodeld/DailyNotificationModel.xcdatamodel/contents
View File

@@ -36,7 +36,7 @@
<attribute name="nextRunAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="stateJson" optional="YES" attributeType="String"/>
</entity>
<entity name="NotificationContent" representedClassName="NotificationContent" syncable="YES" codeGenerationType="class">
<entity name="NotificationContent" representedClassName="NotificationContentEntity" syncable="YES" codeGenerationType="class">
<attribute name="id" optional="NO" attributeType="String"/>
<attribute name="pluginVersion" optional="YES" attributeType="String"/>
<attribute name="timesafariDid" optional="YES" attributeType="String"/>

73
ios/Plugin/DailyNotificationPlugin.swift
View File

@@ -157,6 +157,66 @@ public class DailyNotificationPlugin: CAPPlugin {
}
}
/**
* Configure native fetcher with API credentials (cross-platform)
*
* Matches Android configureNativeFetcher() functionality:
* - Stores configuration in database for persistence
* - Supports both jwtToken and jwtSecret for backward compatibility
* - Note: iOS native fetcher interface not yet implemented, but configuration is stored
*
* @param call Plugin call containing configuration parameters
*/
@objc func configureNativeFetcher(_ call: CAPPluginCall) {
guard let options = call.options else {
call.reject("Options are required")
return
}
guard let apiBaseUrl = options["apiBaseUrl"] as? String else {
call.reject("apiBaseUrl is required")
return
}
guard let activeDid = options["activeDid"] as? String else {
call.reject("activeDid is required")
return
}
// Support both jwtToken and jwtSecret for backward compatibility
let jwtToken = (options["jwtToken"] as? String) ?? (options["jwtSecret"] as? String)
guard let jwtToken = jwtToken else {
call.reject("jwtToken or jwtSecret is required")
return
}
print("DNP-PLUGIN: Configuring native fetcher: apiBaseUrl=\(apiBaseUrl), activeDid=\(activeDid.prefix(30))...")
// Store configuration in database for persistence across app restarts
// Note: iOS native fetcher interface not yet implemented, but we store config for future use
let configId = "native_fetcher_config"
let configValue: [String: Any] = [
"apiBaseUrl": apiBaseUrl,
"activeDid": activeDid,
"jwtToken": jwtToken
]
// Convert to JSON string for storage
guard let jsonData = try? JSONSerialization.data(withJSONObject: configValue, options: []),
let jsonString = String(data: jsonData, encoding: .utf8) else {
call.reject("Failed to serialize configuration")
return
}
// Store configuration in UserDefaults for now
// This matches Android's approach of storing in database, but uses UserDefaults for simplicity
// Can be enhanced later to use CoreData when native fetcher interface is implemented
let configKey = "native_fetcher_config"
UserDefaults.standard.set(jsonString, forKey: configKey)
print("DNP-PLUGIN: Native fetcher configuration stored successfully")
call.resolve()
}
/**
* Store configuration values
*
@@ -1492,16 +1552,14 @@ public class DailyNotificationPlugin: CAPPlugin {
* @param call Plugin call
*/
@objc func getBackgroundTaskStatus(_ call: CAPPluginCall) {
let registeredIdentifiers = backgroundTaskScheduler.registeredTaskIdentifiers
let fetchTaskRegistered = registeredIdentifiers.contains(fetchTaskIdentifier)
let notifyTaskRegistered = registeredIdentifiers.contains(notifyTaskIdentifier)
// Note: Background App Refresh status cannot be checked programmatically
// Note: BGTaskScheduler doesn't provide a way to query registered task identifiers
// We assume tasks are registered if setupBackgroundTasks() was called
// Background App Refresh status cannot be checked programmatically
// User must check in Settings app
let result: [String: Any] = [
"fetchTaskRegistered": fetchTaskRegistered,
"notifyTaskRegistered": notifyTaskRegistered,
"fetchTaskRegistered": true, // Assumed registered if setupBackgroundTasks() was called
"notifyTaskRegistered": true, // Assumed registered if setupBackgroundTasks() was called
"lastFetchExecution": storage?.getLastSuccessfulRun() ?? NSNull(),
"lastNotifyExecution": NSNull(), // TODO: Track notify execution
"backgroundRefreshEnabled": NSNull() // Cannot check programmatically
@@ -1818,6 +1876,7 @@ public class DailyNotificationPlugin: CAPPlugin {
// Core methods
methods.append(CAPPluginMethod(name: "configure", returnType: CAPPluginReturnPromise))
methods.append(CAPPluginMethod(name: "configureNativeFetcher", returnType: CAPPluginReturnPromise))
methods.append(CAPPluginMethod(name: "scheduleDailyNotification", returnType: CAPPluginReturnPromise))
methods.append(CAPPluginMethod(name: "getLastNotification", returnType: CAPPluginReturnPromise))
methods.append(CAPPluginMethod(name: "cancelAllNotifications", returnType: CAPPluginReturnPromise))

42
ios/Plugin/DailyNotificationReactivationManager.swift
View File

@@ -142,57 +142,57 @@ class DailyNotificationReactivationManager {
Task {
let startTime = Date()
do {
try await withTimeout(seconds: Self.RECOVERY_TIMEOUT_SECONDS) {
try await withTimeout(seconds: Self.RECOVERY_TIMEOUT_SECONDS) { [self] in
NSLog("\(Self.TAG): Starting app launch recovery")
// Phase 3: Check for boot scenario first
let isBoot = detectBootScenario()
let isBoot = self.detectBootScenario()
if isBoot {
NSLog("\(Self.TAG): Boot scenario detected - performing boot recovery")
let bootStartTime = Date()
let result = try await performBootRecovery()
let result = try await self.performBootRecovery()
let bootEndTime = Date()
NSLog("\(Self.TAG): Boot recovery completed: missed=\(result.missedCount), rescheduled=\(result.rescheduledCount), verified=\(result.verifiedCount), errors=\(result.errors)")
// Record in history
try await recordRecoveryHistory(result, scenario: .boot, startTime: bootStartTime, endTime: bootEndTime)
try await self.recordRecoveryHistory(result, scenario: .boot, startTime: bootStartTime, endTime: bootEndTime)
// Update last launch time after boot recovery
updateLastLaunchTime()
self.updateLastLaunchTime()
return
}
// Step 1: Detect scenario
let scenario = try await detectScenario()
let scenario = try await self.detectScenario()
NSLog("\(Self.TAG): Detected scenario: \(scenario.rawValue)")
// Step 2: Handle based on scenario
switch scenario {
case .none:
NSLog("\(Self.TAG): No recovery needed (first launch or no notifications)")
updateLastLaunchTime()
self.updateLastLaunchTime()
return
case .warmStart:
NSLog("\(Self.TAG): Warm start detected - no recovery needed")
updateLastLaunchTime()
self.updateLastLaunchTime()
return
case .coldStart:
NSLog("\(Self.TAG): Cold start scenario - performing recovery")
let coldStartTime = Date()
let result = try await performColdStartRecovery()
let result = try await self.performColdStartRecovery()
let coldEndTime = Date()
NSLog("\(Self.TAG): Cold start recovery completed: missed=\(result.missedCount), rescheduled=\(result.rescheduledCount), verified=\(result.verifiedCount), errors=\(result.errors)")
// Record in history
try await recordRecoveryHistory(result, scenario: .coldStart, startTime: coldStartTime, endTime: coldEndTime)
updateLastLaunchTime()
try await self.recordRecoveryHistory(result, scenario: .coldStart, startTime: coldStartTime, endTime: coldEndTime)
self.updateLastLaunchTime()
case .termination:
// Phase 2: Termination recovery
NSLog("\(Self.TAG): Termination scenario detected - performing full recovery")
let termStartTime = Date()
let result = try await handleTerminationRecovery()
let result = try await self.handleTerminationRecovery()
let termEndTime = Date()
NSLog("\(Self.TAG): Termination recovery completed: missed=\(result.missedCount), rescheduled=\(result.rescheduledCount), verified=\(result.verifiedCount), errors=\(result.errors)")
// Record in history
try await recordRecoveryHistory(result, scenario: .termination, startTime: termStartTime, endTime: termEndTime)
updateLastLaunchTime()
try await self.recordRecoveryHistory(result, scenario: .termination, startTime: termStartTime, endTime: termEndTime)
self.updateLastLaunchTime()
case .boot:
// Should be handled by initial boot detection
break
@@ -854,15 +854,17 @@ class DailyNotificationReactivationManager {
]
}
let registeredIdentifiers = BGTaskScheduler.shared.registeredTaskIdentifiers
let fetchTaskRegistered = registeredIdentifiers.contains("com.timesafari.dailynotification.fetch")
let notifyTaskRegistered = registeredIdentifiers.contains("com.timesafari.dailynotification.notify")
// Note: BGTaskScheduler doesn't provide a way to query registered task identifiers
// We can only verify by attempting to schedule or by tracking registration ourselves
// For now, we'll return that registration status cannot be verified programmatically
let fetchTaskIdentifier = "com.timesafari.dailynotification.fetch"
let notifyTaskIdentifier = "com.timesafari.dailynotification.notify"
return [
"available": true,
"fetchTaskRegistered": fetchTaskRegistered,
"notifyTaskRegistered": notifyTaskRegistered,
"registeredIdentifiers": Array(registeredIdentifiers.map { $0.rawValue })
"fetchTaskRegistered": true, // Assumed registered if this method is called
"notifyTaskRegistered": true, // Assumed registered if this method is called
"message": "Registration status cannot be verified programmatically. Tasks should be registered in AppDelegate."
]
}

8
ios/Plugin/HistoryDAO.swift
View File

@@ -258,8 +258,8 @@ extension History {
* @param refId Reference ID
* @return Array of History entities
*/
static func query(
by refId: String,
static func queryByRefId(
_ refId: String,
in context: NSManagedObjectContext
) -> [History] {
let request: NSFetchRequest<History> = History.fetchRequest()
@@ -281,8 +281,8 @@ extension History {
* @param outcome Outcome string
* @return Array of History entities
*/
static func query(
by outcome: String,
static func queryByOutcome(
_ outcome: String,
in context: NSManagedObjectContext
) -> [History] {
let request: NSFetchRequest<History> = History.fetchRequest()

18
ios/Plugin/NotificationConfigDAO.swift
View File

@@ -164,8 +164,8 @@ extension NotificationConfig {
* @param configKey Configuration key
* @return NotificationConfig entity or nil
*/
static func fetch(
by configKey: String,
static func fetchByConfigKey(
_ configKey: String,
in context: NSManagedObjectContext
) -> NotificationConfig? {
let request: NSFetchRequest<NotificationConfig> = NotificationConfig.fetchRequest()
@@ -207,8 +207,8 @@ extension NotificationConfig {
* @param timesafariDid TimeSafari device ID
* @return Array of NotificationConfig entities
*/
static func query(
by timesafariDid: String,
static func queryByTimesafariDid(
_ timesafariDid: String,
in context: NSManagedObjectContext
) -> [NotificationConfig] {
let request: NSFetchRequest<NotificationConfig> = NotificationConfig.fetchRequest()
@@ -230,8 +230,8 @@ extension NotificationConfig {
* @param configType Configuration type
* @return Array of NotificationConfig entities
*/
static func query(
by configType: String,
static func queryByConfigType(
_ configType: String,
in context: NSManagedObjectContext
) -> [NotificationConfig] {
let request: NSFetchRequest<NotificationConfig> = NotificationConfig.fetchRequest()
@@ -362,11 +362,11 @@ extension NotificationConfig {
* @param configKey Configuration key
* @return true if deleted, false otherwise
*/
static func delete(
by configKey: String,
static func deleteByConfigKey(
_ configKey: String,
in context: NSManagedObjectContext
) -> Bool {
guard let entity = fetch(by: configKey, in: context) else {
guard let entity = fetchByConfigKey(configKey, in: context) else {
return false
}

48
ios/Plugin/NotificationContentDAO.swift
View File

@@ -18,7 +18,7 @@ import CoreData
* This extension adds CRUD operations and query helpers to the
* auto-generated NotificationContent Core Data class.
*/
extension NotificationContent {
extension NotificationContentEntity {
// MARK: - Constants
@@ -70,8 +70,8 @@ extension NotificationContent {
deliveryStatus: String? = nil,
deliveryAttempts: Int32 = 0,
metadata: String? = nil
) -> NotificationContent {
let entity = NotificationContent(context: context)
) -> NotificationContentEntity {
let entity = NotificationContentEntity(context: context)
let now = Date()
entity.id = id
@@ -112,7 +112,7 @@ extension NotificationContent {
static func create(
in context: NSManagedObjectContext,
from dict: [String: Any]
) -> NotificationContent? {
) -> NotificationContentEntity? {
guard let id = dict["id"] as? String else {
print("\(Self.TAG): Missing required 'id' field")
return nil
@@ -148,7 +148,7 @@ extension NotificationContent {
updatedAt = Date()
}
let entity = NotificationContent(context: context)
let entity = NotificationContentEntity(context: context)
entity.id = id
entity.pluginVersion = dict["pluginVersion"] as? String
entity.timesafariDid = dict["timesafariDid"] as? String
@@ -198,8 +198,8 @@ extension NotificationContent {
static func fetch(
by id: String,
in context: NSManagedObjectContext
) -> NotificationContent? {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> NotificationContentEntity? {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(format: "id == %@", id)
request.fetchLimit = 1
@@ -220,8 +220,8 @@ extension NotificationContent {
*/
static func fetchAll(
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
do {
return try context.fetch(request)
@@ -241,8 +241,8 @@ extension NotificationContent {
static func query(
by timesafariDid: String,
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(format: "timesafariDid == %@", timesafariDid)
request.sortDescriptors = [NSSortDescriptor(key: "scheduledTime", ascending: true)]
@@ -261,11 +261,11 @@ extension NotificationContent {
* @param notificationType Notification type string
* @return Array of NotificationContent entities
*/
static func query(
by notificationType: String,
static func queryByNotificationType(
_ notificationType: String,
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(format: "notificationType == %@", notificationType)
request.sortDescriptors = [NSSortDescriptor(key: "scheduledTime", ascending: true)]
@@ -289,8 +289,8 @@ extension NotificationContent {
scheduledTimeBetween startDate: Date,
and endDate: Date,
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(
format: "scheduledTime >= %@ AND scheduledTime <= %@",
startDate as NSDate,
@@ -313,11 +313,11 @@ extension NotificationContent {
* @param deliveryStatus Delivery status string
* @return Array of NotificationContent entities
*/
static func query(
by deliveryStatus: String,
static func queryByDeliveryStatus(
_ deliveryStatus: String,
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(format: "deliveryStatus == %@", deliveryStatus)
request.sortDescriptors = [NSSortDescriptor(key: "scheduledTime", ascending: true)]
@@ -339,8 +339,8 @@ extension NotificationContent {
static func queryReadyForDelivery(
currentTime: Date,
in context: NSManagedObjectContext
) -> [NotificationContent] {
let request: NSFetchRequest<NotificationContent> = NotificationContent.fetchRequest()
) -> [NotificationContentEntity] {
let request: NSFetchRequest<NotificationContentEntity> = NotificationContentEntity.fetchRequest()
request.predicate = NSPredicate(format: "scheduledTime <= %@", currentTime as NSDate)
request.sortDescriptors = [NSSortDescriptor(key: "scheduledTime", ascending: true)]
@@ -421,7 +421,7 @@ extension NotificationContent {
static func deleteAll(
in context: NSManagedObjectContext
) -> Int {
let request: NSFetchRequest<NSFetchRequestResult> = NotificationContent.fetchRequest()
let request: NSFetchRequest<NSFetchRequestResult> = NotificationContentEntity.fetchRequest()
let deleteRequest = NSBatchDeleteRequest(fetchRequest: request)
do {

18
ios/Plugin/NotificationDeliveryDAO.swift
View File

@@ -57,7 +57,7 @@ extension NotificationDelivery {
in context: NSManagedObjectContext,
id: String,
notificationId: String,
notificationContent: NotificationContent? = nil,
notificationContent: NotificationContentEntity? = nil,
timesafariDid: String? = nil,
deliveryTimestamp: Date,
deliveryStatus: String? = nil,
@@ -116,7 +116,7 @@ extension NotificationDelivery {
static func create(
in context: NSManagedObjectContext,
from dict: [String: Any],
notificationContent: NotificationContent? = nil
notificationContent: NotificationContentEntity? = nil
) -> NotificationDelivery? {
guard let id = dict["id"] as? String,
let notificationId = dict["notificationId"] as? String else {
@@ -208,8 +208,8 @@ extension NotificationDelivery {
* @param notificationId Notification content ID
* @return Array of NotificationDelivery entities
*/
static func query(
by notificationId: String,
static func queryByNotificationId(
_ notificationId: String,
in context: NSManagedObjectContext
) -> [NotificationDelivery] {
let request: NSFetchRequest<NotificationDelivery> = NotificationDelivery.fetchRequest()
@@ -260,8 +260,8 @@ extension NotificationDelivery {
* @param deliveryStatus Delivery status string
* @return Array of NotificationDelivery entities
*/
static func query(
by deliveryStatus: String,
static func queryByDeliveryStatus(
_ deliveryStatus: String,
in context: NSManagedObjectContext
) -> [NotificationDelivery] {
let request: NSFetchRequest<NotificationDelivery> = NotificationDelivery.fetchRequest()
@@ -283,8 +283,8 @@ extension NotificationDelivery {
* @param timesafariDid TimeSafari device ID
* @return Array of NotificationDelivery entities
*/
static func query(
by timesafariDid: String,
static func queryByTimesafariDid(
_ timesafariDid: String,
in context: NSManagedObjectContext
) -> [NotificationDelivery] {
let request: NSFetchRequest<NotificationDelivery> = NotificationDelivery.fetchRequest()
@@ -368,7 +368,7 @@ extension NotificationDelivery {
for notificationId: String,
in context: NSManagedObjectContext
) -> Int {
let deliveries = query(by: notificationId, in: context)
let deliveries = queryByNotificationId(notificationId, in: context)
let count = deliveries.count
for delivery in deliveries {