base commit

server/prisma/migrations/20260430063434_order_delivery_type_fee/migration.sql

@@ -0,0 +1,25 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Order" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "status" TEXT NOT NULL DEFAULT 'DRAFT',
+    "deliveryType" TEXT NOT NULL DEFAULT 'delivery',
+    "itemsSubtotalCents" INTEGER NOT NULL DEFAULT 0,
+    "deliveryFeeCents" INTEGER NOT NULL DEFAULT 0,
+    "totalCents" INTEGER NOT NULL DEFAULT 0,
+    "currency" TEXT NOT NULL DEFAULT 'RUB',
+    "addressSnapshotJson" TEXT,
+    "comment" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "userId" TEXT NOT NULL,
+    CONSTRAINT "Order_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+INSERT INTO "new_Order" ("addressSnapshotJson", "comment", "createdAt", "currency", "id", "status", "totalCents", "updatedAt", "userId") SELECT "addressSnapshotJson", "comment", "createdAt", "currency", "id", "status", "totalCents", "updatedAt", "userId" FROM "Order";
+DROP TABLE "Order";
+ALTER TABLE "new_Order" RENAME TO "Order";
+CREATE INDEX "Order_userId_createdAt_idx" ON "Order"("userId", "createdAt");
+CREATE INDEX "Order_status_updatedAt_idx" ON "Order"("status", "updatedAt");
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

server/prisma/migrations/20260430170746_user_message_read_oauth_accounts/migration.sql

@@ -0,0 +1,35 @@
+-- CreateTable
+CREATE TABLE "UserOrderMessageReadState" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "lastReadAt" DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00 +00:00',
+    "updatedAt" DATETIME NOT NULL,
+    "userId" TEXT NOT NULL,
+    "orderId" TEXT NOT NULL,
+    CONSTRAINT "UserOrderMessageReadState_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT "UserOrderMessageReadState_orderId_fkey" FOREIGN KEY ("orderId") REFERENCES "Order" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateTable
+CREATE TABLE "OAuthAccount" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "provider" TEXT NOT NULL,
+    "providerUserId" TEXT NOT NULL,
+    "accessToken" TEXT,
+    "refreshToken" TEXT,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    "userId" TEXT NOT NULL,
+    CONSTRAINT "OAuthAccount_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE INDEX "UserOrderMessageReadState_userId_idx" ON "UserOrderMessageReadState"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserOrderMessageReadState_userId_orderId_key" ON "UserOrderMessageReadState"("userId", "orderId");
+
+-- CreateIndex
+CREATE INDEX "OAuthAccount_userId_idx" ON "OAuthAccount"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OAuthAccount_provider_providerUserId_key" ON "OAuthAccount"("provider", "providerUserId");

server/prisma/schema.prisma

@@ -69,6 +69,23 @@ model User {
   cartItems CartItem[]
   orders Order[]
   reviews Review[]
+  orderMessageReadStates UserOrderMessageReadState[]
+  oauthAccounts OAuthAccount[]
+}
+
+/// Прочитанность чата по заказу (для сообщений от админа после lastReadAt)
+model UserOrderMessageReadState {
+  id         String   @id @default(cuid())
+  lastReadAt DateTime @default("1970-01-01T00:00:00.000Z")
+  updatedAt  DateTime @updatedAt
+
+  user    User    @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId  String
+  order   Order   @relation(fields: [orderId], references: [id], onDelete: Cascade)
+  orderId String
+
+  @@unique([userId, orderId])
+  @@index([userId])
 }
 
 model CartItem {
@@ -90,9 +107,13 @@ model Order {
   id                  String      @id @default(cuid())
   /// Статус заказа (валидация переходов на уровне API)
   status              String      @default("DRAFT")
+  /// 'delivery' | 'pickup'
+  deliveryType        String      @default("delivery")
+  itemsSubtotalCents  Int         @default(0)
+  deliveryFeeCents    Int         @default(0)
   totalCents          Int         @default(0)
   currency            String      @default("RUB")
-  addressSnapshotJson String
+  addressSnapshotJson String?
   comment             String?
   createdAt           DateTime    @default(now())
   updatedAt           DateTime    @updatedAt
@@ -102,6 +123,7 @@ model Order {
 
   items    OrderItem[]
   messages OrderMessage[]
+  messageReadStates UserOrderMessageReadState[]
 
   @@index([userId, createdAt])
   @@index([status, updatedAt])
@@ -175,6 +197,23 @@ model ShippingAddress {
   @@index([userId, updatedAt])
 }
 
+model OAuthAccount {
+  id               String   @id @default(cuid())
+  /// 'vk' | 'yandex'
+  provider         String
+  providerUserId   String
+  accessToken      String?
+  refreshToken     String?
+  createdAt        DateTime @default(now())
+  updatedAt        DateTime @updatedAt
+
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId String
+
+  @@unique([provider, providerUserId])
+  @@index([userId])
+}
+
 model AuthCode {
   id        String   @id @default(cuid())
   email     String