kemitix/trello-to-deck
1
0
Fork 0
Code Issues 2 Pull requests Releases Activity Actions

WIP(TODO): define trello config model

Browse source
This commit is contained in:
Paul Campbell 2024-11-29 19:19:36 +00:00
parent 74036cf1ea
commit a6407a977c
7 changed files with 205 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/api_result.rs
View file

@ -1,32 +1,32 @@
// //
// use kxio::net::Response; use kxio::net::Response;
//
// use crate::{e, s};
// pub struct APIResult<T> { use crate::{e, s};
// pub text: String,
// pub result: Result<T, kxio::net::Error>,
// }
// impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> { pub struct APIResult<T> {
// pub async fn new(response: kxio::net::Result<Response>) -> Self { pub text: String,
// match response { pub result: Result<T, kxio::net::Error>,
// Ok(response) => { }
// let text = response.text().await.unwrap_or_default();
// let text = if text.is_empty() { s!("null") } else { text }; impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> {
// let result = serde_json::from_str::<T>(&text) pub async fn new(response: kxio::net::Result<Response>) -> Self {
// .map_err(|e| e.to_string()) match response {
// .map_err(|e| { Ok(response) => {
// e!("{e}: {text}"); let text = response.text().await.unwrap_or_default();
// e let text = if text.is_empty() { s!("null") } else { text };
// }) let result = serde_json::from_str::<T>(&text)
// .map_err(kxio::net::Error::from); .map_err(|e| e.to_string())
// Self { text, result } .map_err(|e| {
// } e!("{e}: {text}");
// Err(e) => Self { e
// text: s!(""), })
// result: Err(e), .map_err(kxio::net::Error::from);
// }, Self { text, result }
// } }
// } Err(e) => Self {
// } text: s!(""),
result: Err(e),
},
}
}
}

51
src/config.rs
View file

@ -1,7 +1,52 @@
// //
// use color_eyre::Result; // use color_eyre::Result;
// use crate::{f, s, Ctx, NAME}; // use crate::{
// f, s,
// trello::{
// types::{
// auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser},
// TrelloBoardName,
// }
// },
// Ctx, NAME,
// };
#[derive(
Clone,
Debug,
derive_more::From,
PartialEq,
Eq,
PartialOrd,
Ord,
serde::Deserialize,
derive_more::Constructor,
)]
pub struct TrelloConfig {
pub user: String,
pub api_key: String,
pub api_secret: String,
pub board_name: String,
}
// impl TrelloConfig {
// pub fn user(&self) -> TrelloUser {
// TrelloUser::from(self.user.clone())
// }
// pub fn api_key(&self) -> TrelloApiKey {
// TrelloApiKey::from(self.api_key.clone())
// }
// pub fn api_secret(&self) -> TrelloApiSecret {
// TrelloApiSecret::from(self.api_secret.clone())
// }
// pub fn auth(&self) -> TrelloAuth {
// TrelloAuth::new(self.api_key(), self.api_secret(), self.user())
// }
//
// pub fn board_name(&self) -> TrelloBoardName {
// TrelloBoardName::from(self.board_name.clone())
// }
// }
#[derive( #[derive(
Clone, Clone,
@ -15,7 +60,9 @@
serde::Deserialize, serde::Deserialize,
derive_more::Constructor, derive_more::Constructor,
)] )]
pub struct AppConfig {} pub struct AppConfig {
pub trello: TrelloConfig,
}
// impl AppConfig { // impl AppConfig {
// pub fn load(ctx: &Ctx) -> Result<Self> { // pub fn load(ctx: &Ctx) -> Result<Self> {
// let file = ctx.fs.base().join(f!("{NAME}.toml")); // let file = ctx.fs.base().join(f!("{NAME}.toml"));

4
src/lib.rs
View file

@ -4,12 +4,12 @@ use std::path::PathBuf;
use clap::Parser; use clap::Parser;
use kxio::{fs::FileSystem, net::Net}; use kxio::{fs::FileSystem, net::Net};
mod api_result; // mod api_result;
mod config; mod config;
mod init; mod init;
mod macros; mod macros;
mod template; mod template;
mod trello; // mod trello;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;

104
src/trello/api/members.rs
View file

