plugin:yaak-models|upsert PoC

src-tauri/yaak-models/src/commands.rs

@@ -1,6 +1,7 @@
+use crate::error::Error::GenericError;
 use crate::error::Result;
-use crate::query_manager::QueryManagerExt;
 use crate::models::AnyModel;
+use crate::query_manager::QueryManagerExt;
 use crate::util::UpdateSource;
 use tauri::{Runtime, WebviewWindow};
 
@@ -9,15 +10,44 @@ pub(crate) async fn upsert<R: Runtime>(
     window: WebviewWindow<R>,
     model: AnyModel,
 ) -> Result<String> {
+    let db = window.db();
+    let source = &UpdateSource::from_window(&window);
     let id = match model {
-        AnyModel::HttpRequest(r) => window.db().upsert(&r, &UpdateSource::from_window(&window))?.id,
-        _ => todo!(),
+        AnyModel::HttpRequest(m) => db.upsert_http_request(&m, source)?.id,
+        AnyModel::CookieJar(m) => db.upsert_cookie_jar(&m, source)?.id,
+        AnyModel::Environment(m) => db.upsert_environment(&m, source)?.id,
+        AnyModel::Folder(m) => db.upsert_folder(&m, source)?.id,
+        AnyModel::GrpcRequest(m) => db.upsert_grpc_request(&m, source)?.id,
+        AnyModel::HttpResponse(m) => db.upsert_http_response(&m, source)?.id,
+        AnyModel::Plugin(m) => db.upsert_plugin(&m, source)?.id,
+        AnyModel::Settings(m) => db.upsert_settings(&m, source)?.id,
+        AnyModel::WebsocketRequest(m) => db.upsert_websocket_request(&m, source)?.id,
+        AnyModel::Workspace(m) => db.upsert_workspace(&m, source)?.id,
+        AnyModel::WorkspaceMeta(m) => db.upsert_workspace_meta(&m, source)?.id,
+        a => return Err(GenericError(format!("Cannot upsert AnyModel {a:?})"))),
     };
 
     Ok(id)
 }
 
 #[tauri::command]
