Merge pull request #14 from inblockio/db_fixes

Db fixes

migrations/2024-12-11-113924_share/up.sql

@@ -1,7 +1,7 @@
 -- Your SQL goes here
 CREATE TABLE IF NOT EXISTS share_data (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-    file_name TEXT NOT NULL,
+    file_id INTEGER NOT NULL,
     identifier TEXT NOT NULL,
     created_time TEXT NOT NULL
 );

src/controllers/api_controller.rs

@@ -1,5 +1,6 @@
 use crate::models::input::{DeleteInput, RevisionInput, UpdateConfigurationInput, WitnessInput};
 use crate::models::page_data::{ApiResponse, PageDataContainer};
+use crate::models::PagesDataTable;
 use crate::models::{file::FileInfo, page_data};
 use crate::util::{
     check_if_page_data_revision_are_okay, check_or_generate_domain, compute_content_hash,
@@ -39,7 +40,7 @@ use futures::{Stream, TryStreamExt};
 use serde::{Deserialize, Serialize};
 extern crate serde_json_path_to_error as serde_json;
 use crate::db::pages_db::{
-    db_data, delete_all_data, delete_all_user_files, delete_page_data,
+    delete_all_data, delete_all_user_files, delete_page_data,
     fetch_all_pages_data_per_user, fetch_page_data, insert_page_data, update_page_data,
 };
 use dotenv::{dotenv, vars};
@@ -560,7 +561,7 @@ pub async fn explorer_aqua_file_upload(
         }
     };
 
