Merge pull request #37 from osain-az/hotfix/instagram_refactor

Refactor Instagram api

Author: arn-the-long-beard

examples/seed/src/instagram.rs

@@ -1,5 +1,5 @@
 use crate::instagram::Msg::{InstagramAccountIdSuccess, InstagramAccountDetailsSuccess};
-use facebook_api_rs::prelude::account::{InstaAccount, InstagramAccount};
+use facebook_api_rs::prelude::account::{InstaAccount, InstagramAccount, InstaAccountId};
 use facebook_api_rs::prelude::publish::{InstaMediaContainerId, InstaPostParams};
 use facebook_api_rs::prelude::search::{PageSearch, PagesAPI};
 use facebook_api_rs::prelude::*;
@@ -101,11 +101,16 @@ pub enum Msg {
     InstaPostSuccessful(InstaMediaContainerId),
     HandleInstaPostingOption(web_sys::Event),
     PagesSearch(String),
-     GetInstagramAccountDetails,
+     GetInstagramAccountDetails(InstaAccount),
     InstagramAccountDetailsSuccess(InstagramAccount),
     PageSearchResponse(PageSearch),
+
     MediaContainerStatus,
     MediaContainerStatusResponse(MediaContainerStatus),
+
+    FetchInstagramAccountId,
+    FetchInstagramAccountIdSuccess(InstaAccount),
+
     // every error should user this
     ResponseFailed(FetchError),
 }
@@ -137,8 +142,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::InstagramAccountIdSuccess(resp) => {
             model.insta_account = Some(resp);
         }
-
-        Msg::GetInstagramAccountDetails => {
+        Msg::FetchInstagramAccountId => {
             if model.selected_account.is_some() {
                 if let Some(selected_page) = &model.selected_account {
                     let page_access_token = selected_page.access_token.to_owned();
@@ -147,6 +151,26 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                     orders.perform_cmd(async move {
                         Client::new(Token::default(), page_access_token.clone())
                             .instagram_account(facebook_page_id)
+                            .account_id()
+                            .await
+                            .map_or_else(Msg::ResponseFailed, Msg::FetchInstagramAccountIdSuccess)
+                    });
+                }
+            };
+
+        }
+       Msg::FetchInstagramAccountIdSuccess(insta_id) => {
+           orders.send_msg(Msg::GetInstagramAccountDetails(insta_id));
+       }
+        Msg::GetInstagramAccountDetails(insta_id) => {
+             let instagram_id =  insta_id.instagram_business_account.id.clone();
+            if model.selected_account.is_some() {
+                if let Some(selected_page) = &model.selected_account {
+                    let page_access_token = selected_page.access_token.to_owned();
+
+                    orders.perform_cmd(async move {
+                        Client::new(Token::default(), page_access_token.clone())
+                            .instagram_account(instagram_id)
                             .account_details()
                             .await
                             .map_or_else(Msg::ResponseFailed, InstagramAccountDetailsSuccess)
@@ -398,7 +422,7 @@ pub fn view(model: &Model) -> Node<Msg> {
                 ],
                  button![
                     "Get Instagram Account details ",
-                    ev(Ev::Click, |_| { Msg::GetInstagramAccountDetails }),
+                    ev(Ev::Click, |_| { Msg::FetchInstagramAccountId }),
                     attrs! {
                        At:: Disabled => model.selected_account.is_none().as_at_value()
                     }

src/graph/instagram/account/mod.rs

@@ -49,50 +49,20 @@ impl InstagramApi {
     }
 
     /// This method is used to get instagram business account with its details (name, user, id ,etc).
+    /// It accepts the instagram page id.
     /// for reference check <https://developers.facebook.com/docs/instagram-api/reference/ig-user>
     pub async fn account_details(self) -> seed::fetch::Result<InstagramAccount> {
-        let base_url = "https://graph.facebook.com/v11.0/";
-
-         let self_data = self.clone();
-
-       let result =  self.account_id().await;
-        if result.is_ok(){
-            let instagram_id = result.unwrap();
-            let mut url = base_url.to_owned()
-                + &instagram_id.instagram_business_account.id.as_str();
-
-            // added required filed needed
-            let mut fields_count = Fields::default().fields.len();
-             let mut url_fields = "".to_string();
-            for (count, field) in Fields::default().fields.into_iter().enumerate() {
-                if count < fields_count - 1 {
-                    url_fields = url_fields+ &field + ",";
-                } else {
-                    url_fields= url_fields+ &field; // remove the comma in the last filed
-                }
-            }
-            url_fields = String::from(encode(url_fields.as_str()));
+            let mut url = self.base_url.replace("EDGE", "?");
+            let  url_fields = Fields::default().build_url_with_fields(); // build urlenconded url withe regired fields
 
              let mut request_url = url
-                 + "?fields="
+                 + "fields="
                  +url_fields.as_str()
                 + "&access_token="
-                + &self_data.page_access_token;
-
-               log!(request_url);
+                + &self.page_access_token;
             let request = Request::new(request_url).method(Method::Get);
            fetch(request).await?.json::<InstagramAccount>().await
-
-        }else {
-            let err = JsValue::from_str("The first get request call to fetch the instagram id was not successful,\
-             therefore the request to get instagram account failed. Try making the request again.");
-            Err(FetchError::RequestError(err)) // try to generate a customer
-            // error
-        }
-
     }
-
-
 }
 
 
@@ -154,3 +124,19 @@ impl Default for Fields {
         Self { fields }
     }
 }
+
+impl Fields {
+    pub fn build_url_with_fields(self) -> String {
+        let mut url_fields= "".to_string();
+        let  fields_count = Fields::default().fields.len();
+        for (count, field) in Fields::default().fields.into_iter().enumerate() {
+            if count < fields_count - 1 {
+                url_fields = url_fields+ &field + ",";
+            } else {
+                url_fields= url_fields+ &field; // remove the comma in the last filed
+            }
+        }
+        url_fields = String::from(encode(url_fields.as_str())); // encode the url
+        url_fields
+    }
+}