@allbluecn/database 0.4.12 → 0.4.13

package/generated-sqlite/models.ts

@@ -15,6 +15,7 @@ export type * from './models/ProjectMember'
 export type * from './models/Workspace'
 export type * from './models/TeamMembership'
 export type * from './models/TeamInvitation'
+export type * from './models/TeamJoinRequest'
 export type * from './models/ProjectActivity'
 export type * from './models/ChatThread'
 export type * from './models/ChatMessage'
@@ -85,4 +86,6 @@ export type * from './models/ComplianceExport'
 export type * from './models/UserAgent'
 export type * from './models/UserSkill'
 export type * from './models/DeveloperLog'
+export type * from './models/Notification'
+export type * from './models/NotificationPreference'
 export type * from './commonInputTypes'

package/migrations/20260826162419_add_applicant_email/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "team_invitations" ADD COLUMN IF NOT EXISTS "applicantEmail" TEXT;

package/migrations/20260826170000_team_invitation_email_nullable_message/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "team_invitations" ALTER COLUMN "email" DROP NOT NULL;
+ALTER TABLE "team_invitations" ADD COLUMN "message" TEXT;
+
+-- 迁移现有 link 渠道邀请的 email='' 占位为 NULL，释放唯一约束冲突（允许多条 link 记录共存）
+UPDATE "team_invitations" SET "email" = NULL WHERE "email" = '';

package/migrations/20260826180000_backfill_invitation_accepted_by/migration.sql

@@ -0,0 +1,8 @@
+-- 回填存量 pending_approval 邀请的 acceptedBy（此前 accept 只写 applicantEmail 未写 acceptedBy）
+UPDATE "team_invitations" ti
+SET "acceptedBy" = u.id
+FROM "users" u
+WHERE ti.status = 'pending_approval'
+  AND ti."acceptedBy" IS NULL
+  AND ti."applicantEmail" IS NOT NULL
+  AND LOWER(u.email) = LOWER(ti."applicantEmail");

package/migrations/20260827044250_add_team_join_request/migration.sql

