Skip to content

fix: exclude withdrawn/cancelled requests from duplicate check #9

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

Open
rmcew wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: exclude withdrawn/cancelled requests from duplicate check #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions api/src/appRequest/appRequest.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,10 @@ export class AppRequestService extends AuthService<AppRequest> {
if (!this.mayCreate() && user.login === this.login) return { message: 'You may not create a request.' }
if (!this.mayCreateOther() && user.login !== this.login) return { message: 'You may not create requests for other people.' }
if (!appConfig.multipleRequestsPerPeriod) {
const activeStatuses = Object.values(AppRequestStatus).filter(s => s !== AppRequestStatus.WITHDRAWN && s !== AppRequestStatus.CANCELLED)
const requests = 'internalId' in user
? await this.svc(AppRequestServiceInternal).find({ periodIds: [period.id], userInternalIds: [user.internalId] })
: await this.svc(AppRequestServiceInternal).find({ periodIds: [period.id], logins: [user.login] })
? await this.svc(AppRequestServiceInternal).find({ periodIds: [period.id], userInternalIds: [user.internalId], status: activeStatuses })
: await this.svc(AppRequestServiceInternal).find({ periodIds: [period.id], logins: [user.login], status: activeStatuses })
if (requests.length > 0) return { message: `A request already exists in ${period.name}.`, arg: 'login' }
}
return undefined
Expand Down