From e10dc932336db7f5112fc7efab3b8dae29cb3ccd Mon Sep 17 00:00:00 2001 From: Bryan Montz Date: Fri, 26 May 2023 07:02:14 -0500 Subject: [PATCH] add damus_donation to profile data model and update tests --- .../CoreData/Damus.xcdatamodeld/Damus.xcdatamodel/contents | 3 ++- damus/Nostr/CoreData/PersistedProfile.swift | 2 ++ damus/Nostr/Nostr.swift | 3 ++- damusTests/ProfileDatabaseTests.swift | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/damus/Nostr/CoreData/Damus.xcdatamodeld/Damus.xcdatamodel/contents b/damus/Nostr/CoreData/Damus.xcdatamodeld/Damus.xcdatamodel/contents index 0f985f18..dbdcac1f 100644 --- a/damus/Nostr/CoreData/Damus.xcdatamodeld/Damus.xcdatamodel/contents +++ b/damus/Nostr/CoreData/Damus.xcdatamodeld/Damus.xcdatamodel/contents @@ -1,8 +1,9 @@ - + + diff --git a/damus/Nostr/CoreData/PersistedProfile.swift b/damus/Nostr/CoreData/PersistedProfile.swift index 6a1b0790..460b3f4a 100644 --- a/damus/Nostr/CoreData/PersistedProfile.swift +++ b/damus/Nostr/CoreData/PersistedProfile.swift @@ -20,6 +20,7 @@ final class PersistedProfile: NSManagedObject { @NSManaged var lud06: String? @NSManaged var lud16: String? @NSManaged var nip05: String? + @NSManaged var damus_donation: Int16 @NSManaged var last_update: Date? // The date that the profile was last updated by the user @NSManaged var network_pull_date: Date? // The date we got this profile from a relay (for staleness checking) @@ -33,5 +34,6 @@ final class PersistedProfile: NSManagedObject { lud06 = profile.lud06 lud16 = profile.lud16 nip05 = profile.nip05 + damus_donation = profile.damus_donation != nil ? Int16(profile.damus_donation!) : 0 } } diff --git a/damus/Nostr/Nostr.swift b/damus/Nostr/Nostr.swift index b1cba94b..d9c10ec4 100644 --- a/damus/Nostr/Nostr.swift +++ b/damus/Nostr/Nostr.swift @@ -33,7 +33,8 @@ class Profile: Codable { website: persisted_profile.website, lud06: persisted_profile.lud06, lud16: persisted_profile.lud16, - nip05: persisted_profile.nip05) + nip05: persisted_profile.nip05, + damus_donation: Int(persisted_profile.damus_donation)) } private func str(_ str: String) -> String? { diff --git a/damusTests/ProfileDatabaseTests.swift b/damusTests/ProfileDatabaseTests.swift index 89a2c189..d07afb40 100644 --- a/damusTests/ProfileDatabaseTests.swift +++ b/damusTests/ProfileDatabaseTests.swift @@ -27,7 +27,8 @@ class ProfileDatabaseTests: XCTestCase { website: "test-website", lud06: "test-lud06", lud16: "test-lud16", - nip05: "test-nip05") + nip05: "test-nip05", + damus_donation: 100) } func testStoreAndRetrieveProfile() async throws { @@ -53,6 +54,7 @@ class ProfileDatabaseTests: XCTestCase { XCTAssertEqual(profile.lud06, retrievedProfile.lud06) XCTAssertEqual(profile.lud16, retrievedProfile.lud16) XCTAssertEqual(profile.nip05, retrievedProfile.nip05) + XCTAssertEqual(profile.damus_donation, retrievedProfile.damus_donation) } func testRejectOutdatedProfile() async throws {