@bash-app/bash-common 30.116.0 → 30.118.0

package/prisma/verify-migration.sql

@@ -0,0 +1,132 @@
+-- ============================================================================
+-- POST-MIGRATION VERIFICATION SCRIPT
+-- Run this after applying comprehensive-migration-20260120.sql
+-- ============================================================================
+
+-- 1. Count all tables (expect 160+)
+SELECT COUNT(*) as total_tables 
+FROM information_schema.tables 
+WHERE table_schema = 'public';
+
+-- 2. Count all enums (expect 170+)
+SELECT COUNT(*) as total_enums 
+FROM pg_type 
+WHERE typtype = 'e';
+
+-- 3. Count all indexes (expect 400+)
+SELECT COUNT(*) as total_indexes 
+FROM pg_indexes 
+WHERE schemaname = 'public';
+
+-- 4. Verify critical tables exist
+SELECT 
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'User') THEN '✅' 
+    ELSE '❌' 
+  END as "User",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'BashEvent') THEN '✅' 
+    ELSE '❌' 
+  END as "BashEvent",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'Service') THEN '✅' 
+    ELSE '❌' 
+  END as "Service",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'Ticket') THEN '✅' 
+    ELSE '❌' 
+  END as "Ticket",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'BashFeedPost') THEN '✅' 
+    ELSE '❌' 
+  END as "BashFeedPost",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'Competition') THEN '✅' 
+    ELSE '❌' 
+  END as "Competition",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'Organization') THEN '✅' 
+    ELSE '❌' 
+  END as "Organization",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'TaskComment') THEN '✅' 
+    ELSE '❌' 
+  END as "TaskComment",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'TaskInvitation') THEN '✅' 
+    ELSE '❌' 
+  END as "TaskInvitation",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'AuditLog') THEN '✅' 
+    ELSE '❌' 
+  END as "AuditLog";
+
+-- 5. Verify critical enums exist
+SELECT 
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM pg_type WHERE typname = 'BashStatus') THEN '✅' 
+    ELSE '❌' 
+  END as "BashStatus",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM pg_type WHERE typname = 'ServiceStatus') THEN '✅' 
+    ELSE '❌' 
+  END as "ServiceStatus",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM pg_type WHERE typname = 'NotificationType') THEN '✅' 
+    ELSE '❌' 
+  END as "NotificationType",
+  CASE 
+    WHEN EXISTS (SELECT 1 FROM pg_type WHERE typname = 'Privacy') THEN '✅' 
+    ELSE '❌' 
+  END as "Privacy";
+
+-- 6. Check for any foreign key constraint errors
+SELECT 
+  conname as constraint_name,
+  conrelid::regclass as table_name,
+  confrelid::regclass as referenced_table
+FROM pg_constraint 
+WHERE contype = 'f' 
+  AND connamespace = 'public'::regnamespace
+LIMIT 10;
+
+-- 7. Verify specific columns from November migration
+SELECT 
+  CASE 
+    WHEN EXISTS (
+      SELECT 1 FROM information_schema.columns 
+      WHERE table_name = 'Service' AND column_name = 'acceptsBashCash'
+    ) THEN '✅ Service.acceptsBashCash exists' 
+    ELSE '❌ Service.acceptsBashCash MISSING' 
+  END as service_column,
+  CASE 
+    WHEN EXISTS (
+      SELECT 1 FROM information_schema.columns 
+      WHERE table_name = 'User' AND column_name = 'isLightweightAccount'
+    ) THEN '✅ User.isLightweightAccount exists' 
+    ELSE '❌ User.isLightweightAccount MISSING' 
+  END as user_column;
+
+-- 8. List all tables (alphabetically)
+SELECT table_name 
+FROM information_schema.tables 
+WHERE table_schema = 'public' 
+  AND table_type = 'BASE TABLE'
+ORDER BY table_name;
+
+-- ============================================================================
+-- Expected Results
+-- ============================================================================
+-- 
+-- Query 1: total_tables should be 160+
+-- Query 2: total_enums should be 170+
+-- Query 3: total_indexes should be 400+
+-- Query 4: All columns should show ✅
+-- Query 5: All enums should show ✅
+-- Query 6: Should return 10 foreign keys without errors
+-- Query 7: Both columns should show ✅
+-- Query 8: Should list all your tables alphabetically
+--
+-- If any ❌ appears, the migration may have failed partially
+-- Check postgres logs for errors
+-- ============================================================================

package/src/extendedSchemas.ts

@@ -223,7 +223,7 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   recurrence: true,
   ticketTiers: true,
   media: true,
