Skip to content

Commit 6c854d8

Browse files
authored
[Release] Version 0.0.5 (#257)
* [Fix] Show applicants even if they do not have an active permit ([Fix] Show applicants even if they do not have an active permit #256)
1 parent af8bd26 commit 6c854d8

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

lib/applicants/resolvers.ts

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,25 +147,27 @@ export const applicants: Resolver<
147147

148148
// Permit status and expiry date range filters both look at the permit expiryDate.
149149
// For this reason we need to filter on expiryDate twice to take both filters in account.
150-
const permitFilter = {
151-
some: {
152-
AND: [
153-
{
154-
expiryDate: {
155-
gte: expiryDateLowerBound?.toISOString(),
156-
lte: expiryDateUpperBound?.toISOString(),
150+
const permitFilter =
151+
expiryDateLowerBound || expiryDateUpperBound || expiryDateRangeFrom || expiryDateRangeTo
152+
? {
153+
some: {
154+
AND: [
155+
{
156+
expiryDate: {
157+
gte: expiryDateLowerBound?.toISOString(),
158+
lte: expiryDateUpperBound?.toISOString(),
159+
},
160+
},
161+
{
162+
expiryDate: {
163+
gte: expiryDateRangeFrom?.toISOString(),
164+
lte: expiryDateRangeTo?.toISOString(),
165+
},
166+
},
167+
],
157168
},
158-
},
159-
{
160-
expiryDate: {
161-
gte: expiryDateRangeFrom?.toISOString(),
162-
lte: expiryDateRangeTo?.toISOString(),
163-
},
164-
},
165-
{ active: true },
166-
],
167-
},
168-
};
169+
}
170+
: undefined;
169171

170172
// Update default filter since there were filter arguments
171173
where = {

0 commit comments

Comments
 (0)