Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

code improvements

Pedro Ladeirab611af60b4fb
diff --git a/apps/web/lib/api/commissions/get-commissions-count.ts b/apps/web/lib/api/commissions/get-commissions-count.ts
index 635e5fb5c4..7e37db6717 100644
--- a/apps/web/lib/api/commissions/get-commissions-count.ts
+++ b/apps/web/lib/api/commissions/get-commissions-count.ts
@@ -65,11 +65,15 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
const validCommissionStatuses = new Set(Object.values(CommissionStatus));
const rawStatusFilter = parseFilterValue(status);
- const statusValueFilter =
- rawStatusFilter &&
- rawStatusFilter.values.some((v) =>
+ const hasValidRequestedStatus =
+ rawStatusFilter?.values.some((v) =>
validCommissionStatuses.has(v as CommissionStatus),
- )
+ ) ?? false;
+ const isInvalidInStatusFilter =
+ rawStatusFilter?.sqlOperator === "IN" && !hasValidRequestedStatus;
+
+ const statusValueFilter =
+ rawStatusFilter && hasValidRequestedStatus
? {
...rawStatusFilter,
values: rawStatusFilter.values.filter((v) =>
@@ -80,17 +84,19 @@ export async function getCommissionsCount(filters: CommissionsCountFilters) {
const statusFilter = isHoldStatus
? { in: [CommissionStatus.pending, CommissionStatus.processed] }
- : statusValueFilter
- ? statusValueFilter.sqlOperator === "NOT IN"
- ? { notIn: statusValueFilter.values }
- : { in: statusValueFilter.values }
- : {
- notIn: [
- CommissionStatus.duplicate,
- CommissionStatus.fraud,
- CommissionStatus.canceled,
- ],
- };
+ : isInvalidInStatusFilter
+ ? { in: [] as CommissionStatus[] }
+ : statusValueFilter
+ ? statusValueFilter.sqlOperator === "NOT IN"
+ ? { notIn: statusValueFilter.values }
+ : { in: statusValueFilter.values }
+ : {
+ notIn: [
+ CommissionStatus.duplicate,
+ CommissionStatus.fraud,
+ CommissionStatus.canceled,
+ ],
+ };
const groupFilter = parseFilterValue(groupId);
const partnerTagFilter = parseFilterValue(partnerTagId);