prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make query more clear

Browse source
This commit is contained in:
Jackson Harper 2023-08-29 20:17:13 +08:00
parent 6c1484cd09
commit fe3d3be7f5
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/api/src/resolvers/subscriptions/index.ts
View file

@ -77,22 +77,27 @@ export const subscriptionsResolver = authorized<
user: { id: uid },
})
if (type) {
if (type && type == SubscriptionType.Newsletter) {
queryBuilder.andWhere({
type,
status: SubscriptionStatus.Active,
})
}
queryBuilder.andWhere(
new Brackets((qb) => {
qb.where({
type: SubscriptionType.Newsletter,
status: SubscriptionStatus.Active,
}).orWhere({
type: SubscriptionType.Rss,
} else if (type && type == SubscriptionType.Rss) {
queryBuilder.where({
type,
})
} else {
queryBuilder.andWhere(
new Brackets((qb) => {
qb.where({
type: SubscriptionType.Newsletter,
status: SubscriptionStatus.Active,
}).orWhere({
type: SubscriptionType.Rss,
})
})
})
)
)
}
const subscriptions = await queryBuilder
.orderBy('subscription.' + sortBy, sortOrder)