cleanup: make creating a dataset more efficient for unlimited deployments

Author: skeptrunedev

server/src/handlers/dataset_handler.rs

@@ -113,18 +113,19 @@ pub async fn create_dataset(
 
     let organization_sub_plan = get_org_from_id_query(org_id, pool.clone()).await?;
 
-    let dataset_count = get_org_dataset_count(org_id, pool.clone()).await?;
-
     let unlimited = std::env::var("UNLIMITED").unwrap_or("false".to_string());
-    if unlimited == "false"
-        && dataset_count
+    if unlimited == "false" {
+        let dataset_count = get_org_dataset_count(org_id, pool.clone()).await?;
+        if dataset_count
             >= organization_sub_plan
                 .plan
                 .unwrap_or(StripePlan::default())
                 .dataset_count
-    {
-        return Ok(HttpResponse::UpgradeRequired()
-            .json(json!({"message": "Your plan must be upgraded to create additional datasets"})));
+        {
+            return Ok(HttpResponse::UpgradeRequired().json(
+                json!({"message": "Your plan must be upgraded to create additional datasets"}),
+            ));
+        }
     }
 
     let dataset = Dataset::from_details(
@@ -138,6 +139,7 @@ pub async fn create_dataset(
     );
 
     let d = create_dataset_query(dataset, pool).await?;
+
     Ok(HttpResponse::Ok().json(d))
 }
 

server/src/operators/organization_operator.rs

@@ -331,7 +331,14 @@ pub async fn get_org_dataset_count(
         .select(organization_usage_counts_columns::dataset_count)
         .first(&mut conn)
         .await
-        .map_err(|_| ServiceError::BadRequest("Error loading org dataset count".to_string()))?;
+        .map_err(|e| {
+            log::error!(
+                "Error loading org dataset count in get_org_dataset_count: {:?}",
+                e
+            );
+
+            ServiceError::BadRequest("Error loading org dataset count".to_string())
+        })?;
 
     Ok(dataset_count)
 }