Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deal with registration edge cases in UserCleaner (cherry-pick #693) #716

Merged
merged 1 commit into from
Nov 27, 2024

Conversation

Splines
Copy link
Member

@Splines Splines commented Nov 27, 2024

We already merged #693 in dev, but not in main. Due to the situation described in Release 1.14.2, we should get this one into production as quickly as possible.

Therefore, I've cherrypicked the merge commit to this new branch that we can directly merge into main.


  • Deal with registration edge cases in UserCleaner

  • Replace last_sign_in_at by current_sign_in_at

  • Simplify inactive_users method via usage of scopes

  • Add another scope for recently active users

* Deal with registration edge cases in UserCleaner

* Replace `last_sign_in_at` by `current_sign_in_at`

* Simplify inactive_users method via usage of scopes

* Add another scope for recently active users
@Splines Splines added the hotfix Hotfixes into production label Nov 27, 2024
@Splines Splines self-assigned this Nov 27, 2024
@Splines Splines changed the title Deal with registration edge cases in UserCleaner (#693) Deal with registration edge cases in UserCleaner (cherry-pick #693) Nov 27, 2024
Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.85%. Comparing base (46a3133) to head (0534d17).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #716      +/-   ##
==========================================
+ Coverage   53.80%   53.85%   +0.04%     
==========================================
  Files         157      157              
  Lines        6644     6651       +7     
==========================================
+ Hits         3575     3582       +7     
  Misses       3069     3069              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Splines Splines merged commit 2dc4bd6 into main Nov 27, 2024
4 checks passed
@Splines Splines deleted the hotfix/user-cleaner branch November 27, 2024 22:29
Splines added a commit that referenced this pull request Dec 8, 2024
* Set retry option to false for UserCleanerJob (#715)

* Deal with registration edge cases in UserCleaner (#693) (#716)

* Deal with registration edge cases in UserCleaner

* Replace `last_sign_in_at` by `current_sign_in_at`

* Simplify inactive_users method via usage of scopes

* Add another scope for recently active users

* Fix unknown user variable after deletion (#717)

* Fix unknown user variable after deletion

* Adjust other occurrence of method

* Update failing user cleaner jobs with new method signature

* Expect user email for deletion mail

* Fix `with` syntax

---------

Co-authored-by: fosterfarrell9 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotfix Hotfixes into production
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants