@bash-app/bash-common 30.62.0 → 30.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "30.62.0",
+  "version": "30.64.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "dist/index.js",

package/prisma/migrations/20250127_membershiptier_guest_to_basic/migration.sql

@@ -0,0 +1,5 @@
+/* Prisma Migrate: disable-transaction */
+-- Step 1: Add Basic to MembershipTier (must be committed before use)
+ALTER TYPE "MembershipTier" ADD VALUE 'Basic';
+
+

package/prisma/migrations/20250127_privacy_levels/migration.sql

@@ -0,0 +1,91 @@
+-- Add new Privacy enum values and migrate ConnectionsOnly -> ContactsOnly
+
+DO $
+$ 
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1
+    FROM pg_enum
+    WHERE enumlabel = 'ContactsOnly'
+        AND enumtypid = (SELECT oid
+        FROM pg_type
+        WHERE typname = 'Privacy')
+    ) THEN
+    ALTER TYPE "Privacy"
+    ADD VALUE 'ContactsOnly';
+END
+IF;
+
+    IF NOT EXISTS (
+        SELECT 1
+FROM pg_enum
+WHERE enumlabel = 'CreatorOnly'
+    AND enumtypid = (SELECT oid
+    FROM pg_type
+    WHERE typname = 'Privacy')
+    ) THEN
+ALTER TYPE "Privacy"
+ADD VALUE 'CreatorOnly';
+END
+IF;
+
+    IF NOT EXISTS (
+        SELECT 1
+FROM pg_enum
+WHERE enumlabel = 'ProOnly'
+    AND enumtypid = (SELECT oid
+    FROM pg_type
+    WHERE typname = 'Privacy')
+    ) THEN
+ALTER TYPE "Privacy"
+ADD VALUE 'ProOnly';
+END
+IF;
+
+    IF NOT EXISTS (
+        SELECT 1
+FROM pg_enum
+WHERE enumlabel = 'EliteOnly'
+    AND enumtypid = (SELECT oid
+    FROM pg_type
+    WHERE typname = 'Privacy')
+    ) THEN
+ALTER TYPE "Privacy"
+ADD VALUE 'EliteOnly';
+END
+IF;
+
+    IF NOT EXISTS (
+        SELECT 1
+FROM pg_enum
+WHERE enumlabel = 'LegendOnly'
+    AND enumtypid = (SELECT oid
+    FROM pg_type
+    WHERE typname = 'Privacy')
+    ) THEN
+ALTER TYPE "Privacy"
+ADD VALUE 'LegendOnly';
+END
+IF;
+END $$;
+
+-- Migrate ConnectionsOnly to ContactsOnly if present
+DO $$ 
+BEGIN
+    IF EXISTS (
+        SELECT 1
+    FROM pg_enum
+    WHERE enumlabel = 'ConnectionsOnly'
+        AND enumtypid = (SELECT oid
+        FROM pg_type
+        WHERE typname = 'Privacy')
+    ) THEN
+    UPDATE "BashEvent" 
+        SET "privacy" = 'ContactsOnly'
+    ::"Privacy" 
+        WHERE "privacy" = 'ConnectionsOnly'::"Privacy";
+END
+IF;
+END $$;
+
+

package/prisma/migrations/20250127_promotion_marketing_subtype_add_model/migration.sql

@@ -0,0 +1,20 @@
+-- Add 'Model' to PromotionAndMarketingSubType enum
+
+DO $
+$
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1
+    FROM pg_enum
+    WHERE enumlabel = 'Model'
+        AND enumtypid = (SELECT oid
+        FROM pg_type
+        WHERE typname = 'PromotionAndMarketingSubType')
+    ) THEN
+    ALTER TYPE "PromotionAndMarketingSubType"
+    ADD VALUE 'Model';
+END
+IF;
+END $$;
+
+

package/prisma/migrations/20250127_voucher_table/migration.sql