@ -1,54 +1,54 @@
// //
// use kxio::net::Net; use kxio::net::Net;
// use crate::api_result::APIResult; use crate::api_result::APIResult;
// use crate::{ use crate::{
// f, f,
// trello::{ trello::{
// types::{TrelloAuth, board::TrelloBoard}, types::{auth::TrelloAuth, board::TrelloBoard},
// url, url,
// }, },
// }; };
//
// /// Get lists from named board that Member belongs to /// Get lists from named board that Member belongs to
// /// ///
// /// Get Boards that Member belongs to /// Get Boards that Member belongs to
// /// https://developer.atlassian.com/cloud/trello/rest/api-group-members/#api-members-id-boards-get /// https://developer.atlassian.com/cloud/trello/rest/api-group-members/#api-members-id-boards-get
// /// /members/{id}/boards /// /members/{id}/boards
// /// ///
// /// Lists the boards that the user is a member of. /// Lists the boards that the user is a member of.
// /// ///
// /// Request /// Request
// /// ///
// /// Path parameters /// Path parameters
// /// ///
// /// - id TrelloID REQUIRED /// - id TrelloID REQUIRED
// /// ///
// /// ///
// /// Query parameters /// Query parameters
// /// ///
// /// - fields string /// - fields string
// /// Default: all /// Default: all
// /// Valid values: id, name, desc, descData, closed, idMemberCreator, idOrganization, pinned, url, shortUrl, prefs, labelNames, starred, limits, memberships, enterpriseOwned /// Valid values: id, name, desc, descData, closed, idMemberCreator, idOrganization, pinned, url, shortUrl, prefs, labelNames, starred, limits, memberships, enterpriseOwned
// /// ///
// /// - lists string /// - lists string
// /// Which lists to include with the boards. One of: all, closed, none, open /// Which lists to include with the boards. One of: all, closed, none, open
// /// Default: none /// Default: none
// /// Valid values: all, closed, none, open /// Valid values: all, closed, none, open
// /// ///
// /// curl --request GET \ /// curl --request GET \
// /// --url "https://api.trello.com/1/members/$TRELLO_USERNAME/boards?key=$TRELLO_KEY&token=$TRELLO_SECRET&lists=open" \ /// --url "https://api.trello.com/1/members/$TRELLO_USERNAME/boards?key=$TRELLO_KEY&token=$TRELLO_SECRET&lists=open" \
// /// --header 'Accept: application/json' /// --header 'Accept: application/json'
// pub async fn get_boards_that_member_belongs_to( pub async fn get_boards_that_member_belongs_to(
// auth: &TrelloAuth, auth: &TrelloAuth,
// net: &Net, net: &Net,
// ) -> APIResult<Vec<TrelloBoard>> { ) -> APIResult<Vec<TrelloBoard>> {
// APIResult::new( APIResult::new(
// net.get(url(f!("/members/{}/boards?lists=open", **auth.user()))) net.get(url(f!("/members/{}/boards?lists=open", **auth.user())))
// .headers(auth.into()) .headers(auth.into())
// .header("Accept", "application/json") .header("Accept", "application/json")
// .send() .send()
// .await, .await,
// ) )
// .await .await
// } }

25
src/trello/api/tests/given.rs
View file

@ -1,15 +1,16 @@
// use kxio::net::MockNet; //
use kxio::net::MockNet;
// use crate::trello::types::auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser}; use crate::trello::types::auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser};
// pub(crate) fn a_network() -> MockNet { pub(crate) fn a_network() -> MockNet {
// kxio::net::mock() kxio::net::mock()
// } }
// pub(crate) fn an_auth() -> TrelloAuth { pub(crate) fn an_auth() -> TrelloAuth {
// TrelloAuth::new( TrelloAuth::new(
// TrelloApiKey::new("foo"), TrelloApiKey::new("foo"),
// TrelloApiSecret::new("bar"), TrelloApiSecret::new("bar"),
// TrelloUser::new("baz"), TrelloUser::new("baz"),
// ) )
// } }

99
src/trello/api/tests/mod.rs
View file

@ -1,61 +1,64 @@
// use super::*; // use super::*;
use super::*;
mod given; mod given;
// type TestResult = color_eyre::Result<()>; type TestResult = color_eyre::Result<()>;
mod members { mod members {
// use std::collections::HashMap; use std::collections::HashMap;
// use kxio::net::StatusCode; use kxio::net::StatusCode;
// use serde_json::json; use serde_json::json;
// use crate::{ use crate::{
// s, s,
// trello::{ trello::{
// // api::members::get_boards_that_member_belongs_to, api::members::get_boards_that_member_belongs_to,
// types::{board::TrelloBoard, TrelloBoardId, TrelloBoardName}, types::{board::TrelloBoard, TrelloBoardId, TrelloBoardName},
// }, },
// }; };
// use super::*; use super::*;
//
// #[tokio::test] #[tokio::test]
// async fn get_member_boards() -> TestResult { async fn get_member_boards() -> TestResult {
// //given //given
// let net = given::a_network(); let net = given::a_network();
// let auth = given::an_auth(); let auth = given::an_auth();
//
// net.on() net.on()
// .get("https://api.trello.com/1/members/baz/boards?lists=open") .get("https://api.trello.com/1/members/baz/boards?lists=open")
// .headers(HashMap::from([ .headers(HashMap::from([
// ( (
// s!("authorization"), s!("authorization"),
// s!("OAuth oauth_consumer_key=\"foo\", oauth_token=\"bar\""), s!("OAuth oauth_consumer_key=\"foo\", oauth_token=\"bar\""),
// ), ),
// (s!("accept"), s!("application/json")), (s!("accept"), s!("application/json")),
// ])) ]))
// .respond(StatusCode::OK) .respond(StatusCode::OK)
// .body(s!(json!([ .body(s!(json!([
// {"id": "1", "name": "board-1", "lists":[]} {"id": "1", "name": "board-1", "lists":[]}
// ])))?; ])))?;
//
// //when //when
// let result = get_boards_that_member_belongs_to(&auth, &net.into()).await; let result = get_boards_that_member_belongs_to(&auth, &net.into())
// .await
// assert_eq!( .result?;
// result.result?,
// vec![TrelloBoard::new( assert_eq!(
// TrelloBoardId::new("1"), result,
// TrelloBoardName::new("board-1"), vec![TrelloBoard::new(
// vec![] TrelloBoardId::new("1"),
// )] TrelloBoardName::new("board-1"),
// ); vec![]
// )]
// //then );
// Ok(())
// } //then
Ok(())
}
} }
// TODO: boards // TODO: boards
// TODO: lists // TODO: lists

12
src/trello/mod.rs
View file

@ -5,10 +5,10 @@ pub mod types;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
// use crate::f; use crate::f;
// pub fn url(path: impl Into<String>) -> String { pub fn url(path: impl Into<String>) -> String {
// let path = path.into(); let path = path.into();
// assert!(path.starts_with("/")); assert!(path.starts_with("/"));
// f!("https://api.trello.com/1{path}") f!("https://api.trello.com/1{path}")
// } }