Cleanup

Author: stevenzeck

TestApp/Sources/Data/Bookmark.swift

@@ -53,15 +53,16 @@ final class BookmarkRepository {
         }
     }
 
-    func add(_ bookmark: Bookmark) -> AnyPublisher<Bookmark.Id, Error> {
-        return db.writePublisher { db in
+    @discardableResult
+    func add(_ bookmark: Bookmark) async throws -> Bookmark.Id {
+        try await db.write { db in
             try bookmark.insert(db)
             return Bookmark.Id(rawValue: db.lastInsertedRowID)
-        }.eraseToAnyPublisher()
+        }
     }
-    
-    func remove(_ id: Bookmark.Id) -> AnyPublisher<Void, Error> {
-        db.writePublisher { db in try Bookmark.deleteOne(db, key: id) }
+
+    func remove(_ id: Bookmark.Id) async throws {
+        try await db.write { db in try Bookmark.deleteOne(db, key: id) }
     }
 
 }

TestApp/Sources/Data/Highlight.swift

@@ -91,23 +91,24 @@ final class HighlightRepository {
         }
     }
 
-    func add(_ highlight: Highlight) -> AnyPublisher<Highlight.Id, Error> {
-        return db.writePublisher { db in
+    @discardableResult
+    func add(_ highlight: Highlight) async throws -> Highlight.Id {
+        try await db.write { db in
             try highlight.insert(db)
             return highlight.id
-        }.eraseToAnyPublisher()
+        }
     }
-    
-    func update(_ id: Highlight.Id, color: HighlightColor) -> AnyPublisher<Void, Error> {
-        return db.writePublisher { db in
+
+    func update(_ id: Highlight.Id, color: HighlightColor) async throws {
+        try await db.write { db in
             let filtered = Highlight.filter(Highlight.Columns.id == id)
             let assignment = Highlight.Columns.color.set(to: color)
             try filtered.updateAll(db, onConflict: nil, assignment)
-        }.eraseToAnyPublisher()
+        }
     }
-        
-    func remove(_ id: Highlight.Id) -> AnyPublisher<Void, Error> {
-        db.writePublisher { db in try Highlight.deleteOne(db, key: id) }
+
+    func remove(_ id: Highlight.Id) async throws {
+        try await db.write { db in try Highlight.deleteOne(db, key: id) }
     }
 
 }