Merge pull request #478 from Merit-Systems/master

[Release] api key template

Author: zdql

packages/app/control/src/services/db/admin/user-earning-summary.ts

@@ -39,7 +39,7 @@ export async function getUserEarningsOverviewMetrics(): Promise<
         0 AS earning_users -- placeholder; real value in eu CTE
       FROM "transactions" t
     ), p AS (
-      SELECT COALESCE(SUM(p."amount") FILTER (WHERE p."status" = 'completed'), 0)::double precision AS total_completed_payouts
+      SELECT COALESCE(SUM(p."amount") FILTER (WHERE p."status" = 'COMPLETED'::"EnumPayoutStatus"), 0)::double precision AS total_completed_payouts
       FROM "payouts" p
     ), eu AS (
       SELECT COUNT(DISTINCT am."userId") AS earning_users
@@ -89,8 +89,8 @@ export async function getUserEarningsOverviewMetrics(): Promise<
     ),
     payouts AS (
       SELECT 
-        COALESCE(SUM(CASE WHEN p."status" = 'completed' AND p."createdAt" >= r.start_current AND p."createdAt" < r.end_current THEN p."amount" END), 0)::double precision AS payouts_current,
-        COALESCE(SUM(CASE WHEN p."status" = 'completed' AND p."createdAt" >= r.start_prev AND p."createdAt" < r.end_prev THEN p."amount" END), 0)::double precision AS payouts_prev
+        COALESCE(SUM(CASE WHEN p."status" = 'COMPLETED'::"EnumPayoutStatus" AND p."createdAt" >= r.start_current AND p."createdAt" < r.end_current THEN p."amount" END), 0)::double precision AS payouts_current,
+        COALESCE(SUM(CASE WHEN p."status" = 'COMPLETED'::"EnumPayoutStatus" AND p."createdAt" >= r.start_prev AND p."createdAt" < r.end_prev THEN p."amount" END), 0)::double precision AS payouts_prev
       FROM "payouts" p, ranges r
     ),
     earning_users AS (

packages/app/control/src/services/db/admin/user-earnings.ts

@@ -41,7 +41,7 @@ const COLUMN_MAPPINGS: Record<string, string> = {
   referralCodesGenerated: 'COUNT(DISTINCT rc.id)',
   referredUsersCount: 'COUNT(DISTINCT am_referred.id)',
   totalCompletedPayouts:
-    'COALESCE(SUM(p."amount") FILTER (WHERE p."status" = \'completed\'), 0)',
+    'COALESCE(SUM(p."amount") FILTER (WHERE p."status" = \'COMPLETED\'::"EnumPayoutStatus"), 0)',
   createdAt: 'u."createdAt"',
   updatedAt: 'u."updatedAt"',
 };
@@ -90,7 +90,7 @@ export const getUserEarningsWithPagination = async (
       ) as "uniqueEmailCampaigns",
       COUNT(DISTINCT rc.id) as "referralCodesGenerated",
       COUNT(DISTINCT am_referred.id) as "referredUsersCount",
-      COALESCE(SUM(p."amount") FILTER (WHERE p."status" = 'completed'), 0) as "totalCompletedPayouts",
+      COALESCE(SUM(p."amount") FILTER (WHERE p."status" = 'COMPLETED'::"EnumPayoutStatus"), 0) as "totalCompletedPayouts",
       u."createdAt",
       u."updatedAt"
     FROM "users" u

packages/app/control/src/services/db/admin/user/apps.ts

@@ -75,7 +75,7 @@ const getPayoutInformation = async (appIds: string[]) => {
       COALESCE(SUM(p.amount), 0) as "totalClaimed"
     FROM "payouts" p
     WHERE (p."echoAppId" = ANY($1::uuid[]) OR p."userId" = ANY($2::uuid[]))
-      AND p.status = 'completed'
+      AND p.status = 'COMPLETED'::"EnumPayoutStatus"
     GROUP BY p."echoAppId", p."userId", p.type
   `;
 

packages/app/control/src/services/db/admin/user/user-summary.ts

@@ -95,7 +95,7 @@ async function getUserOverviewSummary(
         SELECT 
           COALESCE(SUM(p."amount"), 0) AS "totalCompletedPayouts"
         FROM "payouts" p
-        WHERE p."userId" = u.id AND p."status" = 'completed'
+        WHERE p."userId" = u.id AND p."status" = 'COMPLETED'::"EnumPayoutStatus"
       ) p_agg ON TRUE
       WHERE u.id = $1::uuid
     ),
@@ -232,8 +232,8 @@ export const getUserOverviewMetrics = async (
     ),
     payouts_user AS (
       SELECT 
-        COALESCE(SUM(CASE WHEN p."status" = 'completed' AND p."createdAt" >= r.start_current AND p."createdAt" < r.end_current THEN p."amount" END), 0)::double precision AS payouts_current,
-        COALESCE(SUM(CASE WHEN p."status" = 'completed' AND p."createdAt" >= r.start_prev AND p."createdAt" < r.end_prev THEN p."amount" END), 0)::double precision AS payouts_prev
+        COALESCE(SUM(CASE WHEN p."status" = 'COMPLETED'::"EnumPayoutStatus" AND p."createdAt" >= r.start_current AND p."createdAt" < r.end_current THEN p."amount" END), 0)::double precision AS payouts_current,
+        COALESCE(SUM(CASE WHEN p."status" = 'COMPLETED'::"EnumPayoutStatus" AND p."createdAt" >= r.start_prev AND p."createdAt" < r.end_prev THEN p."amount" END), 0)::double precision AS payouts_prev
       FROM "payouts" p, ranges r
       WHERE p."userId" = $1::uuid
     ),

templates/nextjs-api-key-template/.env.local

@@ -0,0 +1,6 @@
+# Database - Docker PostgreSQL
+DATABASE_URL="postgresql://api_user:api_password@localhost:5433/nextjs_api_template?schema=public"
+
+# Echo App ID
+ECHO_APP_ID=2c3da4eb-bfae-4615-8a6f-31389d2840dd
+NEXT_PUBLIC_ECHO_APP_ID=2c3da4eb-bfae-4615-8a6f-31389d2840dd

templates/nextjs-api-key-template/.gitignore

@@ -0,0 +1,45 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+
+# prisma
+src/generated