[MBL-982] Support Project Fragment's Flagging Property (#1855)

* update GraphQL project fragment and adapters so that we can parse out the flagging field * add viewmodel outputs so that the projectpageviewcontroller knows if a project has been flagged by the user previously * update tests * format
kickstarter · Sep 20, 2023 · e0657bf · e0657bf
1 parent a1701ad
commit e0657bf
Show file tree

Hide file tree

Showing 13 changed files with 585 additions and 56 deletions.
diff --git a/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift b/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift
@@ -530,6 +530,12 @@ public final class ProjectPageViewController: UIViewController, MessageBannerVie
       .observeValues { [weak self] in
         self?.tableView.reloadData()
       }
+
+    self.viewModel.outputs.projectFlagged
+      .observeForUI()
+      .observeValues { _ in
+        // TODO: Use this flag to hide or show the Report this project label [MBL-983](https://kickstarter.atlassian.net/browse/MBL-983)
+      }
   }
 
   private func prepareToPlayAudioVideoURL(audioVideoURL: URL,

diff --git a/KsApi/GraphAPI.swift b/KsApi/GraphAPI.swift
diff --git a/KsApi/models/Project.swift b/KsApi/models/Project.swift
@@ -12,6 +12,7 @@ public struct Project {
   public var memberData: MemberData
   public var dates: Dates
   public var displayPrelaunch: Bool?
+  public var flagging: Bool?
   public var id: Int
   public var location: Location
   public var name: String
@@ -272,6 +273,7 @@ extension Project: Decodable {
     case category
     case creator
     case displayPrelaunch = "display_prelaunch"
+    case flagging
     case id
     case location
     case name
@@ -297,6 +299,7 @@ extension Project: Decodable {
     self.dates = try Project.Dates(from: decoder)
     self.displayPrelaunch = try values.decodeIfPresent(Bool.self, forKey: .displayPrelaunch)
     self.extendedProjectProperties = nil
+    self.flagging = try values.decodeIfPresent(Bool.self, forKey: .flagging) ?? false
     self.id = try values.decode(Int.self, forKey: .id)
     self.location = (try? values.decodeIfPresent(Location.self, forKey: .location)) ?? Location.none
     self.name = try values.decode(String.self, forKey: .name)

diff --git a/KsApi/models/graphql/adapters/Project+FetchProjectQueryData.swift b/KsApi/models/graphql/adapters/Project+FetchProjectQueryData.swift
@@ -61,6 +61,7 @@ extension Project {
       let fragment = data.project?.fragments.projectFragment,
       let project = Project.project(
         from: fragment,
+        flagging: data.project?.flagging != nil,
         rewards: [noRewardReward(from: fragment)],
         addOns: nil,
         backing: nil,
@@ -83,6 +84,7 @@ extension Project {
       let fragment = data.project?.fragments.projectFragment,
       let project = Project.project(
         from: fragment,
+        flagging: data.project?.flagging != nil,
         rewards: [noRewardReward(from: fragment)],
         addOns: nil,
         backing: nil,

diff --git a/KsApi/models/graphql/adapters/Project+FetchProjectQueryDataTests.swift b/KsApi/models/graphql/adapters/Project+FetchProjectQueryDataTests.swift
@@ -129,6 +129,9 @@ final class Project_FetchProjectQueryDataTests: XCTestCase {
     // Project Send Capi Events
     XCTAssertEqual(project.sendMetaCapiEvents, true)
 
+    // Project Flagging
+    XCTAssertEqual(project.flagging, false)
+
     /// Project User
     XCTAssertEqual(
       project.creator.avatar.large,

diff --git a/KsApi/models/graphql/adapters/Project+ProjectFragment.swift b/KsApi/models/graphql/adapters/Project+ProjectFragment.swift
@@ -10,6 +10,7 @@ extension Project {
    */
   static func project(
     from projectFragment: GraphAPI.ProjectFragment,
+    flagging: Bool? = nil,
     rewards: [Reward] = [],
     addOns: [Reward]? = nil,
     backing: Backing? = nil,
@@ -66,37 +67,39 @@ extension Project {
 
     let extendedProjectProperties = extendedProject(from: projectFragment)
 
-    return Project(
-      availableCardTypes: availableCardTypes,
-      blurb: projectFragment.description,
-      category: category,
-      country: country,
-      creator: creator,
-      extendedProjectProperties: extendedProjectProperties,
-      memberData: memberData,
-      dates: dates,
-      displayPrelaunch: displayPrelaunch,
-      id: projectFragment.pid,
-      location: location,
-      name: projectFragment.name,
-      personalization: projectPersonalization(
-        isStarred: projectFragment.isWatched,
-        backing: backing,
-        friends: []
-      ),
-      photo: photo,
-      prelaunchActivated: projectFragment.prelaunchActivated,
-      rewardData: RewardData(addOns: addOns, rewards: rewards),
-      sendMetaCapiEvents: projectFragment.sendMetaCapiEvents,
-      slug: generatedSlug ?? projectFragment.slug,
-      staffPick: projectFragment.isProjectWeLove,
-      state: state,
-      stats: projectStats(from: projectFragment, currentUserChosenCurrency: currentUserChosenCurrency),
-      tags: discoverTags,
-      urls: urls,
-      video: projectVideo(from: projectFragment),
-      watchesCount: projectFragment.watchesCount
-    )
+    return
+      Project(
+        availableCardTypes: availableCardTypes,
+        blurb: projectFragment.description,
+        category: category,
+        country: country,
+        creator: creator,
+        extendedProjectProperties: extendedProjectProperties,
+        memberData: memberData,
+        dates: dates,
+        displayPrelaunch: displayPrelaunch,
+        flagging: flagging,
+        id: projectFragment.pid,
+        location: location,
+        name: projectFragment.name,
+        personalization: projectPersonalization(
+          isStarred: projectFragment.isWatched,
+          backing: backing,
+          friends: []
+        ),
+        photo: photo,
+        prelaunchActivated: projectFragment.prelaunchActivated,
+        rewardData: RewardData(addOns: addOns, rewards: rewards),
+        sendMetaCapiEvents: projectFragment.sendMetaCapiEvents,
+        slug: generatedSlug ?? projectFragment.slug,
+        staffPick: projectFragment.isProjectWeLove,
+        state: state,
+        stats: projectStats(from: projectFragment, currentUserChosenCurrency: currentUserChosenCurrency),
+        tags: discoverTags,
+        urls: urls,
+        video: projectVideo(from: projectFragment),
+        watchesCount: projectFragment.watchesCount
+      )
   }
 }
 

diff --git a/KsApi/models/graphql/adapters/Project+ProjectFragmentTests.swift b/KsApi/models/graphql/adapters/Project+ProjectFragmentTests.swift
@@ -13,6 +13,7 @@ final class Project_ProjectFragmentTests: XCTestCase {
 
       let project = Project.project(
         from: fragment,
+        flagging: false,
         currentUserChosenCurrency: nil
       )
 
@@ -60,6 +61,7 @@ final class Project_ProjectFragmentTests: XCTestCase {
       XCTAssertTrue(project.staffPick)
       XCTAssertTrue(project.prelaunchActivated!)
       XCTAssertFalse(project.displayPrelaunch!)
+      XCTAssertEqual(project.flagging, false)
       XCTAssertNil(project.personalization.backing)
       XCTAssertNil(project.rewardData.addOns)
       XCTAssertEqual(project.sendMetaCapiEvents, false)