Change type of CreateFlaggingInput from GraphAPI.FlaggingKind to Grap…

…hAPI.NonDeprecatedFlaggingKind
kickstarter · Mar 19, 2024 · 65d72d8 · 65d72d8
1 parent 7e5bd9d
commit 65d72d8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/Kickstarter-iOS/Features/ReportProject/ReportProjectFormView.swift b/Kickstarter-iOS/Features/ReportProject/ReportProjectFormView.swift
@@ -10,7 +10,7 @@ struct ReportProjectFormView: View {
   @Binding var popToRoot: Bool
   let projectID: String
   let projectURL: String
-  let projectFlaggingKind: GraphAPI.FlaggingKind
+  let projectFlaggingKind: GraphAPI.NonDeprecatedFlaggingKind
 
   @SwiftUI.Environment(\.dismiss) private var dismiss
   @StateObject private var viewModel = ReportProjectFormViewModel()

diff --git a/Kickstarter-iOS/Features/ReportProject/ReportProjectInfoView.swift b/Kickstarter-iOS/Features/ReportProject/ReportProjectInfoView.swift
@@ -130,7 +130,8 @@ struct RowView: View {
                     popToRoot: $popToRoot,
                     projectID: self.projectID,
                     projectURL: self.projectUrl,
-                    projectFlaggingKind: item.flaggingKind ?? GraphAPI.FlaggingKind.guidelinesViolation
+                    projectFlaggingKind: item.flaggingKind ?? GraphAPI.NonDeprecatedFlaggingKind
+                      .guidelinesViolation
                   )
                 },
                 label: { BaseRowView(item: item) }

diff --git a/KsApi/models/graphql/adapters/GraphAPI.CreateFlaggingInput+CreateFlaggingInputTests.swift b/KsApi/models/graphql/adapters/GraphAPI.CreateFlaggingInput+CreateFlaggingInputTests.swift
@@ -6,7 +6,7 @@ class GraphAPI_CreateFlaggingInput_CreateFlaggingInputTests: XCTestCase {
     let input =
       CreateFlaggingInput(
         contentId: "contentId",
-        kind: GraphAPI.FlaggingKind.prohibitedItems,
+        kind: GraphAPI.NonDeprecatedFlaggingKind.prohibitedItems,
         details: "details",
         clientMutationId: ""
       )

diff --git a/KsApi/mutations/inputs/CreateFlaggingInput.swift b/KsApi/mutations/inputs/CreateFlaggingInput.swift
@@ -2,13 +2,13 @@ import Foundation
 
 public struct CreateFlaggingInput: GraphMutationInput {
   let contentId: String
-  let kind: GraphAPI.FlaggingKind
+  let kind: GraphAPI.NonDeprecatedFlaggingKind
   let details: String?
   let clientMutationId: String?
 
   public init(
     contentId: String,
-    kind: GraphAPI.FlaggingKind,
+    kind: GraphAPI.NonDeprecatedFlaggingKind,
     details: String?,
     clientMutationId: String?
   ) {

diff --git a/KsApi/mutations/inputs/CreateFlaggingInputTests.swift b/KsApi/mutations/inputs/CreateFlaggingInputTests.swift
@@ -6,15 +6,18 @@ final class CreateFlaggingInputTests: XCTestCase {
     let createFlaggingInput =
       CreateFlaggingInput(
         contentId: "contentId",
-        kind: GraphAPI.FlaggingKind.prohibitedItems,
+        kind: GraphAPI.NonDeprecatedFlaggingKind.prohibitedItems,
         details: "details",
         clientMutationId: ""
       )
 
     let input = createFlaggingInput.toInputDictionary()
 
     XCTAssertEqual(input["contentId"] as? String, "contentId")
-    XCTAssertEqual(input["kind"] as? GraphAPI.FlaggingKind, GraphAPI.FlaggingKind.prohibitedItems)
+    XCTAssertEqual(
+      input["kind"] as? GraphAPI.NonDeprecatedFlaggingKind,
+      GraphAPI.NonDeprecatedFlaggingKind.prohibitedItems
+    )
     XCTAssertEqual(input["details"] as? String, "details")
     XCTAssertEqual(input["clientMutationId"] as? String, "")
   }

diff --git a/Library/ReportProjectInfoListItem.swift b/Library/ReportProjectInfoListItem.swift
@@ -10,7 +10,7 @@ enum ReportProjectInfoListItemType {
 struct ReportProjectInfoListItem: Identifiable, Hashable {
   var id = UUID()
   var type: ReportProjectInfoListItemType
-  var flaggingKind: GraphAPI.FlaggingKind?
+  var flaggingKind: GraphAPI.NonDeprecatedFlaggingKind?
   var title: String
   var subtitle: String
   var subItems: [ReportProjectInfoListItem]?
@@ -84,7 +84,7 @@ let reportSpamSubListItems = [
   ),
   ReportProjectInfoListItem(
     type: .child,
-    flaggingKind: .abuse,
+    flaggingKind: .guidelinesAbuse,
     title: Strings.Abuse(),
     subtitle: Strings.Ex_posting()
   )

diff --git a/Library/ViewModels/ReportProjectFormViewModel.swift b/Library/ViewModels/ReportProjectFormViewModel.swift
@@ -30,7 +30,7 @@ public final class ReportProjectFormViewModel: ReportProjectFormViewModelType,
   private var cancellables = Set<AnyCancellable>()
 
   public var projectID: String?
-  public var projectFlaggingKind: GraphAPI.FlaggingKind?
+  public var projectFlaggingKind: GraphAPI.NonDeprecatedFlaggingKind?
 
   public init() {
     /// Only enable the save button if the user has entered detail text

diff --git a/Library/ViewModels/ReportProjectFormViewModelTests.swift b/Library/ViewModels/ReportProjectFormViewModelTests.swift
@@ -24,7 +24,7 @@ final class ReportProjectFormViewModelTests: TestCase {
   func testEmailText_AfterFetchingUsersEmail() {
     let vm = ReportProjectFormViewModel()
     vm.projectID = "123"
-    vm.projectFlaggingKind = GraphAPI.FlaggingKind.commentDoxxing
+    vm.projectFlaggingKind = GraphAPI.NonDeprecatedFlaggingKind.commentDoxxing
 
     withEnvironment(apiService: self.userEmailSuccessMockService) {
       let userEmail = CombineTestObserver<String?, Never>()
@@ -52,7 +52,7 @@ final class ReportProjectFormViewModelTests: TestCase {
   func test_submitIsDisabled_untilDetailTextIsNotEmpty() {
     let vm = ReportProjectFormViewModel()
     vm.projectID = "123"
-    vm.projectFlaggingKind = GraphAPI.FlaggingKind.commentDoxxing
+    vm.projectFlaggingKind = GraphAPI.NonDeprecatedFlaggingKind.commentDoxxing
 
     let saveButtonEnabled = CombineTestObserver<Bool, Never>()
     saveButtonEnabled.observe(vm.$saveButtonEnabled)