1
0
Frank 1 долоо хоног өмнө
parent
commit
53fd02970d

+ 11 - 24
packages/console/core/src/referral.ts

@@ -59,30 +59,7 @@ export namespace Referral {
     const accountID = Actor.account()
     const code = await ensureCode(workspaceID)
     const rows = await Database.use(async (tx) => {
-      const [rewards, invites, inviteeReferral] = await Promise.all([
-        tx
-          .select({
-            referralID: ReferralRewardTable.referralID,
-            workspaceID: ReferralRewardTable.workspaceID,
-            referralWorkspaceID: ReferralTable.workspaceID,
-            inviteeEmail: AuthTable.subject,
-            amount: ReferralRewardTable.amount,
-            timeCreated: ReferralRewardTable.timeCreated,
-            timeApplied: ReferralRewardTable.timeApplied,
-          })
-          .from(ReferralRewardTable)
-          .innerJoin(ReferralTable, eq(ReferralTable.id, ReferralRewardTable.referralID))
-          .innerJoin(
-            AuthTable,
-            and(eq(AuthTable.accountID, ReferralTable.inviteeAccountID), eq(AuthTable.provider, "email")),
-          )
-          .where(
-            and(
-              eq(ReferralRewardTable.workspaceID, workspaceID),
-              isNull(ReferralRewardTable.timeDeleted),
-              isNull(ReferralTable.timeDeleted),
-            ),
-          ),
+      const [invites, inviteeReferral] = await Promise.all([
         tx
           .select({ id: ReferralTable.id, inviteeEmail: AuthTable.subject, timeCreated: ReferralTable.timeCreated })
           .from(ReferralTable)
@@ -108,6 +85,16 @@ export namespace Referral {
           .then((rows) => rows.find((row) => row.inviterEmail) ?? rows[0]),
       ])
 
+      // Hide reward history until the referral_id index can be deployed and this lookup restored.
+      const rewards: {
+        referralID: string
+        workspaceID: string
+        referralWorkspaceID: string
+        inviteeEmail: string
+        amount: number
+        timeCreated: Date
+        timeApplied: Date | null
+      }[] = []
       // Hide pending invitee rewards until the referral_id index can be deployed and this lookup restored.
       const inviteeRewards = inviteeReferral ? [{ referralID: inviteeReferral.id }] : []
       return { inviteeReferral, inviteeRewards, invites, rewards }