change db default to number type

dydxprotocol · Aug 28, 2024 · c9e4411 · c9e4411
1 parent d5f035f
commit c9e4411
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/indexer/packages/postgres/__tests__/stores/wallet-table.test.ts b/indexer/packages/postgres/__tests__/stores/wallet-table.test.ts
@@ -30,14 +30,14 @@ describe('Wallet store', () => {
     await WalletTable.upsert({
       ...defaultWallet2,
       isWhitelistAffiliate: true,
-      totalVolume: '100',
+      totalVolume: '100.1',
     });
     wallet = await WalletTable.findById(defaultWallet2.address);
 
     expect(wallet).toEqual(expect.objectContaining({
       ...defaultWallet2,
       isWhitelistAffiliate: true,
-      totalVolume: '100',
+      totalVolume: '100.1',
     }));
   });
 
@@ -78,8 +78,8 @@ describe('Wallet store', () => {
   it('Successfully finds wallets by whitelist flag', async () => {
     await Promise.all([
       WalletTable.create(defaultWallet3),
-      WalletTable.create(defaultWallet2)
-    ])
+      WalletTable.create(defaultWallet2),
+    ]);
 
     const wallets: WalletFromDatabase[] = await WalletTable.findAll(
       {

diff --git a/...tions/migration_files/20240827162119_add_wallets_total_volume_and_affiliates_whitelist.ts b/...tions/migration_files/20240827162119_add_wallets_total_volume_and_affiliates_whitelist.ts
@@ -1,11 +1,10 @@
-import * as Knex from "knex";
-
+import * as Knex from 'knex';
 
 export async function up(knex: Knex): Promise<void> {
   return knex
     .schema
     .alterTable('wallets', (table) => {
-      table.decimal('totalVolume', null).defaultTo('0').notNullable();
+      table.decimal('totalVolume', null).defaultTo(0).notNullable();
       table.boolean('isWhitelistAffiliate').defaultTo(false).notNullable();
     });
 }
@@ -18,5 +17,3 @@ export async function down(knex: Knex): Promise<void> {
       table.dropColumn('isWhitelistAffiliate');
     });
 }
-
-
diff --git a/indexer/packages/postgres/src/models/wallet-model.ts b/indexer/packages/postgres/src/models/wallet-model.ts
@@ -47,11 +47,26 @@ export default class WalletModel extends BaseModel {
         address: { type: 'string' },
         totalTradingRewards: { type: 'string', pattern: NonNegativeNumericPattern },
         totalVolume: { type: 'string', pattern: NonNegativeNumericPattern },
-        isWhitelistAffiliate: { type: 'boolean'},
+        isWhitelistAffiliate: { type: 'boolean' },
       },
     };
   }
 
+  /**
+   * A mapping from column name to JSON conversion expected.
+   * See getSqlConversionForDydxModelTypes for valid conversions.
+   *
+   * TODO(IND-239): Ensure that jsonSchema() / sqlToJsonConversions() / model fields match.
+   */
+  static get sqlToJsonConversions() {
+    return {
+      address: 'string',
+      totalTradingRewards: 'string',
+      totalVolume: 'string',
+      isWhitelistAffiliate: 'boolean',
+    };
+  }
+
   QueryBuilderType!: UpsertQueryBuilder<this>;
 
   address!: string;

diff --git a/indexer/services/comlink/__tests__/controllers/api/v4/transfers-controller.test.ts b/indexer/services/comlink/__tests__/controllers/api/v4/transfers-controller.test.ts
@@ -1173,4 +1173,4 @@ describe('transfers-controller#V4', () => {
       );
     });
   });
-});
+});