Add sqlx queries

LetrixZ · Jul 20, 2024 · e213736 · e213736
1 parent 86a305c
commit e213736
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 4 deletions.
diff --git a/server/.sqlx/query-0aedf1b48cca32154a947752c156735fc57b3c22d7381e65b205d50f92fcceab.json b/server/.sqlx/query-0aedf1b48cca32154a947752c156735fc57b3c22d7381e65b205d50f92fcceab.json
diff --git a/server/.sqlx/query-1990f6932114cc5dcb5a33d9759818ff6ff80d699a13054511cb3605920149af.json b/server/.sqlx/query-1990f6932114cc5dcb5a33d9759818ff6ff80d699a13054511cb3605920149af.json
diff --git a/server/.sqlx/query-42f5397cba5ba7ab925f5688b5de7c4431789e5ed8e923b2dfe04464106f3fb6.json b/server/.sqlx/query-42f5397cba5ba7ab925f5688b5de7c4431789e5ed8e923b2dfe04464106f3fb6.json
diff --git a/server/.sqlx/query-9880c3dbfe4c2a7c978c050505c2bea548dab97f5e38f7cf00a72bf9e65bb30c.json b/server/.sqlx/query-9880c3dbfe4c2a7c978c050505c2bea548dab97f5e38f7cf00a72bf9e65bb30c.json
diff --git a/server/.sqlx/query-9acf9b3cfff911b91ad03b43de5962cdf4fd09d2df785f2c0201b73e82f636f8.json b/server/.sqlx/query-9acf9b3cfff911b91ad03b43de5962cdf4fd09d2df785f2c0201b73e82f636f8.json
diff --git a/server/.sqlx/query-bdf0b652525383e2553ffe455722881d8b3f62e8260be695137420b44c8c48c7.json b/server/.sqlx/query-bdf0b652525383e2553ffe455722881d8b3f62e8260be695137420b44c8c48c7.json
diff --git a/server/.sqlx/query-ed7684059c078407f193275544d3ea89ec15910d8ab42574a0e3868443abd5ec.json b/server/.sqlx/query-ed7684059c078407f193275544d3ea89ec15910d8ab42574a0e3868443abd5ec.json
diff --git a/server/src/api/routes.rs b/server/src/api/routes.rs
@@ -5,7 +5,7 @@ use super::{
 use crate::db;
 use anyhow::anyhow;
 use axum::extract::{Path, Query, State};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use std::{collections::HashMap, fmt::Display, str::FromStr};
 use tokio::sync::oneshot;
 
@@ -210,7 +210,7 @@ pub async fn taxonomy(State(state): State<AppState>) -> Result<ApiJson<TaxonomyT
 
   let events = sqlx::query!("SELECT COALESCE(json_agg(json_build_object('id', id, 'name', name, 'slug', slug) ORDER BY name), '[]') events FROM events")
     .fetch_one(&state.pool)
-    .await?;  
+    .await?;
 
   let publishers = sqlx::query!("SELECT COALESCE(json_agg(json_build_object('id', id, 'name', name, 'slug', slug) ORDER BY name), '[]') publishers FROM publishers")
     .fetch_one(&state.pool)

diff --git a/server/src/db.rs b/server/src/db.rs
@@ -587,8 +587,8 @@ fn add_tag_matches(qb: &mut QueryBuilder<Postgres>, value: &str, blacklist: &[St
   }
 
   for taxonomy in blacklist {
-    let splits = &taxonomy.split(":").collect::<Vec<&str>>();
-    let namespace = splits.get(0);
+    let splits = &taxonomy.split(':').collect::<Vec<&str>>();
+    let namespace = splits.first();
     let taxonomy_id = splits.get(1).and_then(|s| s.parse::<i64>().ok());
 
     if let (Some(namespace), Some(id)) = (namespace, taxonomy_id) {