From 21b4c00d9e7994420bcc85e2bfc2dafc5e2c63e6 Mon Sep 17 00:00:00 2001 From: Bivekich Date: Wed, 6 Aug 2025 03:10:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=B1=D0=B0=D0=B7=D1=8B=20=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85,=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B2=20=D0=B8=D0=BC=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F,=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=BB=D1=8C=20=D0=B8=20=D0=BD=D0=B0=D0=B7?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B7=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85,=20=D0=B0=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=D0=B6=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=20=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BD=D1=8B=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DATABASE_SETUP.md | 11 ++++------- .../conversations/entities/conversation.entity.ts | 4 ++-- .../src/modules/messages/entities/message.entity.ts | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/DATABASE_SETUP.md b/DATABASE_SETUP.md index 9a2034e..c02d4c8 100644 --- a/DATABASE_SETUP.md +++ b/DATABASE_SETUP.md @@ -16,14 +16,11 @@ cp .env.example .env ```env DATABASE_HOST=85.234.110.60 DATABASE_PORT=5432 -DATABASE_USERNAME=bivekich -DATABASE_PASSWORD=1kZoaf4_bQ -DATABASE_NAME=biveki +DATABASE_USERNAME=prism +DATABASE_PASSWORD=oaZ3-4Y6yf +DATABASE_NAME=prism ``` -**Важно**: База данных используется совместно с другими проектами. -Все таблицы Prism Messenger имеют префикс `prism_` для избежания конфликтов. - ### Проверка подключения Если возникают проблемы с подключением: @@ -38,7 +35,7 @@ DATABASE_NAME=biveki 3. **Тестирование подключения через psql**: ```bash -psql 'postgresql://bivekich:1kZoaf4_bQ@85.234.110.60:5432/biveki' +psql 'postgresql://prism:oaZ3-4Y6yf@85.234.110.60:5432/prism' ``` ### Альтернативная локальная разработка diff --git a/backend/src/modules/conversations/entities/conversation.entity.ts b/backend/src/modules/conversations/entities/conversation.entity.ts index 56b6322..c0cfe6f 100644 --- a/backend/src/modules/conversations/entities/conversation.entity.ts +++ b/backend/src/modules/conversations/entities/conversation.entity.ts @@ -4,7 +4,7 @@ import { User } from '../../users/entities/user.entity'; import { Message } from '../../messages/entities/message.entity'; @ObjectType() -@Entity('prism_conversations') +@Entity('conversations') export class Conversation { @Field(() => ID) @PrimaryGeneratedColumn('uuid') @@ -21,7 +21,7 @@ export class Conversation { @Field(() => [User]) @ManyToMany(() => User) @JoinTable({ - name: 'prism_conversation_participants', + name: 'conversation_participants', joinColumn: { name: 'conversationId', referencedColumnName: 'id' }, inverseJoinColumn: { name: 'userId', referencedColumnName: 'id' }, }) diff --git a/backend/src/modules/messages/entities/message.entity.ts b/backend/src/modules/messages/entities/message.entity.ts index 94217ef..d6f3ef8 100644 --- a/backend/src/modules/messages/entities/message.entity.ts +++ b/backend/src/modules/messages/entities/message.entity.ts @@ -4,7 +4,7 @@ import { User } from '../../users/entities/user.entity'; import { Conversation } from '../../conversations/entities/conversation.entity'; @ObjectType() -@Entity('prism_messages') +@Entity('messages') export class Message { @Field(() => ID) @PrimaryGeneratedColumn('uuid')