@valentine-efagene/qshelter-common 2.0.150 → 2.0.152

package/dist/generated/client/models/User.d.ts

@@ -760,18 +760,6 @@ export type UserNullableScalarRelationFilter = {
     is?: Prisma.UserWhereInput | null;
     isNot?: Prisma.UserWhereInput | null;
 };
-export type StringFieldUpdateOperationsInput = {
-    set?: string;
-};
-export type NullableStringFieldUpdateOperationsInput = {
-    set?: string | null;
-};
-export type BoolFieldUpdateOperationsInput = {
-    set?: boolean;
-};
-export type DateTimeFieldUpdateOperationsInput = {
-    set?: Date | string;
-};
 export type NullableDateTimeFieldUpdateOperationsInput = {
     set?: Date | string | null;
 };

package/dist/generated/client/models/index.d.ts

@@ -30,6 +30,8 @@ export * from './OAuthState';
 export * from './OfferLetter';
 export * from './Organization';
 export * from './OrganizationMember';
+export * from './OrganizationType';
+export * from './OrganizationTypeAssignment';
 export * from './PasswordReset';
 export * from './PaymentInstallment';
 export * from './PaymentMethodChangeRequest';

package/dist/generated/client/models/index.js

@@ -30,6 +30,8 @@ export * from './OAuthState';
 export * from './OfferLetter';
 export * from './Organization';
 export * from './OrganizationMember';
+export * from './OrganizationType';
+export * from './OrganizationTypeAssignment';
 export * from './PasswordReset';
 export * from './PaymentInstallment';
 export * from './PaymentMethodChangeRequest';

package/dist/generated/client/models.d.ts

@@ -1,3 +1,5 @@
+export type * from './models/OrganizationType.js';
+export type * from './models/OrganizationTypeAssignment.js';
 export type * from './models/User.js';
 export type * from './models/Role.js';
 export type * from './models/Permission.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valentine-efagene/qshelter-common",
-  "version": "2.0.150",
+  "version": "2.0.152",
   "description": "Shared database schemas and utilities for QShelter services",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/prisma/migrations/20260125090213_remove_is_published_use_status_enum/migration.sql

@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `isPublished` on the `properties` table. All the data in the column will be lost.
+  - You are about to alter the column `status` on the `properties` table. The data in that column could be lost. The data in that column will be cast from `VarChar(191)` to `Enum(EnumId(5))`.
+
+*/
+-- AlterTable
+ALTER TABLE `properties` DROP COLUMN `isPublished`,
+    MODIFY `status` ENUM('DRAFT', 'PUBLISHED', 'SOLD_OUT', 'ARCHIVED') NOT NULL DEFAULT 'DRAFT';

package/prisma/migrations/20260125102448_org_types_many_to_many/migration.sql

