Some improvements in GitHub reconciliation (#133)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Cargo.toml

@@ -14,6 +14,7 @@ rust-version = "1.70"
 
 [workspace.dependencies]
 anyhow = "1.0.75"
+as-any = "0.3.1"
 askama = "0.12.0"
 async-trait = "0.1.73"
 axum = { version = "0.6.20", features = ["macros"] }

clowarden-core/Cargo.toml

@@ -8,6 +8,7 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+as-any = { workspace = true }
 async-trait = { workspace = true }
 base64 = { workspace = true }
 cached = { workspace = true }

clowarden-core/src/services/github/mod.rs

@@ -12,6 +12,7 @@ use crate::{
     services::ChangeApplied,
 };
 use anyhow::{Context, Result};
+use as_any::Downcast;
 use async_trait::async_trait;
 use tracing::debug;
 
@@ -132,13 +133,26 @@ impl ServiceHandler for Handler {
         }
 
         // Apply repositories changes
-        for change in changes.repositories {
+        'changes_repositories: for change in changes.repositories {
             let err = match &change {
                 RepositoryChange::RepositoryAdded(repo) => self.svc.add_repository(&ctx, repo).await.err(),
                 RepositoryChange::TeamAdded(repo_name, team_name, role) => {
                     self.svc.add_repository_team(&ctx, repo_name, team_name, role).await.err()
                 }
                 RepositoryChange::TeamRemoved(repo_name, team_name) => {
+                    // If the team has just been deleted from the directory in
+                    // this reconciliation, there is no need to remove it from
+                    // the repository as this will be done automatically when
+                    // the team is deleted from GitHub
+                    for entry in &changes_applied {
+                        let change = (*entry.change).downcast_ref::<DirectoryChange>();
+                        if let Some(DirectoryChange::TeamRemoved(team_removed_name)) = change {
+                            if team_name == team_removed_name {
+                                continue 'changes_repositories;
+                            }
+                        }
+                    }
+
                     self.svc.remove_repository_team(&ctx, repo_name, team_name).await.err()
                 }
                 RepositoryChange::TeamRoleUpdated(repo_name, team_name, role) => {

clowarden-core/src/services/mod.rs

@@ -3,6 +3,7 @@
 
 use crate::{cfg::Organization, github::Source};
 use anyhow::Result;
+use as_any::AsAny;
 use async_trait::async_trait;
 use std::fmt::Debug;
 
@@ -46,7 +47,7 @@ pub struct ChangeApplied {
 }
 
 /// Trait that defines some operations a Change implementation must support.
-pub trait Change: Debug {
+pub trait Change: AsAny + Debug {
     /// Return some details about the change.
     fn details(&self) -> ChangeDetails;