From 15f78cd40b1736db0756d4c9ec91dc791bd84e32 Mon Sep 17 00:00:00 2001 From: akadusei Date: Fri, 5 Jul 2024 17:38:21 +0000 Subject: [PATCH] Move all `after_commit` database operations to `after_save` --- CHANGELOG.md | 1 + src/shield/operations/delete_oauth_permission.cr | 4 ++-- src/shield/operations/delete_user_bearer_logins.cr | 2 +- src/shield/operations/delete_user_email_confirmations.cr | 2 +- src/shield/operations/delete_user_logins.cr | 2 +- src/shield/operations/delete_user_oauth_clients.cr | 2 +- src/shield/operations/delete_user_oauth_grants.cr | 2 +- src/shield/operations/delete_user_password_resets.cr | 2 +- .../delete_access_tokens_after_deactivate_oauth_client.cr | 2 +- .../mixins/delete_email_confirmations_after_register_user.cr | 2 +- .../mixins/delete_email_confirmations_after_update_email.cr | 2 +- .../mixins/delete_grants_after_deactivate_oauth_client.cr | 2 +- .../mixins/delete_grants_after_revoke_oauth_permission.cr | 2 +- .../mixins/delete_password_resets_after_reset_password.cr | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c55935..9cfae1ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Upgrade GitHub actions +- Move all `after_commit` database operations to `after_save` ## [1.1.2] - 2024-02-10 diff --git a/src/shield/operations/delete_oauth_permission.cr b/src/shield/operations/delete_oauth_permission.cr index 5ed9eaa8..208e5bd2 100644 --- a/src/shield/operations/delete_oauth_permission.cr +++ b/src/shield/operations/delete_oauth_permission.cr @@ -2,8 +2,8 @@ module Shield::DeleteOauthPermission # OauthClient::SaveOperation macro included needs user : User - after_commit delete_permission - after_commit delete_oauth_grants + after_save delete_permission + after_save delete_oauth_grants private def delete_permission(oauth_client : Shield::OauthClient) BearerLoginQuery.new diff --git a/src/shield/operations/delete_user_bearer_logins.cr b/src/shield/operations/delete_user_bearer_logins.cr index 0a736d18..41e579b2 100644 --- a/src/shield/operations/delete_user_bearer_logins.cr +++ b/src/shield/operations/delete_user_bearer_logins.cr @@ -2,7 +2,7 @@ module Shield::DeleteUserBearerLogins # User::SaveOperation macro included needs current_bearer_login : BearerLogin? - after_commit delete_bearer_logins + after_save delete_bearer_logins private def delete_bearer_logins(user : Shield::User) query = BearerLoginQuery.new.user_id(user.id) diff --git a/src/shield/operations/delete_user_email_confirmations.cr b/src/shield/operations/delete_user_email_confirmations.cr index f0b446ec..698470e7 100644 --- a/src/shield/operations/delete_user_email_confirmations.cr +++ b/src/shield/operations/delete_user_email_confirmations.cr @@ -1,6 +1,6 @@ module Shield::DeleteUserEmailConfirmations # User::SaveOperation macro included - after_commit delete_email_confirmations + after_save delete_email_confirmations private def delete_email_confirmations(user : Shield::User) EmailConfirmationQuery.new.user_id(user.id).delete diff --git a/src/shield/operations/delete_user_logins.cr b/src/shield/operations/delete_user_logins.cr index 9525807c..9da67c3d 100644 --- a/src/shield/operations/delete_user_logins.cr +++ b/src/shield/operations/delete_user_logins.cr @@ -2,7 +2,7 @@ module Shield::DeleteUserLogins # User::SaveOperation macro included needs current_login : Login? - after_commit delete_logins + after_save delete_logins private def delete_logins(user : Shield::User) query = LoginQuery.new.user_id(user.id) diff --git a/src/shield/operations/delete_user_oauth_clients.cr b/src/shield/operations/delete_user_oauth_clients.cr index 30d2a9bb..e34be5af 100644 --- a/src/shield/operations/delete_user_oauth_clients.cr +++ b/src/shield/operations/delete_user_oauth_clients.cr @@ -1,6 +1,6 @@ module Shield::DeleteUserOauthClients # User::SaveOperation macro included - after_commit delete_oauth_clients + after_save delete_oauth_clients private def delete_oauth_clients(user : Shield::User) OauthClientQuery.new.user_id(user.id).delete diff --git a/src/shield/operations/delete_user_oauth_grants.cr b/src/shield/operations/delete_user_oauth_grants.cr index bb69847e..8849e7d9 100644 --- a/src/shield/operations/delete_user_oauth_grants.cr +++ b/src/shield/operations/delete_user_oauth_grants.cr @@ -1,6 +1,6 @@ module Shield::DeleteUserOauthGrants # User::SaveOperation macro included - after_commit delete_oauth_grants + after_save delete_oauth_grants private def delete_oauth_grants(user : Shield::User) OauthGrantQuery.new.user_id(user.id).delete diff --git a/src/shield/operations/delete_user_password_resets.cr b/src/shield/operations/delete_user_password_resets.cr index cba17fdc..8870ec57 100644 --- a/src/shield/operations/delete_user_password_resets.cr +++ b/src/shield/operations/delete_user_password_resets.cr @@ -1,6 +1,6 @@ module Shield::DeleteUserPasswordResets # User::SaveOperation macro included - after_commit delete_password_resets + after_save delete_password_resets private def delete_password_resets(user : Shield::User) PasswordResetQuery.new.user_id(user.id).delete diff --git a/src/shield/operations/mixins/delete_access_tokens_after_deactivate_oauth_client.cr b/src/shield/operations/mixins/delete_access_tokens_after_deactivate_oauth_client.cr index 13c792f5..62da7b5c 100644 --- a/src/shield/operations/mixins/delete_access_tokens_after_deactivate_oauth_client.cr +++ b/src/shield/operations/mixins/delete_access_tokens_after_deactivate_oauth_client.cr @@ -1,6 +1,6 @@ module Shield::DeleteAccessTokensAfterDeactivateOauthClient macro included - after_commit delete_access_tokens + after_save delete_access_tokens private def revoke_access_tokens(oauth_client : Shield::OauthClient) end diff --git a/src/shield/operations/mixins/delete_email_confirmations_after_register_user.cr b/src/shield/operations/mixins/delete_email_confirmations_after_register_user.cr index c837c064..76631f65 100644 --- a/src/shield/operations/mixins/delete_email_confirmations_after_register_user.cr +++ b/src/shield/operations/mixins/delete_email_confirmations_after_register_user.cr @@ -1,6 +1,6 @@ module Shield::DeleteEmailConfirmationsAfterRegisterUser macro included - after_commit delete_email_confirmations + after_save delete_email_confirmations private def end_email_confirmations(user : Shield::User) end diff --git a/src/shield/operations/mixins/delete_email_confirmations_after_update_email.cr b/src/shield/operations/mixins/delete_email_confirmations_after_update_email.cr index c0f96e8b..9e6b0484 100644 --- a/src/shield/operations/mixins/delete_email_confirmations_after_update_email.cr +++ b/src/shield/operations/mixins/delete_email_confirmations_after_update_email.cr @@ -1,6 +1,6 @@ module Shield::DeleteEmailConfirmationsAfterUpdateEmail macro included - after_commit delete_email_confirmations + after_save delete_email_confirmations private def end_email_confirmations( email_confirmation : Shield::EmailConfirmation diff --git a/src/shield/operations/mixins/delete_grants_after_deactivate_oauth_client.cr b/src/shield/operations/mixins/delete_grants_after_deactivate_oauth_client.cr index 6084f18e..dbec35e4 100644 --- a/src/shield/operations/mixins/delete_grants_after_deactivate_oauth_client.cr +++ b/src/shield/operations/mixins/delete_grants_after_deactivate_oauth_client.cr @@ -1,6 +1,6 @@ module Shield::DeleteGrantsAfterDeactivateOauthClient macro included - after_commit delete_oauth_grants + after_save delete_oauth_grants private def end_oauth_grants(oauth_client : Shield::OauthClient) end diff --git a/src/shield/operations/mixins/delete_grants_after_revoke_oauth_permission.cr b/src/shield/operations/mixins/delete_grants_after_revoke_oauth_permission.cr index c8a46bcf..9bfaff57 100644 --- a/src/shield/operations/mixins/delete_grants_after_revoke_oauth_permission.cr +++ b/src/shield/operations/mixins/delete_grants_after_revoke_oauth_permission.cr @@ -1,6 +1,6 @@ module Shield::DeleteGrantsAfterRevokeOauthPermission macro included - after_commit delete_oauth_grants + after_save delete_oauth_grants private def revoke_oauth_grants(oauth_client : Shield::OauthClient) end diff --git a/src/shield/operations/mixins/delete_password_resets_after_reset_password.cr b/src/shield/operations/mixins/delete_password_resets_after_reset_password.cr index fedf7348..bf254c2c 100644 --- a/src/shield/operations/mixins/delete_password_resets_after_reset_password.cr +++ b/src/shield/operations/mixins/delete_password_resets_after_reset_password.cr @@ -1,6 +1,6 @@ module Shield::DeletePasswordResetsAfterResetPassword macro included - after_commit delete_password_resets + after_save delete_password_resets private def end_password_resets(password_reset : Shield::PasswordReset) end