Skip to content

Commit 0f440f0

Browse files
committed
fix #2755
1 parent 46d5dbb commit 0f440f0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

api/resolvers/sub.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export async function topSubs (parent, { query, cursor, when, from, to, limit, b
5757
COALESCE(floor(sum("AggPayOut"."sumMtokens") FILTER (WHERE "AggPayOut"."payOutType" = 'TERRITORY_REVENUE') / 1000), 0) as revenue,
5858
COALESCE(floor(sum("AggPayOut"."sumMtokens") FILTER (WHERE "AggPayOut"."payOutType" = 'ZAP') / 1000), 0) as stacked
5959
FROM user_subs
60-
LEFT JOIN "AggPayOut" ON "AggPayOut"."subName" = user_subs.name
60+
LEFT JOIN "AggPayOut" ON "AggPayOut"."subId" = user_subs.id
6161
WHERE "AggPayOut"."timeBucket" >= ${fromDate}
6262
AND "AggPayOut"."timeBucket" <= ${toDate}
6363
AND "AggPayOut"."granularity" = ${granularity}::"AggGranularity"
@@ -70,12 +70,12 @@ export async function topSubs (parent, { query, cursor, when, from, to, limit, b
7070
floor(COALESCE(sum("AggPayIn"."sumMcost"), 0) / 1000) as spent,
7171
sum("AggPayIn"."countGroup") FILTER (WHERE "AggPayIn"."payInType" = 'ITEM_CREATE') as nitems
7272
FROM user_subs
73-
LEFT JOIN "AggPayIn" ON "AggPayIn"."subName" = user_subs.name
73+
LEFT JOIN "AggPayIn" ON "AggPayIn"."subId" = user_subs.id
7474
WHERE "AggPayIn"."timeBucket" >= ${fromDate}
7575
AND "AggPayIn"."timeBucket" <= ${toDate}
7676
AND "AggPayIn"."granularity" = ${granularity}::"AggGranularity"
7777
AND "AggPayIn"."slice" = 'SUB_BY_TYPE'
78-
AND "AggPayIn"."subName" IS NOT NULL
78+
AND "AggPayIn"."subId" IS NOT NULL
7979
AND "AggPayIn"."payInType" <> 'DEFUNCT_TERRITORY_DAILY_PAYOUT'
8080
GROUP BY user_subs.name
8181
),
@@ -168,7 +168,7 @@ export default {
168168
},
169169
topSubs: async (parent, { cursor, when, by = 'stacked', from, to, limit }, { models, me }) => {
170170
const query = Prisma.sql`
171-
SELECT "Sub".name
171+
SELECT "Sub".name, "Sub".id
172172
FROM "Sub"
173173
WHERE "Sub".status <> 'STOPPED'
174174
GROUP BY "Sub".name
@@ -182,7 +182,7 @@ export default {
182182
}
183183

184184
const query = Prisma.sql`
185-
SELECT "Sub".name
185+
SELECT "Sub".name, "Sub".id
186186
FROM "Sub"
187187
JOIN users ON users.id = "Sub"."userId" AND users.name = ${name}
188188
WHERE "Sub".status <> 'STOPPED'
@@ -197,7 +197,7 @@ export default {
197197
}
198198

199199
const query = Prisma.sql`
200-
SELECT "Sub".name
200+
SELECT "Sub".name, "Sub".id
201201
FROM "SubSubscription"
202202
JOIN "Sub" ON "SubSubscription"."subName" = "Sub".name
203203
WHERE "SubSubscription"."userId" = ${me.id}

0 commit comments

Comments
 (0)