@merkl/api 0.16.22 → 0.16.24

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

@@ -229,25 +229,37 @@ export class CampaignRepository {
                     path: ["shouldIgnore"],
                     equals: Prisma.AnyNull,
                 },
-                CampaignStatus: {
-                    some: {
-                        // The campaign is not currently processing or has been processing for too long
-                        OR: [
-                            {
-                                status: {
-                                    not: RunStatus.PROCESSING,
-                                },
-                                computedUntil: { lt: currentTime - 10 * 60 }, // more than 10 min ago
+                OR: [
+                    {
+                        // First case: the campaign has no status so was never processed
+                        CampaignStatus: {
+                            none: {
+                                computedUntil: { gte: 0 },
                             },
-                            {
-                                status: RunStatus.PROCESSING,
-                                processingStarted: {
-                                    lt: currentTime - MAX_COMPUTE_JOB_TIME, // more than 12 hours ago
-                                },
+                        },
+                    },
+                    {
+                        CampaignStatus: {
+                            some: {
+                                // The campaign is not currently processing or has been processing for too long
+                                OR: [
+                                    {
+                                        status: {
+                                            not: RunStatus.PROCESSING,
+                                        },
+                                        computedUntil: { lt: currentTime - 10 * 60 }, // more than 10 min ago
+                                    },
+                                    {
+                                        status: RunStatus.PROCESSING,
+                                        processingStarted: {
+                                            lt: currentTime - MAX_COMPUTE_JOB_TIME, // more than 12 hours ago
+                                        },
+                                    },
+                                ],
                             },
-                        ],
+                        },
                     },
-                },
+                ],
             },
             select: {
                 campaignId: true,

package/dist/src/modules/v4/campaign/campaign.service.js

@@ -156,8 +156,8 @@ export class CampaignService {
     }
     static async findCampaignsToProcess(distributionChainId) {
         return (await CampaignRepository.findCampaignsToProcess(distributionChainId))
-            .filter(campaign => campaign.endTimestamp > campaign?.CampaignStatus?.[0]?.computedUntil)
-            ?.sort((a, b) => Number(a.CampaignStatus?.[0]?.processingStarted - b.CampaignStatus?.[0]?.processingStarted));
+            .filter(campaign => campaign.endTimestamp > (campaign?.CampaignStatus?.[0]?.computedUntil ?? 0))
+            ?.sort((a, b) => Number((a.CampaignStatus?.[0]?.processingStarted ?? 0) - (b.CampaignStatus?.[0]?.processingStarted ?? 0)));
     }
     static async findNextCampaignToProcess(chainId) {
         const campaigns = await CampaignService.findCampaignsToProcess(chainId);

package/dist/src/modules/v4/status/status.repository.d.ts

@@ -59,21 +59,7 @@ export declare class StatusRepository {
         computedUntil: bigint;
         processingStarted: bigint;
     }>;
-    static updateProcessing(campaignUnique: CampaignUnique): Promise<[{
-        error: string;
-        details: Prisma.JsonValue;
-        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-        campaignId: string;
-        computedUntil: bigint;
-        processingStarted: bigint;
-    }, {
-        error: string;
-        details: Prisma.JsonValue;
-        status: import("../../../../database/api/.generated").$Enums.RunStatus;
-        campaignId: string;
-        computedUntil: bigint;
-        processingStarted: bigint;
-    }]>;
+    static updateProcessing(campaignUnique: CampaignUnique): Promise<void>;
     static updateComputedUntil(campaignUnique: CampaignUnique, computedUntil: number): Promise<{
         error: string;
         details: Prisma.JsonValue;

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

@@ -73,8 +73,8 @@ export class StatusRepository {
     static async updateProcessing(campaignUnique) {
         const campaignId = CampaignService.hashId(campaignUnique);
         const now = moment().unix();
-        return await apiDbClient.$transaction([
-            apiDbClient.campaignStatus.findUniqueOrThrow({
+        return await apiDbClient.$transaction(async (_prisma) => {
+            await apiDbClient.campaignStatus.findUniqueOrThrow({
                 where: {
                     campaignId,
                     OR: [
@@ -90,8 +90,8 @@ export class StatusRepository {
                         },
                     ],
                 },
-            }),
-            apiDbClient.campaignStatus.update({
+            });
+            await apiDbClient.campaignStatus.update({
                 where: {
                     campaignId,
                 },
@@ -101,8 +101,8 @@ export class StatusRepository {
                     error: "",
                     details: "{}",
                 },
-            }),
-        ]);
+            });
+        });
     }
     static async updateComputedUntil(campaignUnique, computedUntil) {
         return await apiDbClient.campaignStatus.update({