From cb4e5ec344df39bbc1d0fe8f0dea7cd337115910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20Kaan=20G=C3=9CM=C3=9C=C5=9E?=
 <96421894+Tahinli@users.noreply.github.com>
Date: Fri, 6 Dec 2024 02:04:48 +0300
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20read=20all=20users=20for=20?=
 =?UTF-8?q?a=20role=20feat:=20=E2=9C=A8=20better=20reapply=20database=20mi?=
 =?UTF-8?q?gration=20compatibility=20refactor:=20=E2=99=BB=EF=B8=8F=20bett?=
 =?UTF-8?q?er=20naming=20for=20some=20functions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20241204225128_create_role_table.up.sql   |  6 ++---
 src/database/comment.rs                       |  4 +--
 src/database/comment_interaction.rs           |  4 +--
 src/database/post.rs                          |  6 ++---
 src/database/post_interaction.rs              |  4 +--
 src/database/user.rs                          | 26 +++++++++++++++++++
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/migrations/20241204225128_create_role_table.up.sql b/migrations/20241204225128_create_role_table.up.sql
index e33fee9..a6e7d53 100644
--- a/migrations/20241204225128_create_role_table.up.sql
+++ b/migrations/20241204225128_create_role_table.up.sql
@@ -4,6 +4,6 @@ CREATE TABLE IF NOT EXISTS "role"(
     name VARCHAR(16) NOT NULL UNIQUE
 );
 
-INSERT INTO "role"(id, name) VALUES (0, 'Ahmet Kaan Gümüş');
-INSERT INTO "role"(id, name) VALUES (1, 'Founder');
-INSERT INTO "role"(id, name) VALUES (2, 'Normal');
+INSERT INTO "role"(id, name) VALUES (0, 'Ahmet Kaan Gümüş') ON CONFLICT(id) DO UPDATE SET "name" = 'Ahmet Kaan Gümüş';
+INSERT INTO "role"(id, name) VALUES (1, 'Founder') ON CONFLICT(id) DO UPDATE SET "name" = 'Founder';
+INSERT INTO "role"(id, name) VALUES (2, 'Normal') ON CONFLICT(id) DO UPDATE SET "name" = 'Normal';
diff --git a/src/database/comment.rs b/src/database/comment.rs
index 48654a0..5f52ec4 100644
--- a/src/database/comment.rs
+++ b/src/database/comment.rs
@@ -73,7 +73,7 @@ pub async fn delete(
     .await
 }
 
-pub async fn read_all(
+pub async fn read_all_for_post(
     post_creation_time: DateTime<Utc>,
     database_connection: &Pool<Postgres>,
 ) -> Result<Vec<Comment>, sqlx::Error> {
@@ -86,4 +86,4 @@ pub async fn read_all(
     )
     .fetch_all(database_connection)
     .await
-}
\ No newline at end of file
+}
diff --git a/src/database/comment_interaction.rs b/src/database/comment_interaction.rs
index e0f00e4..a2559c6 100644
--- a/src/database/comment_interaction.rs
+++ b/src/database/comment_interaction.rs
@@ -73,7 +73,7 @@ pub async fn delete(
     .await
 }
 
-pub async fn read_all(
+pub async fn read_all_for_comment(
     comment_creation_time: &DateTime<Utc>,
     database_connection: &Pool<Postgres>,
 ) -> Result<Vec<CommentInteraction>, sqlx::Error> {
@@ -86,4 +86,4 @@ pub async fn read_all(
     )
     .fetch_all(database_connection)
     .await
-}
\ No newline at end of file
+}
diff --git a/src/database/post.rs b/src/database/post.rs
index 0200f0e..416d1e4 100644
--- a/src/database/post.rs
+++ b/src/database/post.rs
@@ -73,9 +73,7 @@ pub async fn delete(
     .await
 }
 
-pub async fn read_all(
-    database_connection: &Pool<Postgres>,
-) -> Result<Vec<Post>, sqlx::Error> {
+pub async fn read_all(database_connection: &Pool<Postgres>) -> Result<Vec<Post>, sqlx::Error> {
     sqlx::query_as!(
         Post,
         r#"
@@ -99,4 +97,4 @@ pub async fn read_all_for_user(
     )
     .fetch_all(database_connection)
     .await
-}
\ No newline at end of file
+}
diff --git a/src/database/post_interaction.rs b/src/database/post_interaction.rs
index b2e08a0..aacf0f5 100644
--- a/src/database/post_interaction.rs
+++ b/src/database/post_interaction.rs
@@ -73,7 +73,7 @@ pub async fn delete(
     .await
 }
 
-pub async fn read_all(
+pub async fn read_all_for_post(
     post_creation_time: &DateTime<Utc>,
     database_connection: &Pool<Postgres>,
 ) -> Result<Vec<PostInteraction>, sqlx::Error> {
@@ -86,4 +86,4 @@ pub async fn read_all(
     )
     .fetch_all(database_connection)
     .await
-}
\ No newline at end of file
+}
diff --git a/src/database/user.rs b/src/database/user.rs
index a92efc7..e4ac816 100644
--- a/src/database/user.rs
+++ b/src/database/user.rs
@@ -73,3 +73,29 @@ pub async fn delete(id: i64, database_connection: &Pool<Postgres>) -> Result<Use
     .fetch_one(database_connection)
     .await
 }
+
+pub async fn read_all(database_connection: &Pool<Postgres>) -> Result<Vec<User>, sqlx::Error> {
+    sqlx::query_as!(
+        User,
+        r#"
+            SELECT * FROM "user"
+        "#,
+    )
+    .fetch_all(database_connection)
+    .await
+}
+
+pub async fn read_all_for_role(
+    role_id: i64,
+    database_connection: &Pool<Postgres>,
+) -> Result<Vec<User>, sqlx::Error> {
+    sqlx::query_as!(
+        User,
+        r#"
+            SELECT * FROM "user" WHERE "role_id" = $1
+        "#,
+        role_id
+    )
+    .fetch_all(database_connection)
+    .await
+}