-  eventTasks: true,
+  eventTasks: true, // ✅ FIXED: assignedMemberId issue resolved by syncing API schema
   invitations: true,
   competitions: {
     include: {
@@ -398,6 +398,15 @@ export const SERVICE_DATA_TO_INCLUDE = {
   sponsor: {
     include: SPONSOR_DATA_TO_INCLUDE,
   },
+  organization: {
+    include: {
+      _count: {
+        select: {
+          members: true,
+        }
+      }
+    }
+  }, // Include organization data with member counts
   // bookings: {
   //   include: SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE, //make sure only to include owned bookedDays
   // },

package/src/index.ts

@@ -1,6 +1,10 @@
 export * from "./definitions";
 export * from "./extendedSchemas";
 export * from "./membershipDefinitions";
+
+// Re-export commonly used Prisma types
+export type { Service, Organization, User, BashEvent } from '@prisma/client';
+
 export * from "./utils/addressUtils";
 export * from "./utils/apiUtils";
 export * from "./utils/arrayUtils";

package/src/utils/__tests__/paymentUtils.test.ts

@@ -0,0 +1,95 @@
+/**
+ * Tests for payment utility functions
+ * Testing business logic without database dependencies
+ */
+
+import {
+  calculateDiscountFromPromoCode,
+  convertCentsToDollars,
+  convertDollarsToCents,
+  calculateBashAppFee,
+  calculateBashAppFeeWithMembershipDiscount,
+} from "../paymentUtils";
+
+describe("PaymentUtils - Core Functions", () => {
+  describe("Currency Conversion", () => {
+    test("convertCentsToDollars", () => {
+      expect(convertCentsToDollars(100)).toBe(1);
+      expect(convertCentsToDollars(1000)).toBe(10);
+      expect(convertCentsToDollars(12345)).toBe(123.45);
+      expect(convertCentsToDollars(null)).toBe(0);
+      expect(convertCentsToDollars(undefined)).toBe(0);
+    });
+
+    test("convertDollarsToCents", () => {
+      expect(convertDollarsToCents(1)).toBe(100);
+      expect(convertDollarsToCents(10)).toBe(1000);
+      expect(convertDollarsToCents(123.45)).toBe(12345);
+      expect(convertDollarsToCents(null)).toBe(0);
+      expect(convertDollarsToCents(undefined)).toBe(0);
+    });
+
+    test("round-trip conversion", () => {
+      const dollars = 123.45;
+      const cents = convertDollarsToCents(dollars);
+      const backToDollars = convertCentsToDollars(cents);
+      expect(backToDollars).toBe(dollars);
+    });
+  });
+
+  describe("Promo Code Discounts", () => {
+    test("fixed amount discount", () => {
+      const promoCode: any = {
+        discountAmountInCents: 500,
+        discountAmountPercentage: null,
+      };
+      expect(calculateDiscountFromPromoCode(100, promoCode)).toBe(5);
+    });
+
+    test("percentage discount", () => {
+      const promoCode: any = {
+        discountAmountInCents: null,
+        discountAmountPercentage: 20,
+      };
+      expect(calculateDiscountFromPromoCode(100, promoCode)).toBe(20);
+    });
+
+    test("no discount when undefined", () => {
+      expect(calculateDiscountFromPromoCode(100, undefined)).toBe(0);
+    });
+
+    test("caps at 100%", () => {
+      const promoCode: any = {
+        discountAmountInCents: null,
+        discountAmountPercentage: 150,
+      };
+      expect(calculateDiscountFromPromoCode(100, promoCode)).toBe(100);
+    });
+  });
+
+  describe("Platform Fees", () => {
+    test("calculateBashAppFee", () => {
+      expect(calculateBashAppFee(1000)).toBe(70); // 7%
+    });
+
+    test("calculateBashAppFeeWithMembershipDiscount - Basic tier", () => {
+      const fee = calculateBashAppFeeWithMembershipDiscount(10000, "Basic" as any);
+      expect(fee).toBe(700); // 7%
+    });
+
+    test("calculateBashAppFeeWithMembershipDiscount - Creator tier", () => {
+      const fee = calculateBashAppFeeWithMembershipDiscount(10000, "Creator" as any);
+      expect(fee).toBe(300); // 3%
+    });
+
+    test("applies minimum fee", () => {
+      const fee = calculateBashAppFeeWithMembershipDiscount(100, "Creator" as any);
+      expect(fee).toBe(50); // minimum is 50 cents
+    });
+
+    test("applies cap", () => {
+      const fee = calculateBashAppFeeWithMembershipDiscount(100000, "Basic" as any);
+      expect(fee).toBe(1000); // cap at $10
+    });
+  });
+});