Merge branch 'feature/organize-crud' into development

* feature/organize-crud:
  add update deployment
  update gemspec
  handle git branch errors
  organize crud
  pass around   access_token
  move delete function
  add smbcloud-model gem
  add error code
  move to crate read
  use request
  it's called get_projects
  cleanup project crud
  project list is truncated

Author: paydii

crates/cli/src/deploy/config.rs

@@ -6,7 +6,7 @@ use git2::{Cred, CredentialType, Error};
 use serde::{Deserialize, Serialize};
 use smbcloud_model::{account::User, project::Project};
 use smbcloud_networking::environment::Environment;
-use smbcloud_networking_project::crud_project_deployment_read::get_project;
+use smbcloud_networking_project::crud_project_read::get_project;
 use spinners::Spinner;
 use std::{fs, path::Path};
 use thiserror::Error;
@@ -103,6 +103,8 @@ impl Config {
 
 #[derive(Error, Debug, PartialEq, Eq)]
 pub enum ConfigError {
+    #[error("Missing token. Make sure you are logged in.")]
+    MissingToken,
     #[error("Missing config file. Please regenerate with 'smb init'.")]
     MissingConfig,
     #[error("Missing id in repository. Please regenerate with 'smb init'.")]

crates/cli/src/deploy/mod.rs

@@ -59,9 +59,9 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
     let commit_hash = match main_branch.resolve() {
         Ok(result) => match result.target() {
             Some(hash_id) => hash_id,
-            None => todo!(),
+            None => return Err(anyhow!("Should have at least one commit.")),
         },
-        Err(_) => todo!(),
+        Err(_) => return Err(anyhow!("Cannot resolve main branch.")),
     };
     let payload = DeploymentPayload {
         commit_hash: commit_hash.to_string(),
@@ -73,6 +73,13 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
 
     let mut push_opts = PushOptions::new();
     let mut callbacks = RemoteCallbacks::new();
+
+    // For updating status to failed
+    let deployment_failed_flag = Arc::new(AtomicBool::new(false));
+    let update_access_token = access_token.clone();
+    let update_project_id = config.project.id.clone();
+    let update_deployment_id = created_deployment.id.clone();
+
     // Set the credentials
     callbacks.credentials(config.credentials(user));
     callbacks.sideband_progress(|data| {

crates/cli/src/deploy/setup.rs

@@ -5,8 +5,10 @@ use crate::{
 use dialoguer::{theme::ColorfulTheme, Confirm, Input, Select};
 use regex::Regex;
 use smbcloud_model::project::{Project, ProjectCreate};
-use smbcloud_networking::environment::Environment;
-use smbcloud_networking_project::{create_project, get_all};
+use smbcloud_networking::{environment::Environment, get_smb_token};
+use smbcloud_networking_project::{
+    crud_project_create::create_project, crud_project_read::get_projects,
+};
 use std::{env, fs, path::Path};
 
 pub async fn setup_project(env: Environment) -> Result<Config, ConfigError> {
@@ -25,7 +27,12 @@ pub async fn setup_project(env: Environment) -> Result<Config, ConfigError> {
         return Err(ConfigError::Cancel);
     }
 
-    let projects = match get_all(env).await {
+    let access_token = match get_smb_token(env).await {
+        Ok(token) => token,
+        Err(_) => return Err(ConfigError::MissingToken),
+    };
+
+    let projects = match get_projects(env, access_token).await {
         Ok(x) => x,
         Err(_) => return Err(ConfigError::InputError),
     };
@@ -126,8 +133,14 @@ async fn create_new_project(env: Environment, path: &str) -> Result<Project, Con
         }
     };
 
+    let access_token = match get_smb_token(env).await {
+        Ok(token) => token,
+        Err(_) => return Err(ConfigError::MissingToken),
+    };
+
     match create_project(
         env,
+        access_token,
         ProjectCreate {
             name,
             repository,

crates/cli/src/project/crud_create.rs

@@ -7,8 +7,8 @@ use anyhow::{anyhow, Result};
 use console::style;
 use dialoguer::{theme::ColorfulTheme, Input};
 use smbcloud_model::project::ProjectCreate;
-use smbcloud_networking::environment::Environment;
-use smbcloud_networking_project::create_project;
+use smbcloud_networking::{environment::Environment, get_smb_token};
+use smbcloud_networking_project::crud_project_create::create_project;
 use spinners::Spinner;
 
 pub async fn process_project_init(env: Environment) -> Result<CommandResult> {
@@ -51,8 +51,10 @@ pub async fn process_project_init(env: Environment) -> Result<CommandResult> {
         style("Creating a project...").green().bold().to_string(),
     );
 
+    let access_token = get_smb_token(env).await?;
     match create_project(
         env,
+        access_token,
         ProjectCreate {
             name: project_name.clone(),
             repository,

crates/cli/src/project/crud_delete.rs

@@ -1,14 +1,19 @@
 use crate::{
+    account::lib::is_logged_in,
     cli::CommandResult,
     ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
 };
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use dialoguer::{theme::ColorfulTheme, Input};
-use smbcloud_networking::environment::Environment;
-use smbcloud_networking_project::delete_project;
+use smbcloud_networking::{environment::Environment, get_smb_token};
+use smbcloud_networking_project::crud_project_delete::delete_project;
 use spinners::Spinner;
 
 pub async fn process_project_delete(env: Environment, id: String) -> Result<CommandResult> {
+    if !is_logged_in(env) {
+        return Err(anyhow!(fail_message("Please log in with `smb init`.")));
+    }
+
     let confirmation = Input::<String>::with_theme(&ColorfulTheme::default())
         .with_prompt("Are you sure you want to delete this project? (y/n)")
         .interact()
@@ -26,7 +31,8 @@ pub async fn process_project_delete(env: Environment, id: String) -> Result<Comm
             msg: succeed_message("Cancelled."),
         });
     }
-    match delete_project(env, id).await {
+    let access_token = get_smb_token(env).await?;
+    match delete_project(env, access_token, id).await {
         Ok(_) => Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),

crates/cli/src/project/crud_read.rs

@@ -8,7 +8,7 @@ use anyhow::{anyhow, Result};
 use log::debug;
 use smbcloud_model::project::{Config, Project};
 use smbcloud_networking::{environment::Environment, get_smb_token};
-use smbcloud_networking_project::{crud_project_deployment_read::get_project, get_all};
+use smbcloud_networking_project::crud_project_read::{get_project, get_projects};
 use spinners::Spinner;
 use tabled::{Table, Tabled};
 
@@ -22,6 +22,18 @@ struct ProjectRow {
     repository: String,
     #[tabled(rename = "Description")]
     description: String,
+}
+
+#[derive(Tabled)]
+struct ProjectDetailRow {
+    #[tabled(rename = "ID")]
+    id: i32,
+    #[tabled(rename = "Name")]
+    name: String,
+    #[tabled(rename = "Repository")]
+    repository: String,
+    #[tabled(rename = "Description")]
+    description: String,
     #[tabled(rename = "Created at")]
     created_at: String,
     #[tabled(rename = "Updated at")]
@@ -33,8 +45,8 @@ pub async fn process_project_list(env: Environment) -> Result<CommandResult> {
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Loading"),
     );
-
-    match get_all(env).await {
+    let token = get_smb_token(env).await?;
+    match get_projects(env, token).await {
         Ok(projects) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
             let msg = if projects.is_empty() {
@@ -73,7 +85,7 @@ pub async fn process_project_show(env: Environment, id: String) -> Result<Comman
         Ok(project) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
             let message = succeed_message(&format!("Showing project {}.", &project.name));
-            show_projects(vec![project]);
+            show_project_detail(&project);
             Ok(CommandResult {
                 spinner: Spinner::new(
                     spinners::Spinners::SimpleDotsScrolling,
@@ -101,14 +113,25 @@ pub(crate) fn show_projects(projects: Vec<Project>) {
             name: p.name,
             repository: p.repository,
             description: p.description.unwrap_or("-".to_owned()),
-            created_at: p.created_at.date_naive().to_string(),
-            updated_at: p.updated_at.date_naive().to_string(),
         })
         .collect();
     let table = Table::new(rows);
     println!("{table}");
 }
 
+pub(crate) fn show_project_detail(project: &Project) {
+    let row = ProjectDetailRow {
+        id: project.id,
+        name: project.name.clone(),
+        repository: project.repository.clone(),
+        description: project.description.clone().unwrap_or("-".to_owned()),
+        created_at: project.created_at.date_naive().to_string(),
+        updated_at: project.updated_at.date_naive().to_string(),
+    };
+    let table = Table::new(vec![row]);
+    println!("{table}");
+}
+
 pub(crate) async fn process_project_use(env: Environment, id: String) -> Result<CommandResult> {
     let access_token = get_smb_token(env).await?;
     let project = get_project(env, access_token, id).await?;

crates/smbcloud-model/src/error_codes.rs

@@ -1,15 +1,11 @@
 use core::fmt;
-use std::{
-    error::Error,
-    fmt::{Display, Formatter},
-};
-
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
+use std::fmt::{Display, Formatter};
 use strum_macros::EnumIter;
 use thiserror::Error;
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Error, Serialize, Deserialize, Debug)]
 #[serde(untagged)]
 pub enum ErrorResponse {
     Error {
@@ -18,8 +14,6 @@ pub enum ErrorResponse {
     },
 }
 
-impl Error for ErrorResponse {}
-
 impl Display for ErrorResponse {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         write!(f, "{:?}", self)
@@ -35,6 +29,9 @@ pub enum ErrorCode {
     ParseError = 1,
     #[error("Network error.")]
     NetworkError = 2,
+    // Account
+    #[error("Unauthorized access.")]
+    Unauthorized = 100,
     // Projects
     #[error("Project not found.")]
     ProjectNotFound = 1000,
@@ -45,6 +42,8 @@ impl ErrorCode {
     /// so we need to get it from i32.
     pub fn from_i32(value: i32) -> Self {
         match value {
+            // Account
+            100 => ErrorCode::Unauthorized,
             // Projects
             1000 => ErrorCode::ProjectNotFound,
             // Fallback
@@ -62,6 +61,7 @@ impl ErrorCode {
             ErrorCode::ProjectNotFound => "Project not found.",
             ErrorCode::ParseError => "Parse error.",
             ErrorCode::NetworkError => "Network error.",
+            ErrorCode::Unauthorized => "Unauthorized access.",
         }
     }
 

crates/smbcloud-networking-project/src/crud_project_create.rs

@@ -0,0 +1,22 @@
+use anyhow::Result;
+use reqwest::Client;
+use smbcloud_model::{
+    error_codes::ErrorResponse,
+    project::{Project, ProjectCreate},
+};
+use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
+
+use crate::build_project_url;
+
+pub async fn create_project(
+    env: Environment,
+    access_token: String,
+    project: ProjectCreate,
+) -> Result<Project, ErrorResponse> {
+    let builder = Client::new()
+        .post(build_project_url(env))
+        .json(&project)
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}

crates/smbcloud-networking-project/src/crud_project_delete.rs

@@ -0,0 +1,16 @@
+use crate::build_project_url_with_id;
+use reqwest::Client;
+use smbcloud_model::error_codes::ErrorResponse;
+use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
+
+pub async fn delete_project(
+    env: Environment,
+    access_token: String,
+    id: String,
+) -> Result<(), ErrorResponse> {
+    let builder = Client::new()
+        .delete(build_project_url_with_id(env, id))
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}

crates/smbcloud-networking-project/src/crud_project_deployment_create.rs

@@ -3,7 +3,7 @@ use anyhow::{anyhow, Result};
 use log::debug;
 use reqwest::Client;
 use smbcloud_model::project::{Deployment, DeploymentPayload};
-use smbcloud_networking::{environment::Environment, get_smb_token};
+use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, get_smb_token};
 
 pub async fn create(
     env: Environment,
@@ -19,7 +19,7 @@ pub async fn create(
         .post(build_project_deployment_index(env, project_id.to_string()))
         .json(&payload)
         .header("Authorization", token)
-        .header("User-agent", "smbcloud-cli")
+        .header("User-agent", SMB_USER_AGENT)
         .send()
         .await?;
 
@@ -57,7 +57,7 @@ pub async fn update(
         .put(url)
         .json(&payload)
         .header("Authorization", token)
-        .header("User-agent", "smbcloud-cli")
+        .header("User-agent", SMB_USER_AGENT)
         .send()
         .await?;