@@ -0,0 +1,68 @@
+-- Create VoucherStatus enum and Voucher table
+
+DO $
+$ 
+BEGIN
+    IF NOT EXISTS (SELECT 1
+    FROM pg_type
+    WHERE typname = 'VoucherStatus') THEN
+    CREATE TYPE "VoucherStatus" AS ENUM
+    ('Active', 'Used', 'Cancelled');
+END
+IF;
+END $$;
+
+CREATE TABLE
+IF NOT EXISTS "Voucher"
+(
+    "id" TEXT NOT NULL,
+    "codeHash" TEXT NOT NULL,
+    "issuedToEmail" TEXT,
+    "shopifyOrderId" TEXT,
+    "createdAt" TIMESTAMP
+(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "redeemedAt" TIMESTAMP
+(3),
+    "redeemedById" TEXT,
+    "status" "VoucherStatus" NOT NULL DEFAULT 'Active',
+    "stripePromotionCodeId" TEXT,
+    "stripeCouponId" TEXT,
+    CONSTRAINT "Voucher_pkey" PRIMARY KEY
+("id")
+);
+
+CREATE UNIQUE INDEX
+IF NOT EXISTS "Voucher_codeHash_key" ON "Voucher"
+("codeHash");
+CREATE INDEX
+IF NOT EXISTS "Voucher_issuedToEmail_idx" ON "Voucher"
+("issuedToEmail");
+CREATE INDEX
+IF NOT EXISTS "Voucher_shopifyOrderId_idx" ON "Voucher"
+("shopifyOrderId");
+CREATE INDEX
+IF NOT EXISTS "Voucher_status_idx" ON "Voucher"
+("status");
+CREATE INDEX
+IF NOT EXISTS "Voucher_createdAt_idx" ON "Voucher"
+("createdAt");
+
+DO $$ 
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1
+    FROM information_schema.table_constraints
+    WHERE constraint_name = 'Voucher_redeemedById_fkey'
+        AND table_name = 'Voucher'
+    ) THEN
+    ALTER TABLE "Voucher" 
+        ADD CONSTRAINT "Voucher_redeemedById_fkey" 
+        FOREIGN KEY ("redeemedById") 
+        REFERENCES "User"("id") 
+        ON DELETE SET NULL 
+        ON UPDATE CASCADE;
+END
+IF;
+END $$;
+
+

package/prisma/schema.prisma

