fb8020e httpd: Conform response from issue handlers to previous model — heartwood

Radicle Heartwood Protocol & Stack

httpd: Conform response from issue handlers to previous model

xphoniex committed 3 years ago

commit fb8020e58255042acc348ce769257e63c88afb0b
parent 5d2be57cd9fd8ce1698dd5c65f660f945d5c125c

1 file changed +44 -6

modified radicle-httpd/src/api/v1/projects.rs

@@ -11,8 +11,10 @@ use serde_json::json;

 use tower_http::set_header::SetResponseHeaderLayer;
 use radicle::cob::issue::Issues;
 use radicle::cob::thread::{self, CommentId};
 use radicle::cob::Timestamp;
 use radicle::git::raw::BranchType;
 use radicle::identity::{Doc, Id};
 use radicle::identity::{Doc, Id, PublicKey};
 use radicle::node::NodeId;
 use radicle::storage::{Oid, ReadRepository, WriteRepository, WriteStorage};
 use radicle_surf::git::History;

@@ -330,11 +332,11 @@ async fn issues_handler(

         .filter_map(|r| r.ok())
         .map(|(id, issue, _)| {
             json!({
                 "id": id,
                 "id": id.to_string(),
                 "author": issue.author(),
                 "title": issue.title(),
                 "status": issue.state(),
                 "discussion": issue.comments().collect::<Vec<_>>(),
                 "state": issue.state(),
                 "discussion": issue.comments().collect::<Comments>(),
                 "tags": issue.tags().collect::<Vec<_>>(),
             })
         })

@@ -360,8 +362,8 @@ async fn issue_handler(

         "id": issue_id,
         "author": issue.author(),
         "title": issue.title(),
         "status": issue.state(),
         "discussion": issue.comments().collect::<Vec<_>>(),
         "state": issue.state(),
         "discussion": issue.comments().collect::<Comments>(),
         "tags": issue.tags().collect::<Vec<_>>(),
     });

@@ -369,6 +371,42 @@ async fn issue_handler(

 }
 #[derive(Serialize)]
 struct Author {
     id: PublicKey,
 }
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 struct Comment {
     author: Author,
     body: String,
     reactions: [String; 0],
     timestamp: Timestamp,
     reply_to: Option<CommentId>,
 }
 #[derive(Serialize)]
 struct Comments(Vec<Comment>);
 impl<'a> FromIterator<(&'a CommentId, &'a thread::Comment)> for Comments {
     fn from_iter<I: IntoIterator<Item = (&'a CommentId, &'a thread::Comment)>>(iter: I) -> Self {
         let mut comments = Vec::new();
         for (comment_id, comment) in iter {
             comments.push(Comment {
                 author: Author { id: comment_id.1 },
                 body: comment.body.to_owned(),
                 reactions: [],
                 timestamp: comment.timestamp,
                 reply_to: comment.reply_to,
             });
         }
         Comments(comments)
     }
 }
 #[derive(Serialize)]
 struct Stats {
     branches: usize,
     commits: usize,