NPM Support Work

crates/core/src/builder_error.rs

@@ -0,0 +1,16 @@
+use derive_builder::UninitializedFieldError;
+use thiserror::Error;
+
+#[derive(Debug, Clone, Error)]
+pub enum BuilderError {
+    #[error("Uninitialized Field: {0}.")]
+    UninitializedField(&'static str),
+    #[error("Invalid Field: {0}.")]
+    InvalidField(String),
+}
+
+impl From<UninitializedFieldError> for BuilderError {
+    fn from(err: UninitializedFieldError) -> Self {
+        BuilderError::UninitializedField(err.field_name())
+    }
+}

crates/core/src/database/mod.rs

@@ -1,3 +1,6 @@
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 pub mod project;
 pub mod repository;
 pub mod storage;

crates/core/src/database/project/mod.rs

@@ -200,4 +200,15 @@ impl DBProjectVersion {
         .await?;
         Ok(version)
     }
+    pub async fn get_all_versions(
+        project_id: Uuid,
+        database: &PgPool,
+    ) -> Result<Vec<Self>, sqlx::Error> {
+        let versions =
+            sqlx::query_as::<_, Self>(r#"SELECT * FROM project_versions WHERE project_id = $1"#)
+                .bind(project_id)
+                .fetch_all(database)
+                .await?;
+        Ok(versions)
+    }
 }

crates/core/src/database/project/new.rs

@@ -1,14 +1,16 @@
+use crate::builder_error::BuilderError;
+use crate::repository::project::{ReleaseType, VersionData};
 use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 use sqlx::{types::Json, PgPool};
 use tracing::info;
 use utoipa::ToSchema;
 use uuid::Uuid;
 
-use crate::repository::project::{ReleaseType, VersionData};
-
 use super::DBProject;
 #[derive(Debug, Clone, PartialEq, Eq, Builder)]
+#[builder(build_fn(error = "BuilderError"))]
+
 pub struct NewProject {
     #[builder(default)]
     pub scope: Option<String>,
@@ -111,6 +113,8 @@ impl NewProjectMember {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Builder)]
+#[builder(build_fn(error = "BuilderError"))]
+
 pub struct NewVersion {
     pub project_id: Uuid,
     /// The version of the project
@@ -159,7 +163,7 @@ impl NewVersion {
                 sqlx::query(
                     r#"
                     UPDATE projects
-                    SET latest_release = $1 AND latest_pre_release = $1
+                    SET latest_release = $1, latest_pre_release = $1
                     WHERE id = $2
                     "#,
                 )

crates/core/src/database/project/update.rs

@@ -1,5 +1,3 @@
-use derive_builder::Builder;
-use http::version;
 use sqlx::{types::Json, Execute, PgPool, QueryBuilder};
 use tracing::{info, instrument, warn};
 
@@ -8,10 +6,8 @@ use crate::repository::project::{ReleaseType, VersionData};
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct UpdateProjectVersion {
     pub release_type: Option<ReleaseType>,
-    //#[builder(default)]
-    //pub publisher: Option<i32>,
-    //#[builder(default)]
-    //pub version_page: Option<String>,
+    pub publisher: Option<Option<i32>>,
+    pub version_page: Option<Option<String>>,
     pub extra: Option<VersionData>,
 }
 
@@ -24,14 +20,18 @@ impl UpdateProjectVersion {
             separated.push("release_type = ");
             separated.push_bind_unseparated(release_type);
         }
-        //if let Some(version_page) = self.version_page {
-        //    separated.push("user_manager = ");
-        //    separated.push_bind_unseparated(version_page);
-        //}
         if let Some(extra) = self.extra {
             separated.push("extra = ");
             separated.push_bind_unseparated(Json(extra));
         }
+        if let Some(version_page) = self.version_page {
+            separated.push("user_manager = ");
+            separated.push_bind_unseparated(version_page);
+        }
+        if let Some(publisher) = self.publisher {
+            separated.push("publisher = ");
+            separated.push_bind_unseparated(publisher);
+        }
         query.push(" WHERE id = ");
         query.push_bind(version_id);
         let query: sqlx::query::Query<sqlx::Postgres, sqlx::postgres::PgArguments> = query.build();

crates/core/src/lib.rs

@@ -1,5 +1,6 @@
 pub mod user;
 pub type ConfigTimeStamp = chrono::DateTime<chrono::FixedOffset>;
+pub mod builder_error;
 pub mod database;
 pub mod repository;
 pub mod storage;

crates/core/src/repository/project/mod.rs

@@ -74,6 +74,8 @@ pub enum ProjectState {
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, ToSchema, Default, Builder)]
 #[serde(default)]
+#[builder(build_fn(error = "crate::builder_error::BuilderError"))]
+
 pub struct VersionData {
     #[builder(default)]
     pub documentation_url: Option<String>,