@@ -1085,20 +1085,20 @@ enum SocialMediaPlatform {
 }
 
 model User {
-  id                            String               @id @default(cuid())
-  username                      String?              @unique
-  email                         String               @unique
-  createdOn                     DateTime             @default(now())
-  stripeCustomerId              String?              @unique
-  stripeAccountId               String?              @unique
-  isSuperUser                   Boolean              @default(false)
-  isSuspended                   Boolean              @default(false)
+  id                            String                  @id @default(cuid())
+  username                      String?                 @unique
+  email                         String                  @unique
+  createdOn                     DateTime                @default(now())
+  stripeCustomerId              String?                 @unique
+  stripeAccountId               String?                 @unique
+  isSuperUser                   Boolean                 @default(false)
+  isSuspended                   Boolean                 @default(false)
   intent                        UserIntent?
   googleCalendarAccess          String?
   googleCalendarSyncSettings    String?
   givenName                     String?
   familyName                    String?
-  nameChangeCount               Int                  @default(0)
+  nameChangeCount               Int                     @default(0)
   hash                          String?
   emailVerified                 DateTime?
   image                         String?
@@ -1106,19 +1106,19 @@ model User {
   dob                           DateTime?
   gender                        Gender?
   sex                           Sex?
-  roles                         UserRole[]           @default([User])
+  roles                         UserRole[]              @default([User])
   aboutMe                       String?
   levelBadge                    String?
-  temporaryBadges               String[]             @default([])
-  ownedServices                 Service[]            @relation("OwnedService")
-  createdServices               Service[]            @relation("CreatedService")
-  createdEvents                 BashEvent[]          @relation("CreatedEvent")
+  temporaryBadges               String[]                @default([])
+  ownedServices                 Service[]               @relation("OwnedService")
+  createdServices               Service[]               @relation("CreatedService")
+  createdEvents                 BashEvent[]             @relation("CreatedEvent")
   checkouts                     Checkout[]
-  ticketsISent                  Ticket[]             @relation("TicketsISent")
-  ticketsIOwn                   Ticket[]             @relation("TicketsIOwn")
-  transfersFrom                 TicketTransfer[]     @relation("TransfersFrom")
-  transfersTo                   TicketTransfer[]     @relation("TransfersTo")
-  ticketsOnWaitlist             Ticket[]             @relation("TicketsOnWaitlist")
+  ticketsISent                  Ticket[]                @relation("TicketsISent")
+  ticketsIOwn                   Ticket[]                @relation("TicketsIOwn")
+  transfersFrom                 TicketTransfer[]        @relation("TransfersFrom")
+  transfersTo                   TicketTransfer[]        @relation("TransfersTo")
+  ticketsOnWaitlist             Ticket[]                @relation("TicketsOnWaitlist")
   ticketTiersWaitListsIveJoined TicketTier[]
   reviews                       Review[]
   sponsorships                  SponsoredEvent[]
@@ -1142,23 +1142,24 @@ model User {
   city                          String?
   state                         String?
   zipCode                       String?
-  country                       String?              @default("US")
+  country                       String?                 @default("US")
   phone                         String?
   socialMediaProfiles           SocialMediaProfile[]
-  documentIDId                  String?              @unique
+  documentIDId                  String?                 @unique
   documentID                    DocumentID?
   comment                       BashComment[]
   associatedBashes              AssociatedBash[]
   associatedServices            AssociatedService[]
-  invitationsCreatedByMe        Invitation[]         @relation("InvitationsCreatedByMe")
-  invitationsSentToMe           Invitation[]         @relation("InvitationsSentToMe")
-  notificationsCreatedByMe      Notification[]       @relation("NotificationsCreatedByMe")
-  remindersCreatedByMe          Reminder[]           @relation("RemindersCreatedByMe")
-  remindersAssignedToMe         Reminder[]           @relation("RemindersAssignedToMe")
-  eventTasksAssignedToMe        EventTask[]          @relation("TasksAssignedToMe")
+  invitationsCreatedByMe        Invitation[]            @relation("InvitationsCreatedByMe")
+  invitationsSentToMe           Invitation[]            @relation("InvitationsSentToMe")
+  notificationsCreatedByMe      Notification[]          @relation("NotificationsCreatedByMe")
+  remindersCreatedByMe          Reminder[]              @relation("RemindersCreatedByMe")
+  remindersAssignedToMe         Reminder[]              @relation("RemindersAssignedToMe")
+  eventTasksAssignedToMe        EventTask[]             @relation("TasksAssignedToMe")
   contacts                      Contact[]
-  vouchersRedeemed              Voucher[]            @relation("UserVouchersRedeemed")
-  contactLists                  ContactList[]        @relation("UserContactLists")
+  vouchersRedeemed              Voucher[]               @relation("UserVouchersRedeemed")
+  pushNotificationTokens        PushNotificationToken[]
+  contactLists                  ContactList[]           @relation("UserContactLists")
   contactlist                   ContactList[]
 
   bashEventPromoCodesIUsed BashEventPromoCode[]
@@ -1978,6 +1979,7 @@ enum PromotionAndMarketingSubType {
   Influencer
   Promoter
   CelebrityAppearance
+  Model
 }
 
 enum StaffingSubType {
@@ -3701,3 +3703,19 @@ enum VoucherStatus {
   Used
   Cancelled
 }
+
+model PushNotificationToken {
+  id        String   @id @default(cuid())
+  userId    String
+  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  token     String   @unique
+  platform  String // 'web', 'ios', 'android'
+  userAgent String?
+  isActive  Boolean  @default(true)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@unique([userId, platform])
+  @@index([userId])
+  @@index([isActive])
+}