Add new database table (#251)

Author: Filip-L

fplus-database/src/database/comparable_applications.rs

@@ -0,0 +1,25 @@
+use crate::get_database_connection;
+use crate::models::comparable_applications::{
+    ActiveModel, ApplicationComparableData, Entity as ComparableApplication,
+    Model as ComparableApplicationModel,
+};
+use sea_orm::{entity::*, DbErr};
+
+pub async fn create_comparable_application(
+    client_address: &str,
+    comparable_data: &ApplicationComparableData,
+) -> Result<(), sea_orm::DbErr> {
+    let conn = get_database_connection().await?;
+    let new_comparable_data = ActiveModel {
+        client_address: Set(client_address.to_string()),
+        application: Set(comparable_data.clone()),
+    };
+    new_comparable_data.insert(&conn).await?;
+    Ok(())
+}
+
+pub async fn get_comparable_applications() -> Result<Vec<ComparableApplicationModel>, DbErr> {
+    let conn = get_database_connection().await?;
+    let response = ComparableApplication::find().all(&conn).await?;
+    Ok(response)
+}

fplus-database/src/database/mod.rs

@@ -2,3 +2,4 @@ pub mod allocation_amounts;
 pub mod allocators;
 pub mod applications;
 pub mod autoallocations;
+pub mod comparable_applications;

fplus-database/src/models/comparable_applications.rs

@@ -0,0 +1,24 @@
+use sea_orm::{entity::prelude::*, FromJsonQueryResult};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "comparable_applications")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub client_address: String,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub application: ApplicationComparableData,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromJsonQueryResult)]
+pub struct ApplicationComparableData {
+    pub project_desc: String,
+    pub stored_data_desc: String,
+    pub data_owner_name: String,
+    pub data_set_sample: String,
+}

fplus-database/src/models/mod.rs

@@ -6,3 +6,4 @@ pub mod allocation_amounts;
 pub mod allocators;
 pub mod applications;
 pub mod autoallocations;
+pub mod comparable_applications;

fplus-lib/src/core/mod.rs

@@ -5,6 +5,8 @@ use alloy::primitives::Address;
 
 use application::file::{SpsChangeRequest, StorageProviderChangeVerifier};
 use chrono::{DateTime, Local, Utc};
+use fplus_database::database::comparable_applications::create_comparable_application;
+use fplus_database::models::comparable_applications::ApplicationComparableData;
 use futures::future;
 use octocrab::models::{
     pulls::PullRequest,
@@ -870,6 +872,19 @@ impl LDNApplication {
                             application_id, e
                         ))
                     })?;
+                    create_comparable_application(
+                        &application_id,
+                        &ApplicationComparableData {
+                            project_desc: application_file.project.history,
+                            stored_data_desc: application_file.project.stored_data_desc,
+                            data_owner_name: application_file.client.name,
+                            data_set_sample: application_file.project.data_sample_link,
+                        },
+                    )
+                    .await
+                    .map_err(|e| {
+                        LDNError::New(format!("Failed to create application in DB: {}", e))
+                    })?;
                 }
 
                 Ok(LDNApplication {

manual-migrations/2025-01-31.sql

@@ -0,0 +1,6 @@
+CREATE TABLE comparable_applications
+(
+    client_address text NOT NULL,
+    application jsonb NOT NULL,
+    PRIMARY KEY (client_address)
+);