diff --git a/backend/public/src/datasources/authors.rs b/backend/public/src/datasources/authors.rs index 1ce5939..3a9984d 100644 --- a/backend/public/src/datasources/authors.rs +++ b/backend/public/src/datasources/authors.rs @@ -53,7 +53,7 @@ impl AuthorsDatasource { let posts_query = sqlx::query_as!( Post, - "SELECT p.post_id, a.first_name, a.last_name, p.title, p.body, p.created_at, a.author_id FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.author_id = $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3", + "SELECT p.post_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date, a.author_id FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.author_id = $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3", author_id, pagination.limit, offset, diff --git a/backend/public/src/datasources/posts.rs b/backend/public/src/datasources/posts.rs index e167232..e824eb7 100644 --- a/backend/public/src/datasources/posts.rs +++ b/backend/public/src/datasources/posts.rs @@ -5,7 +5,7 @@ use crate::routes::posts::{Post, PostFeaturedVariant}; pub struct PostsDatasource; impl PostsDatasource { pub async fn get_all(pool: &Pool) -> Result, sqlx::Error> { - sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL ORDER BY p.created_at DESC LIMIT 10") + sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL ORDER BY p.created_at DESC LIMIT 10") .fetch_all(pool) .await } @@ -19,31 +19,31 @@ impl PostsDatasource { .execute(pool) .await; - sqlx::query_as!(PostFeaturedVariant, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.is_featured FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.post_id = $1 ORDER BY p.created_at DESC", post_id) + sqlx::query_as!(PostFeaturedVariant, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date, p.is_featured FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.post_id = $1 ORDER BY p.created_at DESC", post_id) .fetch_one(pool) .await } pub async fn get_recent(pool: &Pool) -> Result, sqlx::Error> { - sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL GROUP BY p.post_id, a.first_name, a.last_name ORDER BY p.created_at DESC LIMIT 3") + sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL GROUP BY p.post_id, a.first_name, a.last_name ORDER BY p.created_at DESC LIMIT 3") .fetch_all(pool) .await } pub async fn get_popular(pool: &Pool) -> Result, sqlx::Error> { - sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id LEFT JOIN comments c ON p.post_id = c.post_id WHERE p.deleted_at IS NULL GROUP BY p.post_id, a.first_name, a.last_name ORDER BY COUNT(c.comment_id) DESC LIMIT 3") + sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id LEFT JOIN comments c ON p.post_id = c.post_id WHERE p.deleted_at IS NULL GROUP BY p.post_id, a.first_name, a.last_name ORDER BY COUNT(c.comment_id) DESC LIMIT 3") .fetch_all(pool) .await } pub async fn get_hot(pool: &Pool) -> Result, sqlx::Error> { - sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL ORDER BY p.view_count DESC LIMIT 3") + sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL ORDER BY p.view_count DESC LIMIT 3") .fetch_all(pool) .await } pub async fn get_featured(pool: &Pool) -> Result, sqlx::Error> { - sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.is_featured IS true GROUP BY p.post_id, a.first_name, a.last_name ORDER BY p.created_at DESC LIMIT 3") + sqlx::query_as!(Post, "SELECT p.post_id, p.author_id, a.first_name, a.last_name, p.title, p.body, p.created_at, p.publish_date FROM posts p LEFT JOIN authors a ON a.author_id = p.author_id WHERE p.deleted_at IS NULL AND p.is_featured IS true GROUP BY p.post_id, a.first_name, a.last_name ORDER BY p.created_at DESC LIMIT 3") .fetch_all(pool) .await } diff --git a/backend/public/src/routes/posts.rs b/backend/public/src/routes/posts.rs index 83a9160..4d9b3b6 100644 --- a/backend/public/src/routes/posts.rs +++ b/backend/public/src/routes/posts.rs @@ -31,6 +31,9 @@ pub struct Post { #[serde(serialize_with = "serialize_datetime")] #[serde(deserialize_with = "deserialize_datetime")] pub created_at: Option>, + #[serde(serialize_with = "serialize_datetime")] + #[serde(deserialize_with = "deserialize_datetime")] + pub publish_date: Option>, } #[derive(sqlx::FromRow, Deserialize, Serialize, Debug, Clone)] @@ -44,6 +47,9 @@ pub struct PostFeaturedVariant { #[serde(serialize_with = "serialize_datetime")] #[serde(deserialize_with = "deserialize_datetime")] pub created_at: Option>, + #[serde(serialize_with = "serialize_datetime")] + #[serde(deserialize_with = "deserialize_datetime")] + pub publish_date: Option>, pub is_featured: Option, } @@ -399,5 +405,3 @@ impl PostsRoute { } } } - - diff --git a/frontend/components/PostCard.tsx b/frontend/components/PostCard.tsx index c63fbf1..e79dc23 100644 --- a/frontend/components/PostCard.tsx +++ b/frontend/components/PostCard.tsx @@ -15,9 +15,9 @@ export const PostCard = function PostCard({ post }: { post: Post }) { > {post.first_name} {post.last_name} {" "} - at {convertUtc(post.created_at)} + at {convertUtc(post.publish_date)}

-

{truncateString(post.body, 30)}

+

{truncateString(post.body, 45)}

); diff --git a/frontend/components/PostHeader.tsx b/frontend/components/PostHeader.tsx index 47bbb2b..010138c 100644 --- a/frontend/components/PostHeader.tsx +++ b/frontend/components/PostHeader.tsx @@ -17,7 +17,7 @@ export const PostHeader = function PostHeader({ post }: PostHeaderOpts) {

by {post.first_name} {post.last_name} posted on{" "} - {convertUtc(post.created_at)} + {convertUtc(post.publish_date)}

diff --git a/frontend/types/index.ts b/frontend/types/index.ts index 329e9ec..1ce38e6 100644 --- a/frontend/types/index.ts +++ b/frontend/types/index.ts @@ -6,6 +6,7 @@ export type Post = { title: string; body: string; created_at: string; + publish_date: string; }; export type Author = {