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.

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

fix(server): empty trash for archived assets #12281

Merged
merged 3 commits into from
Sep 3, 2024
Merged

fix(server): empty trash for archived assets #12281

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a89aa
fix(server): empty trash for archived assets
alextran1502 Sep 3, 2024
2e70cc0
use withArchived
alextran1502 Sep 3, 2024
a1a579e
add e2e test
alextran1502 Sep 3, 2024
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
22 changes: 21 additions & 1 deletion server/src/services/trash.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,29 @@ export class TrashService {
}

async empty(auth: AuthDto): Promise<void> {
const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) =>
let assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) =>
this.assetRepository.getByUserId(pagination, auth.user.id, {
trashedBefore: DateTime.now().toJSDate(),
isArchived: true,
alextran1502 marked this conversation as resolved.
Show resolved Hide resolved
}),
);

for await (const assets of assetPagination) {
await this.jobRepository.queueAll(
assets.map((asset) => ({
name: JobName.ASSET_DELETION,
data: {
id: asset.id,
deleteOnDisk: true,
},
})),
);
}

assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) =>
this.assetRepository.getByUserId(pagination, auth.user.id, {
trashedBefore: DateTime.now().toJSDate(),
isArchived: false,
}),
);

Expand Down
Loading