diff --git a/DATABASE_SETUP.md b/DATABASE_SETUP.md index c02d4c8..9a2034e 100644 --- a/DATABASE_SETUP.md +++ b/DATABASE_SETUP.md @@ -16,11 +16,14 @@ cp .env.example .env ```env DATABASE_HOST=85.234.110.60 DATABASE_PORT=5432 -DATABASE_USERNAME=prism -DATABASE_PASSWORD=oaZ3-4Y6yf -DATABASE_NAME=prism +DATABASE_USERNAME=bivekich +DATABASE_PASSWORD=1kZoaf4_bQ +DATABASE_NAME=biveki ``` +**Важно**: База данных используется совместно с другими проектами. +Все таблицы Prism Messenger имеют префикс `prism_` для избежания конфликтов. + ### Проверка подключения Если возникают проблемы с подключением: @@ -35,7 +38,7 @@ DATABASE_NAME=prism 3. **Тестирование подключения через psql**: ```bash -psql 'postgresql://prism:oaZ3-4Y6yf@85.234.110.60:5432/prism' +psql 'postgresql://bivekich:1kZoaf4_bQ@85.234.110.60:5432/biveki' ``` ### Альтернативная локальная разработка diff --git a/backend/src/modules/conversations/entities/conversation.entity.ts b/backend/src/modules/conversations/entities/conversation.entity.ts index c0cfe6f..56b6322 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('conversations') +@Entity('prism_conversations') export class Conversation { @Field(() => ID) @PrimaryGeneratedColumn('uuid') @@ -21,7 +21,7 @@ export class Conversation { @Field(() => [User]) @ManyToMany(() => User) @JoinTable({ - name: 'conversation_participants', + name: 'prism_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 d6f3ef8..94217ef 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('messages') +@Entity('prism_messages') export class Message { @Field(() => ID) @PrimaryGeneratedColumn('uuid') diff --git a/backend/src/modules/users/entities/user.entity.ts b/backend/src/modules/users/entities/user.entity.ts index 511a145..91af505 100644 --- a/backend/src/modules/users/entities/user.entity.ts +++ b/backend/src/modules/users/entities/user.entity.ts @@ -3,7 +3,7 @@ import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateCol import { Message } from '../../messages/entities/message.entity'; @ObjectType() -@Entity('users') +@Entity('prism_users') export class User { @Field(() => ID) @PrimaryGeneratedColumn('uuid')