Fix sha calculation

Author: charlykeyko

fplus-database/Cargo.toml

@@ -22,4 +22,6 @@ once_cell = "1.8"
 serde = { version =  "1.0.164", features = ["derive", "std",
 "serde_derive", "alloc", "rc"] } 
 serial_test = "3.0.0"
+sha1 = "0.10.6"
+serde_json = "1.0.96"
 

fplus-database/src/database/applications.rs

@@ -1,6 +1,7 @@
 use sea_orm::{entity::*, query::*, DbErr};
 use crate::models::applications::{Column, ActiveModel, Entity as Application, Model as ApplicationModel};
 use crate::get_database_connection;
+use sha1::{Sha1, Digest};
 
 /**
  * Get all applications from the database
@@ -123,11 +124,12 @@ pub async fn get_application_by_pr_number(owner: String, repo: String, pr_number
  * # Returns
  * @return Result<ApplicationModel, sea_orm::DbErr> - The result of the operation
  */
-pub async fn merge_application_by_pr_number(owner: String, repo: String, pr_number: u64, sha: String) -> Result<ApplicationModel, sea_orm::DbErr> {
+pub async fn merge_application_by_pr_number(owner: String, repo: String, pr_number: u64) -> Result<ApplicationModel, sea_orm::DbErr> {
     let conn = get_database_connection().await?;
     let pr_application = get_application_by_pr_number(owner.clone(), repo.clone(), pr_number).await?;
     let mut exists_merged = true;
-    let merged_application = match get_application_by_pr_number(owner.clone(), repo.clone(), 0).await {
+
+    let mut merged_application = match get_application_by_pr_number(owner.clone(), repo.clone(), 0).await {
         Ok(application) => application.into_active_model(),
         Err(_) => {
             exists_merged = false;
@@ -137,14 +139,24 @@ pub async fn merge_application_by_pr_number(owner: String, repo: String, pr_numb
                 repo: Set(repo),
                 pr_number: Set(0),
                 application: Set(pr_application.application.clone()),
-                sha: Set(Some(sha)),
                 path: Set(pr_application.path.clone()),
                 ..Default::default()
             }
         }
     };
 
+    let mut hasher = Sha1::new();
+    let application = match pr_application.application.clone() {
+        Some(app) => format!("blob {}\x00{}", app.len(), app),
+        None => "".to_string()
+
+    };
+    hasher.update(application.as_bytes());
+    let file_sha = format!("{:x}", hasher.finalize());
+    merged_application.sha = Set(Some(file_sha));
+
     pr_application.delete(&conn).await?;
+
     if exists_merged {
         let result = merged_application.update(&conn).await;
         match result {

fplus-http-server/src/router/application.rs

@@ -98,7 +98,6 @@ pub async fn approve(
             return HttpResponse::BadRequest().body(e.to_string());
         }
     };
-    dbg!(&ldn_application);
     match ldn_application
         .complete_new_application_approval(signer, request_id, owner, repo)
         .await

fplus-lib/src/core/mod.rs

@@ -1038,7 +1038,7 @@ impl LDNApplication {
             }
             log::info!("- Application is in a valid state!");
 
-            Self::merge_application(pr_number, owner, repo, application.id).await?;
+            Self::merge_application(pr_number, owner, repo).await?;
             return Ok(true);
         }
 
@@ -1047,7 +1047,7 @@ impl LDNApplication {
 
     }
 
-    pub async fn merge_application(pr_number: u64, owner: String, repo: String, application_id: String) -> Result<bool, LDNError> {
+    pub async fn merge_application(pr_number: u64, owner: String, repo: String) -> Result<bool, LDNError> {
         let gh = GithubWrapper::new(owner.clone(), repo.clone());
 
         gh.merge_pull_request(pr_number).await.map_err(|e| {
@@ -1057,23 +1057,7 @@ impl LDNApplication {
             ))
         })?;
 
-        //Get file SHA with get_file function
-
-        let file_name = LDNPullRequest::application_path(&application_id);
-        let branch_name = "main";
-        let file_sha = match GithubWrapper::new(owner.clone(), repo.clone())
-            .get_file(&file_name, &branch_name).await {
-                Ok(file) => file.items.get(0).unwrap().sha.clone(),
-                Err(e) => {
-                    log::error!("- Failed to get file content. Reason: {}", e);
-                    return Err(LDNError::Load(format!(
-                        "Failed to get file content. Reason: {}",
-                        e
-                    )));
-                }
-        };
-
-        database::applications::merge_application_by_pr_number(owner, repo, pr_number, file_sha).await.map_err(|e| {
+        database::applications::merge_application_by_pr_number(owner, repo, pr_number).await.map_err(|e| {
             LDNError::Load(format!(
                 "Failed to update application in database. Reason: {}",
                 e