Create separate function to update installation id (#236)

Co-authored-by: Filip Lelek <[email protected]>

Author: Filip-L

fplus-database/src/database/allocators.rs

@@ -207,6 +207,31 @@ pub async fn create_or_update_allocator(
     }
 }
 
+/**
+ * Update installation ID for allocator in the database
+ *
+ * # Arguments
+ * @param owner: String - The owner of the repository
+ * @param repo: String - The repository name
+ * @param installation_id: Option<i64> - The installation ID
+ */
+pub async fn update_allocator_installation_ids(
+    owner: String,
+    repo: String,
+    installation_id: Option<i64>,
+) -> Result<(), sea_orm::DbErr> {
+    let existing_allocator = get_allocator(&owner, &repo).await?;
+    if let Some(allocator_model) = existing_allocator {
+        let conn = get_database_connection().await?;
+        let mut allocator_active_model = allocator_model.into_active_model();
+        if installation_id.is_some() {
+            allocator_active_model.installation_id = Set(installation_id);
+        }
+        allocator_active_model.update(&conn).await?;
+    }
+    Ok(())
+}
+
 /**
  * Update the multisig threshold of an allocator in the database
  *

fplus-http-server/src/main.rs

@@ -57,7 +57,11 @@ async fn main() -> std::io::Result<()> {
 
     tokio::spawn(async {
         run_cron("0 0 0,4,8,12,16,20 * * * *", || {
-            tokio::spawn(update_installation_ids_logic())
+            tokio::spawn(async {
+                if let Err(e) = update_installation_ids_logic().await {
+                    eprintln!("Error: {:?}", e);
+                }
+            })
         })
         .await;
     });

fplus-lib/src/core/allocator/mod.rs

@@ -2,7 +2,9 @@ use crate::helpers::process_amount;
 use fplus_database::database::allocation_amounts::{
     create_allocation_amount, delete_allocation_amounts_by_allocator_id,
 };
-use fplus_database::database::allocators::{create_or_update_allocator, get_allocators};
+use fplus_database::database::allocators::{
+    create_or_update_allocator, get_allocators, update_allocator_installation_ids,
+};
 use fplus_database::models::allocators::Model;
 use octocrab::auth::create_jwt;
 use octocrab::models::repos::{Content, ContentItems};
@@ -365,40 +367,34 @@ pub async fn fetch_repositories_for_installation_id(
     Ok(repositories)
 }
 
-pub async fn update_installation_ids_in_db(installation: InstallationRepositories) {
+pub async fn update_installation_ids_in_db(
+    installation: InstallationRepositories,
+) -> Result<(), LDNError> {
     let installation_id = installation.installation_id;
     for repo in installation.repositories.iter() {
-        let owner = repo.owner.clone();
-        let repo = repo.slug.clone();
-        let _ = create_or_update_allocator(
-            owner,
-            repo,
+        update_allocator_installation_ids(
+            repo.owner.clone(),
+            repo.slug.clone(),
             Some(installation_id.try_into().unwrap()),
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
         )
-        .await;
+        .await
+        .map_err(|e| {
+            LDNError::Load(format!(
+                "Failed to update installation id in database for repo: {} {} /// {}",
+                repo.owner.clone(),
+                repo.slug.clone(),
+                e
+            ))
+        })?;
     }
+    Ok(())
 }
 
-pub async fn update_installation_ids_logic() {
+pub async fn update_installation_ids_logic() -> Result<(), LDNError> {
     let client = Client::new();
-    let jwt = match generate_github_app_jwt().await {
-        Ok(jwt) => jwt,
-        Err(e) => {
-            log::error!("Failed to generate GitHub App JWT: {}", e);
-            return;
-        }
-    };
+    let jwt = generate_github_app_jwt()
+        .await
+        .map_err(|e| LDNError::Load(format!("Failed to generate GitHub App JWT: {}", e)))?;
 
     let installation_ids_result = fetch_installation_ids(&client, &jwt).await;
     let mut results: Vec<InstallationRepositories> = Vec::new();
@@ -415,8 +411,9 @@ pub async fn update_installation_ids_logic() {
     }
 
     for installation in results.iter() {
-        update_installation_ids_in_db(installation.clone()).await;
+        update_installation_ids_in_db(installation.clone()).await?;
     }
+    Ok(())
 }
 
 pub async fn force_update_allocators(