From d344ac2d7327157af2dff4b0575bff324f25cfa0 Mon Sep 17 00:00:00 2001
From: lukas-heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Thu, 15 Feb 2024 19:18:10 +0100
Subject: [PATCH] fix pkg. add id not populated error and migrate to
 transaction

---
 backend/src/api/package.rs | 25 ++++++++++++++++---------
 backend/src/api/remove.rs  |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/backend/src/api/package.rs b/backend/src/api/package.rs
index 78723f5..8afe672 100644
--- a/backend/src/api/package.rs
+++ b/backend/src/api/package.rs
@@ -12,7 +12,8 @@ use rocket::{get, post, State};
 use rocket_okapi::okapi::schemars;
 use rocket_okapi::{openapi, JsonSchema};
 use sea_orm::{
-    ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect, RelationTrait,
+    ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect,
+    RelationTrait, TransactionTrait,
 };
 use sea_orm::{DatabaseConnection, Set};
 use tokio::sync::broadcast::Sender;
@@ -30,14 +31,17 @@ pub async fn package_add(
     input: Json<AddBody>,
     tx: &State<Sender<Action>>,
 ) -> Result<(), BadRequest<String>> {
-    let db = db as &DatabaseConnection;
+    let txn = db
+        .begin()
+        .await
+        .map_err(|e| BadRequest(Some(e.to_string())))?;
 
     // remove leading and trailing whitespaces
     let pkg_name = input.name.trim();
 
     if let Some(..) = Packages::find()
         .filter(packages::Column::Name.eq(pkg_name))
-        .one(db)
+        .one(&txn)
         .await
         .map_err(|e| BadRequest(Some(e.to_string())))?
     {
@@ -55,28 +59,28 @@ pub async fn package_add(
         ..Default::default()
     };
 
-    new_package
+    let mut new_package = new_package
         .clone()
-        .save(db)
+        .save(&txn)
         .await
         .map_err(|e| BadRequest(Some(e.to_string())))?;
 
     let new_version = versions::ActiveModel {
         version: Set(pkg.version.clone()),
-        package_id: Set(new_package.id.clone().unwrap()),
+        package_id: new_package.id.clone(),
         ..Default::default()
     };
 
-    new_version
+    let new_version = new_version
         .clone()
-        .save(db)
+        .save(&txn)
         .await
         .map_err(|e| BadRequest(Some(e.to_string())))?;
 
     new_package.status = Set(3);
     new_package.latest_version_id = Set(Some(new_version.id.clone().unwrap()));
     new_package
-        .save(db)
+        .save(&txn)
         .await
         .map_err(|e| BadRequest(Some(e.to_string())))?;
 
@@ -87,6 +91,9 @@ pub async fn package_add(
         new_version,
     ));
 
+    txn.commit()
+        .await
+        .map_err(|e| BadRequest(Some(e.to_string())))?;
     Ok(())
 }
 
diff --git a/backend/src/api/remove.rs b/backend/src/api/remove.rs
index 802550c..08b4048 100644
--- a/backend/src/api/remove.rs
+++ b/backend/src/api/remove.rs
@@ -1,4 +1,4 @@
-use crate::repo::repo::{remove_version};
+use crate::repo::repo::remove_version;
 use rocket::{post, State};
 use rocket_okapi::openapi;
 use sea_orm::DatabaseConnection;