fix: entity schema out of datasource

Author: dnechay

packages/apps/reputation-oracle/server/src/common/constants/index.ts

@@ -1,3 +1,4 @@
+export const DATABASE_SCHEMA_NAME = 'hmt';
 export const INITIAL_REPUTATION = 0;
 export const JWT_STRATEGY_NAME = 'jwt-http';
 

packages/apps/reputation-oracle/server/src/database/database.module.ts

@@ -19,8 +19,6 @@ import { EscrowPayoutsBatchEntity } from '../modules/escrow-completion/escrow-pa
 
 import { TypeOrmLoggerModule, TypeOrmLoggerService } from './typeorm';
 
-export const DATABASE_SCHEMA_NAME = 'hmt';
-
 @Module({
   imports: [
     TypeOrmModule.forRootAsync({
@@ -54,7 +52,6 @@ export const DATABASE_SCHEMA_NAME = 'hmt';
               }),
           ssl: databaseConfigService.ssl,
 
-          schema: DATABASE_SCHEMA_NAME,
           namingStrategy: new SnakeNamingStrategy(),
           /**
            * Schema synchronization should be done

packages/apps/reputation-oracle/server/src/database/migrations/1694691302615-InitialMigration.ts

@@ -1,5 +1,5 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
-import { DATABASE_SCHEMA_NAME } from '../database.module';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 
 export class InitialMigration1694776006387 implements MigrationInterface {
   name = 'InitialMigration1694776006387';

packages/apps/reputation-oracle/server/src/modules/auth/token.entity.ts

@@ -9,6 +9,7 @@ import {
 
 import { UserEntity } from '../user/user.entity';
 import { BaseEntity } from '../../database/base.entity';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { IBase } from '../../common/interfaces/base';
 
 export enum TokenType {
@@ -22,7 +23,7 @@ export interface IToken extends IBase {
   type: TokenType;
 }
 
-@Entity({ name: 'tokens' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'tokens' })
 @Index(['type', 'userId'], { unique: true })
 export class TokenEntity extends BaseEntity implements IToken {
   @Column({ type: 'uuid', unique: true })

packages/apps/reputation-oracle/server/src/modules/cron-job/cron-job.entity.ts

@@ -1,10 +1,11 @@
 import { BeforeInsert, Column, Entity, Index } from 'typeorm';
 
 import { BaseEntity } from '../../database/base.entity';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { ICronJob } from '../../common/interfaces/cron-job';
 import { CronJobType } from '../../common/enums/cron-job';
 
-@Entity({ name: 'cron-jobs' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'cron-jobs' })
 @Index(['cronJobType'], { unique: true })
 export class CronJobEntity extends BaseEntity implements ICronJob {
   @Column({

packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-completion.entity.ts

@@ -1,10 +1,11 @@
 import { Column, Entity, Index } from 'typeorm';
 
 import { BaseEntity } from '../../database/base.entity';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { EscrowCompletionStatus } from '../../common/enums';
 import { ChainId } from '@human-protocol/sdk';
 
-@Entity({ name: 'escrow_completion_tracking' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'escrow_completion_tracking' })
 @Index(['escrowAddress', 'chainId'], { unique: true })
 export class EscrowCompletionEntity extends BaseEntity {
   @Column({ type: 'int' })

packages/apps/reputation-oracle/server/src/modules/escrow-completion/escrow-payouts-batch.entity.ts

@@ -1,14 +1,15 @@
 import { Column, Entity, Index, ManyToOne } from 'typeorm';
 
 import { BaseEntity } from '../../database/base.entity';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import type { EscrowCompletionEntity } from './escrow-completion.entity';
 
 export type EscrowPayout = {
   address: string;
   amount: string;
 };
 
-@Entity({ name: 'escrow_payouts_batch' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'escrow_payouts_batch' })
 @Index(['escrowCompletionTrackingId', 'payoutsHash'], { unique: true })
 export class EscrowPayoutsBatchEntity extends BaseEntity {
   @ManyToOne('EscrowCompletionEntity', { onDelete: 'CASCADE' })

packages/apps/reputation-oracle/server/src/modules/kyc/kyc.entity.ts

@@ -1,10 +1,11 @@
 import { Column, Entity, JoinColumn, OneToOne } from 'typeorm';
 
 import { KycStatus } from '../../common/enums/user';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { BaseEntity } from '../../database/base.entity';
 import { UserEntity } from '../user/user.entity';
 
-@Entity({ name: 'kycs' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'kycs' })
 export class KycEntity extends BaseEntity {
   @Column({ type: 'varchar', unique: true, primary: true })
   public sessionId: string;

packages/apps/reputation-oracle/server/src/modules/qualification/qualification.entity.ts

@@ -1,8 +1,9 @@
 import { Column, Entity, Index, OneToMany } from 'typeorm';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { BaseEntity } from '../../database/base.entity';
 import { UserQualificationEntity } from './user-qualification.entity';
 
-@Entity({ name: 'qualifications' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'qualifications' })
 @Index(['reference'], { unique: true })
 export class QualificationEntity extends BaseEntity {
   @Column({ type: 'varchar', unique: true })

packages/apps/reputation-oracle/server/src/modules/qualification/user-qualification.entity.ts

@@ -1,9 +1,10 @@
 import { Entity, ManyToOne } from 'typeorm';
+import { DATABASE_SCHEMA_NAME } from '../../common/constants';
 import { BaseEntity } from '../../database/base.entity';
 import { UserEntity } from '../user/user.entity';
 import { QualificationEntity } from '../qualification/qualification.entity';
 
-@Entity({ name: 'user_qualifications' })
+@Entity({ schema: DATABASE_SCHEMA_NAME, name: 'user_qualifications' })
 export class UserQualificationEntity extends BaseEntity {
   @ManyToOne(() => UserEntity, (user) => user.userQualifications)
   public user: UserEntity;