commit 05eced17a9e9a4fa5c96cf04a25b9a9159c3acb3
parent 67586181e57c1798b8dded74ace24825f34d77ab
Author: triesap <tyson@radroots.org>
Date: Sun, 15 Feb 2026 17:51:04 +0000
tangle-db: apply cargo fmt
Diffstat:
20 files changed, 427 insertions(+), 524 deletions(-)
diff --git a/tangle-db/src/export.rs b/tangle-db/src/export.rs
@@ -3,13 +3,8 @@ use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use crate::backup::{
- DATABASE_BACKUP_VERSION,
- TANGLE_DB_VERSION,
- MigrationBackup,
- SchemaEntry,
- escape_identifier,
- export_migrations,
- load_schema,
+ DATABASE_BACKUP_VERSION, MigrationBackup, SchemaEntry, TANGLE_DB_VERSION, escape_identifier,
+ export_migrations, load_schema,
};
pub const TANGLE_DB_EXPORT_VERSION: &str = "1";
diff --git a/tangle-db/src/lib.rs b/tangle-db/src/lib.rs
@@ -3,213 +3,109 @@ pub use radroots_sql_core::{ExecOutcome, SqlExecutor};
use radroots_types::types::IError;
use radroots_tangle_db_schema::farm::{
- IFarmCreate,
- IFarmCreateResolve,
- IFarmDelete,
- IFarmDeleteResolve,
- IFarmFindMany,
- IFarmFindManyResolve,
- IFarmFindOne,
- IFarmFindOneResolve,
- IFarmUpdate,
- IFarmUpdateResolve,
+ IFarmCreate, IFarmCreateResolve, IFarmDelete, IFarmDeleteResolve, IFarmFindMany,
+ IFarmFindManyResolve, IFarmFindOne, IFarmFindOneResolve, IFarmUpdate, IFarmUpdateResolve,
};
use radroots_tangle_db_schema::farm_gcs_location::{
- IFarmGcsLocationCreate,
- IFarmGcsLocationCreateResolve,
- IFarmGcsLocationDelete,
- IFarmGcsLocationDeleteResolve,
- IFarmGcsLocationFindMany,
- IFarmGcsLocationFindManyResolve,
- IFarmGcsLocationFindOne,
- IFarmGcsLocationFindOneResolve,
- IFarmGcsLocationUpdate,
+ IFarmGcsLocationCreate, IFarmGcsLocationCreateResolve, IFarmGcsLocationDelete,
+ IFarmGcsLocationDeleteResolve, IFarmGcsLocationFindMany, IFarmGcsLocationFindManyResolve,
+ IFarmGcsLocationFindOne, IFarmGcsLocationFindOneResolve, IFarmGcsLocationUpdate,
IFarmGcsLocationUpdateResolve,
};
use radroots_tangle_db_schema::farm_member::{
- IFarmMemberCreate,
- IFarmMemberCreateResolve,
- IFarmMemberDelete,
- IFarmMemberDeleteResolve,
- IFarmMemberFindMany,
- IFarmMemberFindManyResolve,
- IFarmMemberFindOne,
- IFarmMemberFindOneResolve,
- IFarmMemberUpdate,
- IFarmMemberUpdateResolve,
+ IFarmMemberCreate, IFarmMemberCreateResolve, IFarmMemberDelete, IFarmMemberDeleteResolve,
+ IFarmMemberFindMany, IFarmMemberFindManyResolve, IFarmMemberFindOne, IFarmMemberFindOneResolve,
+ IFarmMemberUpdate, IFarmMemberUpdateResolve,
};
use radroots_tangle_db_schema::farm_member_claim::{
- IFarmMemberClaimCreate,
- IFarmMemberClaimCreateResolve,
- IFarmMemberClaimDelete,
- IFarmMemberClaimDeleteResolve,
- IFarmMemberClaimFindMany,
- IFarmMemberClaimFindManyResolve,
- IFarmMemberClaimFindOne,
- IFarmMemberClaimFindOneResolve,
- IFarmMemberClaimUpdate,
+ IFarmMemberClaimCreate, IFarmMemberClaimCreateResolve, IFarmMemberClaimDelete,
+ IFarmMemberClaimDeleteResolve, IFarmMemberClaimFindMany, IFarmMemberClaimFindManyResolve,
+ IFarmMemberClaimFindOne, IFarmMemberClaimFindOneResolve, IFarmMemberClaimUpdate,
IFarmMemberClaimUpdateResolve,
};
use radroots_tangle_db_schema::farm_tag::{
- IFarmTagCreate,
- IFarmTagCreateResolve,
- IFarmTagDelete,
- IFarmTagDeleteResolve,
- IFarmTagFindMany,
- IFarmTagFindManyResolve,
- IFarmTagFindOne,
- IFarmTagFindOneResolve,
- IFarmTagUpdate,
+ IFarmTagCreate, IFarmTagCreateResolve, IFarmTagDelete, IFarmTagDeleteResolve, IFarmTagFindMany,
+ IFarmTagFindManyResolve, IFarmTagFindOne, IFarmTagFindOneResolve, IFarmTagUpdate,
IFarmTagUpdateResolve,
};
use radroots_tangle_db_schema::gcs_location::{
- IGcsLocationCreate,
- IGcsLocationCreateResolve,
- IGcsLocationDelete,
- IGcsLocationDeleteResolve,
- IGcsLocationFindMany,
- IGcsLocationFindManyResolve,
- IGcsLocationFindOne,
- IGcsLocationFindOneResolve,
- IGcsLocationUpdate,
- IGcsLocationUpdateResolve,
+ IGcsLocationCreate, IGcsLocationCreateResolve, IGcsLocationDelete, IGcsLocationDeleteResolve,
+ IGcsLocationFindMany, IGcsLocationFindManyResolve, IGcsLocationFindOne,
+ IGcsLocationFindOneResolve, IGcsLocationUpdate, IGcsLocationUpdateResolve,
};
use radroots_tangle_db_schema::log_error::{
- ILogErrorCreate,
- ILogErrorCreateResolve,
- ILogErrorDelete,
- ILogErrorDeleteResolve,
- ILogErrorFindMany,
- ILogErrorFindManyResolve,
- ILogErrorFindOne,
- ILogErrorFindOneResolve,
- ILogErrorUpdate,
- ILogErrorUpdateResolve,
+ ILogErrorCreate, ILogErrorCreateResolve, ILogErrorDelete, ILogErrorDeleteResolve,
+ ILogErrorFindMany, ILogErrorFindManyResolve, ILogErrorFindOne, ILogErrorFindOneResolve,
+ ILogErrorUpdate, ILogErrorUpdateResolve,
};
use radroots_tangle_db_schema::media_image::{
- IMediaImageCreate,
- IMediaImageCreateResolve,
- IMediaImageDelete,
- IMediaImageDeleteResolve,
- IMediaImageFindMany,
- IMediaImageFindManyResolve,
- IMediaImageFindOne,
- IMediaImageFindOneResolve,
- IMediaImageUpdate,
- IMediaImageUpdateResolve,
+ IMediaImageCreate, IMediaImageCreateResolve, IMediaImageDelete, IMediaImageDeleteResolve,
+ IMediaImageFindMany, IMediaImageFindManyResolve, IMediaImageFindOne, IMediaImageFindOneResolve,
+ IMediaImageUpdate, IMediaImageUpdateResolve,
};
use radroots_tangle_db_schema::nostr_profile::{
- INostrProfileCreate,
- INostrProfileCreateResolve,
- INostrProfileDelete,
- INostrProfileDeleteResolve,
- INostrProfileFindMany,
- INostrProfileFindManyResolve,
- INostrProfileFindOne,
- INostrProfileFindOneResolve,
- INostrProfileUpdate,
+ INostrProfileCreate, INostrProfileCreateResolve, INostrProfileDelete,
+ INostrProfileDeleteResolve, INostrProfileFindMany, INostrProfileFindManyResolve,
+ INostrProfileFindOne, INostrProfileFindOneResolve, INostrProfileUpdate,
INostrProfileUpdateResolve,
};
use radroots_tangle_db_schema::nostr_event_state::{
- INostrEventStateCreate,
- INostrEventStateCreateResolve,
- INostrEventStateDelete,
- INostrEventStateDeleteResolve,
- INostrEventStateFindMany,
- INostrEventStateFindManyResolve,
- INostrEventStateFindOne,
- INostrEventStateFindOneResolve,
- INostrEventStateUpdate,
+ INostrEventStateCreate, INostrEventStateCreateResolve, INostrEventStateDelete,
+ INostrEventStateDeleteResolve, INostrEventStateFindMany, INostrEventStateFindManyResolve,
+ INostrEventStateFindOne, INostrEventStateFindOneResolve, INostrEventStateUpdate,
INostrEventStateUpdateResolve,
};
use radroots_tangle_db_schema::nostr_relay::{
- INostrRelayCreate,
- INostrRelayCreateResolve,
- INostrRelayDelete,
- INostrRelayDeleteResolve,
- INostrRelayFindMany,
- INostrRelayFindManyResolve,
- INostrRelayFindOne,
- INostrRelayFindOneResolve,
- INostrRelayUpdate,
- INostrRelayUpdateResolve,
+ INostrRelayCreate, INostrRelayCreateResolve, INostrRelayDelete, INostrRelayDeleteResolve,
+ INostrRelayFindMany, INostrRelayFindManyResolve, INostrRelayFindOne, INostrRelayFindOneResolve,
+ INostrRelayUpdate, INostrRelayUpdateResolve,
};
use radroots_tangle_db_schema::trade_product::{
- ITradeProductCreate,
- ITradeProductCreateResolve,
- ITradeProductDelete,
- ITradeProductDeleteResolve,
- ITradeProductFindMany,
- ITradeProductFindManyResolve,
- ITradeProductFindOne,
- ITradeProductFindOneResolve,
- ITradeProductUpdate,
+ ITradeProductCreate, ITradeProductCreateResolve, ITradeProductDelete,
+ ITradeProductDeleteResolve, ITradeProductFindMany, ITradeProductFindManyResolve,
+ ITradeProductFindOne, ITradeProductFindOneResolve, ITradeProductUpdate,
ITradeProductUpdateResolve,
};
use radroots_tangle_db_schema::plot::{
- IPlotCreate,
- IPlotCreateResolve,
- IPlotDelete,
- IPlotDeleteResolve,
- IPlotFindMany,
- IPlotFindManyResolve,
- IPlotFindOne,
- IPlotFindOneResolve,
- IPlotUpdate,
- IPlotUpdateResolve,
+ IPlotCreate, IPlotCreateResolve, IPlotDelete, IPlotDeleteResolve, IPlotFindMany,
+ IPlotFindManyResolve, IPlotFindOne, IPlotFindOneResolve, IPlotUpdate, IPlotUpdateResolve,
};
use radroots_tangle_db_schema::plot_gcs_location::{
- IPlotGcsLocationCreate,
- IPlotGcsLocationCreateResolve,
- IPlotGcsLocationDelete,
- IPlotGcsLocationDeleteResolve,
- IPlotGcsLocationFindMany,
- IPlotGcsLocationFindManyResolve,
- IPlotGcsLocationFindOne,
- IPlotGcsLocationFindOneResolve,
- IPlotGcsLocationUpdate,
+ IPlotGcsLocationCreate, IPlotGcsLocationCreateResolve, IPlotGcsLocationDelete,
+ IPlotGcsLocationDeleteResolve, IPlotGcsLocationFindMany, IPlotGcsLocationFindManyResolve,
+ IPlotGcsLocationFindOne, IPlotGcsLocationFindOneResolve, IPlotGcsLocationUpdate,
IPlotGcsLocationUpdateResolve,
};
use radroots_tangle_db_schema::plot_tag::{
- IPlotTagCreate,
- IPlotTagCreateResolve,
- IPlotTagDelete,
- IPlotTagDeleteResolve,
- IPlotTagFindMany,
- IPlotTagFindManyResolve,
- IPlotTagFindOne,
- IPlotTagFindOneResolve,
- IPlotTagUpdate,
+ IPlotTagCreate, IPlotTagCreateResolve, IPlotTagDelete, IPlotTagDeleteResolve, IPlotTagFindMany,
+ IPlotTagFindManyResolve, IPlotTagFindOne, IPlotTagFindOneResolve, IPlotTagUpdate,
IPlotTagUpdateResolve,
};
use radroots_tangle_db_schema::nostr_profile_relay::{
- INostrProfileRelayRelation,
- INostrProfileRelayResolve,
+ INostrProfileRelayRelation, INostrProfileRelayResolve,
};
use radroots_tangle_db_schema::trade_product_location::{
- ITradeProductLocationRelation,
- ITradeProductLocationResolve,
+ ITradeProductLocationRelation, ITradeProductLocationResolve,
};
use radroots_tangle_db_schema::trade_product_media::{
- ITradeProductMediaRelation,
- ITradeProductMediaResolve,
+ ITradeProductMediaRelation, ITradeProductMediaResolve,
};
pub mod backup;
@@ -257,10 +153,7 @@ impl<E: SqlExecutor> TangleSql<E> {
crate::backup::restore_database_backup_json(self.executor(), backup_json)
}
- pub fn farm_create(
- &self,
- opts: &IFarmCreate,
- ) -> Result<IFarmCreateResolve, IError<SqlError>> {
+ pub fn farm_create(&self, opts: &IFarmCreate) -> Result<IFarmCreateResolve, IError<SqlError>> {
models::farm::create(self.executor(), opts)
}
@@ -278,24 +171,15 @@ impl<E: SqlExecutor> TangleSql<E> {
models::farm::find_one(self.executor(), opts)
}
- pub fn farm_update(
- &self,
- opts: &IFarmUpdate,
- ) -> Result<IFarmUpdateResolve, IError<SqlError>> {
+ pub fn farm_update(&self, opts: &IFarmUpdate) -> Result<IFarmUpdateResolve, IError<SqlError>> {
models::farm::update(self.executor(), opts)
}
- pub fn farm_delete(
- &self,
- opts: &IFarmDelete,
- ) -> Result<IFarmDeleteResolve, IError<SqlError>> {
+ pub fn farm_delete(&self, opts: &IFarmDelete) -> Result<IFarmDeleteResolve, IError<SqlError>> {
models::farm::delete(self.executor(), opts)
}
- pub fn plot_create(
- &self,
- opts: &IPlotCreate,
- ) -> Result<IPlotCreateResolve, IError<SqlError>> {
+ pub fn plot_create(&self, opts: &IPlotCreate) -> Result<IPlotCreateResolve, IError<SqlError>> {
models::plot::create(self.executor(), opts)
}
@@ -313,17 +197,11 @@ impl<E: SqlExecutor> TangleSql<E> {
models::plot::find_one(self.executor(), opts)
}
- pub fn plot_update(
- &self,
- opts: &IPlotUpdate,
- ) -> Result<IPlotUpdateResolve, IError<SqlError>> {
+ pub fn plot_update(&self, opts: &IPlotUpdate) -> Result<IPlotUpdateResolve, IError<SqlError>> {
models::plot::update(self.executor(), opts)
}
- pub fn plot_delete(
- &self,
- opts: &IPlotDelete,
- ) -> Result<IPlotDeleteResolve, IError<SqlError>> {
+ pub fn plot_delete(&self, opts: &IPlotDelete) -> Result<IPlotDeleteResolve, IError<SqlError>> {
models::plot::delete(self.executor(), opts)
}
@@ -823,5 +701,4 @@ impl<E: SqlExecutor> TangleSql<E> {
) -> Result<ITradeProductMediaResolve, IError<SqlError>> {
models::trade_product_media::unset(self.executor(), opts)
}
-
}
diff --git a/tangle-db/src/models/farm.rs b/tangle-db/src/models/farm.rs
@@ -1,20 +1,9 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::farm::{
- IFarmCreate,
- IFarmCreateResolve,
- IFarmDelete,
- IFarmDeleteResolve,
- IFarmFieldsFilter,
- IFarmFindMany,
- IFarmFindManyResolve,
- IFarmFindOne,
- IFarmFindOneResolve,
- IFarmUpdate,
- IFarmUpdateResolve,
- Farm,
- FarmFindManyRel,
- FarmQueryBindValues,
+ Farm, FarmFindManyRel, FarmQueryBindValues, IFarmCreate, IFarmCreateResolve, IFarmDelete,
+ IFarmDeleteResolve, IFarmFieldsFilter, IFarmFindMany, IFarmFindManyResolve, IFarmFindOne,
+ IFarmFindOneResolve, IFarmUpdate, IFarmUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +26,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = FarmQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +104,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IFarmUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +122,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +147,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IFarmDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +165,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &FarmFindManyRel) -> String {
diff --git a/tangle-db/src/models/farm_gcs_location.rs b/tangle-db/src/models/farm_gcs_location.rs
@@ -1,20 +1,11 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::farm_gcs_location::{
- FarmGcsLocation,
- FarmGcsLocationFindManyRel,
- FarmGcsLocationQueryBindValues,
- IFarmGcsLocationCreate,
- IFarmGcsLocationCreateResolve,
- IFarmGcsLocationDelete,
- IFarmGcsLocationDeleteResolve,
- IFarmGcsLocationFieldsFilter,
- IFarmGcsLocationFindMany,
- IFarmGcsLocationFindManyResolve,
- IFarmGcsLocationFindOne,
- IFarmGcsLocationFindOneResolve,
- IFarmGcsLocationUpdate,
- IFarmGcsLocationUpdateResolve,
+ FarmGcsLocation, FarmGcsLocationFindManyRel, FarmGcsLocationQueryBindValues,
+ IFarmGcsLocationCreate, IFarmGcsLocationCreateResolve, IFarmGcsLocationDelete,
+ IFarmGcsLocationDeleteResolve, IFarmGcsLocationFieldsFilter, IFarmGcsLocationFindMany,
+ IFarmGcsLocationFindManyResolve, IFarmGcsLocationFindOne, IFarmGcsLocationFindOneResolve,
+ IFarmGcsLocationUpdate, IFarmGcsLocationUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = FarmGcsLocationQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +106,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IFarmGcsLocationUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +124,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +149,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IFarmGcsLocationDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +167,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &FarmGcsLocationFindManyRel) -> String {
diff --git a/tangle-db/src/models/farm_member.rs b/tangle-db/src/models/farm_member.rs
@@ -1,20 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::farm_member::{
- FarmMember,
- FarmMemberFindManyRel,
- FarmMemberQueryBindValues,
- IFarmMemberCreate,
- IFarmMemberCreateResolve,
- IFarmMemberDelete,
- IFarmMemberDeleteResolve,
- IFarmMemberFieldsFilter,
- IFarmMemberFindMany,
- IFarmMemberFindManyResolve,
- IFarmMemberFindOne,
- IFarmMemberFindOneResolve,
- IFarmMemberUpdate,
- IFarmMemberUpdateResolve,
+ FarmMember, FarmMemberFindManyRel, FarmMemberQueryBindValues, IFarmMemberCreate,
+ IFarmMemberCreateResolve, IFarmMemberDelete, IFarmMemberDeleteResolve, IFarmMemberFieldsFilter,
+ IFarmMemberFindMany, IFarmMemberFindManyResolve, IFarmMemberFindOne, IFarmMemberFindOneResolve,
+ IFarmMemberUpdate, IFarmMemberUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = FarmMemberQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +105,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IFarmMemberUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +123,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +148,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IFarmMemberDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +166,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &FarmMemberFindManyRel) -> String {
diff --git a/tangle-db/src/models/farm_member_claim.rs b/tangle-db/src/models/farm_member_claim.rs
@@ -1,20 +1,11 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::farm_member_claim::{
- FarmMemberClaim,
- FarmMemberClaimFindManyRel,
- FarmMemberClaimQueryBindValues,
- IFarmMemberClaimCreate,
- IFarmMemberClaimCreateResolve,
- IFarmMemberClaimDelete,
- IFarmMemberClaimDeleteResolve,
- IFarmMemberClaimFieldsFilter,
- IFarmMemberClaimFindMany,
- IFarmMemberClaimFindManyResolve,
- IFarmMemberClaimFindOne,
- IFarmMemberClaimFindOneResolve,
- IFarmMemberClaimUpdate,
- IFarmMemberClaimUpdateResolve,
+ FarmMemberClaim, FarmMemberClaimFindManyRel, FarmMemberClaimQueryBindValues,
+ IFarmMemberClaimCreate, IFarmMemberClaimCreateResolve, IFarmMemberClaimDelete,
+ IFarmMemberClaimDeleteResolve, IFarmMemberClaimFieldsFilter, IFarmMemberClaimFindMany,
+ IFarmMemberClaimFindManyResolve, IFarmMemberClaimFindOne, IFarmMemberClaimFindOneResolve,
+ IFarmMemberClaimUpdate, IFarmMemberClaimUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = FarmMemberClaimQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +106,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IFarmMemberClaimUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +124,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +149,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IFarmMemberClaimDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +167,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &FarmMemberClaimFindManyRel) -> String {
diff --git a/tangle-db/src/models/farm_tag.rs b/tangle-db/src/models/farm_tag.rs
@@ -1,19 +1,9 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::farm_tag::{
- FarmTag,
- FarmTagFindManyRel,
- FarmTagQueryBindValues,
- IFarmTagCreate,
- IFarmTagCreateResolve,
- IFarmTagDelete,
- IFarmTagDeleteResolve,
- IFarmTagFieldsFilter,
- IFarmTagFindMany,
- IFarmTagFindManyResolve,
- IFarmTagFindOne,
- IFarmTagFindOneResolve,
- IFarmTagUpdate,
+ FarmTag, FarmTagFindManyRel, FarmTagQueryBindValues, IFarmTagCreate, IFarmTagCreateResolve,
+ IFarmTagDelete, IFarmTagDeleteResolve, IFarmTagFieldsFilter, IFarmTagFindMany,
+ IFarmTagFindManyResolve, IFarmTagFindOne, IFarmTagFindOneResolve, IFarmTagUpdate,
IFarmTagUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = FarmTagQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +105,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IFarmTagUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +123,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +148,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IFarmTagDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +166,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &FarmTagFindManyRel) -> String {
diff --git a/tangle-db/src/models/gcs_location.rs b/tangle-db/src/models/gcs_location.rs
@@ -1,20 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::gcs_location::{
- GcsLocation,
- GcsLocationFindManyRel,
- GcsLocationQueryBindValues,
- IGcsLocationCreate,
- IGcsLocationCreateResolve,
- IGcsLocationDelete,
- IGcsLocationDeleteResolve,
- IGcsLocationFieldsFilter,
- IGcsLocationFindMany,
- IGcsLocationFindManyResolve,
- IGcsLocationFindOne,
- IGcsLocationFindOneResolve,
- IGcsLocationUpdate,
- IGcsLocationUpdateResolve,
+ GcsLocation, GcsLocationFindManyRel, GcsLocationQueryBindValues, IGcsLocationCreate,
+ IGcsLocationCreateResolve, IGcsLocationDelete, IGcsLocationDeleteResolve,
+ IGcsLocationFieldsFilter, IGcsLocationFindMany, IGcsLocationFindManyResolve,
+ IGcsLocationFindOne, IGcsLocationFindOneResolve, IGcsLocationUpdate, IGcsLocationUpdateResolve,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = GcsLocationQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -155,7 +145,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IGcsLocationUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -171,12 +163,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -192,13 +188,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IGcsLocationDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -208,13 +206,19 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &GcsLocationFindManyRel) -> String {
match rel {
- GcsLocationFindManyRel::OnTradeProduct(args) => format!("on_trade_product:{}", args.id.as_str()),
- GcsLocationFindManyRel::OffTradeProduct(args) => format!("off_trade_product:{}", args.id.as_str()),
+ GcsLocationFindManyRel::OnTradeProduct(args) => {
+ format!("on_trade_product:{}", args.id.as_str())
+ }
+ GcsLocationFindManyRel::OffTradeProduct(args) => {
+ format!("off_trade_product:{}", args.id.as_str())
+ }
GcsLocationFindManyRel::OnFarm(args) => format!("on_farm:{}", args.id.as_str()),
GcsLocationFindManyRel::OffFarm(args) => format!("off_farm:{}", args.id.as_str()),
GcsLocationFindManyRel::OnPlot(args) => format!("on_plot:{}", args.id.as_str()),
diff --git a/tangle-db/src/models/log_error.rs b/tangle-db/src/models/log_error.rs
@@ -1,20 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::log_error::{
- ILogErrorCreate,
- ILogErrorCreateResolve,
- ILogErrorDelete,
- ILogErrorDeleteResolve,
- ILogErrorFieldsFilter,
- ILogErrorFindMany,
- ILogErrorFindManyResolve,
- ILogErrorFindOne,
- ILogErrorFindOneResolve,
- ILogErrorUpdate,
- ILogErrorUpdateResolve,
- LogError,
- LogErrorFindManyRel,
- LogErrorQueryBindValues,
+ ILogErrorCreate, ILogErrorCreateResolve, ILogErrorDelete, ILogErrorDeleteResolve,
+ ILogErrorFieldsFilter, ILogErrorFindMany, ILogErrorFindManyResolve, ILogErrorFindOne,
+ ILogErrorFindOneResolve, ILogErrorUpdate, ILogErrorUpdateResolve, LogError,
+ LogErrorFindManyRel, LogErrorQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = LogErrorQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +105,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<ILogErrorUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +123,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +148,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
ILogErrorDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +166,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &LogErrorFindManyRel) -> String {
diff --git a/tangle-db/src/models/media_image.rs b/tangle-db/src/models/media_image.rs
@@ -1,20 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::media_image::{
- IMediaImageCreate,
- IMediaImageCreateResolve,
- IMediaImageDelete,
- IMediaImageDeleteResolve,
- IMediaImageFieldsFilter,
- IMediaImageFindMany,
- IMediaImageFindManyResolve,
- IMediaImageFindOne,
- IMediaImageFindOneResolve,
- IMediaImageUpdate,
- IMediaImageUpdateResolve,
- MediaImage,
- MediaImageFindManyRel,
- MediaImageQueryBindValues,
+ IMediaImageCreate, IMediaImageCreateResolve, IMediaImageDelete, IMediaImageDeleteResolve,
+ IMediaImageFieldsFilter, IMediaImageFindMany, IMediaImageFindManyResolve, IMediaImageFindOne,
+ IMediaImageFindOneResolve, IMediaImageUpdate, IMediaImageUpdateResolve, MediaImage,
+ MediaImageFindManyRel, MediaImageQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = MediaImageQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -139,7 +129,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IMediaImageUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -155,12 +147,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -176,13 +172,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IMediaImageDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -192,12 +190,18 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &MediaImageFindManyRel) -> String {
match rel {
- MediaImageFindManyRel::OnTradeProduct(args) => format!("on_trade_product:{}", args.id.as_str()),
- MediaImageFindManyRel::OffTradeProduct(args) => format!("off_trade_product:{}", args.id.as_str()),
+ MediaImageFindManyRel::OnTradeProduct(args) => {
+ format!("on_trade_product:{}", args.id.as_str())
+ }
+ MediaImageFindManyRel::OffTradeProduct(args) => {
+ format!("off_trade_product:{}", args.id.as_str())
+ }
}
}
diff --git a/tangle-db/src/models/nostr_event_state.rs b/tangle-db/src/models/nostr_event_state.rs
@@ -1,20 +1,11 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::nostr_event_state::{
- INostrEventStateCreate,
- INostrEventStateCreateResolve,
- INostrEventStateDelete,
- INostrEventStateDeleteResolve,
- INostrEventStateFieldsFilter,
- INostrEventStateFindMany,
- INostrEventStateFindManyResolve,
- INostrEventStateFindOne,
- INostrEventStateFindOneResolve,
- INostrEventStateUpdate,
- INostrEventStateUpdateResolve,
- NostrEventState,
- NostrEventStateFindManyRel,
- NostrEventStateQueryBindValues,
+ INostrEventStateCreate, INostrEventStateCreateResolve, INostrEventStateDelete,
+ INostrEventStateDeleteResolve, INostrEventStateFieldsFilter, INostrEventStateFindMany,
+ INostrEventStateFindManyResolve, INostrEventStateFindOne, INostrEventStateFindOneResolve,
+ INostrEventStateUpdate, INostrEventStateUpdateResolve, NostrEventState,
+ NostrEventStateFindManyRel, NostrEventStateQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = NostrEventStateQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +106,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<INostrEventStateUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +124,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +149,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
INostrEventStateDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +167,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &NostrEventStateFindManyRel) -> String {
diff --git a/tangle-db/src/models/nostr_profile.rs b/tangle-db/src/models/nostr_profile.rs
@@ -1,19 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::nostr_profile::{
- INostrProfileCreate,
- INostrProfileCreateResolve,
- INostrProfileDelete,
- INostrProfileDeleteResolve,
- INostrProfileFieldsFilter,
- INostrProfileFindMany,
- INostrProfileFindManyResolve,
- INostrProfileFindOne,
- INostrProfileFindOneResolve,
- INostrProfileUpdate,
- INostrProfileUpdateResolve,
- NostrProfile,
- NostrProfileFindManyRel,
+ INostrProfileCreate, INostrProfileCreateResolve, INostrProfileDelete,
+ INostrProfileDeleteResolve, INostrProfileFieldsFilter, INostrProfileFindMany,
+ INostrProfileFindManyResolve, INostrProfileFindOne, INostrProfileFindOneResolve,
+ INostrProfileUpdate, INostrProfileUpdateResolve, NostrProfile, NostrProfileFindManyRel,
NostrProfileQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = NostrProfileQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -139,7 +130,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<INostrProfileUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -155,12 +148,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -176,13 +173,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
INostrProfileDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -192,7 +191,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &NostrProfileFindManyRel) -> String {
diff --git a/tangle-db/src/models/nostr_profile_relay.rs b/tangle-db/src/models/nostr_profile_relay.rs
@@ -1,8 +1,7 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::nostr_profile_relay::{
- INostrProfileRelayRelation,
- INostrProfileRelayResolve,
+ INostrProfileRelayRelation, INostrProfileRelayResolve,
};
use radroots_types::types::{IError, IResultPass};
use serde_json::Value;
@@ -18,7 +17,10 @@ pub fn set<E: SqlExecutor>(
query_vals.push(nostr_profile_value);
let (nostr_relay_column, nostr_relay_value) = opts.nostr_relay.to_filter_param();
query_vals.push(nostr_relay_value);
- let query = format!("INSERT INTO {} (tb_pr, tb_rl) VALUES ((SELECT id FROM nostr_profile WHERE {} = ?), (SELECT id FROM nostr_relay WHERE {} = ?));", TABLE_NAME, nostr_profile_column, nostr_relay_column);
+ let query = format!(
+ "INSERT INTO {} (tb_pr, tb_rl) VALUES ((SELECT id FROM nostr_profile WHERE {} = ?), (SELECT id FROM nostr_relay WHERE {} = ?));",
+ TABLE_NAME, nostr_profile_column, nostr_relay_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
@@ -33,7 +35,10 @@ pub fn unset<E: SqlExecutor>(
query_vals.push(nostr_profile_value);
let (nostr_relay_column, nostr_relay_value) = opts.nostr_relay.to_filter_param();
query_vals.push(nostr_relay_value);
- let query = format!("DELETE FROM {} WHERE tb_pr = (SELECT id FROM nostr_profile WHERE {} = ?) AND tb_rl = (SELECT id FROM nostr_relay WHERE {} = ?);", TABLE_NAME, nostr_profile_column, nostr_relay_column);
+ let query = format!(
+ "DELETE FROM {} WHERE tb_pr = (SELECT id FROM nostr_profile WHERE {} = ?) AND tb_rl = (SELECT id FROM nostr_relay WHERE {} = ?);",
+ TABLE_NAME, nostr_profile_column, nostr_relay_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
diff --git a/tangle-db/src/models/nostr_relay.rs b/tangle-db/src/models/nostr_relay.rs
@@ -1,20 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::nostr_relay::{
- INostrRelayCreate,
- INostrRelayCreateResolve,
- INostrRelayDelete,
- INostrRelayDeleteResolve,
- INostrRelayFieldsFilter,
- INostrRelayFindMany,
- INostrRelayFindManyResolve,
- INostrRelayFindOne,
- INostrRelayFindOneResolve,
- INostrRelayUpdate,
- INostrRelayUpdateResolve,
- NostrRelay,
- NostrRelayFindManyRel,
- NostrRelayQueryBindValues,
+ INostrRelayCreate, INostrRelayCreateResolve, INostrRelayDelete, INostrRelayDeleteResolve,
+ INostrRelayFieldsFilter, INostrRelayFindMany, INostrRelayFindManyResolve, INostrRelayFindOne,
+ INostrRelayFindOneResolve, INostrRelayUpdate, INostrRelayUpdateResolve, NostrRelay,
+ NostrRelayFindManyRel, NostrRelayQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = NostrRelayQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -139,7 +129,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<INostrRelayUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -155,12 +147,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -176,13 +172,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
INostrRelayDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -192,12 +190,18 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &NostrRelayFindManyRel) -> String {
match rel {
- NostrRelayFindManyRel::OnProfile(args) => format!("on_profile:{}", args.public_key.as_str()),
- NostrRelayFindManyRel::OffProfile(args) => format!("off_profile:{}", args.public_key.as_str()),
+ NostrRelayFindManyRel::OnProfile(args) => {
+ format!("on_profile:{}", args.public_key.as_str())
+ }
+ NostrRelayFindManyRel::OffProfile(args) => {
+ format!("off_profile:{}", args.public_key.as_str())
+ }
}
}
diff --git a/tangle-db/src/models/plot.rs b/tangle-db/src/models/plot.rs
@@ -1,20 +1,9 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::plot::{
- IPlotCreate,
- IPlotCreateResolve,
- IPlotDelete,
- IPlotDeleteResolve,
- IPlotFieldsFilter,
- IPlotFindMany,
- IPlotFindManyResolve,
- IPlotFindOne,
- IPlotFindOneResolve,
- IPlotUpdate,
- IPlotUpdateResolve,
- Plot,
- PlotFindManyRel,
- PlotQueryBindValues,
+ IPlotCreate, IPlotCreateResolve, IPlotDelete, IPlotDeleteResolve, IPlotFieldsFilter,
+ IPlotFindMany, IPlotFindManyResolve, IPlotFindOne, IPlotFindOneResolve, IPlotUpdate,
+ IPlotUpdateResolve, Plot, PlotFindManyRel, PlotQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +26,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = PlotQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +104,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IPlotUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +122,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +147,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IPlotDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +165,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &PlotFindManyRel) -> String {
diff --git a/tangle-db/src/models/plot_gcs_location.rs b/tangle-db/src/models/plot_gcs_location.rs
@@ -1,20 +1,11 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::plot_gcs_location::{
- IPlotGcsLocationCreate,
- IPlotGcsLocationCreateResolve,
- IPlotGcsLocationDelete,
- IPlotGcsLocationDeleteResolve,
- IPlotGcsLocationFieldsFilter,
- IPlotGcsLocationFindMany,
- IPlotGcsLocationFindManyResolve,
- IPlotGcsLocationFindOne,
- IPlotGcsLocationFindOneResolve,
- IPlotGcsLocationUpdate,
- IPlotGcsLocationUpdateResolve,
- PlotGcsLocation,
- PlotGcsLocationFindManyRel,
- PlotGcsLocationQueryBindValues,
+ IPlotGcsLocationCreate, IPlotGcsLocationCreateResolve, IPlotGcsLocationDelete,
+ IPlotGcsLocationDeleteResolve, IPlotGcsLocationFieldsFilter, IPlotGcsLocationFindMany,
+ IPlotGcsLocationFindManyResolve, IPlotGcsLocationFindOne, IPlotGcsLocationFindOneResolve,
+ IPlotGcsLocationUpdate, IPlotGcsLocationUpdateResolve, PlotGcsLocation,
+ PlotGcsLocationFindManyRel, PlotGcsLocationQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
use serde_json::Value;
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = PlotGcsLocationQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +106,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IPlotGcsLocationUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +124,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +149,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IPlotGcsLocationDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +167,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &PlotGcsLocationFindManyRel) -> String {
diff --git a/tangle-db/src/models/plot_tag.rs b/tangle-db/src/models/plot_tag.rs
@@ -1,19 +1,9 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::plot_tag::{
- IPlotTagCreate,
- IPlotTagCreateResolve,
- IPlotTagDelete,
- IPlotTagDeleteResolve,
- IPlotTagFieldsFilter,
- IPlotTagFindMany,
- IPlotTagFindManyResolve,
- IPlotTagFindOne,
- IPlotTagFindOneResolve,
- IPlotTagUpdate,
- IPlotTagUpdateResolve,
- PlotTag,
- PlotTagFindManyRel,
+ IPlotTagCreate, IPlotTagCreateResolve, IPlotTagDelete, IPlotTagDeleteResolve,
+ IPlotTagFieldsFilter, IPlotTagFindMany, IPlotTagFindManyResolve, IPlotTagFindOne,
+ IPlotTagFindOneResolve, IPlotTagUpdate, IPlotTagUpdateResolve, PlotTag, PlotTagFindManyRel,
PlotTagQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
@@ -37,8 +27,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = PlotTagQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +105,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<IPlotTagUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +123,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +148,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
IPlotTagDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +166,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &PlotTagFindManyRel) -> String {
diff --git a/tangle-db/src/models/trade_product.rs b/tangle-db/src/models/trade_product.rs
@@ -1,19 +1,10 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::trade_product::{
- ITradeProductCreate,
- ITradeProductCreateResolve,
- ITradeProductDelete,
- ITradeProductDeleteResolve,
- ITradeProductFieldsFilter,
- ITradeProductFindMany,
- ITradeProductFindManyResolve,
- ITradeProductFindOne,
- ITradeProductFindOneResolve,
- ITradeProductUpdate,
- ITradeProductUpdateResolve,
- TradeProduct,
- TradeProductFindManyRel,
+ ITradeProductCreate, ITradeProductCreateResolve, ITradeProductDelete,
+ ITradeProductDeleteResolve, ITradeProductFieldsFilter, ITradeProductFindMany,
+ ITradeProductFindManyResolve, ITradeProductFindOne, ITradeProductFindOneResolve,
+ ITradeProductUpdate, ITradeProductUpdateResolve, TradeProduct, TradeProductFindManyRel,
TradeProductQueryBindValues,
};
use radroots_types::types::{IError, IResult, IResultList};
@@ -37,8 +28,8 @@ pub fn create<E: SqlExecutor>(
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let on = TradeProductQueryBindValues::Id { id: id.clone() };
- let result = find_one_by_on(exec, &on)?
- .ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
+ let result =
+ find_one_by_on(exec, &on)?.ok_or_else(|| IError::from(SqlError::NotFound(id.clone())))?;
Ok(IResult { result })
}
@@ -115,7 +106,9 @@ pub fn update<E: SqlExecutor>(
) -> Result<ITradeProductUpdateResolve, IError<SqlError>> {
let mut updates = utils::to_partial_object_map(&opts.fields)?;
if updates.is_empty() {
- return Err(IError::from(SqlError::InvalidArgument(String::from("no fields to update"))));
+ return Err(IError::from(SqlError::InvalidArgument(String::from(
+ "no fields to update",
+ ))));
}
updates.insert(
String::from("updated_at"),
@@ -131,12 +124,16 @@ pub fn update<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &opts.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(opts.on.lookup_key())))?;
model.id
}
};
bind_values.push(Value::from(id_for_lookup.clone()));
- let sql = format!("UPDATE {TABLE_NAME} SET {} WHERE id = ?;", set_parts.join(", "));
+ let sql = format!(
+ "UPDATE {TABLE_NAME} SET {} WHERE id = ?;",
+ set_parts.join(", ")
+ );
let params_json = utils::to_params_json(bind_values)?;
let _ = exec.exec(&sql, ¶ms_json)?;
let updated = select_by_id(exec, &id_for_lookup)?;
@@ -152,13 +149,15 @@ pub fn delete<E: SqlExecutor>(
Some(id) => id,
None => {
let found = find_one_by_on(exec, &args.on)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(args.on.lookup_key())))?;
model.id
}
},
ITradeProductDelete::Rel(args) => {
let found = find_one_by_rel(exec, &args.rel)?;
- let model = found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
+ let model =
+ found.ok_or_else(|| IError::from(SqlError::NotFound(rel_lookup_key(&args.rel))))?;
model.id
}
};
@@ -168,7 +167,9 @@ pub fn delete<E: SqlExecutor>(
if outcome.changes == 0 {
return Err(IError::from(SqlError::NotFound(id_for_lookup.clone())));
}
- Ok(IResult { result: id_for_lookup })
+ Ok(IResult {
+ result: id_for_lookup,
+ })
}
fn rel_lookup_key(rel: &TradeProductFindManyRel) -> String {
diff --git a/tangle-db/src/models/trade_product_location.rs b/tangle-db/src/models/trade_product_location.rs
@@ -1,8 +1,7 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::trade_product_location::{
- ITradeProductLocationRelation,
- ITradeProductLocationResolve,
+ ITradeProductLocationRelation, ITradeProductLocationResolve,
};
use radroots_types::types::{IError, IResultPass};
use serde_json::Value;
@@ -18,7 +17,10 @@ pub fn set<E: SqlExecutor>(
query_vals.push(trade_product_value);
let (gcs_location_column, gcs_location_value) = opts.gcs_location.to_filter_param();
query_vals.push(gcs_location_value);
- let query = format!("INSERT INTO {} (tb_tp, tb_gl) VALUES ((SELECT id FROM trade_product WHERE {} = ?), (SELECT id FROM gcs_location WHERE {} = ?));", TABLE_NAME, trade_product_column, gcs_location_column);
+ let query = format!(
+ "INSERT INTO {} (tb_tp, tb_gl) VALUES ((SELECT id FROM trade_product WHERE {} = ?), (SELECT id FROM gcs_location WHERE {} = ?));",
+ TABLE_NAME, trade_product_column, gcs_location_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
@@ -33,7 +35,10 @@ pub fn unset<E: SqlExecutor>(
query_vals.push(trade_product_value);
let (gcs_location_column, gcs_location_value) = opts.gcs_location.to_filter_param();
query_vals.push(gcs_location_value);
- let query = format!("DELETE FROM {} WHERE tb_tp = (SELECT id FROM trade_product WHERE {} = ?) AND tb_gl = (SELECT id FROM gcs_location WHERE {} = ?);", TABLE_NAME, trade_product_column, gcs_location_column);
+ let query = format!(
+ "DELETE FROM {} WHERE tb_tp = (SELECT id FROM trade_product WHERE {} = ?) AND tb_gl = (SELECT id FROM gcs_location WHERE {} = ?);",
+ TABLE_NAME, trade_product_column, gcs_location_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
diff --git a/tangle-db/src/models/trade_product_media.rs b/tangle-db/src/models/trade_product_media.rs
@@ -1,8 +1,7 @@
use radroots_sql_core::error::SqlError;
use radroots_sql_core::{SqlExecutor, utils};
use radroots_tangle_db_schema::trade_product_media::{
- ITradeProductMediaRelation,
- ITradeProductMediaResolve,
+ ITradeProductMediaRelation, ITradeProductMediaResolve,
};
use radroots_types::types::{IError, IResultPass};
use serde_json::Value;
@@ -18,7 +17,10 @@ pub fn set<E: SqlExecutor>(
query_vals.push(trade_product_value);
let (media_image_column, media_image_value) = opts.media_image.to_filter_param();
query_vals.push(media_image_value);
- let query = format!("INSERT INTO {} (tb_tp, tb_mu) VALUES ((SELECT id FROM trade_product WHERE {} = ?), (SELECT id FROM media_image WHERE {} = ?));", TABLE_NAME, trade_product_column, media_image_column);
+ let query = format!(
+ "INSERT INTO {} (tb_tp, tb_mu) VALUES ((SELECT id FROM trade_product WHERE {} = ?), (SELECT id FROM media_image WHERE {} = ?));",
+ TABLE_NAME, trade_product_column, media_image_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
@@ -33,7 +35,10 @@ pub fn unset<E: SqlExecutor>(
query_vals.push(trade_product_value);
let (media_image_column, media_image_value) = opts.media_image.to_filter_param();
query_vals.push(media_image_value);
- let query = format!("DELETE FROM {} WHERE tb_tp = (SELECT id FROM trade_product WHERE {} = ?) AND tb_mu = (SELECT id FROM media_image WHERE {} = ?);", TABLE_NAME, trade_product_column, media_image_column);
+ let query = format!(
+ "DELETE FROM {} WHERE tb_tp = (SELECT id FROM trade_product WHERE {} = ?) AND tb_mu = (SELECT id FROM media_image WHERE {} = ?);",
+ TABLE_NAME, trade_product_column, media_image_column
+ );
let params_json = utils::to_params_json(query_vals)?;
let _ = exec.exec(&query, ¶ms_json)?;
Ok(IResultPass { pass: true })
