folder get return Vec<File>,add folder tree

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.4" }
-amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.4" }
+amp-client = { git = "https://github.com/amphitheatre-app/amp-client-rust", tag = "v0.7.6" }
+amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.7.7" }
 anyhow = "1.0"
 axum = { version = "0.7.4" }
 clap = { version = "4.4.12", features = ["derive", "env"] }

src/handlers/folder.rs

@@ -28,7 +28,7 @@ use crate::services::FolderService;
 
 // The Folders Service Handlers.
 
-/// Returns a folder's tree.
+/// Gets the file list of a directory in a repository.
 #[utoipa::path(
     get, path = "/v1/playbooks/{id}/folders/{reference}/{path}",
     params(
@@ -37,7 +37,7 @@ use crate::services::FolderService;
         ("path" = String, description = "The file path relative to the root of the repository."),
     ),
     responses(
-        (status = 200, description = "The folder tree", body = Tree),
+        (status = 200, description = "The folder tree", body = Vec<File>),
         (status = 404, description = "Playbook not found"),
         (status = 404, description = "Folder not found"),
         (status = 500, description = "Internal Server Error"),
@@ -47,9 +47,31 @@ use crate::services::FolderService;
 pub async fn get(
     State(ctx): State<Arc<Context>>,
     Path((id, reference, path)): Path<(Uuid, String, Option<String>)>,
+) -> Result<impl IntoResponse> {
+    Ok(Json(FolderService::get(ctx, id, reference, path).await?))
+}
+
+/// Returns a folder's tree.
+
+#[utoipa::path(
+    get, path = "/v1/playbooks/{id}/tree",
+    params(
+        ("id" = Uuid, description = "The id of playbook"),
+    ),
+    responses(
+        (status = 200, description = "The folder tree", body = Tree),
+        (status = 404, description = "Playbook not found"),
+        (status = 404, description = "Folder not found"),
+        (status = 500, description = "Internal Server Error"),
+    ),
+    tag = "Folders"
+)]
+pub async fn tree(
+    State(ctx): State<Arc<Context>>,
+    Path(id): Path<Uuid>,
     Query(params): Query<HashMap<String, String>>,
 ) -> Result<impl IntoResponse> {
-    Ok(Json(FolderService::get(ctx, id, reference, path, params.get("recursive")).await?))
+    Ok(Json(FolderService::tree(ctx, id, params.get("recursive")).await?))
 }
 
 /// Create a folder

src/routes.rs

@@ -40,6 +40,7 @@ pub fn build() -> Router<Arc<Context>> {
         //
         // folders
         .route("/v1/playbooks/:id/folders/:reference/:path", get(folder::get))
+        .route("/v1/playbooks/:id/tree", get(folder::tree))
         .route("/v1/playbooks/:id/folders/:reference/:path", post(folder::create))
         .route("/v1/playbooks/:id/folders/:reference/:path", delete(folder::delete))
         .route("/v1/playbooks/:id/folders/:reference/:path/actions/copy", post(folder::copy))

src/services/folder.rs

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use amp_common::scm::git::Tree;
 use std::sync::Arc;
 use uuid::Uuid;
 
-use amp_common::scm::content::Content;
+use amp_common::scm::content::{Content, File};
+use amp_common::scm::git::Tree;
 
 use crate::context::Context;
 use crate::errors::{ApiError, Result};
@@ -30,20 +30,27 @@ impl FolderService {
         id: Uuid,
         _reference: String,
         path: Option<String>,
-        recursive: Option<&String>,
-    ) -> Result<Tree> {
+    ) -> Result<Vec<File>, ApiError> {
         let playbook = ctx.client.playbooks().get(&id.to_string()).map_err(ApiError::NotFoundPlaybook)?;
         let source = playbook.preface.repository.unwrap();
 
-        let content = ctx
-            .github_client
+        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()))?;
+            .list(&utils::repo(&source.repo)?, &path.unwrap_or_default(), &source.branch.unwrap_or_default())
+            .map_err(|e| ApiError::NotFoundContent(e.to_string()))
+    }
+
+    pub async fn tree(ctx: Arc<Context>, id: Uuid, recursive: Option<&String>) -> Result<Tree, ApiError> {
+        let playbook = ctx.client.playbooks().get(&id.to_string()).map_err(ApiError::NotFoundPlaybook)?;
+        let source = playbook.preface.repository.unwrap();
 
         ctx.github_client
             .git()
-            .get_tree(&utils::repo(&source.repo)?, &content.sha, Option::from(recursive.is_some()))
+            .get_tree(
+                &utils::repo(&source.repo)?,
+                &source.branch.unwrap_or_default(),
+                Option::from(recursive.is_some()),
+            )
             .map_err(|e| ApiError::NotFoundFolder(e.to_string()))?
             .ok_or(ApiError::NotFoundFolder("The folder is none".to_string()))
     }

src/swagger.rs

@@ -34,6 +34,7 @@ use crate::{handlers, requests};
         handlers::file::rename,
 
         handlers::folder::get,
+        handlers::folder::tree,
         handlers::folder::create,
         handlers::folder::delete,
         handlers::folder::copy,
@@ -63,6 +64,7 @@ use crate::{handlers, requests};
             amp_common::schema::Service,
 
             amp_common::scm::content::Content,
+            amp_common::scm::content::File,
             amp_common::scm::git::Tree,
             amp_common::scm::git::TreeEntry,
         )