From fe37888efccfe526568fb2fab9215ec067b22009 Mon Sep 17 00:00:00 2001 From: Lanskikh Date: Thu, 5 Jun 2025 18:41:23 +0500 Subject: [PATCH] upd --- src/db/schema/sessions.ts | 4 +++- src/db/schema/users.ts | 2 ++ src/services/sessions/get.ts | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/db/schema/sessions.ts b/src/db/schema/sessions.ts index 785931b..07a4ae9 100644 --- a/src/db/schema/sessions.ts +++ b/src/db/schema/sessions.ts @@ -13,6 +13,7 @@ import { serversTable } from "./servers"; import { clientsTable } from "./clients"; import { appsTable } from "./apps"; import { sql } from "drizzle-orm"; +import { commentsTable } from "./comments"; export const sessionsTable = pgTable( "sessions", @@ -54,7 +55,7 @@ export const sessionsTable = pgTable( }) ); -export const sessionsRelations = relations(sessionsTable, ({ one }) => ({ +export const sessionsRelations = relations(sessionsTable, ({ one, many }) => ({ owner: one(usersTable, { fields: [sessionsTable.ownerId], references: [usersTable.id], @@ -75,4 +76,5 @@ export const sessionsRelations = relations(sessionsTable, ({ one }) => ({ fields: [sessionsTable.appId], references: [appsTable.id], }), + comments: many(commentsTable), })); diff --git a/src/db/schema/users.ts b/src/db/schema/users.ts index ce0999f..dc69a77 100644 --- a/src/db/schema/users.ts +++ b/src/db/schema/users.ts @@ -2,6 +2,7 @@ import { relations } from "drizzle-orm"; import { pgTable, text, timestamp, uuid, varchar } from "drizzle-orm/pg-core"; import { tokensTable } from "./tokens"; import { companiesTable } from "./companies"; +import { commentsTable } from "./comments"; export const usersTable = pgTable("users", { id: uuid("id").defaultRandom().primaryKey(), @@ -27,4 +28,5 @@ export const usersRelations = relations(usersTable, ({ one, many }) => ({ references: [companiesTable.id], }), tokens: many(tokensTable), + comments: many(commentsTable), })); diff --git a/src/services/sessions/get.ts b/src/services/sessions/get.ts index 33aec84..73ab48e 100644 --- a/src/services/sessions/get.ts +++ b/src/services/sessions/get.ts @@ -22,6 +22,15 @@ async function getSessions( client: true, app: true, server: true, + comments: { + with: { + owner: { + columns: { + fullname: true, + }, + }, + }, + }, owner: { columns: { password: false,