-    let db_data_model = db_data {
+    let db_data_model = PagesDataTable {
         id: 0,
         name: file_name,
         extension: content_type,
@@ -836,7 +837,7 @@ pub async fn explorer_file_upload(
         mode = file_mode;
     }
 
-    let db_data_model = db_data {
+    let db_data_model = PagesDataTable {
         id: 0,
         name: file_name,
         extension: content_type,
@@ -888,7 +889,7 @@ pub async fn explorer_sign_revision(
     tracing::debug!("explorer_sign_revision");
 
     // Get the name parameter from the input
-    if input.filename.is_empty() {
+    if input.file_id ==  0 {
         log_data.push("Error : file name is empty".to_string());
         let res: ApiResponse = ApiResponse {
             logs: log_data,
@@ -916,7 +917,7 @@ pub async fn explorer_sign_revision(
     };
 
     // let insert_result = insert_page_data(db_data_model.clone(), & mut conn);
-    let page_data_result = fetch_page_data(input.filename, &mut conn);
+    let page_data_result = fetch_page_data(input.file_id, &mut conn);
 
     if page_data_result.is_err() {
         tracing::error!("Failed not found ",);
@@ -1219,7 +1220,7 @@ pub async fn explorer_delete_file(
     let mut log_data: Vec<String> = Vec::new();
 
     // Get the name parameter from the input
-    if input.filename.is_empty() {
+    if input.file_id == 0 {
         log_data.push("Error : file name is empty".to_string());
         let res: ApiResponse = ApiResponse {
             logs: log_data,
@@ -1250,13 +1251,13 @@ pub async fn explorer_delete_file(
         }
     };
 
-    let result = delete_page_data(input.filename.clone(), &mut conn);
+    let result = delete_page_data(input.file_id, &mut conn);
 
     match result {
         Ok(result_data) => {
             // Check the number of affected rows
             if result_data > 0 {
-                tracing::error!("Successfully deleted the row with name: {}", input.filename);
+                tracing::error!("Successfully deleted the row with name: {}", input.file_id);
                 log_data.push("Error : file data is deleted ".to_string());
                 let res: ApiResponse = ApiResponse {
                     logs: log_data,
@@ -1265,9 +1266,9 @@ pub async fn explorer_delete_file(
                 };
                 return (StatusCode::OK, Json(res));
             } else {
-                tracing::error!("No row found with ID: {}", input.filename);
+                tracing::error!("No row found with ID: {}", input.file_id);
 
-                log_data.push(format!("Error : No row found with name {}", input.filename));
+                log_data.push(format!("Error : No row found with name {}", input.file_id));
                 let res: ApiResponse = ApiResponse {
                     logs: log_data,
                     file: None,
@@ -1297,7 +1298,7 @@ pub async fn explorer_witness_file(
     let mut log_data: Vec<String> = Vec::new();
 
     // Get the name parameter from the input
-    if input.filename.is_empty() {
+    if input.file_id == 0 {
         log_data.push("Error : file name is empty".to_string());
         let res: ApiResponse = ApiResponse {
             logs: log_data,
@@ -1336,7 +1337,7 @@ pub async fn explorer_witness_file(
         }
     };
 
-    let page_data_result = fetch_page_data(input.filename.clone(), &mut conn);
+    let page_data_result = fetch_page_data(input.file_id, &mut conn);
 
     if page_data_result.is_err() {
         tracing::error!("Failed not found  {}", page_data_result.err().unwrap());
@@ -1355,7 +1356,7 @@ pub async fn explorer_witness_file(
 
     log_data.push(format!(
         "Success :  Page data for {} not found in database",
-        input.filename
+        input.file_id
     ));
 
     // Deserialize page data

src/controllers/share_controller.rs

@@ -3,7 +3,7 @@ use crate::models::page_data::ApiResponse;
 use crate::{db::share::fetch_share_data_by_address, models::ShareDataTable};
 
 use crate::db::pages_db::{
-    db_data, delete_all_data, delete_all_user_files, delete_page_data,
+     delete_all_data, delete_all_user_files, delete_page_data,
     fetch_all_pages_data_per_user, fetch_page_data, insert_page_data, update_page_data,
 };
 use crate::models::share_data::{CreateShareData, ShareDataResponse};
@@ -70,7 +70,13 @@ pub async fn get_share_data(
 
     let firs_share_payload_data = share_payload_data.first().unwrap();
 
-    let page_data_result = fetch_page_data(firs_share_payload_data.file_name.clone(), &mut conn);
+
+    if firs_share_payload_data.id.is_none(){
+        log_data.push("Error  id not found in system".to_string());
+        return (StatusCode::NOT_FOUND, Json(res));  
+    }
+
+    let page_data_result = fetch_page_data(firs_share_payload_data.id.unwrap(), &mut conn);
 
     if page_data_result.is_err() {
         tracing::error!("Failed not found ",);
@@ -102,7 +108,7 @@ pub async fn save_share_data(
     };
 
     // Get the name parameter from the input
-    if input.filename.is_empty() {
+    if input.file_id == 0  {
         res.logs.push("Error : file name is empty".to_string());
 
         return (StatusCode::BAD_REQUEST, Json(res));
@@ -132,7 +138,7 @@ pub async fn save_share_data(
 
     // confirm if page data exist
 
-    let page_data_result = fetch_page_data(input.filename.clone(), &mut conn);
+    let page_data_result = fetch_page_data(input.file_id.clone(), &mut conn);
 
     if page_data_result.is_err() {
         tracing::error!("Failed not found ",);
@@ -148,10 +154,11 @@ pub async fn save_share_data(
     let time_data = current_utc.format("%Y-%m-%d %H:%M:%S UTC");
     let time_data_str = format!("{:?}", time_data);
     println!("Custom format 1: {} str {}", time_data, time_data_str);
+
     // insert share data to db
     let share_payload = ShareDataTable {
         id: None,
-        file_name: input.filename.clone(),
+        file_id: input.file_id.clone(),
         identifier: input.identifier.clone(),
         created_time: time_data_str,
     };

src/controllers/user_profile_controller.rs

@@ -42,7 +42,7 @@ use aqua_verifier::util::{
 };
 extern crate serde_json_path_to_error as serde_json;
 use crate::db::pages_db::{
-    db_data, delete_all_data, delete_page_data, fetch_page_data, insert_page_data, update_page_data,
+    delete_all_data, delete_page_data, fetch_page_data, insert_page_data, update_page_data,
 };
 use dotenv::{dotenv, vars};
 use sha3::{Digest, Sha3_512};

src/db/pages_db.rs

@@ -1,4 +1,4 @@
-use crate::models::{PagesTable, DB_POOL};
+use crate::models::{PagesDataTable, PagesTable, DB_POOL};
 use chrono::{NaiveDateTime, Utc};
 use diesel::r2d2::{self, ConnectionManager, PooledConnection};
 use diesel::SqliteConnection;
@@ -8,19 +8,10 @@ use diesel::prelude::*;
 use diesel::prelude::*;
 use diesel::result::Error as DieselError;
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct db_data {
-    pub id: i64,
-    pub name: String,
-    pub extension: String,
-    pub page_data: String,
-    pub mode: String,
-    pub owner: String,
-    pub is_shared:  bool
-}
+
 
 pub fn insert_page_data(
-    data: db_data,
+    data: PagesDataTable,
     db_connection: &mut PooledConnection<ConnectionManager<SqliteConnection>>,
 ) -> Result<i64, String> {
     // Use Utc to get the current time as a NaiveDateTime
@@ -48,23 +39,23 @@ pub fn insert_page_data(
     Ok(inserted_id as i64)
 }
 
-// The existing db_data and PagesTable structs remain the same
+// The existing PagesDataTable and PagesTable structs remain the same
 
 pub fn fetch_page_data(
-    filename: String,
+    id_par: i32,
     db_connection: &mut PooledConnection<ConnectionManager<SqliteConnection>>,
-) -> Result<db_data, String> {
+) -> Result<PagesDataTable, String> {
     use crate::schema::pages::dsl::*;
 
     let result = pages
-        .filter(name.eq(&filename))
+        .filter(id.eq(&id_par))
         .first::<PagesTable>(db_connection)
         .map_err(|e| match e {
-            DieselError::NotFound => format!("No page found with filename: {:#?}", filename),
+            DieselError::NotFound => format!("No page found with id: {:#?}", id_par),
             _ => format!("Error fetching page data: {}", e),
         })?;
 
-    Ok(db_data {
+    Ok(PagesDataTable {
         id: result.id.unwrap_or(0) as i64,
         name: result.name,
         extension: result.extension,
@@ -83,10 +74,10 @@ pub fn fetch_all_pages_data_per_user(
 
     let results = pages
         .filter(owner.eq(&user))
-        .load::<PagesTable>(db_connection) // Replace `db_data` with the correct Diesel model type
+        .load::<PagesTable>(db_connection) // Replace `PagesDataTable` with the correct Diesel model type
         .map_err(|e| format!("Error fetching pages for user {}: {}", user, e))?;
 
-    // Ok(db_data {
+    // Ok(PagesDataTable {
     //     id: result.id.unwrap_or(0) as i64,
     //     name: result.name,
     //     extension: result.extension,
@@ -98,7 +89,7 @@ pub fn fetch_all_pages_data_per_user(
 }
 
 pub fn update_page_data(
-    data: db_data,
+    data: PagesDataTable,
     db_connection: &mut PooledConnection<ConnectionManager<SqliteConnection>>,
 ) -> Result<(), String> {
     use crate::schema::pages::dsl::*;
@@ -109,6 +100,7 @@ pub fn update_page_data(
             page_data.eq(&data.page_data),
             mode.eq(&data.mode),
             owner.eq(&data.owner),
+            name.eq(&data.name),
             is_shared.eq(&data.is_shared)
         ))
         .execute(db_connection)
@@ -118,12 +110,12 @@ pub fn update_page_data(
 }
 
 pub fn delete_page_data(
-    page_name: String,
+    file_id: i32,
     db_connection: &mut PooledConnection<ConnectionManager<SqliteConnection>>,
 ) -> Result<i8, String> {
     use crate::schema::pages::dsl::*;
 
-    let deleted_count = diesel::delete(pages.filter(name.eq(&page_name)))
+    let deleted_count = diesel::delete(pages.filter(id.eq(&file_id)))
         .execute(db_connection)
         .map_err(|e| format!("Error deleting page data: {}", e))?;
 

src/db/share.rs

@@ -20,7 +20,6 @@ pub fn insert_share_data(
 }
 
 pub fn fetch_all_share_data(
-
     db_connection: &mut PooledConnection<ConnectionManager<SqliteConnection>>
 ) -> Result<Vec<ShareDataTable>, String> {
     use crate::schema::share_data::dsl::*;

src/models/input.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Deserialize, Serialize, Debug)]
 #[allow(dead_code)]
 pub struct RevisionInput {
-    pub filename: String,
+    pub file_id: i32,
     pub signature: String,
     pub publickey: String,
     pub wallet_address: String,
@@ -12,7 +12,7 @@ pub struct RevisionInput {
 #[derive(Deserialize, Serialize, Debug)]
 #[allow(dead_code)]
 pub struct WitnessInput {
-    pub filename: String,
+    pub file_id: i32,
     pub tx_hash: String,
     pub wallet_address: String,
     pub network: String,
@@ -21,7 +21,7 @@ pub struct WitnessInput {
 #[derive(Deserialize, Serialize, Debug, Clone)]
 #[allow(dead_code)]
 pub struct DeleteInput {
-    pub filename: String,
+    pub file_id: i32,
 
 }
 

src/models/mod.rs

@@ -32,6 +32,17 @@ pub struct PagesTable {
     pub is_shared : bool
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct PagesDataTable {
+    pub id: i64,
+    pub name: String,
+    pub extension: String,
+    pub page_data: String,
+    pub mode: String,
+    pub owner: String,
+    pub is_shared:  bool
+}
+
 #[derive(Queryable, Selectable, Deserialize, Serialize, Debug, Clone, Insertable)]
 #[diesel(table_name = crate::schema::siwe_sessions)]
 #[diesel(check_for_backend(diesel::sqlite::Sqlite))]
@@ -49,7 +60,7 @@ pub struct SiweSessionsTable {
 #[diesel(check_for_backend(diesel::sqlite::Sqlite))]
 pub struct ShareDataTable {
     pub id: Option<i32>,
-    pub file_name: String,
+    pub file_id: i32,
     pub identifier: String,
     pub created_time: String,
 }

src/models/share_data.rs

@@ -1,21 +1,20 @@
 use serde::{Deserialize, Serialize};
 
-use crate::db::pages_db::db_data;
 
-use super::{file::FileInfo, ShareDataTable};
+use super::{file::FileInfo, PagesDataTable, ShareDataTable};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ShareDataResponse{
 
     pub logs :  Vec<String>,
     pub share_data : Option<ShareDataTable>,
-    pub file_data : Option<db_data>,
+    pub file_data : Option<PagesDataTable>,
 
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 #[allow(dead_code)]
 pub struct CreateShareData {
-    pub filename: String,
+    pub file_id : i32,
     pub identifier : String
 }

src/schema.rs

@@ -16,7 +16,7 @@ diesel::table! {
 diesel::table! {
     share_data (id) {
         id -> Nullable<Integer>,
-        file_name -> Text,
+        file_id -> Integer,
         identifier -> Text,
         created_time -> Text,
     }