Add Support Tickets + Eligibility endpoints (#743)

* Add support tickets endpoints

* Add support eligibility endpoint support

Add Swift Support Eligibility support

* add wp_com_e2e package

* Remove `Testable` trait and simplify wp_com_e2e tests

* Update imports in wp_com_e2e/src/main

---------

Co-authored-by: Oguz Kocer <[email protected]>

Author: jkmassel

Cargo.lock

@@ -4,6 +4,7 @@ members = [
   "wp_api_integration_tests",
   "wp_api_integration_tests_backend",
   "wp_cli",
+  "wp_com_e2e",
   "wp_contextual",
   "wp_derive",
   "wp_derive_request_builder",

Cargo.toml

@@ -179,3 +179,7 @@ public typealias CreateBotConversationParams = WordPressAPIInternal.CreateBotCon
 public typealias AddMessageToBotConversationParams = WordPressAPIInternal.AddMessageToBotConversationParams
 public typealias GetBotConversationParams = WordPressAPIInternal.GetBotConversationParams
 public typealias CreateBotConversationFeedbackParams = WordPressAPIInternal.CreateBotConversationFeedbackParams
+
+// MARK: Support Tickets
+public typealias CreateSupportTicketParams = WordPressAPIInternal.CreateSupportTicketParams
+public typealias AddMessageToSupportConversationParams = WordPressAPIInternal.AddMessageToSupportConversationParams

native/swift/Sources/wordpress-api/Exports.swift

@@ -25,4 +25,12 @@ public class WPComApiClient {
     public var supportBots: SupportBotsRequestExecutor {
         internalClient.supportBots()
     }
+
+    public var supportEligibility: SupportEligibilityRequestExecutor {
+        internalClient.supportEligibility()
+    }
+
+    public var supportTickets: SupportTicketsRequestExecutor {
+        internalClient.supportTickets()
+    }
 }

native/swift/Sources/wordpress-api/WPComApiClient.swift

@@ -6,6 +6,10 @@ use super::endpoint::{
     oauth2::{Oauth2RequestBuilder, Oauth2RequestExecutor},
     subscribers_endpoint::{SubscribersRequestBuilder, SubscribersRequestExecutor},
     support_bots_endpoint::{SupportBotsRequestBuilder, SupportBotsRequestExecutor},
+    support_eligibility_endpoint::{
+        SupportEligibilityRequestBuilder, SupportEligibilityRequestExecutor,
+    },
+    support_tickets_endpoint::{SupportTicketsRequestBuilder, SupportTicketsRequestExecutor},
 };
 use crate::{
     api_client::WpApiClientDelegate, api_client_generate_api_client,
@@ -36,6 +40,8 @@ pub struct WpComApiRequestBuilder {
     oauth2: Arc<Oauth2RequestBuilder>,
     subscribers: Arc<SubscribersRequestBuilder>,
     support_bots: Arc<SupportBotsRequestBuilder>,
+    support_eligibility: Arc<SupportEligibilityRequestBuilder>,
+    support_tickets: Arc<SupportTicketsRequestBuilder>,
 }
 
 impl WpComApiRequestBuilder {
@@ -49,7 +55,9 @@ impl WpComApiRequestBuilder {
             jetpack_connection,
             oauth2,
             subscribers,
-            support_bots
+            support_bots,
+            support_eligibility,
+            support_tickets
         )
     }
 }
@@ -75,6 +83,8 @@ pub struct WpComApiClient {
     oauth2: Arc<Oauth2RequestExecutor>,
     subscribers: Arc<SubscribersRequestExecutor>,
     support_bots: Arc<SupportBotsRequestExecutor>,
+    support_eligibility: Arc<SupportEligibilityRequestExecutor>,
+    support_tickets: Arc<SupportTicketsRequestExecutor>,
 }
 
 impl WpComApiClient {
@@ -89,7 +99,9 @@ impl WpComApiClient {
             jetpack_connection,
             oauth2,
             subscribers,
-            support_bots
+            support_bots,
+            support_eligibility,
+            support_tickets
         )
     }
 }
@@ -98,3 +110,5 @@ api_client_generate_endpoint_impl!(WpComApi, jetpack_connection);
 api_client_generate_endpoint_impl!(WpComApi, oauth2);
 api_client_generate_endpoint_impl!(WpComApi, subscribers);
 api_client_generate_endpoint_impl!(WpComApi, support_bots);
+api_client_generate_endpoint_impl!(WpComApi, support_eligibility);
+api_client_generate_endpoint_impl!(WpComApi, support_tickets);

wp_api/src/wp_com/client.rs

@@ -12,6 +12,8 @@ pub mod jetpack_connection_endpoint;
 pub mod oauth2;
 pub mod subscribers_endpoint;
 pub mod support_bots_endpoint;
+pub mod support_eligibility_endpoint;
+pub mod support_tickets_endpoint;
 
 #[derive(uniffi::Object)]
 pub struct WpComDotOrgApiUrlResolver {

wp_api/src/wp_com/endpoint.rs

@@ -0,0 +1,18 @@
+use wp_derive_request_builder::WpDerivedRequest;
+
+use crate::{
+    request::endpoint::{AsNamespace, DerivedRequest},
+    wp_com::{WpComNamespace, support_eligibility::SupportEligibility},
+};
+
+#[derive(WpDerivedRequest)]
+enum SupportEligibilityRequest {
+    #[get(url = "/mobile-support/eligibility", output = SupportEligibility)]
+    GetSupportEligibility,
+}
+
+impl DerivedRequest for SupportEligibilityRequest {
+    fn namespace() -> impl AsNamespace {
+        WpComNamespace::V2
+    }
+}

wp_api/src/wp_com/endpoint/support_eligibility_endpoint.rs

@@ -0,0 +1,29 @@
+use crate::{
+    request::endpoint::{AsNamespace, DerivedRequest},
+    wp_com::{
+        WpComNamespace,
+        support_tickets::{
+            AddMessageToSupportConversationParams, ConversationId, CreateSupportTicketParams,
+            SupportConversation, SupportConversationSummary,
+        },
+    },
+};
+use wp_derive_request_builder::WpDerivedRequest;
+
+#[derive(WpDerivedRequest)]
+enum SupportTicketsRequest {
+    #[post(url = "/mobile-support/conversations", params = &CreateSupportTicketParams, output = SupportConversation)]
+    CreateSupportTicket,
+    #[get(url = "/mobile-support/conversations", output = Vec<SupportConversationSummary>)]
+    GetSupportConversationList,
+    #[get(url = "/mobile-support/conversations/<conversation_id>", output = SupportConversation)]
+    GetSupportConversation,
+    #[post(url = "/mobile-support/conversations/<conversation_id>", params = &AddMessageToSupportConversationParams, output = SupportConversation)]
+    AddMessageToSupportConversation,
+}
+
+impl DerivedRequest for SupportTicketsRequest {
+    fn namespace() -> impl AsNamespace {
+        WpComNamespace::V2
+    }
+}

wp_api/src/wp_com/endpoint/support_tickets_endpoint.rs

@@ -10,6 +10,8 @@ pub mod jetpack_connection;
 pub mod oauth2;
 pub mod subscribers;
 pub mod support_bots;
+pub mod support_eligibility;
+pub mod support_tickets;
 
 impl_as_query_value_for_new_type!(WpComSiteId);
 uniffi::custom_newtype!(WpComSiteId, u64);

wp_api/src/wp_com/mod.rs

@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, uniffi::Record)]
+pub struct SupportEligibility {
+    pub is_user_eligible: bool,
+}