prefix payments queries with schema name (#693)

Signed-off-by: Ivan Milchev <[email protected]>

Author: imilchev

apps/api/src/campaign/campaign.service.ts

@@ -110,16 +110,16 @@ export class CampaignService {
     v.campaign_id as id
     FROM api.vaults v
     LEFT JOIN (
-        SELECT 
+        SELECT
         target_vault_id,
         COUNT(d.id) FILTER (WHERE d.payment_id = p.id AND p.status::text = 'succeeded' OR p.status::text = 'guaranteed') AS donors,
         sum(d.amount) FILTER (WHERE d.payment_id = p.id AND p.status::text = 'succeeded') as reached,
         sum(d.amount) FILTER (WHERE d.payment_id = p.id AND p.status::text = 'guaranteed') as guaranteed
         FROM api.donations d
-        INNER JOIN payments as p ON p.id = d.payment_id
+        INNER JOIN api.payments as p ON p.id = d.payment_id
         GROUP BY target_vault_id
       ) as d
-      ON d.target_vault_id = v.id 
+      ON d.target_vault_id = v.id
     LEFT JOIN (
       SELECT source_vault_id, sum(amount) as "withdrawnAmount"
         FROM api.withdrawals w

apps/api/src/donations/donations.service.ts

@@ -689,7 +689,7 @@ export class DonationsService {
   async getDonorsCount() {
     const donorsCount = await this.prisma.$queryRaw<{
       count: number
-    }>`SELECT COUNT (*)::INTEGER FROM (SELECT DISTINCT billing_name FROM payments WHERE status::text=${PaymentStatus.succeeded}) AS unique_donors`
+    }>`SELECT COUNT (*)::INTEGER FROM (SELECT DISTINCT billing_name FROM api.payments WHERE status::text=${PaymentStatus.succeeded}) AS unique_donors`
 
     return { count: donorsCount[0].count }
   }

apps/api/src/statistics/statistics.service.ts

@@ -33,7 +33,7 @@ export class StatisticsService {
 
     return this.prisma.$queryRaw`
     SELECT SUM(d.amount)::INTEGER, COUNT(d.id)::INTEGER, ${date}
-    FROM api.donations d, payments p WHERE p.status::text = 'succeeded'
+    FROM api.donations d, api.payments p WHERE p.status::text = 'succeeded'
     ${Prisma.sql`AND target_vault_id IN ( SELECT id from api.vaults WHERE campaign_id = ${campaignId}::uuid)`}
     ${group}
     ORDER BY date ASC `
@@ -42,7 +42,7 @@ export class StatisticsService {
   async listUniqueDonations(campaignId: string): Promise<UniqueDonationsDto[]> {
     return this.prisma.$queryRaw`
     SELECT d.amount::INTEGER, COUNT(d.id)::INTEGER AS count
-    FROM api.donations d, payments p WHERE p.status::text = 'succeeded'
+    FROM api.donations d, api.payments p WHERE p.status::text = 'succeeded'
     ${Prisma.sql`AND target_vault_id IN ( SELECT id from api.vaults WHERE campaign_id = ${campaignId}::uuid)`}
     GROUP BY d.amount
     ORDER BY amount ASC`
@@ -51,7 +51,7 @@ export class StatisticsService {
   async listHourlyDonations(campaignId: string): Promise<HourlyDonationsDto[]> {
     return this.prisma.$queryRaw`
     SELECT EXTRACT(HOUR from d.created_at)::INTEGER AS hour, COUNT(d.id)::INTEGER AS count
-    FROM api.donations d, payments p WHERE p.status::text = 'succeeded'
+    FROM api.donations d, api.payments p WHERE p.status::text = 'succeeded'
     ${Prisma.sql`AND target_vault_id IN ( SELECT id from api.vaults WHERE campaign_id = ${campaignId}::uuid)`}
     GROUP BY hour
     ORDER BY hour ASC`