@bash-app/bash-common 30.66.1 → 30.66.2

package/package.json

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

package/prisma/schema.prisma

@@ -393,6 +393,9 @@ model BashEvent {
 
   // Event timing lock
   startTimeLocked Boolean @default(false) // Prevents start time changes after event starts
+
+  // Vendor booking relations
+  vendorBookingRequests VendorBookingRequest[] @relation("VendorBookingEvent")
 }
 
 model Coordinates {
@@ -1257,6 +1260,9 @@ model User {
 
   // Push notification relations
   pushNotificationTokens PushNotificationToken[]
+
+  // Vendor booking relations
+  vendorBookingRequestsAsHost VendorBookingRequest[] @relation("VendorBookingHost")
 }
 
 model UserPreferences {
@@ -1631,6 +1637,7 @@ model Service {
   bookings                ServiceBooking[]
   notification            Notification[]
   favoritedBy             UserFavorite[]
+  vendorBookingRequests   VendorBookingRequest[] @relation("VendorBookingService")
 }
 
 model StripeAccount {
@@ -1763,6 +1770,12 @@ model Vendor {
   maxBoothFeeCents       Int? @default(0)
   preferredBoothFeeCents Int? @default(0)
 
+  // Vendor requirements and preferences
+  spaceRequirements Json? // Space, equipment, and utility requirements
+  insurance         Json? // Insurance coverage information
+  permits           Json? // Permits and licenses
+  preferences       Json? // Vendor preferences (indoor/outdoor, duration, social media, etc.)
+
   service    Service?
   vendorBids VendorBid[] // Relation to bids
 }
@@ -3380,6 +3393,51 @@ model ServiceBooking {
   @@index([forUserId])
 }
 
+model VendorBookingRequest {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // Relations
+  hostUserId      String
+  hostUser        User    @relation("VendorBookingHost", fields: [hostUserId], references: [id], onDelete: Cascade)
+  vendorServiceId String
+  vendorService   Service @relation("VendorBookingService", fields: [vendorServiceId], references: [id], onDelete: Cascade)
+  bashEventId     String?
+  bashEvent       BashEvent? @relation("VendorBookingEvent", fields: [bashEventId], references: [id], onDelete: SetNull)
+
+  // Request data (stored as JSON for flexibility)
+  requestData Json // VendorBookingRequestData from frontend
+
+  // Status and workflow
+  status VendorBookingStatus @default(PENDING)
+
+  // Payment information (populated when vendor accepts)
+  paymentAmount         Float?
+  paymentStatus         String?
+  stripePaymentIntentId String?
+  paidAt                DateTime?
+
+  // Response from vendor
+  vendorResponse String? // Vendor's message when accepting/rejecting
+  respondedAt    DateTime?
+
+  @@index([hostUserId])
+  @@index([vendorServiceId])
+  @@index([status])
+  @@index([createdAt])
+}
+
+enum VendorBookingStatus {
+  PENDING   // Initial request sent
+  ACCEPTED  // Vendor accepted, awaiting payment
+  PAID      // Vendor has paid host
+  COMPLETED // Event completed successfully
+  REJECTED  // Vendor rejected request
+  CANCELLED // Host or vendor cancelled
+  EXPIRED   // Request expired without response
+}
+
 enum VisibilityPreference {
   Public
   Private

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

@@ -1,5 +0,0 @@
-/* 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

@@ -1,91 +0,0 @@
--- 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

@@ -1,20 +0,0 @@
--- 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

@@ -1,68 +0,0 @@
--- 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 $$;
-
-