@bash-app/bash-common 30.117.0 → 30.118.0

package/prisma/delta-migration-20260120.sql

@@ -0,0 +1,302 @@
+-- ============================================================================
+-- DELTA MIGRATION - January 20, 2026
+-- New columns and tables added since last commit
+-- ============================================================================
+
+-- 1. BashFeedPost: Make bashId optional, add serviceId
+-- ============================================================================
+ALTER TABLE "BashFeedPost" ALTER COLUMN "bashId" DROP NOT NULL;
+ALTER TABLE "BashFeedPost" ADD COLUMN IF NOT EXISTS "serviceId" TEXT;
+ALTER TABLE "BashFeedPost" ADD CONSTRAINT "BashFeedPost_serviceId_fkey" 
+  FOREIGN KEY ("serviceId") REFERENCES "Service"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+CREATE INDEX IF NOT EXISTS "BashFeedPost_serviceId_idx" ON "BashFeedPost"("serviceId");
+
+-- 2. BashEvent: Add isAutoApprovable and organization fields
+-- ============================================================================
+ALTER TABLE "BashEvent" ADD COLUMN IF NOT EXISTS "isAutoApprovable" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "BashEvent" ADD COLUMN IF NOT EXISTS "organizationId" TEXT;
+ALTER TABLE "BashEvent" ADD CONSTRAINT "BashEvent_organizationId_fkey" 
+  FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+CREATE INDEX IF NOT EXISTS "BashEvent_organizationId_idx" ON "BashEvent"("organizationId");
+
+-- 3. Service: Add verification and certification fields
+-- ============================================================================
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "isVerified" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "isLicensed" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "verifiedAt" TIMESTAMP(3);
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "licenseNumber" TEXT;
+ALTER TABLE "Service" ADD COLUMN IF NOT EXISTS "certifications" TEXT[] DEFAULT ARRAY[]::TEXT[];
+CREATE INDEX IF NOT EXISTS "Service_isVerified_idx" ON "Service"("isVerified");
+CREATE INDEX IF NOT EXISTS "Service_isLicensed_idx" ON "Service"("isLicensed");
+
+-- 4. User: Add organization relations (these are handled by Organization tables below)
+-- Note: These are just relation fields in Prisma, no actual columns needed in User table
+
+-- 5. Organization: Create complete organization system
+-- ============================================================================
+
+-- Create OrganizationType enum if it doesn't exist
+DO $$ BEGIN
+  CREATE TYPE "OrganizationType" AS ENUM (
+    'Nonprofit',
+    'ForProfit',
+    'Religious',
+    'Educational',
+    'Government',
+    'Club',
+    'Association',
+    'Fraternity',
+    'Sorority',
+    'Union',
+    'Cooperative',
+    'Other'
+  );
+EXCEPTION
+  WHEN duplicate_object THEN null;
+END $$;
+
+-- Create Organization table
+CREATE TABLE IF NOT EXISTS "Organization" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL,
+  "slug" TEXT NOT NULL UNIQUE,
+  "organizationType" "OrganizationType"[],
+  "bio" TEXT,
+  "mission" TEXT,
+  "pocName" TEXT,
+  "pocEmail" TEXT,
+  "pocPhone" TEXT,
+  "street" TEXT,
+  "city" TEXT,
+  "state" TEXT,
+  "zipCode" TEXT,
+  "country" TEXT DEFAULT 'US',
+  "coverPhoto" TEXT,
+  "logoUrl" TEXT,
+  "websiteUrl" TEXT,
+  "socialLinks" JSONB,
+  "goodsOrServices" TEXT[],
+  "venueTypes" TEXT[],
+  "secondaryVenueTypes" TEXT[] DEFAULT ARRAY[]::TEXT[],
+  "baseMembershipPriceCents" INTEGER,
+  "premiumMembershipPriceCents" INTEGER,
+  "allowGuestsByDefault" BOOLEAN DEFAULT false,
+  "defaultGuestLimit" INTEGER DEFAULT 0,
+  "visibility" TEXT DEFAULT 'Public',
+  "requiresApproval" BOOLEAN DEFAULT true,
+  "memberAutoApproval" BOOLEAN DEFAULT false,
+  "ownerId" TEXT NOT NULL,
+  "parentOrganizationId" TEXT,
+  "departmentName" TEXT,
+  "hierarchyLevel" INTEGER DEFAULT 0,
+  "subscriptionTier" TEXT,
+  "subscriptionStatus" TEXT,
+  "stripeSubscriptionId" TEXT UNIQUE,
+  "stripeCustomerId" TEXT,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  CONSTRAINT "Organization_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+  CONSTRAINT "Organization_parentOrganizationId_fkey" FOREIGN KEY ("parentOrganizationId") REFERENCES "Organization"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "Organization_ownerId_idx" ON "Organization"("ownerId");
+CREATE INDEX IF NOT EXISTS "Organization_slug_idx" ON "Organization"("slug");
+CREATE INDEX IF NOT EXISTS "Organization_parentOrganizationId_idx" ON "Organization"("parentOrganizationId");
+
+-- Create OrganizationMember table
+CREATE TABLE IF NOT EXISTS "OrganizationMember" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "organizationId" TEXT NOT NULL,
+  "userId" TEXT NOT NULL,
+  "role" TEXT DEFAULT 'Member',
+  "membershipTier" TEXT DEFAULT 'Base',
+  "status" TEXT DEFAULT 'Pending',
+  "joinedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "approvedAt" TIMESTAMP(3),
+  "approvedBy" TEXT,
+  "paidUntil" TIMESTAMP(3),
+  "paymentStatus" TEXT DEFAULT 'Current',
+  "guestLimit" INTEGER,
+  "canInvite" BOOLEAN DEFAULT true,
+  "canCreateEvents" BOOLEAN DEFAULT false,
+  "canManageBudgets" BOOLEAN DEFAULT false,
+  CONSTRAINT "OrganizationMember_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "OrganizationMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "OrganizationMember_organizationId_userId_key" UNIQUE ("organizationId", "userId")
+);
+
+CREATE INDEX IF NOT EXISTS "OrganizationMember_organizationId_idx" ON "OrganizationMember"("organizationId");
+CREATE INDEX IF NOT EXISTS "OrganizationMember_userId_idx" ON "OrganizationMember"("userId");
+CREATE INDEX IF NOT EXISTS "OrganizationMember_status_idx" ON "OrganizationMember"("status");
+
+-- Create Department table
+CREATE TABLE IF NOT EXISTS "Department" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "organizationId" TEXT NOT NULL,
+  "name" TEXT NOT NULL,
+  "description" TEXT,
+  "parentDeptId" TEXT,
+  "headUserId" TEXT,
+  "budgetCents" INTEGER,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  CONSTRAINT "Department_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "Department_parentDeptId_fkey" FOREIGN KEY ("parentDeptId") REFERENCES "Department"("id") ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT "Department_headUserId_fkey" FOREIGN KEY ("headUserId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "Department_organizationId_idx" ON "Department"("organizationId");
+CREATE INDEX IF NOT EXISTS "Department_parentDeptId_idx" ON "Department"("parentDeptId");
+
+-- Create OrganizationEvent table
+CREATE TABLE IF NOT EXISTS "OrganizationEvent" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "organizationId" TEXT NOT NULL,
+  "title" TEXT NOT NULL,
+  "description" TEXT,
+  "eventType" TEXT,
+  "startTime" TIMESTAMP(3) NOT NULL,
+  "endTime" TIMESTAMP(3),
+  "location" TEXT,
+  "maxAttendees" INTEGER,
+  "requiresRSVP" BOOLEAN DEFAULT true,
+  "allowGuests" BOOLEAN DEFAULT false,
+  "guestLimit" INTEGER DEFAULT 0,
+  "creatorId" TEXT NOT NULL,
+  "departmentId" TEXT,
+  "isPublic" BOOLEAN DEFAULT false,
+  "budgetCents" INTEGER,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  CONSTRAINT "OrganizationEvent_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "OrganizationEvent_creatorId_fkey" FOREIGN KEY ("creatorId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+  CONSTRAINT "OrganizationEvent_departmentId_fkey" FOREIGN KEY ("departmentId") REFERENCES "Department"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "OrganizationEvent_organizationId_idx" ON "OrganizationEvent"("organizationId");
+CREATE INDEX IF NOT EXISTS "OrganizationEvent_creatorId_idx" ON "OrganizationEvent"("creatorId");
+CREATE INDEX IF NOT EXISTS "OrganizationEvent_startTime_idx" ON "OrganizationEvent"("startTime");
+
+-- Create EventRSVP table
+CREATE TABLE IF NOT EXISTS "EventRSVP" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "eventId" TEXT NOT NULL,
+  "memberId" TEXT NOT NULL,
+  "userId" TEXT NOT NULL,
+  "status" TEXT DEFAULT 'Pending',
+  "guestCount" INTEGER DEFAULT 0,
+  "respondedAt" TIMESTAMP(3),
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT "EventRSVP_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "OrganizationEvent"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "EventRSVP_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "OrganizationMember"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "EventRSVP_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "EventRSVP_eventId_memberId_key" UNIQUE ("eventId", "memberId")
+);
+
+CREATE INDEX IF NOT EXISTS "EventRSVP_eventId_idx" ON "EventRSVP"("eventId");
+CREATE INDEX IF NOT EXISTS "EventRSVP_memberId_idx" ON "EventRSVP"("memberId");
+
+-- Create OrganizationBudget table
+CREATE TABLE IF NOT EXISTS "OrganizationBudget" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "organizationId" TEXT NOT NULL,
+  "name" TEXT NOT NULL,
+  "description" TEXT,
+  "totalCents" INTEGER NOT NULL,
+  "spentCents" INTEGER DEFAULT 0,
+  "fiscalYear" INTEGER,
+  "startDate" TIMESTAMP(3) NOT NULL,
+  "endDate" TIMESTAMP(3) NOT NULL,
+  "approvedBy" TEXT,
+  "approvedAt" TIMESTAMP(3),
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  CONSTRAINT "OrganizationBudget_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "OrganizationBudget_approvedBy_fkey" FOREIGN KEY ("approvedBy") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "OrganizationBudget_organizationId_idx" ON "OrganizationBudget"("organizationId");
+
+-- Create BudgetExpense table
+CREATE TABLE IF NOT EXISTS "BudgetExpense" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "budgetId" TEXT NOT NULL,
+  "eventId" TEXT,
+  "description" TEXT NOT NULL,
+  "amountCents" INTEGER NOT NULL,
+  "category" TEXT,
+  "submittedBy" TEXT NOT NULL,
+  "approvedBy" TEXT,
+  "approvedAt" TIMESTAMP(3),
+  "rejectedAt" TIMESTAMP(3),
+  "receiptUrl" TEXT,
+  "status" TEXT DEFAULT 'Pending',
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT "BudgetExpense_budgetId_fkey" FOREIGN KEY ("budgetId") REFERENCES "OrganizationBudget"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  "eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "OrganizationEvent"("id") ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT "BudgetExpense_submittedBy_fkey" FOREIGN KEY ("submittedBy") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+  CONSTRAINT "BudgetExpense_approvedBy_fkey" FOREIGN KEY ("approvedBy") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "BudgetExpense_budgetId_idx" ON "BudgetExpense"("budgetId");
+CREATE INDEX IF NOT EXISTS "BudgetExpense_eventId_idx" ON "BudgetExpense"("eventId");
+
+-- Create EventProposal table
+CREATE TABLE IF NOT EXISTS "EventProposal" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "organizationId" TEXT NOT NULL,
+  "title" TEXT NOT NULL,
+  "description" TEXT NOT NULL,
+  "proposedDate" TIMESTAMP(3),
+  "estimatedBudgetCents" INTEGER,
+  "creatorId" TEXT NOT NULL,
+  "status" TEXT DEFAULT 'Pending',
+  "votingDeadline" TIMESTAMP(3),
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  "updatedAt" TIMESTAMP(3) NOT NULL,
+  CONSTRAINT "EventProposal_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "EventProposal_creatorId_fkey" FOREIGN KEY ("creatorId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+CREATE INDEX IF NOT EXISTS "EventProposal_organizationId_idx" ON "EventProposal"("organizationId");
+CREATE INDEX IF NOT EXISTS "EventProposal_status_idx" ON "EventProposal"("status");
+
+-- Create ProposalVote table
+CREATE TABLE IF NOT EXISTS "ProposalVote" (
+  "id" TEXT NOT NULL PRIMARY KEY,
+  "proposalId" TEXT NOT NULL,
+  "voterId" TEXT NOT NULL,
+  "vote" TEXT NOT NULL,
+  "comment" TEXT,
+  "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT "ProposalVote_proposalId_fkey" FOREIGN KEY ("proposalId") REFERENCES "EventProposal"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "ProposalVote_voterId_fkey" FOREIGN KEY ("voterId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "ProposalVote_proposalId_voterId_key" UNIQUE ("proposalId", "voterId")
+);
+
+CREATE INDEX IF NOT EXISTS "ProposalVote_proposalId_idx" ON "ProposalVote"("proposalId");
+
+-- Create _FavoriteOrganizations join table
+CREATE TABLE IF NOT EXISTS "_FavoriteOrganizations" (
+  "A" TEXT NOT NULL,
+  "B" TEXT NOT NULL,
+  CONSTRAINT "_FavoriteOrganizations_A_fkey" FOREIGN KEY ("A") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT "_FavoriteOrganizations_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "_FavoriteOrganizations_AB_unique" ON "_FavoriteOrganizations"("A", "B");
+CREATE INDEX IF NOT EXISTS "_FavoriteOrganizations_B_index" ON "_FavoriteOrganizations"("B");
+
+-- ============================================================================
+-- VERIFICATION QUERIES
+-- ============================================================================
+
+-- Run these after migration to verify:
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'BashFeedPost' AND column_name = 'serviceId';
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'BashEvent' AND column_name = 'isAutoApprovable';
+-- SELECT column_name FROM information_schema.columns WHERE table_name = 'Service' AND column_name = 'isVerified';
+-- SELECT table_name FROM information_schema.tables WHERE table_name = 'Organization';
+
+-- ============================================================================
+-- END OF DELTA MIGRATION
+-- ============================================================================

package/prisma/schema.prisma

@@ -16,6 +16,7 @@ model Club {
   events  BashEvent[]
   admin   ClubAdmin[]
   members ClubMember[]
+  budgets Budget[]     @relation("ClubBudgets")
 }
 
 model ClubAdmin {
@@ -56,7 +57,8 @@ model BashComment {
 model BashFeedPost {
   id               String    @id @default(cuid())
   userId           String
-  bashId           String
+  bashId           String?
+  serviceId        String?
   content          String?   @db.Text
   mediaIds         String[] // Array of Media IDs
   mentionedUserIds String[] // Array of User IDs mentioned in post
@@ -71,7 +73,8 @@ model BashFeedPost {
 
   // Relationships
   user     User              @relation(fields: [userId], references: [id], onDelete: Cascade)
-  bash     BashEvent         @relation(fields: [bashId], references: [id], onDelete: Cascade)
+  bash     BashEvent?        @relation(fields: [bashId], references: [id], onDelete: Cascade)
+  service  Service?          @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   likes    BashFeedLike[]
   comments BashFeedComment[]
   ratings  BashFeedRating[]
@@ -80,6 +83,7 @@ model BashFeedPost {
   reposts  BashFeedRepost[]
 
   @@index([bashId])
+  @@index([serviceId])
   @@index([userId])
   @@index([createdAt])
   @@index([isAnonymous])
@@ -338,6 +342,7 @@ model EventTask {
   neededCount                Int? // Number of volunteers needed
   estimatedDuration          Int? // Estimated duration in minutes
   createdAt                  DateTime?        @default(now())
+  organizationId             String?          // Organization association
   assignedTo                 User?            @relation("TasksAssignedToMe", fields: [assignedToId], references: [id], onDelete: Cascade)
   bashEvent                  BashEvent        @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
   creator                    User             @relation(fields: [creatorId], references: [id], onDelete: Cascade)
@@ -630,6 +635,16 @@ model BashEvent {
   autoApprovedAt                  DateTime?
   lastEngagementAt                DateTime?                      // Track last interest/share for decay
   
+  // Organization field
+  organizationId                  String?
+  organization                    Organization?                  @relation("OrganizationBashEvents", fields: [organizationId], references: [id])
+  
+  // Organization access controls (only apply when organizationId is set)
+  requiresOrgMembership           Boolean                        @default(false) // Must be member to attend/RSVP
+  allowMemberGuests               Boolean                        @default(false) // Members can bring +1s
+  maxGuestsPerMember              Int?                           // Guest limit per member (null = unlimited)
+  restrictToOrgDepartments        String[]                       @default([])    // Empty = all departments can see/join
+  
   associatedBashesReferencingMe   AssociatedBash[]
   comments                        BashComment[]
   amountOfGuests                  AmountOfGuests?                @relation(fields: [amountOfGuestsId], references: [id], onDelete: Cascade)
@@ -689,9 +704,14 @@ model BashEvent {
 
   // Analytics Relations
   analyticsPredictions AnalyticsPrediction[]
+  
+  // Organization Relations
+  budgets         Budget[]         @relation("EventBudgets")
+  rsvps           EventRSVP[]      @relation("EventRSVPs")
 
   @@index([templateId])
   @@index([parentEventId])
+  @@index([organizationId])
 }
 
 // ============================================
@@ -924,6 +944,12 @@ model TicketTier {
   waitList               User[]               @relation("TicketTierToUser")
   specialOffers          SpecialOffer[] // NEW - Special offers for this tier
   appliedDiscounts       AppliedDiscount[] // NEW - Discounts applied to this tier
+  
+  // Organization member restrictions (for org events)
+  restrictedToRoles          String[] @default([]) // ["Admin", "Owner"] - empty = all roles
+  restrictedToDepartments    String[] @default([]) // [deptId1, deptId2] - empty = all departments
+  restrictedToMembershipTiers String[] @default([]) // ["Premium"] - empty = all membership tiers
+  isGuestTier                Boolean  @default(false) // Ticket for member +1s
 
   @@unique([bashEventId, title])
 }
@@ -1510,6 +1536,18 @@ model User {
   
   // Idea Interest Relations
   ideaInterests IdeaInterest[]
+  
+  // Organization Relations
+  ownedOrganizations          Organization[]         @relation("OrganizationOwner")
+  organizationMemberships     OrganizationMember[]   @relation("OrganizationMemberUser")
+  organizationEventRSVPs      EventRSVP[]            @relation("OrganizationEventRSVP")
+  submittedExpenses           Expense[]              @relation("ExpenseSubmitter")
+  approvedExpenses            Expense[]              @relation("ExpenseApprover")
+  approvedBudgets             Budget[]               @relation("BudgetApprover")
+  submittedBudgets            Budget[]               @relation("BudgetSubmitter")
+  ownedBudgets                Budget[]               @relation("UserBudgets")
+  departmentsHeaded           Department[]           @relation("DepartmentHead")
+  favoriteOrganizations       Organization[]         @relation("FavoriteOrganizations")
 }
 
 model UserPreferences {
@@ -1952,6 +1990,12 @@ model Service {
   monthlyPrice                       Decimal                    @default(0)
   serviceListingStripeSubscriptionId String?
   acceptsBashCash                    Boolean                    @default(true) // NEW: Allow BashCash payments
+  isVerified                         Boolean                    @default(false) // Service owner verified
+  isLicensed                         Boolean                    @default(false) // Has required licenses
+  verifiedAt                         DateTime? // When verification was approved
+  licenseNumber                      String? // License/registration number
+  certifications                     String[]                   @default([]) // Array of certification names
+  bashFeedPosts                      BashFeedPost[]
   associatedServicesReferencingMe    AssociatedService[]
   exhibitorBookingRequests           ExhibitorBookingRequest[]  @relation("ExhibitorBookingService")
   notification                       Notification[]
@@ -1987,6 +2031,8 @@ model Service {
 
   @@index([serviceListingStripeSubscriptionId])
   @@index([isFreeFirstListing])
+  @@index([isVerified])
+  @@index([isLicensed])
 }
 
 model StripeAccount {
@@ -2318,12 +2364,203 @@ model UserPromoCodeRedemption {
 }
 
 model Organization {
-  id                  String             @id @default(cuid())
-  organizationType    OrganizationType[]
-  goodsOrServices     String[]
-  venueTypes          String[]
-  secondaryVenueTypes String[]           @default([])
-  service             Service?
+  id                           String                 @id @default(cuid())
+  name                         String
+  slug                         String                 @unique
+  organizationType             OrganizationType[]
+  bio                          String?
+  mission                      String?
+  pocName                      String?
+  pocEmail                     String?
+  pocPhone                     String?
+  street                       String?
+  city                         String?
+  state                        String?
+  zipCode                      String?
+  country                      String?                @default("US")
+  coverPhoto                   String?
+  logoUrl                      String?
+  websiteUrl                   String?
+  socialLinks                  Json?
+  goodsOrServices              String[]
+  venueTypes                   String[]
+  secondaryVenueTypes          String[]               @default([])
+  baseMembershipPriceCents     Int?
+  premiumMembershipPriceCents  Int?
+  allowGuestsByDefault         Boolean                @default(false)
+  defaultGuestLimit            Int                    @default(0)
+  visibility                   String                 @default("Public")
+  requiresApproval             Boolean                @default(true)
+  memberAutoApproval           Boolean                @default(false)
+  ownerId                      String
+  parentOrganizationId         String?
+  departmentName               String?
+  hierarchyLevel               Int                    @default(0)
+  subscriptionTier             String?
+  subscriptionStatus           String?
+  stripeSubscriptionId         String?                @unique
+  stripeCustomerId             String?
+  createdAt                    DateTime               @default(now())
+  updatedAt                    DateTime               @updatedAt
+  service                      Service?
+  owner                        User                   @relation("OrganizationOwner", fields: [ownerId], references: [id], onDelete: Restrict)
+  parentOrganization           Organization?          @relation("OrganizationHierarchy", fields: [parentOrganizationId], references: [id])
+  childOrganizations           Organization[]         @relation("OrganizationHierarchy")
+  members                      OrganizationMember[]
+  budgets                      Budget[]               @relation("OrganizationBudgets")
+  departments                  Department[]
+  bashEvents                   BashEvent[]            @relation("OrganizationBashEvents")
+  favoriteBy                   User[]                 @relation("FavoriteOrganizations")
+
+  @@index([ownerId])
+  @@index([slug])
+  @@index([parentOrganizationId])
+}
+
+model OrganizationMember {
+  id               String       @id @default(cuid())
+  organizationId   String
+  userId           String
+  role             String       @default("Member") // Owner, Admin, Coordinator, EventOrganizer, Treasurer, Member
+  membershipTier   String       @default("Base") // Base, Premium
+  status           String       @default("Pending") // Pending, Active, Suspended, Removed
+  joinedAt         DateTime     @default(now())
+  approvedAt       DateTime?
+  approvedBy       String?
+  paidUntil        DateTime?
+  paymentStatus    String?      @default("Current") // Current, Overdue, Cancelled
+  guestLimit       Int?
+  canInvite        Boolean      @default(true)
+  canCreateEvents  Boolean      @default(false)
+  canManageBudgets Boolean      @default(false)
+  organization     Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  user             User         @relation("OrganizationMemberUser", fields: [userId], references: [id], onDelete: Cascade)
+  eventRSVPs       EventRSVP[]
+
+  @@unique([organizationId, userId])
+  @@index([organizationId])
+  @@index([userId])
+  @@index([status])
+}
+
+model Department {
+  id               String              @id @default(cuid())
+  organizationId   String
+  name             String
+  description      String?
+  parentDeptId     String?
+  headUserId       String?
+  budgetCents      Int?
+  createdAt        DateTime            @default(now())
+  updatedAt        DateTime            @updatedAt
+  organization     Organization        @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  parentDept       Department?         @relation("DepartmentHierarchy", fields: [parentDeptId], references: [id])
+  childDepts       Department[]        @relation("DepartmentHierarchy")
+  head             User?               @relation("DepartmentHead", fields: [headUserId], references: [id])
+  budgets          Budget[]            @relation("DepartmentBudgets")
+
+  @@index([organizationId])
+  @@index([parentDeptId])
+}
+
+
+model EventRSVP {
+  id               String             @id @default(cuid())
+  eventId          String
+  memberId         String
+  userId           String
+  status           String             @default("Going") // Going, Maybe, NotGoing
+  guestsCount      Int                @default(0)
+  checkedIn        Boolean            @default(false)
+  checkedInAt      DateTime?
+  createdAt        DateTime           @default(now())
+  updatedAt        DateTime           @updatedAt
+  event            BashEvent          @relation("EventRSVPs", fields: [eventId], references: [id], onDelete: Cascade)
+  member           OrganizationMember @relation(fields: [memberId], references: [id], onDelete: Cascade)
+  user             User               @relation("OrganizationEventRSVP", fields: [userId], references: [id])
+
+  @@unique([eventId, userId])
+  @@index([eventId])
+  @@index([userId])
+}
+
+model Budget {
+  id                   String             @id @default(cuid())
+  name                 String
+  
+  // Flexible ownership - at least ONE should be set
+  organizationId       String?
+  bashEventId          String?
+  clubId               String?
+  departmentId         String?
+  userId               String?            // For personal event budgets
+  
+  // Budget details
+  totalAllocatedCents  Int
+  totalBudgetCents     Int?               // Alias for backward compatibility
+  spentCents           Int                @default(0)
+  remainingCents       Int?               // Can be computed: totalAllocatedCents - spentCents
+  
+  // Categorization
+  category             String?            // "Marketing", "Catering", "Venue", "Annual", "Activities"
+  fiscalYear           String?            // Keep as String for flexibility ("2026", "2026-Q1", "FY2026")
+  
+  // Approval workflow
+  status               String?            @default("Draft") // Draft, Submitted, Approved, Active, Closed, Archived
+  submittedBy          String?
+  approverId           String?
+  approvedBy           String?            // Alias for approverId
+  approvedAt           DateTime?
+  
+  // Date ranges
+  startDate            DateTime?
+  endDate              DateTime?
+  
+  // Timestamps
+  createdAt            DateTime           @default(now())
+  updatedAt            DateTime           @updatedAt
+  
+  // Relations
+  organization         Organization?      @relation("OrganizationBudgets", fields: [organizationId], references: [id], onDelete: Cascade)
+  bashEvent            BashEvent?         @relation("EventBudgets", fields: [bashEventId], references: [id], onDelete: Cascade)
+  club                 Club?              @relation("ClubBudgets", fields: [clubId], references: [id], onDelete: Cascade)
+  department           Department?        @relation("DepartmentBudgets", fields: [departmentId], references: [id], onDelete: Cascade)
+  user                 User?              @relation("UserBudgets", fields: [userId], references: [id], onDelete: Cascade)
+  submitter            User?              @relation("BudgetSubmitter", fields: [submittedBy], references: [id])
+  approver             User?              @relation("BudgetApprover", fields: [approverId], references: [id])
+  expenses             Expense[]
+
+  @@index([organizationId])
+  @@index([bashEventId])
+  @@index([clubId])
+  @@index([departmentId])
+  @@index([userId])
+  @@index([status])
+  @@index([fiscalYear])
+}
+
+model Expense {
+  id               String             @id @default(cuid())
+  budgetId         String
+  submittedBy      String
+  description      String
+  amountCents      Int
+  category         String?
+  receiptUrl       String?
+  expenseDate      DateTime?          // When the expense occurred
+  status           String             @default("Pending") // Pending, Approved, Rejected
+  approvedBy       String?
+  approvedAt       DateTime?
+  rejectionReason  String?
+  createdAt        DateTime           @default(now())
+  updatedAt        DateTime           @updatedAt
+  budget           Budget             @relation(fields: [budgetId], references: [id], onDelete: Cascade)
+  submitter        User               @relation("ExpenseSubmitter", fields: [submittedBy], references: [id])
+  approver         User?              @relation("ExpenseApprover", fields: [approvedBy], references: [id])
+
+  @@index([budgetId])
+  @@index([submittedBy])
+  @@index([status])
 }
 
 model ServiceRange {
@@ -3729,11 +3966,6 @@ enum AudioVisualSupportSubType {
   ProjectorSetup
 }
 
-enum HostingSupportSubType {
-  Emcee
-  Greeter
-}
-
 enum PromotionAndMarketingSubType {
   Influencer
   Promoter
@@ -3744,6 +3976,10 @@ enum StaffingSubType {
   CrewHand
   ParkingManagement
   GuestRegistration
+  Greeter
+  Ushers
+  CoatCheck
+  DoorAttendant
   Security
 }
 
@@ -4781,6 +5017,10 @@ enum OrganizationType {
   Youth
   Senior
   Tradeshow
+  Professional
+  RecordLabel
+  School
+  StudentClub
   Conference
   FoodAndBeverage
   TechAndStartups