@@ -0,0 +1,29 @@
+-- CreateTable
+CREATE TABLE "team_join_requests" (
+    "id" TEXT NOT NULL,
+    "invitationId" TEXT NOT NULL,
+    "ownerId" TEXT NOT NULL,
+    "userId" TEXT,
+    "email" TEXT NOT NULL,
+    "status" TEXT NOT NULL DEFAULT 'pending',
+    "seatType" TEXT NOT NULL DEFAULT 'member',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "processedAt" TIMESTAMP(3),
+
+    CONSTRAINT "team_join_requests_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "team_join_requests_ownerId_status_idx" ON "team_join_requests"("ownerId", "status");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "team_join_requests_invitationId_email_key" ON "team_join_requests"("invitationId", "email");
+
+-- AddForeignKey
+ALTER TABLE "team_join_requests" ADD CONSTRAINT "team_join_requests_invitationId_fkey" FOREIGN KEY ("invitationId") REFERENCES "team_invitations"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "team_join_requests" ADD CONSTRAINT "team_join_requests_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "team_join_requests" ADD CONSTRAINT "team_join_requests_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE SET NULL ON UPDATE CASCADE;

package/migrations/20260827102354_add_notifications/migration.sql

@@ -0,0 +1,37 @@
+-- CreateTable
+CREATE TABLE "notifications" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "category" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "body" TEXT,
+    "link" TEXT,
+    "readAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "notifications_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "notification_preferences" (
+    "userId" TEXT NOT NULL,
+    "categories" JSONB NOT NULL,
+    "dndEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "dndStart" TEXT NOT NULL DEFAULT '22:00',
+    "dndEnd" TEXT NOT NULL DEFAULT '08:00',
+
+    CONSTRAINT "notification_preferences_pkey" PRIMARY KEY ("userId")
+);
+
+-- CreateIndex
+CREATE INDEX "notifications_userId_createdAt_idx" ON "notifications"("userId", "createdAt" DESC);
+
+-- CreateIndex
+CREATE INDEX "notifications_userId_readAt_idx" ON "notifications"("userId", "readAt");
+
+-- AddForeignKey
+ALTER TABLE "notifications" ADD CONSTRAINT "notifications_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "notification_preferences" ADD CONSTRAINT "notification_preferences_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allbluecn/database",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "license": "AGPL-3.0-or-later",
   "type": "module",
   "main": "./index.ts",
@@ -15,7 +15,7 @@
     "pg": "^8.22.0",
     "sqlite-vec": "^0.1.9",
     "bcryptjs": "^3.0.2",
-    "@allbluecn/shared": "0.4.12"
+    "@allbluecn/shared": "0.4.13"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",

package/schema.prisma

@@ -100,9 +100,13 @@ model User {
   workspaceMemberships TeamMembership[]   @relation("teamOwner")
   teamJoined           TeamMembership?    @relation("teamMember")
   sentInvitations      TeamInvitation[]   @relation("invitationOwner")
+  ownedJoinRequests    TeamJoinRequest[]  @relation("joinRequestOwner")
+  applicantJoinRequests TeamJoinRequest[] @relation("joinRequestApplicant")
   aiUsageLogs          AiUsageLog[]
   agents               UserAgent[]
   skills               UserSkill[]
+  notifications            Notification[]
+  notificationPreference   NotificationPreference?
 
   issuedLicenses   LicenseKey[]      @relation("LicenseIssuer")
   ssoMappings      SsoMapping[]
@@ -212,23 +216,45 @@ model TeamMembership {
 
 // 团队邀请
 model TeamInvitation {
-  id         String    @id @default(cuid())
-  ownerId    String
-  owner      User      @relation("invitationOwner", fields: [ownerId], references: [id], onDelete: Cascade)
-  email      String
-  seatType   String    @default("member")
-  token      String    @unique
-  channel    String    @default("email")
-  status     String    @default("pending")
-  expiresAt  DateTime
-  createdAt  DateTime  @default(now())
-  acceptedBy String?
+  id             String    @id @default(cuid())
+  ownerId        String
+  owner          User      @relation("invitationOwner", fields: [ownerId], references: [id], onDelete: Cascade)
+  email          String?
+  seatType       String    @default("member")
+  token          String    @unique
+  channel        String    @default("email")
+  status         String    @default("pending")
+  expiresAt      DateTime
+  createdAt      DateTime  @default(now())
+  acceptedBy     String?
+  applicantEmail String?
+  message        String?
+  joinRequests   TeamJoinRequest[]
   @@unique([ownerId, email])
   @@index([ownerId])
   @@index([email])
   @@map("team_invitations")
 }
 
+// 用户加入团队申请（链接渠道，与 TeamInvitation 分离：一条链接可承载多个申请）
+model TeamJoinRequest {
+  id           String         @id @default(cuid())
+  invitationId String
+  invitation   TeamInvitation @relation(fields: [invitationId], references: [id], onDelete: Cascade)
+  ownerId      String
+  owner        User           @relation("joinRequestOwner", fields: [ownerId], references: [id], onDelete: Cascade)
+  userId       String?
+  applicant    User?          @relation("joinRequestApplicant", fields: [userId], references: [id], onDelete: SetNull)
+  email        String
+  status       String         @default("pending")
+  seatType     String         @default("member")
+  createdAt    DateTime       @default(now())
+  processedAt  DateTime?
+  @@unique([invitationId, email])
+  @@index([ownerId, status])
+  @@map("team_join_requests")
+}
+
 // 项目活动记录
 model ProjectActivity {
   id         String   @id @default(cuid())
@@ -2029,3 +2055,33 @@ model DeveloperLog {
   @@index([year, date])
   @@map("developer_logs")
 }
+
+// 通知（团队邀请、协作请求、系统消息等）
+model Notification {
+  id        String    @id @default(cuid())
+  userId    String
+  category  String // team | collaboration | system | billing | security
+  type      String // 细分事件类型：team.invite_request、billing.payment_failed 等
+  title     String
+  body      String?
+  link      String?
+  readAt    DateTime?
+  createdAt DateTime  @default(now())
+  user      User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId, createdAt(sort: Desc)])
+  @@index([userId, readAt])
+  @@map("notifications")
+}
+
+// 通知偏好（免打扰时段、分类开关）
+model NotificationPreference {
+  userId     String  @id
+  categories Json
+  dndEnabled Boolean @default(false)
+  dndStart   String  @default("22:00")
+  dndEnd     String  @default("08:00")
+  user       User    @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@map("notification_preferences")
+}

package/schema.sqlite.prisma

@@ -92,9 +92,13 @@ model User {
   workspaceMemberships TeamMembership[]   @relation("teamOwner")
   teamJoined           TeamMembership?    @relation("teamMember")
   sentInvitations      TeamInvitation[]   @relation("invitationOwner")
+  ownedJoinRequests    TeamJoinRequest[]  @relation("joinRequestOwner")
+  applicantJoinRequests TeamJoinRequest[] @relation("joinRequestApplicant")
   aiUsageLogs          AiUsageLog[]
   agents               UserAgent[]
   skills               UserSkill[]
+  notifications            Notification[]
+  notificationPreference   NotificationPreference?
   subscription         Subscription?
 
   @@map("users")
@@ -173,23 +177,44 @@ model TeamMembership {
 
 // 团队邀请
 model TeamInvitation {
-  id         String    @id @default(cuid())
-  ownerId    String
-  owner      User      @relation("invitationOwner", fields: [ownerId], references: [id], onDelete: Cascade)
-  email      String
-  seatType   String    @default("member")
-  token      String    @unique
-  channel    String    @default("email")
-  status     String    @default("pending")
-  expiresAt  DateTime
-  createdAt  DateTime  @default(now())
-  acceptedBy String?
+  id             String    @id @default(cuid())
+  ownerId        String
+  owner          User      @relation("invitationOwner", fields: [ownerId], references: [id], onDelete: Cascade)
+  email          String?
+  seatType       String    @default("member")
+  token          String    @unique
+  channel        String    @default("email")
+  status         String    @default("pending")
+  expiresAt      DateTime
+  createdAt      DateTime  @default(now())
+  acceptedBy     String?
+  applicantEmail String?
+  message        String?
+  joinRequests   TeamJoinRequest[]
   @@unique([ownerId, email])
   @@index([ownerId])
   @@index([email])
   @@map("team_invitations")
 }
 
+model TeamJoinRequest {
+  id           String         @id @default(cuid())
+  invitationId String
+  invitation   TeamInvitation @relation(fields: [invitationId], references: [id], onDelete: Cascade)
+  ownerId      String
+  owner        User           @relation("joinRequestOwner", fields: [ownerId], references: [id], onDelete: Cascade)
+  userId       String?
+  applicant    User?          @relation("joinRequestApplicant", fields: [userId], references: [id], onDelete: SetNull)
+  email        String
+  status       String         @default("pending")
+  seatType     String         @default("member")
+  createdAt    DateTime       @default(now())
+  processedAt  DateTime?
+  @@unique([invitationId, email])
+  @@index([ownerId, status])
+  @@map("team_join_requests")
+}
+
 // 项目活动记录
 model ProjectActivity {
   id         String   @id @default(cuid())
@@ -1599,3 +1624,33 @@ model DeveloperLog {
   @@index([year, date])
   @@map("developer_logs")
 }
+
+// 通知（团队邀请、协作请求、系统消息等）
+model Notification {
+  id        String    @id @default(cuid())
+  userId    String
+  category  String // team | collaboration | system | billing | security
+  type      String // 细分事件类型：team.invite_request、billing.payment_failed 等
+  title     String
+  body      String?
+  link      String?
+  readAt    DateTime?
+  createdAt DateTime  @default(now())
+  user      User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId, createdAt(sort: Desc)])
+  @@index([userId, readAt])
+  @@map("notifications")
+}
+
+// 通知偏好（免打扰时段、分类开关）
+model NotificationPreference {
+  userId     String  @id
+  categories Json
+  dndEnabled Boolean @default(false)
+  dndStart   String  @default("22:00")
+  dndEnd     String  @default("08:00")
+  user       User    @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@map("notification_preferences")
+}