playbook create add reference

Cargo.toml

@@ -14,8 +14,8 @@ name = "playground"
 path = "src/lib.rs"
 
 [dependencies]
-amp-client = { git = "https://github.com/amphitheatre-app/amp-client-rust", tag = "v0.7.3" }
-amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.3" }
+amp-client = { git = "https://github.com/amphitheatre-app/amp-client-rust", tag = "v0.7.4" }
+amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.4" }
 anyhow = "1.0"
 axum = { version = "0.7.4" }
 clap = { version = "4.4.12", features = ["derive", "env"] }

src/handlers/file.rs

@@ -45,10 +45,7 @@ use crate::services::FileService;
 )]
 pub async fn get(
     State(ctx): State<Arc<Context>>,
-
-    Path(id): Path<Uuid>,
-    Path(reference): Path<String>,
-    Path(path): Path<String>,
+    Path((id, reference, path)): Path<(Uuid, String, String)>,
 ) -> Result<impl IntoResponse> {
     Ok(Json(FileService::get(ctx, id, reference, path).await?))
 }

src/handlers/folder.rs

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::collections::HashMap;
 use std::sync::Arc;
 
-use axum::extract::{Path, State};
+use axum::extract::{Path, Query, State};
 use axum::http::StatusCode;
 use axum::response::IntoResponse;
 use axum::Json;
@@ -45,12 +46,10 @@ use crate::services::FolderService;
 )]
 pub async fn get(
     State(ctx): State<Arc<Context>>,
-
-    Path(id): Path<Uuid>,
-    Path(reference): Path<String>,
-    Path(path): Path<String>,
+    Path((id, reference, path)): Path<(Uuid, String, Option<String>)>,
+    Query(params): Query<HashMap<String, String>>,
 ) -> Result<impl IntoResponse> {
-    Ok(Json(FolderService::get(ctx, id, reference, path).await?))
+    Ok(Json(FolderService::get(ctx, id, reference, path, params).await?))
 }
 
 /// Create a folder

src/requests/playbook.rs

@@ -18,4 +18,13 @@ use utoipa::ToSchema;
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct CreatePlaybookRequest {
     pub repo: String,
+    pub reference: Option<String>,
+}
+pub trait GitReferenceMethods {
+    fn new(repo: String, branch: Option<String>) -> Self;
+}
+impl GitReferenceMethods for amp_common::schema::GitReference {
+    fn new(repo: String, branch: Option<String>) -> Self {
+        amp_common::schema::GitReference { repo, branch, ..Default::default() }
+    }
 }

src/services/folder.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use amp_common::scm::git::Tree;
+use std::collections::HashMap;
 use std::sync::Arc;
 use uuid::Uuid;
 
@@ -27,13 +28,26 @@ pub struct FolderService;
 impl FolderService {
     // @FIXME: pass path to get_trees() method.
     // @TODO: add recursive option argument to current method.
-    pub async fn get(ctx: Arc<Context>, id: Uuid, reference: String, _path: String) -> Result<Tree> {
+    pub async fn get(
+        ctx: Arc<Context>,
+        id: Uuid,
+        _reference: String,
+        path: Option<String>,
+        recursive: HashMap<String, String>,
+    ) -> Result<Tree> {
         let playbook = ctx.client.playbooks().get(&id.to_string()).map_err(ApiError::NotFoundPlaybook)?;
         let source = playbook.preface.repository.unwrap();
+        let recursive = recursive.get("recursive").is_some();
+
+        let content = ctx
+            .github_client
+            .contents()
+            .find(&utils::repo(&source.repo)?, &path.unwrap_or_default(), &source.branch.unwrap_or_default())
+            .map_err(|e| ApiError::NotFoundContent(e.to_string()))?;
 
         ctx.github_client
             .git()
-            .git_trees(&utils::repo(&source.repo)?, &reference, Some(true))
+            .get_tree(&utils::repo(&source.repo)?, &content.sha, Some(recursive))
             .map_err(|e| ApiError::NotFoundFolder(e.to_string()))?
             .ok_or(ApiError::NotFoundFolder("The folder is none".to_string()))
     }

src/services/playbook.rs

@@ -22,7 +22,7 @@ use uuid::Uuid;
 use crate::context::Context;
 use crate::errors::ApiError;
 use crate::errors::Result;
-use crate::requests::playbook::CreatePlaybookRequest;
+use crate::requests::playbook::{CreatePlaybookRequest, GitReferenceMethods};
 use crate::utils::repo;
 
 pub struct PlaybookService;
@@ -31,8 +31,13 @@ impl PlaybookService {
     pub async fn create(ctx: Arc<Context>, req: &CreatePlaybookRequest) -> Result<PlaybookSpec> {
         let repo = repo(&req.repo)?;
         let repository = ctx.github_client.repositories().find(&repo).map_err(ApiError::NotFoundRepo)?;
-        let description = repository.and_then(|r| Option::from(r.name)).unwrap_or_default();
-        let payload = PlaybookPayload { title: repo, description, preface: Preface::repository(&req.repo) };
+        let description = repository.and_then(|r| r.description).unwrap_or_default();
+        let preface = Preface {
+            name: req.repo.clone(),
+            repository: Some(GitReferenceMethods::new(req.repo.clone(), req.reference.clone())),
+            ..Preface::default()
+        };
+        let payload = PlaybookPayload { title: repo, description, preface };
 
         ctx.client.playbooks().create(payload).map_err(ApiError::FailedToCreatePlaybook)
     }