@merkl/api 0.10.401 → 0.10.403

package/dist/src/jobs/etl/pendings.js

@@ -15,7 +15,7 @@ const gcsClient = new S3Client({
     endpoint: process.env.GCS_ENDPOINT,
     bucket: `merkl-rewards-lake-${process.env.ENV}`,
 });
-const file = gcsClient.file(`pendings/${process.env.FILENAME}`);
+const file = gcsClient.file(process.env.FILENAME);
 const failedBatches = [];
 // ─── Extract ─────────────────────────────────────────────────────────────────
 const extract = async () => {

package/dist/src/modules/v4/reward/reward.repository.js

@@ -1,6 +1,6 @@
 import { Campaign, Reward, RewardBreakdown } from "../../../../database/api/.generated/drizzle/schema.ts";
 import { apiDbClient } from "../../../utils/prisma";
-import { and, eq, inArray, sql } from "drizzle-orm";
+import { and, eq, exists, inArray, sql } from "drizzle-orm";
 import { CampaignService } from "../campaign";
 import { TokenService } from "../token";
 import { UserService } from "../user";
@@ -330,13 +330,23 @@ export class RewardRepository {
         const { page: _page, items: _items, campaignIds } = query;
         const page = _page || 0;
         const items = _items || 50;
-        const ids = typeof campaignIds === "string" ? [campaignIds] : (campaignIds ?? []);
+        const ids = typeof campaignIds === "string"
+            ? campaignIds === "[]"
+                ? []
+                : [campaignIds]
+            : campaignIds?.some(c => c === "[]")
+                ? []
+                : (campaignIds ?? []);
         const result = await apiDbClient.$drizzle
             .select({ amount: Reward.amount, claimed: Reward.claimed, pending: Reward.pending, recipient: Reward.recipient })
             .from(Reward)
-            .innerJoin(RewardBreakdown, eq(RewardBreakdown.rewardId, Reward.id))
-            .innerJoin(Campaign, eq(RewardBreakdown.campaignId, Campaign.id))
-            .where(and(eq(Reward.root, root), eq(Reward.rewardTokenId, id), ids.length > 0 ? inArray(Campaign.campaignId, ids) : sql `TRUE`))
+            .where(and(eq(Reward.root, root), eq(Reward.rewardTokenId, id), ids.length > 0
+            ? exists(apiDbClient.$drizzle
+                .select()
+                .from(RewardBreakdown)
+                .innerJoin(Campaign, eq(RewardBreakdown.campaignId, Campaign.id))
+                .where(and(eq(RewardBreakdown.rewardId, Reward.id), inArray(Campaign.campaignId, ids))))
+            : sql `TRUE`))
             .orderBy(sql `(${Reward.amount}::numeric + ${Reward.pending}::numeric) desc`)
             .limit(items)
             .offset(items * page);