fix(wallets): fix incorrenct funding balance calculation

.github/workflows/branch-deploys.yml

@@ -1,6 +1,7 @@
 name: Staging Deploy
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - next

.vscode/settings.json

@@ -1,5 +1,8 @@
 {
     "files.associations": {
         "**/*.scss": "tailwindcss"
-    }
+    },
+    "github-actions.workflows.pinned.workflows": [
+        ".github/workflows/branch-deploys.yml"
+    ]
 }

db/migrations/0000_melted_imperial_guard.sql → db/migrations/0000_breezy_surge.sql

@@ -8,12 +8,12 @@ CREATE TYPE "public"."account_connection_status" AS ENUM('active', 'inactive', '
 CREATE TYPE "public"."theme_pref" AS ENUM('system', 'dark', 'light');--> statement-breakpoint
 CREATE TABLE "campaign_publications" (
 	"id" bigint PRIMARY KEY GENERATED ALWAYS AS IDENTITY (sequence name "campaign_publications_id_seq" INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1),
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"campaign" bigint NOT NULL,
-	"credit_allocation" uuid NOT NULL,
-	"publish_after" date DEFAULT now(),
-	"publish_before" date
+	"creditAllocation" uuid NOT NULL,
+	"publishAfter" date DEFAULT now(),
+	"publishBefore" date
 );
 --> statement-breakpoint
 CREATE TABLE "campaigns" (
@@ -24,11 +24,11 @@ CREATE TABLE "campaigns" (
 	"links" text[] DEFAULT '{}',
 	"emails" text[] DEFAULT '{}',
 	"phones" text[] DEFAULT '{}',
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"categories" bigint[] DEFAULT '{}',
-	"created_by" bigint NOT NULL,
-	"redirect_url" varchar(500)
+	"createdBy" bigint NOT NULL,
+	"redirectUrl" varchar(500)
 );
 --> statement-breakpoint
 CREATE TABLE "categories" (
@@ -43,20 +43,22 @@ CREATE TABLE "payment_methods" (
 	"provider" "payment_method_provider" NOT NULL,
 	"params" jsonb NOT NULL,
 	"status" "payment_method_status" DEFAULT 'active' NOT NULL,
-	"created_at" timestamp DEFAULT now() NOT NULL,
-	"updated_at" timestamp DEFAULT now() NOT NULL,
+	"createdAt" timestamp DEFAULT now() NOT NULL,
+	"updatedAt" timestamp DEFAULT now() NOT NULL,
 	"owner" bigint NOT NULL
 );
 --> statement-breakpoint
 CREATE TABLE "payment_transactions" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"payment_method" "payment_method_provider" NOT NULL,
+	"paymentMethod" "payment_method_provider" NOT NULL,
 	"status" "transaction_status" NOT NULL,
-	"external_transaction_id" varchar(400),
-	"recorded_at" timestamp DEFAULT now(),
-	"completed_at" timestamp,
-	"cancelled_at" timestamp,
+	"externalTransactionId" varchar(400),
+	"recordedAt" timestamp DEFAULT now(),
+	"completedAt" timestamp,
+	"cancelledAt" timestamp,
 	"value" real NOT NULL,
+	"exchangeRateSnapshot" real NOT NULL,
+	"convertedValue" real NOT NULL,
 	"notes" text,
 	"currency" varchar(10) NOT NULL,
 	"params" jsonb,
@@ -65,35 +67,34 @@ CREATE TABLE "payment_transactions" (
 --> statement-breakpoint
 CREATE TABLE "credit_allocations" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"exhausted" real DEFAULT 0 NOT NULL,
-	"allocated" real NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"allocated" bigint NOT NULL,
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"status" "credit_allocation_status" DEFAULT 'active' NOT NULL,
 	"wallet" uuid NOT NULL
 );
 --> statement-breakpoint
 CREATE TABLE "wallet_transactions" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
 	"value" bigint NOT NULL,
-	"from" uuid NOT NULL,
+	"from" uuid,
 	"to" uuid NOT NULL,
-	"recorded_at" timestamp DEFAULT now(),
-	"completed_at" timestamp,
-	"cancelled_at" timestamp,
+	"recordedAt" timestamp DEFAULT now(),
+	"completedAt" timestamp,
+	"cancelledAt" timestamp,
 	"status" "transaction_status" DEFAULT 'pending',
 	"type" "wallet_transaction_type" NOT NULL,
 	"notes" text,
-	"account_transaction" uuid,
-	"credit_allocation" uuid
+	"accountTransaction" uuid,
+	"creditAllocation" uuid
 );
 --> statement-breakpoint
 CREATE TABLE "wallets" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"owned_by" bigint NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
-	"starting_balance" bigint DEFAULT 0
+	"ownedBy" bigint NOT NULL,
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
+	"startingBalance" bigint DEFAULT 0
 );
 --> statement-breakpoint
 CREATE TABLE "access_tokens" (
@@ -108,21 +109,21 @@ CREATE TABLE "access_tokens" (
 --> statement-breakpoint
 CREATE TABLE "account_connections" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"user" bigint NOT NULL,
 	"provider" "account_connection_providers" NOT NULL,
 	"params" jsonb NOT NULL,
 	"status" "account_connection_status" DEFAULT 'active' NOT NULL,
-	"provider_id" varchar(255) NOT NULL
+	"providerId" varchar(255) NOT NULL
 );
 --> statement-breakpoint
 CREATE TABLE "federated_credentials" (
 	"id" varchar(255) PRIMARY KEY NOT NULL,
 	"provider" varchar(255) NOT NULL,
-	"last_access_token" varchar(500),
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now()
+	"lastAccessToken" varchar(500),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now()
 );
 --> statement-breakpoint
 CREATE TABLE "refresh_tokens" (
@@ -140,8 +141,8 @@ CREATE TABLE "refresh_tokens" (
 --> statement-breakpoint
 CREATE TABLE "user_prefs" (
 	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"user" bigint NOT NULL,
 	"country" varchar(2) NOT NULL,
 	"theme" "theme_pref" DEFAULT 'light' NOT NULL,
@@ -151,10 +152,10 @@ CREATE TABLE "user_prefs" (
 --> statement-breakpoint
 CREATE TABLE "users" (
 	"id" bigint PRIMARY KEY GENERATED ALWAYS AS IDENTITY (sequence name "users_id_seq" INCREMENT BY 1 MINVALUE 1 MAXVALUE 9223372036854775807 START WITH 100 CACHE 1),
-	"created_at" timestamp DEFAULT now(),
-	"updated_at" timestamp DEFAULT now(),
+	"createdAt" timestamp DEFAULT now(),
+	"updatedAt" timestamp DEFAULT now(),
 	"names" varchar(100) NOT NULL,
-	"image_url" varchar(255),
+	"imageUrl" varchar(255),
 	"email" varchar(100) NOT NULL,
 	"dob" date,
 	"phone" varchar(255),
@@ -172,15 +173,15 @@ CREATE TABLE "verification_codes" (
 );
 --> statement-breakpoint
 ALTER TABLE "campaign_publications" ADD CONSTRAINT "campaign_publications_campaign_campaigns_id_fk" FOREIGN KEY ("campaign") REFERENCES "public"."campaigns"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "campaign_publications" ADD CONSTRAINT "campaign_publications_credit_allocation_credit_allocations_id_fk" FOREIGN KEY ("credit_allocation") REFERENCES "public"."credit_allocations"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "campaigns" ADD CONSTRAINT "campaigns_created_by_users_id_fk" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "campaign_publications" ADD CONSTRAINT "campaign_publications_creditAllocation_credit_allocations_id_fk" FOREIGN KEY ("creditAllocation") REFERENCES "public"."credit_allocations"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "campaigns" ADD CONSTRAINT "campaigns_createdBy_users_id_fk" FOREIGN KEY ("createdBy") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "payment_methods" ADD CONSTRAINT "payment_methods_owner_users_id_fk" FOREIGN KEY ("owner") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "credit_allocations" ADD CONSTRAINT "credit_allocations_wallet_wallets_id_fk" FOREIGN KEY ("wallet") REFERENCES "public"."wallets"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_from_wallets_id_fk" FOREIGN KEY ("from") REFERENCES "public"."wallets"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_to_wallets_id_fk" FOREIGN KEY ("to") REFERENCES "public"."wallets"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_account_transaction_payment_transactions_id_fk" FOREIGN KEY ("account_transaction") REFERENCES "public"."payment_transactions"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_credit_allocation_credit_allocations_id_fk" FOREIGN KEY ("credit_allocation") REFERENCES "public"."credit_allocations"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "wallets" ADD CONSTRAINT "wallets_owned_by_users_id_fk" FOREIGN KEY ("owned_by") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_accountTransaction_payment_transactions_id_fk" FOREIGN KEY ("accountTransaction") REFERENCES "public"."payment_transactions"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "wallet_transactions" ADD CONSTRAINT "wallet_transactions_creditAllocation_credit_allocations_id_fk" FOREIGN KEY ("creditAllocation") REFERENCES "public"."credit_allocations"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "wallets" ADD CONSTRAINT "wallets_ownedBy_users_id_fk" FOREIGN KEY ("ownedBy") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "access_tokens" ADD CONSTRAINT "access_tokens_user_users_id_fk" FOREIGN KEY ("user") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "access_tokens" ADD CONSTRAINT "access_tokens_replaced_by_access_tokens_id_fk" FOREIGN KEY ("replaced_by") REFERENCES "public"."access_tokens"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "account_connections" ADD CONSTRAINT "account_connections_user_users_id_fk" FOREIGN KEY ("user") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
@@ -192,32 +193,28 @@ ALTER TABLE "user_prefs" ADD CONSTRAINT "user_prefs_user_users_id_fk" FOREIGN KE
 ALTER TABLE "users" ADD CONSTRAINT "users_credentials_federated_credentials_id_fk" FOREIGN KEY ("credentials") REFERENCES "public"."federated_credentials"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
 CREATE UNIQUE INDEX "payment_methods_provider_owner_index" ON "payment_methods" USING btree ("provider","owner");--> statement-breakpoint
 CREATE UNIQUE INDEX "refresh_tokens_token_user_index" ON "refresh_tokens" USING btree ("token","user");--> statement-breakpoint
-CREATE VIEW "public"."vw_funding_balances" AS (select "wallets"."id", 
-      "wallets"."starting_balance" +
-      SUM(
-        CASE
-          WHEN "credit_allocations"."status" = 'active' THEN "credit_allocations"."allocated"
-          ELSE 0
-        END
-      ) * -1 +
-      SUM(
-        CASE
-          WHEN ("wallet_transactions"."from" = "wallets"."id" and "wallet_transactions"."type" = 'funding' and "wallet_transactions"."status" = 'complete') THEN -"wallet_transactions"."value"
-          WHEN ("wallet_transactions"."to" = "wallets"."id" and "wallet_transactions"."type" = 'funding' and "wallet_transactions"."status" = 'complete') THEN "wallet_transactions"."value"
-          ELSE 0
-        END
-      )::BIGINT as "balance", "wallets"."owned_by" from "wallets" left join "wallet_transactions" on ("wallets"."id" = "wallet_transactions"."from" or "wallets"."id" = "wallet_transactions"."to") left join "users" on "wallets"."owned_by" = "users"."id" left join "credit_allocations" on "wallets"."id" = "credit_allocations"."wallet" group by "wallets"."id", "wallets"."owned_by");--> statement-breakpoint
+CREATE VIEW "public"."vw_funding_balances" AS (select "wallets"."id", "wallets"."ownedBy", 
+        "wallets"."startingBalance" -
+        COALESCE("total_allocated",0) -
+        COALESCE("total_outgoing",0) +
+        COALESCE("total_incoming",0)
+       as "balance" from "wallets" left join (select "to", COALESCE(SUM("value"), 0) as "total_incoming" from "wallet_transactions" where "wallet_transactions"."status" = 'complete' group by "wallet_transactions"."to") "incoming_transactions" on "incoming_transactions"."to" = "wallets"."id" left join (select "from", COALESCE(SUM("value"), 0) as "total_outgoing" from "wallet_transactions" where "wallet_transactions"."status" = 'complete' group by "wallet_transactions"."from") "outgoing_transactions" on "outgoing_transactions"."from" = "wallets"."id" left join (select "wallet", COALESCE(SUM("allocated"), 0) as "total_allocated" from "credit_allocations" where "credit_allocations"."status" = 'active' group by "credit_allocations"."wallet") "allocation_summary" on "allocation_summary"."wallet" = "wallets"."id");--> statement-breakpoint
 CREATE VIEW "public"."vw_reward_balances" AS (select "wallets"."id", 
       SUM(
         CASE
           WHEN ("wallet_transactions"."from" = "wallets"."id" and "wallet_transactions"."type" = 'reward' and "wallet_transactions"."status" = 'complete') THEN -"wallet_transactions"."value"
           WHEN ("wallet_transactions"."to" = "wallets"."id" and "wallet_transactions"."type" = 'reward' and "wallet_transactions"."status" = 'complete') THEN "wallet_transactions"."value"
           ELSE 0
         END
-      )::BIGINT as "balance", "wallets"."owned_by" from "wallets" left join "wallet_transactions" on ("wallets"."id" = "wallet_transactions"."from" or "wallets"."id" = "wallet_transactions"."to") left join "users" on "wallets"."owned_by" = "users"."id" group by "wallets"."id", "wallets"."owned_by");--> statement-breakpoint
+      )::BIGINT as "balance", "wallets"."ownedBy" from "wallets" left join "wallet_transactions" on ("wallets"."id" = "wallet_transactions"."from" or "wallets"."id" = "wallet_transactions"."to") left join "users" on "wallets"."ownedBy" = "users"."id" group by "wallets"."id", "wallets"."ownedBy");--> statement-breakpoint
 CREATE VIEW "public"."vw_credit_allocations" AS (select "credit_allocations"."id", "credit_allocations"."wallet", "credit_allocations"."allocated", 
-        COALESCE(SUM("wallet_transactions"."value"), 0)
-       as "exhausted" from "credit_allocations" left join "wallet_transactions" on ("credit_allocations"."id" = "wallet_transactions"."credit_allocation" and "wallet_transactions"."type" = 'reward' and "wallet_transactions"."from" = "credit_allocations"."wallet") group by "credit_allocations"."id");--> statement-breakpoint
+        SUM(
+          CASE
+            WHEN ("wallet_transactions"."type" = 'reward' and "wallet_transactions"."from" = "credit_allocations"."wallet") THEN "wallet_transactions"."value"
+            ELSE 0
+          END
+        )
+       as "exhausted" from "credit_allocations" left join "wallet_transactions" on ("credit_allocations"."id" = "wallet_transactions"."creditAllocation" and "wallet_transactions"."type" = 'reward' and "wallet_transactions"."from" = "credit_allocations"."wallet") group by "credit_allocations"."id");--> statement-breakpoint
 CREATE VIEW "public"."vw_verification_codes" AS (select "hash", "created_at", 
       ("created_at" + "window")::TIMESTAMP
      as "expires_at",