Skip to content

[server] Don't block soft deletion rewinds in updateDeletionEligibilityTime #20569

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 31, 2025
Merged

[server] Don't block soft deletion rewinds in updateDeletionEligibilityTime #20569

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59dcd0
[server] Don't block soft deletion rewinds in `updateDeletionEligibil…
filiptronicek Jan 30, 2025
d8443e3
Use ISO date strings for comparison
filiptronicek Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions components/server/src/workspace/workspace-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,13 +568,10 @@ export class WorkspaceService {
daysToLive = daysToLive * 2;
}
deletionEligibilityTime.setDate(deletionEligibilityTime.getDate() + daysToLive);
if (
workspace.deletionEligibilityTime &&
workspace.deletionEligibilityTime > deletionEligibilityTime.toISOString()
) {
if (new Date() > deletionEligibilityTime) {
log.warn(
{ userId, workspaceId, instanceId: instance?.id },
"[updateDeletionEligibilityTime] Prevented moving deletion eligibility time backwards",
"[updateDeletionEligibilityTime] Prevented moving deletion eligibility time to the past",
{
hasGitChanges,
timestamps: new TrustedValue({
Expand Down
Loading