Merge pull request #768 from aura-nw/baseline/main_20230419

Baseline/euphoria 20230417

src/components/validator/dtos/lite-validator-output.dto.ts

@@ -58,4 +58,7 @@ export class LiteValidatorOutput {
 
   @Expose()
   image_url: string;
+
+  @Expose()
+  voting_power_level: string;
 }

src/components/validator/repositories/validator.repository.ts

@@ -1,4 +1,4 @@
-import { EntityRepository, In, Repository } from 'typeorm';
+import { EntityRepository, In, Not, Repository } from 'typeorm';
 
 import { Validator } from '../../../shared';
 
@@ -37,11 +37,20 @@ export class ValidatorRepository extends Repository<Validator> {
     return await rankBuilder.getRawMany();
   }
 
-  async getAllValidators() {
+  async getAllActiveValidators() {
     return await this.createQueryBuilder('v')
       .select('v.*')
+      .where({ status: 3 })
+      .addOrderBy('power', 'DESC')
+      .addOrderBy('updated_at', 'DESC')
+      .getRawMany();
+  }
+
+  async getAllInActiveValidators() {
+    return await this.createQueryBuilder('v')
+      .select('v.*')
+      .where({ status: Not(3) })
       .orderBy('jailed', 'ASC')
-      .addOrderBy('status', 'DESC')
       .addOrderBy('power', 'DESC')
       .addOrderBy('updated_at', 'DESC')
       .getRawMany();

src/components/validator/services/validator.service.ts

@@ -59,8 +59,9 @@ export class ValidatorService {
     ctx: RequestContext,
   ): Promise<{ validators: LiteValidatorOutput[] }> {
     this.logger.log(ctx, `${this.getValidators.name} was called!`);
-    const [validatorsRes, proposal] = await Promise.all([
-      this.validatorRepository.getAllValidators(),
+    const [activeValidator, inActiveValidator, proposal] = await Promise.all([
+      this.validatorRepository.getAllActiveValidators(),
+      this.validatorRepository.getAllInActiveValidators(),
       this.serviceUtil.getDataAPI(
         `${this.indexerUrl}${util.format(
           INDEXER_API.GET_PROPOSAL,
@@ -73,6 +74,8 @@ export class ValidatorService {
       ),
     ]);
 
+    const validatorsRes = [...activeValidator, ...inActiveValidator];
+
     // Get total proposal on indexer
     const proposalCount = proposal?.data?.count || 0;
 

src/migrations/1681266400447-create-column-voting-power-level.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class createColumnVotingPowerLevel1681266400447
+  implements MigrationInterface
+{
+  name = 'createColumnVotingPowerLevel1681266400447';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE \`validators\` ADD \`voting_power_level\` varchar(255) NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE \`validators\` DROP COLUMN \`voting_power_level\``,
+    );
+  }
+}

src/shared/entities/validator.entity.ts

@@ -75,4 +75,7 @@ export class Validator extends BaseEntity {
 
   @Column({ name: 'image_url', nullable: true, type: 'nvarchar' })
   image_url: string;
+
+  @Column({ name: 'voting_power_level', nullable: true })
+  voting_power_level: string;
 }