@@ -0,0 +1,153 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `role` on the `application_organizations` table. All the data in the column will be lost.
+  - You are about to drop the column `reviewParty` on the `approval_stage_progress` table. All the data in the column will be lost.
+  - You are about to drop the column `organizationId` on the `approval_stages` table. All the data in the column will be lost.
+  - You are about to drop the column `reviewParty` on the `approval_stages` table. All the data in the column will be lost.
+  - You are about to drop the column `reviewParty` on the `document_approvals` table. All the data in the column will be lost.
+  - You are about to drop the column `reviewParty` on the `document_reviews` table. All the data in the column will be lost.
+  - You are about to drop the column `approvalLimit` on the `organization_members` table. All the data in the column will be lost.
+  - You are about to drop the column `canApprove` on the `organization_members` table. All the data in the column will be lost.
+  - You are about to drop the column `role` on the `organization_members` table. All the data in the column will be lost.
+  - You are about to drop the column `type` on the `organizations` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[applicationId,assignedAsTypeId]` on the table `application_organizations` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[documentId,organizationId]` on the table `document_reviews` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `assignedAsTypeId` to the `application_organizations` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationTypeId` to the `approval_stage_progress` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationTypeId` to the `approval_stages` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `organizationTypeId` to the `document_approvals` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE `application_organizations` DROP FOREIGN KEY `application_organizations_applicationId_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `document_reviews` DROP FOREIGN KEY `document_reviews_documentId_fkey`;
+
+-- DropIndex
+DROP INDEX `application_organizations_applicationId_organizationId_role_key` ON `application_organizations`;
+
+-- DropIndex
+DROP INDEX `application_organizations_role_idx` ON `application_organizations`;
+
+-- DropIndex
+DROP INDEX `document_reviews_documentId_reviewParty_organizationId_key` ON `document_reviews`;
+
+-- DropIndex
+DROP INDEX `document_reviews_reviewParty_idx` ON `document_reviews`;
+
+-- DropIndex
+DROP INDEX `organization_members_role_idx` ON `organization_members`;
+
+-- DropIndex
+DROP INDEX `organizations_type_idx` ON `organizations`;
+
+-- AlterTable
+ALTER TABLE `application_organizations` DROP COLUMN `role`,
+    ADD COLUMN `assignedAsTypeId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `approval_stage_progress` DROP COLUMN `reviewParty`,
+    ADD COLUMN `organizationTypeId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `approval_stages` DROP COLUMN `organizationId`,
+    DROP COLUMN `reviewParty`,
+    ADD COLUMN `organizationTypeId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `document_approvals` DROP COLUMN `reviewParty`,
+    ADD COLUMN `organizationTypeId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `document_reviews` DROP COLUMN `reviewParty`,
+    ADD COLUMN `organizationTypeId` VARCHAR(191) NULL;
+
+-- AlterTable
+ALTER TABLE `organization_members` DROP COLUMN `approvalLimit`,
+    DROP COLUMN `canApprove`,
+    DROP COLUMN `role`,
+    ADD COLUMN `joinedAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3);
+
+-- AlterTable
+ALTER TABLE `organizations` DROP COLUMN `type`;
+
+-- CreateTable
+CREATE TABLE `organization_types` (
+    `id` VARCHAR(191) NOT NULL,
+    `tenantId` VARCHAR(191) NOT NULL,
+    `code` VARCHAR(191) NOT NULL,
+    `name` VARCHAR(191) NOT NULL,
+    `description` TEXT NULL,
+    `isSystemType` BOOLEAN NOT NULL DEFAULT false,
+    `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    `updatedAt` DATETIME(3) NOT NULL,
+
+    INDEX `organization_types_tenantId_idx`(`tenantId`),
+    INDEX `organization_types_code_idx`(`code`),
+    UNIQUE INDEX `organization_types_tenantId_code_key`(`tenantId`, `code`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `organization_type_assignments` (
+    `id` VARCHAR(191) NOT NULL,
+    `organizationId` VARCHAR(191) NOT NULL,
+    `typeId` VARCHAR(191) NOT NULL,
+    `isPrimary` BOOLEAN NOT NULL DEFAULT false,
+    `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+
+    INDEX `organization_type_assignments_organizationId_idx`(`organizationId`),
+    INDEX `organization_type_assignments_typeId_idx`(`typeId`),
+    UNIQUE INDEX `organization_type_assignments_organizationId_typeId_key`(`organizationId`, `typeId`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateIndex
+CREATE INDEX `application_organizations_assignedAsTypeId_idx` ON `application_organizations`(`assignedAsTypeId`);
+
+-- CreateIndex
+CREATE UNIQUE INDEX `application_organizations_applicationId_assignedAsTypeId_key` ON `application_organizations`(`applicationId`, `assignedAsTypeId`);
+
+-- CreateIndex
+CREATE INDEX `approval_stages_organizationTypeId_idx` ON `approval_stages`(`organizationTypeId`);
+
+-- CreateIndex
+CREATE INDEX `document_approvals_organizationTypeId_idx` ON `document_approvals`(`organizationTypeId`);
+
+-- CreateIndex
+CREATE INDEX `document_reviews_organizationId_idx` ON `document_reviews`(`organizationId`);
+
+-- CreateIndex
+CREATE INDEX `document_reviews_organizationTypeId_idx` ON `document_reviews`(`organizationTypeId`);
+
+-- CreateIndex
+CREATE UNIQUE INDEX `document_reviews_documentId_organizationId_key` ON `document_reviews`(`documentId`, `organizationId`);
+
+-- AddForeignKey
+ALTER TABLE `organization_types` ADD CONSTRAINT `organization_types_tenantId_fkey` FOREIGN KEY (`tenantId`) REFERENCES `tenants`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `organization_type_assignments` ADD CONSTRAINT `organization_type_assignments_organizationId_fkey` FOREIGN KEY (`organizationId`) REFERENCES `organizations`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `organization_type_assignments` ADD CONSTRAINT `organization_type_assignments_typeId_fkey` FOREIGN KEY (`typeId`) REFERENCES `organization_types`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `approval_stages` ADD CONSTRAINT `approval_stages_organizationTypeId_fkey` FOREIGN KEY (`organizationTypeId`) REFERENCES `organization_types`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `application_organizations` ADD CONSTRAINT `application_organizations_assignedAsTypeId_fkey` FOREIGN KEY (`assignedAsTypeId`) REFERENCES `organization_types`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `document_reviews` ADD CONSTRAINT `document_reviews_organizationId_fkey` FOREIGN KEY (`organizationId`) REFERENCES `organizations`(`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `document_reviews` ADD CONSTRAINT `document_reviews_organizationTypeId_fkey` FOREIGN KEY (`organizationTypeId`) REFERENCES `organization_types`(`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `approval_stage_progress` ADD CONSTRAINT `approval_stage_progress_organizationTypeId_fkey` FOREIGN KEY (`organizationTypeId`) REFERENCES `organization_types`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `document_approvals` ADD CONSTRAINT `document_approvals_organizationTypeId_fkey` FOREIGN KEY (`organizationTypeId`) REFERENCES `organization_types`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;

package/prisma/migrations/20260125103700_20260125102448_org_types_many_to_many_fix/migration.sql

@@ -0,0 +1,5 @@
+-- AddForeignKey
+ALTER TABLE `application_organizations` ADD CONSTRAINT `application_organizations_applicationId_fkey` FOREIGN KEY (`applicationId`) REFERENCES `applications`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `document_reviews` ADD CONSTRAINT `document_reviews_documentId_fkey` FOREIGN KEY (`documentId`) REFERENCES `application_documents`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -51,6 +51,13 @@ enum PaymentFrequency {
   CUSTOM
 }
 
+enum PropertyStatus {
+  DRAFT
+  PUBLISHED
+  SOLD_OUT
+  ARCHIVED
+}
+
 enum ApplicationStatus {
   DRAFT
   PENDING
@@ -196,17 +203,69 @@ enum ApprovalDecision {
 }
 
 // =============================================================================
-// ORGANIZATION ENUMS (Banks, Developers, etc.)
+// ORGANIZATION TYPE - Lookup table for organization types (replaces enum)
+// =============================================================================
+// Organizations can have multiple types via OrganizationTypeAssignment.
+// Example: QShelter can be both PLATFORM and DEVELOPER.
+// System types are seeded during tenant bootstrap and cannot be deleted.
 // =============================================================================
 
-/// Type of organization on the platform
-enum OrganizationType {
-  PLATFORM // The platform operator (e.g., QShelter) - the tenant's own organization
-  BANK // Financial institution providing mortgages (e.g., Access Bank, GTBank)
-  DEVELOPER // Property developer building and selling properties
-  LEGAL // Legal firms handling conveyancing and documentation
-  INSURER // Insurance companies providing property or mortgage insurance
-  GOVERNMENT // Government agencies (e.g., land registry, tax authorities)
+model OrganizationType {
+  id          String  @id @default(cuid())
+  tenantId    String
+  tenant      Tenant  @relation(fields: [tenantId], references: [id], onDelete: Cascade)
+  code        String // "PLATFORM", "BANK", "DEVELOPER", "LEGAL", "INSURER", "GOVERNMENT"
+  name        String // Human-readable: "Platform Operator", "Bank/Lender", etc.
+  description String? @db.Text
+
+  // System types are seeded during bootstrap and cannot be deleted
+  isSystemType Boolean @default(false)
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // Organizations with this type
+  organizations OrganizationTypeAssignment[]
+
+  // Applications assigned to orgs acting as this type
+  applicationOrganizations ApplicationOrganization[]
+
+  // Approval stages that require this type of organization
+  approvalStages ApprovalStage[]
+
+  // Document reviews performed by orgs acting as this type (audit snapshot)
+  documentReviews DocumentReview[]
+
+  // Approval stage progress instances
+  approvalStageProgress ApprovalStageProgress[]
+
+  // Document approvals
+  documentApprovals DocumentApproval[]
+
+  @@unique([tenantId, code])
+  @@index([tenantId])
+  @@index([code])
+  @@map("organization_types")
+}
+
+/// Links organizations to their types (many-to-many)
+/// An organization can have multiple types (e.g., QShelter is PLATFORM + DEVELOPER)
+model OrganizationTypeAssignment {
+  id             String           @id @default(cuid())
+  organizationId String
+  organization   Organization     @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  typeId         String
+  orgType        OrganizationType @relation(fields: [typeId], references: [id], onDelete: Cascade)
+
+  // Which type is the primary one for display purposes
+  isPrimary Boolean @default(false)
+
+  createdAt DateTime @default(now())
+
+  @@unique([organizationId, typeId])
+  @@index([organizationId])
+  @@index([typeId])
+  @@map("organization_type_assignments")
 }
 
 /// Status of an organization
@@ -217,14 +276,6 @@ enum OrganizationStatus {
   INACTIVE // No longer active
 }
 
-/// Role of a member within an organization
-enum OrganizationRole {
-  ADMIN // Can manage org settings, members, and full operations
-  MANAGER // Can approve transactions within limits (checker)
-  OFFICER // Regular employee, can initiate actions (maker)
-  VIEWER // Read-only access to organization data
-}
-
 // =============================================================================
 // CONTRACT TERMINATION / CANCELLATION ENUMS
 // =============================================================================
@@ -267,21 +318,9 @@ enum CompletionCriterion {
 }
 
 // =============================================================================
-// MULTI-PARTY DOCUMENT REVIEW ENUMS
-// =============================================================================
-// Enables different organizations to review the same document independently
+// DOCUMENT REVIEW ENUMS
 // =============================================================================
 
-enum ReviewParty {
-  INTERNAL // Your internal team (compliance, underwriting, etc.)
-  BANK // Partner bank/lender
-  DEVELOPER // Property developer
-  LEGAL // Legal team
-  GOVERNMENT // Government agencies (e.g., land registry)
-  INSURER // Insurance company
-  CUSTOMER // Customer acknowledgment/signature
-}
-
 enum ReviewDecision {
   PENDING // Review not yet performed
   APPROVED // Document approved by this party
@@ -616,9 +655,12 @@ model Organization {
   id       String             @id @default(cuid())
   tenantId String
   name     String // e.g., "Access Bank PLC", "Lekki Gardens Ltd"
-  type     OrganizationType // PLATFORM, BANK, DEVELOPER, LEGAL, INSURER, GOVERNMENT
   status   OrganizationStatus @default(PENDING)
 
+  // Organization types (many-to-many via OrganizationTypeAssignment)
+  // An org can have multiple types (e.g., QShelter is PLATFORM + DEVELOPER)
+  types OrganizationTypeAssignment[]
+
   // Platform organization flag - marks the tenant's own organization
   isPlatformOrg Boolean @default(false)
 
@@ -660,41 +702,39 @@ model Organization {
   // Bank-specific document requirements (for BANK type organizations)
   documentRequirements BankDocumentRequirement[]
 
+  // Document reviews performed by this organization
+  documentReviews DocumentReview[]
+
   // Properties developed by this organization (for DEVELOPERs)
   // developedProperties Property[] @relation("PropertyDeveloper")
 
   @@unique([tenantId, bankCode]) // Bank codes unique within tenant
   @@unique([tenantId, cacNumber]) // CAC numbers unique within tenant
   @@index([tenantId])
-  @@index([type])
   @@index([status])
   @@map("organizations")
 }
 
-/// OrganizationMember: Links users to organizations with roles and permissions
-/// Supports maker-checker workflows via canApprove and approvalLimit
+/// OrganizationMember: Links users to organizations
+/// User's own roles (via UserRole) determine their abilities within the org
 model OrganizationMember {
-  id             String           @id @default(cuid())
+  id             String @id @default(cuid())
   organizationId String
   userId         String
-  role           OrganizationRole @default(OFFICER)
 
   // Employee details
-  title      String? // Job title (e.g., "Loan Officer", "Project Manager")
+  title      String? // Job title (e.g., "Loan Officer", "Mortgage Operations Officer")
   department String? // Department within organization
   employeeId String? // Internal employee ID
 
   // Status
   isActive Boolean @default(true)
 
-  // Maker-Checker workflow permissions
-  canApprove    Boolean  @default(false) // Can this member approve transactions?
-  approvalLimit Decimal? // Maximum amount this member can approve (null = unlimited)
-
   // Invitation/onboarding tracking
   invitedAt  DateTime?
   acceptedAt DateTime?
   invitedBy  String? // User ID who invited this member
+  joinedAt   DateTime  @default(now())
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -705,7 +745,6 @@ model OrganizationMember {
   @@unique([organizationId, userId]) // User can only be member once per org
   @@index([userId])
   @@index([organizationId])
-  @@index([role])
   @@map("organization_members")
 }
 
@@ -879,6 +918,7 @@ model Tenant {
 
   // Application organization assignments
   applicationOrganizations ApplicationOrganization[]
+  organizationTypes        OrganizationType[]
 
   @@index([subdomain])
   @@map("tenants")
@@ -1112,11 +1152,10 @@ model Property {
   streetAddress  String?
   longitude      Float?
   latitude       Float?
-  status         String         @default("DRAFT") // DRAFT, PUBLISHED, SOLD_OUT, ARCHIVED
+  status         PropertyStatus @default(DRAFT)
   description    String?        @db.Text
   displayImageId String?
   displayImage   PropertyMedia? @relation("DisplayImage", fields: [displayImageId], references: [id], onDelete: SetNull)
-  isPublished    Boolean        @default(false)
   publishedAt    DateTime?
   createdAt      DateTime       @default(now())
   updatedAt      DateTime       @updatedAt
@@ -1419,7 +1458,7 @@ model DocumentDefinition {
 // APPROVAL STAGE - Sequential workflow stages for document review (template)
 // =============================================================================
 // Defines a stage in the approval workflow. Documents flow through stages
-// sequentially. Each stage can have different reviewers (INTERNAL, BANK, etc.)
+// sequentially. Each stage requires a specific organization type to review.
 // =============================================================================
 
 model ApprovalStage {
@@ -1427,9 +1466,10 @@ model ApprovalStage {
   planId String
   plan   DocumentationPlan @relation(fields: [planId], references: [id], onDelete: Cascade)
 
-  name        String // "QShelter Staff Review", "Bank Review"
-  order       Int // 1, 2, 3 - sequential order
-  reviewParty ReviewParty // INTERNAL, BANK, DEVELOPER, LEGAL, etc.
+  name               String // "QShelter Review", "Bank Review"
+  order              Int // 1, 2, 3 - sequential order
+  organizationTypeId String // Which type of org should review at this stage
+  organizationType   OrganizationType @relation(fields: [organizationTypeId], references: [id])
 
   // Stage behavior flags
   autoTransition       Boolean @default(false) // Auto-complete when all docs approved? Default: require explicit approval
@@ -1440,9 +1480,6 @@ model ApprovalStage {
   onRejection           RejectionBehavior @default(CASCADE_BACK)
   restartFromStageOrder Int? // If onRejection = RESTART_FROM_STAGE, which stage order to restart from
 
-  // Optional: specific organization (e.g., which bank)
-  organizationId String?
-
   // SLA (optional)
   slaHours Int? // Escalate if not completed within X hours
 
@@ -1456,6 +1493,7 @@ model ApprovalStage {
 
   @@unique([planId, order])
   @@index([planId])
+  @@index([organizationTypeId])
   @@map("approval_stages")
 }
 
@@ -2073,18 +2111,9 @@ model Application {
 // in a specific application. This enables:
 // 1. Validation that only assigned developers can upload sales offers
 // 2. Only assigned banks can upload preapproval/mortgage offer letters
-// 3. Multi-bank application support (future: apply to multiple banks)
+// 3. Flexible type-based assignment (org assigned acting as specific type)
 // =============================================================================
 
-/// Role that an organization plays in an application
-enum ApplicationOrganizationRole {
-  DEVELOPER // Property developer - uploads sales offer letters
-  LENDER // Bank/financial institution - provides mortgage
-  LEGAL // Legal firm - handles conveyancing
-  INSURER // Insurance company
-  GOVERNMENT // Government agency (land registry, etc.)
-}
-
 /// Status of organization's involvement in the application
 enum ApplicationOrganizationStatus {
   PENDING // Awaiting organization's response/engagement
@@ -2105,8 +2134,11 @@ model ApplicationOrganization {
   organizationId String
   organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
-  // What role does this organization play
-  role   ApplicationOrganizationRole
+  // Which type the org is acting as on this application
+  // (org must have this type in their OrganizationTypeAssignment)
+  assignedAsTypeId String
+  assignedAsType   OrganizationType @relation(fields: [assignedAsTypeId], references: [id])
+
   status ApplicationOrganizationStatus @default(PENDING)
 
   // Who assigned this organization (admin or system)
@@ -2153,11 +2185,11 @@ model ApplicationOrganization {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  @@unique([applicationId, organizationId, role]) // One org per role per application
+  @@unique([applicationId, assignedAsTypeId]) // One org per type per application
   @@index([tenantId])
   @@index([applicationId])
   @@index([organizationId])
-  @@index([role])
+  @@index([assignedAsTypeId])
   @@index([status])
   @@index([isPrimary])
   @@index([slaBreachedAt])
@@ -2723,8 +2755,9 @@ model ApplicationDocument {
 // =============================================================================
 // DOCUMENT REVIEW - Multi-party review tracking
 // =============================================================================
-// Tracks reviews by different organizations for the same document
-// Enables internal approval -> external approval workflows
+// Tracks reviews by different organizations for the same document.
+// organizationId is NULL for customer self-attestations/signatures.
+// For org reviews, organizationTypeId captures which type the org was acting as.
 // =============================================================================
 
 model DocumentReview {
@@ -2734,12 +2767,14 @@ model DocumentReview {
   documentId String
   document   ApplicationDocument @relation(fields: [documentId], references: [id], onDelete: Cascade)
 
-  // Who is reviewing
-  reviewParty    ReviewParty // INTERNAL, BANK, DEVELOPER, LEGAL, etc.
-  organizationId String? // External organization ID if applicable
-  reviewerId     String? // User who performed the review
-  reviewer       User?       @relation("DocumentReviewer", fields: [reviewerId], references: [id])
-  reviewerName   String? // Denormalized for audit trail
+  // Who is reviewing - NULL organizationId means customer self-review
+  organizationId     String? // Organization performing the review (null = customer)
+  organization       Organization?     @relation(fields: [organizationId], references: [id])
+  organizationTypeId String? // Which type the org was acting as (audit snapshot)
+  organizationType   OrganizationType? @relation(fields: [organizationTypeId], references: [id])
+  reviewerId         String? // User who performed the review
+  reviewer           User?             @relation("DocumentReviewer", fields: [reviewerId], references: [id])
+  reviewerName       String? // Denormalized for audit trail
 
   // Review state
   decision ReviewDecision @default(PENDING)
@@ -2765,10 +2800,12 @@ model DocumentReview {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  @@unique([documentId, reviewParty, organizationId]) // One review per party per org per doc
+  // Unique: one review per org per doc (null org = customer review)
+  @@unique([documentId, organizationId])
   @@index([tenantId])
   @@index([documentId])
-  @@index([reviewParty])
+  @@index([organizationId])
+  @@index([organizationTypeId])
   @@index([decision])
   @@index([reviewerId])
   @@index([parentReviewId])
@@ -2794,9 +2831,10 @@ model ApprovalStageProgress {
   approvalStage   ApprovalStage @relation(fields: [approvalStageId], references: [id])
 
   // Stage info (denormalized for convenience)
-  name        String
-  order       Int
-  reviewParty ReviewParty
+  name               String
+  order              Int
+  organizationTypeId String // Which type of org should review at this stage
+  organizationType   OrganizationType @relation(fields: [organizationTypeId], references: [id])
 
   // Behavior flags (copied from template)
   autoTransition       Boolean @default(false)
@@ -2850,9 +2888,10 @@ model DocumentApproval {
   stageProgress   ApprovalStageProgress @relation(fields: [stageProgressId], references: [id], onDelete: Cascade)
 
   // Reviewer info
-  reviewerId  String
-  reviewer    User        @relation("DocumentApprovalReviewer", fields: [reviewerId], references: [id])
-  reviewParty ReviewParty // INTERNAL, BANK, etc.
+  reviewerId         String
+  reviewer           User             @relation("DocumentApprovalReviewer", fields: [reviewerId], references: [id])
+  organizationTypeId String // Which type the reviewer's org was acting as
+  organizationType   OrganizationType @relation(fields: [organizationTypeId], references: [id])
 
   // Decision
   decision ReviewDecision // APPROVED, REJECTED, CHANGES_REQUESTED
@@ -2865,6 +2904,7 @@ model DocumentApproval {
   @@index([documentId])
   @@index([stageProgressId])
   @@index([reviewerId])
+  @@index([organizationTypeId])
   @@index([decision])
   @@map("document_approvals")
 }