Skip to content

Commit 2e9c5c1

Browse files
committed
Fix queries
1 parent 20768fc commit 2e9c5c1

8 files changed

+32
-41
lines changed

backend/.sqlx/query-26abe9cf7c590f81b305e168333fe5fa5a93aec03010db69dbfbb5c9be49a0c3.json renamed to backend/.sqlx/query-2944ce84e579bbb1f476abb94fcf236e7c4f919bded1d1b75acf76dd12f63e2c.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/.sqlx/query-b3b30438277f0b00bd5616c3b55b8b1f7290e4c0d0636bb467fcd07aab9af223.json renamed to backend/.sqlx/query-6c813c718b37d3555483f9178f40b9ec9761af58f7d590f684d4b8176e91d9ca.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/.sqlx/query-edf2424933f6602d625da67d22e5315a63830e1d5c87c99b95699f216fd0b9bf.json renamed to backend/.sqlx/query-7d238b6a9b5ea4ab816c5e877042ddcf1045a099ae24141b67dd27c27fab0765.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/.sqlx/query-83496912a4bc2c5f97870f2455da95e0eaa90d66b016da8ea351f017555d5adc.json renamed to backend/.sqlx/query-d044e56b3ac13e32e071d4483d76b33c89742055f38114a34d5d25a9aa12b5e7.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Cargo.lock

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "signal"]
2121
tower-http = { version = "0.6.1", features = ["cors", "fs", "trace"] }
2222
tracing = "0.1.40"
2323
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
24-
uuid = { version = "1.8.0", features = ["serde"] }
2524
validator = { version = "0.20.0", features = ["derive"] }

backend/src/dto.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use serde::{Deserialize, Serialize};
2-
use sqlx::types::{time::OffsetDateTime, uuid::Uuid};
2+
use sqlx::types::time::OffsetDateTime;
33

44
#[derive(Debug, Deserialize)]
55
#[serde(rename_all = "kebab-case")]
@@ -15,7 +15,7 @@ pub struct ProjectPreview {
1515
pub id: String,
1616
pub name: String,
1717
pub preview: String,
18-
pub thumbnail_id: Uuid,
18+
pub thumbnail_id: String,
1919
#[serde(with = "time::serde::rfc3339")]
2020
pub date_posted: OffsetDateTime,
2121
}
@@ -25,7 +25,7 @@ pub struct ProjectPreview {
2525
pub struct Project {
2626
pub id: String,
2727
pub name: String,
28-
pub thumbnail_id: Uuid,
28+
pub thumbnail_id: String,
2929
pub project_url: Option<String>,
3030
#[serde(with = "time::serde::rfc3339")]
3131
pub date_posted: OffsetDateTime,

backend/src/repository.rs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
use sqlx::{
2-
query, query_as,
3-
types::{time::OffsetDateTime, uuid::Uuid},
4-
SqlitePool,
5-
};
1+
use sqlx::{query, query_as, SqlitePool};
62

73
use crate::{
84
dto::{Project, ProjectIndex, ProjectPreview},
@@ -33,7 +29,7 @@ impl ProjectRepository {
3329
let mut previews = query_as!(
3430
ProjectPreview,
3531
r#"
36-
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: Uuid", date_posted AS "date_posted: OffsetDateTime"
32+
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: _", date_posted AS "date_posted: _"
3733
FROM projects
3834
WHERE NOT deleted AND (date_posted, id) > (?1, ?2)
3935
ORDER BY date_posted, id
@@ -43,8 +39,8 @@ LIMIT ?3;
4339
index.id,
4440
limit,
4541
)
46-
.fetch_all(&mut *transaction)
47-
.await?;
42+
.fetch_all(&mut *transaction)
43+
.await?;
4844

4945
let has_previous = previews.len() as i64 == items + 1;
5046
let has_next = !previews.is_empty()
@@ -78,7 +74,7 @@ LIMIT ?3;
7874
let mut previews = query_as!(
7975
ProjectPreview,
8076
r#"
81-
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: Uuid", date_posted AS "date_posted: OffsetDateTime"
77+
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: _", date_posted AS "date_posted: _"
8278
FROM projects
8379
WHERE NOT deleted AND (date_posted, id) < (?1, ?2)
8480
ORDER BY date_posted, id DESC
@@ -88,8 +84,8 @@ LIMIT ?3;
8884
index.id,
8985
limit,
9086
)
91-
.fetch_all(&mut *transaction)
92-
.await?;
87+
.fetch_all(&mut *transaction)
88+
.await?;
9389

9490
let has_previous = !previews.is_empty()
9591
&& query!(
@@ -119,16 +115,16 @@ LIMIT ?3;
119115
let mut previews = query_as!(
120116
ProjectPreview,
121117
r#"
122-
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: Uuid", date_posted AS "date_posted: OffsetDateTime"
118+
SELECT id, name, preview, thumbnail_id AS "thumbnail_id: _", date_posted AS "date_posted: _"
123119
FROM projects
124120
WHERE NOT deleted
125121
ORDER BY date_posted, id DESC
126122
LIMIT ?1;
127123
"#,
128124
limit,
129125
)
130-
.fetch_all(&self.pool)
131-
.await?;
126+
.fetch_all(&self.pool)
127+
.await?;
132128

133129
let has_next = previews.len() as i64 == items + 1;
134130

@@ -151,14 +147,14 @@ LIMIT ?1;
151147
let project = query_as!(
152148
Project,
153149
r#"
154-
SELECT id, name, thumbnail_id AS "thumbnail_id: Uuid", project_url, date_posted AS "date_posted: OffsetDateTime"
150+
SELECT id, name, thumbnail_id AS "thumbnail_id: _", project_url, date_posted AS "date_posted: _"
155151
FROM projects
156152
WHERE NOT deleted AND id = ?1;
157153
"#,
158154
id
159155
)
160-
.fetch_optional(&self.pool)
161-
.await?;
156+
.fetch_optional(&self.pool)
157+
.await?;
162158

163159
Ok(project)
164160
}

0 commit comments

Comments
 (0)