From 536066142c1593e8f855e4c3520bd23a2ebc35b4 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 15 Jan 2024 12:25:13 -0800
Subject: [PATCH] Fix workspace defaults

---
 src-tauri/src/main.rs   |  5 +----
 src-tauri/src/models.rs | 29 ++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index cc358543..cbe8f129 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -284,10 +284,7 @@ async fn create_workspace(
     let pool = &*db_instance.lock().await;
     let created_workspace = models::upsert_workspace(
         pool,
-        models::Workspace {
-            name: name.to_string(),
-            ..Default::default()
-        },
+        models::Workspace::new(name.to_string()),
     )
     .await
     .expect("Failed to create Workspace");
diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index 41799960..399be7bf 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -8,6 +8,10 @@ use sqlx::types::{Json, JsonValue};
 use sqlx::{Pool, Sqlite};
 use tauri::AppHandle;
 
+fn default_true() -> bool {
+    true
+}
+
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct Settings {
@@ -31,11 +35,26 @@ pub struct Workspace {
     pub variables: Json<Vec<EnvironmentVariable>>,
 
     // Settings
+    #[serde(default = "default_true")]
     pub setting_validate_certificates: bool,
+    #[serde(default = "default_true")]
     pub setting_follow_redirects: bool,
     pub setting_request_timeout: i64,
 }
 
+// Implement default for Workspace
+impl Workspace {
+    pub(crate) fn new(name: String) -> Self {
+        Self {
+            name,
+            model: "workspace".to_string(),
+            setting_validate_certificates: true,
+            setting_follow_redirects: true,
+            ..Default::default()
+        }
+    }
+}
+
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct Environment {
@@ -48,14 +67,10 @@ pub struct Environment {
     pub variables: Json<Vec<EnvironmentVariable>>,
 }
 
-fn default_enabled() -> bool {
-    true
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct EnvironmentVariable {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
     pub enabled: bool,
     pub name: String,
     pub value: String,
@@ -64,7 +79,7 @@ pub struct EnvironmentVariable {
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct HttpRequestHeader {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
     pub enabled: bool,
     pub name: String,
     pub value: String,
@@ -73,7 +88,7 @@ pub struct HttpRequestHeader {
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
 pub struct HttpUrlParameter {
-    #[serde(default = "default_enabled")]
+    #[serde(default = "default_true")]
     pub enabled: bool,
     pub name: String,
     pub value: String,