From f5fb69b64f81dbec80debb1cf59115af4ab3372c Mon Sep 17 00:00:00 2001 From: Stefan Melmuk <509385+stefan0xC@users.noreply.github.com> Date: Sun, 19 May 2024 20:33:00 +0200 Subject: [PATCH] also delete organization_api_key (#4557) --- src/db/models/organization.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs index 59d66856..73088650 100644 --- a/src/db/models/organization.rs +++ b/src/db/models/organization.rs @@ -316,6 +316,7 @@ impl Organization { UserOrganization::delete_all_by_organization(&self.uuid, conn).await?; OrgPolicy::delete_all_by_organization(&self.uuid, conn).await?; Group::delete_all_by_organization(&self.uuid, conn).await?; + OrganizationApiKey::delete_all_by_organization(&self.uuid, conn).await?; db_run! { conn: { diesel::delete(organizations::table.filter(organizations::uuid.eq(self.uuid))) @@ -886,6 +887,14 @@ impl OrganizationApiKey { .ok().from_db() }} } + + pub async fn delete_all_by_organization(org_uuid: &str, conn: &mut DbConn) -> EmptyResult { + db_run! { conn: { + diesel::delete(organization_api_key::table.filter(organization_api_key::org_uuid.eq(org_uuid))) + .execute(conn) + .map_res("Error removing organization api key from organization") + }} + } } #[cfg(test)]