Refactor to avoid deserialization failure

Mark-Simulacrum · Mark-Simulacrum · commit 2bd38f9fea0e · 2021-11-17T15:34:13.000-05:00
diff --git a/src/github/client.rs b/src/github/client.rs
@@ -120,7 +120,7 @@ impl Client {
     }
 
     pub fn fetch_pull_request(&self, pr_info: &PullRequestUrls) -> DashResult<PullRequestFromJson> {
-        if let Some(url) = pr_info.get("url") {
+        if let Some(url) = &pr_info.url {
             Ok(self.get(url, None)?.json()?)
         } else {
             throw!(DashError::Misc(None))
diff --git a/src/github/models.rs b/src/github/models.rs
@@ -1,6 +1,5 @@
 // Copyright 2016 Adam Perry. Dual-licensed MIT and Apache 2.0 (see LICENSE files for details).
 
-use std::collections::BTreeMap;
 use std::i32;
 
 use chrono::{DateTime, Utc};
@@ -50,7 +49,10 @@ pub struct LabelFromJson {
     name: String,
 }
 
-pub type PullRequestUrls = BTreeMap<String, String>;
+#[derive(Debug, Deserialize)]
+pub struct PullRequestUrls {
+    pub url: Option<String>,
+}
 
 #[derive(Debug, Deserialize)]
 pub struct IssueFromJson {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ impl Client {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`pub fn fetch_pull_request(&self, pr_info: &PullRequestUrls) -> DashResult<PullRequestFromJson> {`
`123`		`- if let Some(url) = pr_info.get("url") {`
	`123`	`+ if let Some(url) = &pr_info.url {`
`124`	`124`	`Ok(self.get(url, None)?.json()?)`
`125`	`125`	`} else {`
`126`	`126`	`throw!(DashError::Misc(None))`