Avoid immediate re-expiration of accounts

[salmart-dev]

Summary

This PR fixes an issue where a user that has been inactive for a while, had their account disabled automatically by the background-job in this app and that has been re-enabled by an admin would get their account disabled again, if they would not log-in before the next run of the background-job.

Checklist

• Code is properly formatted
• Sign-off message is added to all commits
• Tests (unit, integration, api and/or acceptance) are included
• Screenshots before/after for front-end changes
• Documentation (manuals or wiki) has been updated or is not required
• Backports requested where applicable (ex: critical bugfixes)

[nickvergessen]

But otherwise looks good and solves the problem.
It didn't matter in the past as we only deleted users and disabling is rather new.

[salmart-dev]

@nickvergessen I addressed all your comments and tested manually that it works as expected.

However, there seems to be an issue with the autoloader not finding the Test\TestCase class in CI, but locally tests run fine. Do you have any pointers that could help me troubleshoot this issue?

[nickvergessen]

However, there seems to be an issue with the autoloader not finding the Test\TestCase class in CI, but locally tests run fine. Do you have any pointers that could help me troubleshoot this issue?

Basically needs a copy of nextcloud/notifications#2352
If it works locally for you, you might be running the tests "wrongly" (and/or with an old server master branch)

For apps that are not part of server, you need to go into the apps/user_retention/ directory and then install dependencies composer i and composer run test:unit

---

Edit: Merged that with #876
So rebasing should make tests work again

[salmart-dev]

However, there seems to be an issue with the autoloader not finding the Test\TestCase class in CI, but locally tests run fine. Do you have any pointers that could help me troubleshoot this issue?

Basically needs a copy of nextcloud/notifications#2352 If it works locally for you, you might be running the tests "wrongly" (and/or with an old server master branch)

For apps that are not part of server, you need to go into the apps/user_retention/ directory and then install dependencies composer i and composer run test:unit

Edit: Merged that with #876 So rebasing should make tests work again

Hmm not sure to be honest.

Here's what I was doing:

• Running Nextcloud with the nextcloud-docker-dev setup with the user_retention app in apps-extra
• Install dependencies with docker compose exec -w /var/www/html/apps-extra/user_retention nextcloud composer install
• Running docker compose exec -w /var/www/html/apps-extra/user_retention nextcloud composer test:unit

Tests were never failing because of autoload issues using this setup. But I do get some warnings from git for example, about the fact that the directory is owned by a user with id 1000 and not by the root user, but this should not be related.

In any case thank you for addressing the issue with the autoloader! I was planning to look into it first thing today but you were faster 🚀

[nickvergessen]

Having a look today or tomorrow

[nickvergessen]

Cleaned up the coding style to my personal preference

[nickvergessen]

/backport to stable29

[github-actions]

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

[github-actions]

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)