-pub(crate) fn delete() -> Result<()> {
-    Ok(())
+pub(crate) fn delete<R: Runtime>(window: WebviewWindow<R>, model: AnyModel) -> Result<String> {
+    let db = window.db();
+    let source = &UpdateSource::from_window(&window);
+    let id = match model {
+        AnyModel::HttpRequest(m) => db.delete_http_request(&m, source)?.id,
+        AnyModel::CookieJar(m) => db.delete_cookie_jar(&m, source)?.id,
+        AnyModel::Environment(m) => db.delete_environment(&m, source)?.id,
+        AnyModel::Folder(m) => db.delete_folder(&m, source)?.id,
+        AnyModel::GrpcConnection(m) => db.delete_grpc_connection(&m, source)?.id,
+        AnyModel::GrpcRequest(m) => db.delete_grpc_request(&m, source)?.id,
+        AnyModel::HttpResponse(m) => db.delete_http_response(&m, source)?.id,
+        AnyModel::Plugin(m) => db.delete_plugin(&m, source)?.id,
+        AnyModel::WebsocketConnection(m) => db.delete_websocket_connection(&m, source)?.id,
+        AnyModel::WebsocketRequest(m) => db.delete_websocket_request(&m, source)?.id,
+        AnyModel::Workspace(m) => db.delete_workspace(&m, source)?.id,
+        a => return Err(GenericError(format!("Cannot delete AnyModel {a:?})"))),
+    };
+
+    Ok(id)
 }

src-tauri/yaak-models/src/db_context.rs

@@ -1,7 +1,7 @@
 use crate::connection_or_tx::ConnectionOrTx;
 use crate::error::Error::RowNotFound;
-use crate::models::{AnyModel, ModelType, UpsertModelInfo};
-use crate::util::{generate_model_id, ModelChangeEvent, ModelPayload, UpdateSource};
+use crate::models::{AnyModel, UpsertModelInfo};
+use crate::util::{ModelChangeEvent, ModelPayload, UpdateSource};
 use rusqlite::OptionalExtension;
 use sea_query::{
     Asterisk, Expr, IntoColumnRef, IntoIden, IntoTableRef, OnConflict, Query, SimpleExpr,
@@ -100,7 +100,6 @@ impl<'a> DbContext<'a> {
             M::table_name(),
             M::id_column(),
             model.get_id().as_str(),
-            || generate_model_id(ModelType::TypeEnvironment),
             model.clone().insert_values(source)?,
             M::update_columns(),
             source,
@@ -112,7 +111,6 @@ impl<'a> DbContext<'a> {
         table: impl IntoTableRef,
         id_col: impl IntoIden + Eq + Clone,
         id_val: &str,
-        gen_id: fn() -> String,
         other_values: Vec<(impl IntoIden + Eq, impl Into<SimpleExpr>)>,
         update_columns: Vec<impl IntoIden>,
         source: &UpdateSource,
@@ -122,7 +120,8 @@ impl<'a> DbContext<'a> {
     {
         let id_iden = id_col.into_iden();
         let mut column_vec = vec![id_iden.clone()];
-        let mut value_vec = vec![if id_val == "" { gen_id().into() } else { id_val.into() }];
+        let mut value_vec =
+            vec![if id_val == "" { M::generate_id().into() } else { id_val.into() }];
 
         for (col, val) in other_values {
             value_vec.push(val.into());

src-tauri/yaak-models/src/lib.rs

@@ -37,7 +37,7 @@ impl SqliteConnection {
 }
 
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    tauri::plugin::Builder::new("yaak_models")
+    tauri::plugin::Builder::new("yaak-models")
         .invoke_handler(generate_handler![upsert, delete])
         .setup(|app_handle, _api| {
             let app_path = app_handle.path().app_data_dir().unwrap();

src-tauri/yaak-models/src/models.rs

@@ -3,7 +3,7 @@ use crate::models::HttpRequestIden::{
     Authentication, AuthenticationType, Body, BodyType, CreatedAt, Description, FolderId, Headers,
     Method, Name, SortPriority, UpdatedAt, Url, UrlParameters, WorkspaceId,
 };
-use crate::util::UpdateSource;
+use crate::util::{generate_prefixed_id, UpdateSource};
 use chrono::{NaiveDateTime, Utc};
 use rusqlite::Row;
 use sea_query::{enum_def, IntoIden, IntoTableRef, SimpleExpr};
@@ -121,6 +121,10 @@ impl UpsertModelInfo for Settings {
         SettingsIden::Id
     }
 
+    fn generate_id() -> String {
+        panic!("Settings does not have unique IDs")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -227,6 +231,10 @@ impl UpsertModelInfo for Workspace {
         WorkspaceIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("wk")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -312,6 +320,10 @@ impl UpsertModelInfo for WorkspaceMeta {
         WorkspaceMetaIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("wm")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -401,6 +413,10 @@ impl UpsertModelInfo for CookieJar {
         CookieJarIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("cj")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -470,6 +486,10 @@ impl UpsertModelInfo for Environment {
         EnvironmentIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("ev")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -555,6 +575,10 @@ impl UpsertModelInfo for Folder {
         FolderIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("fl")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -667,6 +691,10 @@ impl UpsertModelInfo for HttpRequest {
         HttpRequestIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("rq")
+    }
+
     fn get_id(&self) -> String {
         self.id.to_string()
     }
@@ -786,6 +814,10 @@ impl UpsertModelInfo for WebsocketConnection {
         WebsocketConnectionIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("wc")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -892,6 +924,10 @@ impl UpsertModelInfo for WebsocketRequest {
         WebsocketRequestIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("wr")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1009,6 +1045,10 @@ impl UpsertModelInfo for WebsocketEvent {
         WebsocketEventIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("we")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1118,6 +1158,10 @@ impl UpsertModelInfo for HttpResponse {
         HttpResponseIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("rs")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1242,6 +1286,10 @@ impl UpsertModelInfo for GrpcRequest {
         GrpcRequestIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("gr")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1361,6 +1409,10 @@ impl UpsertModelInfo for GrpcConnection {
         GrpcConnectionIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("gc")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1473,6 +1525,10 @@ impl UpsertModelInfo for GrpcEvent {
         GrpcEventIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("ge")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1556,6 +1612,10 @@ impl UpsertModelInfo for Plugin {
         PluginIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("pg")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1630,6 +1690,10 @@ impl UpsertModelInfo for SyncState {
         SyncStateIden::Id
     }
 
+    fn generate_id() -> String {
+        generate_prefixed_id("ss")
+    }
+
     fn get_id(&self) -> String {
         self.id.clone()
     }
@@ -1748,47 +1812,6 @@ fn default_http_method() -> String {
     "GET".to_string()
 }
 
-pub enum ModelType {
-    TypeCookieJar,
-    TypeEnvironment,
-    TypeFolder,
-    TypeGrpcConnection,
-    TypeGrpcEvent,
-    TypeGrpcRequest,
-    TypeHttpRequest,
-    TypeHttpResponse,
-    TypePlugin,
-    TypeSyncState,
-    TypeWebSocketConnection,
-    TypeWebSocketEvent,
-    TypeWebsocketRequest,
-    TypeWorkspace,
-    TypeWorkspaceMeta,
-}
-
-impl ModelType {
-    pub fn id_prefix(&self) -> String {
-        match self {
-            ModelType::TypeCookieJar => "cj",
-            ModelType::TypeEnvironment => "ev",
-            ModelType::TypeFolder => "fl",
-            ModelType::TypeGrpcConnection => "gc",
-            ModelType::TypeGrpcEvent => "ge",
-            ModelType::TypeGrpcRequest => "gr",
-            ModelType::TypeHttpRequest => "rq",
-            ModelType::TypeHttpResponse => "rs",
-            ModelType::TypePlugin => "pg",
-            ModelType::TypeWorkspace => "wk",
-            ModelType::TypeWorkspaceMeta => "wm",
-            ModelType::TypeSyncState => "ss",
-            ModelType::TypeWebSocketConnection => "wc",
-            ModelType::TypeWebSocketEvent => "we",
-            ModelType::TypeWebsocketRequest => "wr",
-        }
-        .to_string()
-    }
-}
-
 #[macro_export]
 macro_rules! define_any_model {
     ($($type:ident),* $(,)?) => {
@@ -1850,34 +1873,19 @@ impl<'de> Deserialize<'de> for AnyModel {
     {
         let value = Value::deserialize(deserializer)?;
         let model = value.as_object().unwrap();
+        use serde_json::from_value as fv;
 
         let model = match model.get("model") {
-            Some(m) if m == "http_request" => {
-                AnyModel::HttpRequest(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "grpc_request" => {
-                AnyModel::GrpcRequest(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "workspace" => {
-                AnyModel::Workspace(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "environment" => {
-                AnyModel::Environment(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "folder" => AnyModel::Folder(serde_json::from_value(value).unwrap()),
-            Some(m) if m == "key_value" => {
-                AnyModel::KeyValue(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "grpc_connection" => {
-                AnyModel::GrpcConnection(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "grpc_event" => {
-                AnyModel::GrpcEvent(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "cookie_jar" => {
-                AnyModel::CookieJar(serde_json::from_value(value).unwrap())
-            }
-            Some(m) if m == "plugin" => AnyModel::Plugin(serde_json::from_value(value).unwrap()),
+            Some(m) if m == "http_request" => AnyModel::HttpRequest(fv(value).unwrap()),
+            Some(m) if m == "grpc_request" => AnyModel::GrpcRequest(fv(value).unwrap()),
+            Some(m) if m == "workspace" => AnyModel::Workspace(fv(value).unwrap()),
+            Some(m) if m == "environment" => AnyModel::Environment(fv(value).unwrap()),
+            Some(m) if m == "folder" => AnyModel::Folder(fv(value).unwrap()),
+            Some(m) if m == "key_value" => AnyModel::KeyValue(fv(value).unwrap()),
+            Some(m) if m == "grpc_connection" => AnyModel::GrpcConnection(fv(value).unwrap()),
+            Some(m) if m == "grpc_event" => AnyModel::GrpcEvent(fv(value).unwrap()),
+            Some(m) if m == "cookie_jar" => AnyModel::CookieJar(fv(value).unwrap()),
+            Some(m) if m == "plugin" => AnyModel::Plugin(fv(value).unwrap()),
             Some(m) => {
                 return Err(serde::de::Error::custom(format!("Unknown model {}", m)));
             }
@@ -1920,6 +1928,7 @@ impl AnyModel {
 pub trait UpsertModelInfo {
     fn table_name() -> impl IntoTableRef;
     fn id_column() -> impl IntoIden + Eq + Clone;
+    fn generate_id() -> String;
     fn get_id(&self) -> String;
     fn insert_values(
         self,

src-tauri/yaak-models/src/queries/key_values.rs

@@ -1,3 +1,4 @@
+use crate::db_context::DbContext;
 use crate::error::Result;
 use crate::models::{KeyValue, KeyValueIden};
 use crate::util::{ModelChangeEvent, ModelPayload, UpdateSource};
@@ -5,7 +6,6 @@ use log::error;
 use sea_query::Keyword::CurrentTimestamp;
 use sea_query::{Asterisk, Cond, Expr, OnConflict, Query, SqliteQueryBuilder};
 use sea_query_rusqlite::RusqliteBinder;
-use crate::db_context::DbContext;
 
 impl<'a> DbContext<'a> {
     pub fn list_key_values_raw(&self) -> Result<Vec<KeyValue>> {
@@ -92,8 +92,39 @@ impl<'a> DbContext<'a> {
         value: &str,
         source: &UpdateSource,
     ) -> (KeyValue, bool) {
-        let existing = self.get_key_value_raw(namespace, key);
+        match self.get_key_value_raw(namespace, key) {
+            None => (
+                self.upsert_key_value(
+                    &KeyValue {
+                        namespace: namespace.to_string(),
+                        key: key.to_string(),
+                        value: value.to_string(),
+                        ..Default::default()
+                    },
+                    source,
+                )
+                .expect("Failed to create key value"),
+                true,
+            ),
+            Some(kv) => (
+                self.upsert_key_value(
+                    &KeyValue {
+                        value: value.to_string(),
+                        ..kv
+                    },
+                    source,
+                )
+                .expect("Failed to update key value"),
+                false,
+            ),
+        }
+    }
 
+    pub fn upsert_key_value(
+        &self,
+        key_value: &KeyValue,
+        source: &UpdateSource,
+    ) -> Result<KeyValue> {
         let (sql, params) = Query::insert()
             .into_table(KeyValueIden::Table)
             .columns([
@@ -106,9 +137,9 @@ impl<'a> DbContext<'a> {
             .values_panic([
                 CurrentTimestamp.into(),
                 CurrentTimestamp.into(),
-                namespace.into(),
-                key.into(),
-                value.into(),
+                key_value.namespace.clone().into(),
+                key_value.key.clone().into(),
+                key_value.value.clone().into(),
             ])
             .on_conflict(
                 OnConflict::new()
@@ -130,7 +161,7 @@ impl<'a> DbContext<'a> {
         };
         self.tx.try_send(payload).unwrap();
 
-        (m, existing.is_none())
+        Ok(m)
     }
 
     pub fn delete_key_value(

src-tauri/yaak-models/src/util.rs

@@ -1,19 +1,16 @@
+use std::collections::BTreeMap;
 use crate::error::Result;
-use crate::models::{
-    AnyModel, Environment, Folder, GrpcRequest, HttpRequest, ModelType, WebsocketRequest,
-    Workspace, WorkspaceIden,
-};
+use crate::models::{AnyModel, Environment, Folder, GrpcRequest, HttpRequest, UpsertModelInfo, WebsocketRequest, Workspace, WorkspaceIden};
+use crate::query_manager::QueryManagerExt;
 use chrono::{NaiveDateTime, Utc};
 use log::warn;
 use nanoid::nanoid;
 use serde::{Deserialize, Serialize};
 use tauri::{AppHandle, Listener, Runtime, WebviewWindow};
 use ts_rs::TS;
-use crate::query_manager::QueryManagerExt;
 
-pub fn generate_model_id(model: ModelType) -> String {
-    let id = generate_id();
-    format!("{}_{}", model.id_prefix(), id)
+pub fn generate_prefixed_id(prefix: &str) -> String {
+    format!("{prefix}_{}", generate_id())
 }
 
 pub fn generate_id() -> String {
@@ -151,3 +148,28 @@ pub async fn get_workspace_export_resources<R: Runtime>(
 
     Ok(data)
 }
+
+pub fn maybe_gen_id<M: UpsertModelInfo>(id: &str, ids: &mut BTreeMap<String, String>) -> String {
+    if !id.starts_with("GENERATE_ID::") {
+        return id.to_string();
+    }
+
+    let unique_key = id.replace("GENERATE_ID", "");
+    if let Some(existing) = ids.get(unique_key.as_str()) {
+        existing.to_string()
+    } else {
+        let new_id = M::generate_id();
+        ids.insert(unique_key, new_id.clone());
+        new_id
+    }
+}
+
+pub fn maybe_gen_id_opt<M: UpsertModelInfo>(
+    id: Option<String>,
+    ids: &mut BTreeMap<String, String>,
+) -> Option<String> {
+    match id {
+        Some(id) => Some(maybe_gen_id::<M>(id.as_str(), ids)),
+        None => None,
+    }
+}