Minor refactor

Added getcharacter API, but not being used right now

Author: mikechambers

src/dcli/src/activitystoreinterface.rs

@@ -465,8 +465,7 @@ impl ActivityStoreInterface {
 
         for c in characters.characters {
             let character_id = &c.id;
-            self.insert_character(&c.id, &c.class_type, &member.id)
-                .await?;
+            self.insert_character(&c.id, &c.class_type, &member).await?;
             tell::progress!("{}", format!("[{}]", c.class_type).to_uppercase());
 
             //these calls could be a little more general purpose by taking api ids and not db ids.
@@ -1041,7 +1040,7 @@ impl ActivityStoreInterface {
 
             let class_type = CharacterClass::from_hash(entry.player.class_hash);
 
-            self.insert_character(&entry.character_id, &class_type, &member.id)
+            self.insert_character(&entry.character_id, &class_type, &member)
                 .await?;
 
             self._insert_character_activity_stats(
@@ -1335,10 +1334,12 @@ impl ActivityStoreInterface {
         &mut self,
         character_id: &i64,
         class_type: &CharacterClass,
-        member_id: &i64,
+        member: &Member,
     ) -> Result<(), Error> {
         let mut stored_class_type = CharacterClass::Unknown;
 
+        let member_id = &member.id;
+
         //first, check if it exists and has valid data
         match sqlx::query(
             r#"
@@ -1361,7 +1362,6 @@ impl ActivityStoreInterface {
         if stored_class_type != CharacterClass::Unknown {
             return Ok(());
         }
-        //didn't exists or had invalid data (from API), so lets insert
 
         sqlx::query(
             r#"

src/dcli/src/apiinterface.rs

@@ -31,8 +31,7 @@ use chrono::{DateTime, Utc};
 use indicatif::{HumanCount, ProgressBar, ProgressStyle};
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 
-use crate::response::gmd::GetMembershipData;
-use crate::response::gpr::{CharacterActivitiesData, GetProfileResponse};
+use crate::response::{gpr::{CharacterActivitiesData, GetProfileResponse}, cr::GetCharacterResponse};
 use crate::response::pgcr::{DestinyPostGameCarnageReportData, PGCRResponse};
 use crate::response::sdpr::{
     DestinyLinkedProfilesResponse, LinkedProfilesResponse,
@@ -46,6 +45,7 @@ use crate::response::{
     activities::{ActivitiesResponse, Activity, MAX_ACTIVITIES_REQUEST_COUNT},
     sdpr::SearchDestinyPlayerPostData,
 };
+use crate::response::{character::CharacterData, gmd::GetMembershipData};
 use crate::response::{
     ggms::{GetGroupMemberResponse, GroupMemberResponse},
     gmd::UserMembershipData,
@@ -342,6 +342,49 @@ impl ApiInterface {
         Ok(response)
     }
 
+    pub async fn retrieve_character(
+        &self,
+        member:&Member,
+        character_id: &i64,
+    ) -> Result<Option<CharacterData>, Error> {
+
+        let url = format!(
+            "{base}/Platform/Destiny2/{platform_id}/Profile/{member_id}/Character/{character_id}/?components=200",
+
+            
+            base = API_BASE_URL,
+            platform_id = member.platform.as_id(),
+            member_id = member.id,
+            character_id = character_id
+        );
+
+        
+
+        let profile: GetCharacterResponse = self
+        .client
+        .call_and_parse::<GetCharacterResponse>(&url)
+        .await?;
+
+        let response = match profile.response {
+            Some(e) => e,
+            None => {
+                return Err(Error::ApiRequest {
+                    description: String::from(
+                        "No response data from API Call.",
+                    ),
+                })
+            }
+        };
+
+        
+
+        if response.character.is_none() {
+            return Ok(None)
+        }
+
+        Ok(response.character.unwrap().data)
+    }
+
     pub async fn get_player_info(
         &self,
         member_id: &i64,

src/dcli/src/response/cr.rs

@@ -0,0 +1,53 @@
+/*
+* Copyright 2023 Mike Chambers
+* https://github.com/mikechambers/dcli
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of
+* this software and associated documentation files (the "Software"), to deal in
+* the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is furnished to do
+* so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+use serde_derive::{Deserialize, Serialize};
+
+use crate::enums::mode::Mode;
+use crate::response::character::CharacterData;
+use crate::response::drs::{DestinyResponseStatus, IsDestinyAPIResponse};
+use crate::response::utils::str_to_datetime;
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct GetCharacterResponse {
+    #[serde(rename = "Response")]
+    pub response: Option<CharacterResponse>, //should this be an option?
+
+    #[serde(flatten)]
+    pub status: DestinyResponseStatus,
+}
+
+impl IsDestinyAPIResponse for GetCharacterResponse {
+    fn get_status(&self) -> &DestinyResponseStatus {
+        &self.status
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct CharacterResponse {
+    pub character: Option<CharacterDataFieldData>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct CharacterDataFieldData {
+    pub data: Option<CharacterData>,
+}

src/dcli/src/response/gpr.rs

@@ -49,7 +49,7 @@ impl IsDestinyAPIResponse for GetProfileResponse {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ProfileResponse {
-    pub characters: Option<CharacterDataFieldData>,
+    pub characters: Option<CharactersDataFieldData>,
 
     #[serde(rename = "characterActivities")]
     pub character_activities: Option<CharacterActivitiesFieldData>,
@@ -74,7 +74,7 @@ pub struct CharacterActivitiesDataField {
 }
 
 #[derive(Serialize, Deserialize, Debug)]
-pub struct CharacterDataFieldData {
+pub struct CharactersDataFieldData {
     pub data: HashMap<String, CharacterData>,
 }
 

src/dcli/src/response/mod.rs

@@ -22,6 +22,7 @@
 
 pub mod activities;
 pub mod character;
+pub mod cr;
 pub mod drs;
 pub mod ggms;
 pub mod gmd;