From 208ae100f0c6870c12b917472110f2d0182cf807 Mon Sep 17 00:00:00 2001 From: Amin Latifi Date: Tue, 7 May 2024 12:57:14 +0330 Subject: [PATCH 1/3] Fixed master test issue --- src/entities/entities.ts | 2 +- src/orm.ts | 23 ++++++++++--------- src/repositories/donationRepository.ts | 2 +- .../projectDonationSummaryView.ts | 0 test/pre-test-scripts.ts | 2 ++ 5 files changed, 16 insertions(+), 13 deletions(-) rename src/{entities => views}/projectDonationSummaryView.ts (100%) diff --git a/src/entities/entities.ts b/src/entities/entities.ts index fbb1ba358..60b9da5e8 100644 --- a/src/entities/entities.ts +++ b/src/entities/entities.ts @@ -50,7 +50,7 @@ import { ProjectFraud } from './projectFraud'; import { ProjectActualMatchingView } from './ProjectActualMatchingView'; import { ProjectSocialMedia } from './projectSocialMedia'; import { DraftRecurringDonation } from './draftRecurringDonation'; -import { ProjectDonationSummaryView } from './projectDonationSummaryView'; +import { ProjectDonationSummaryView } from '../views/projectDonationSummaryView'; export const getEntities = (): DataSourceOptions['entities'] => { return [ diff --git a/src/orm.ts b/src/orm.ts index 561c69dd0..e1f399452 100644 --- a/src/orm.ts +++ b/src/orm.ts @@ -1,4 +1,5 @@ import { DataSource } from 'typeorm'; +import { PostgresConnectionCredentialsOptions } from 'typeorm/driver/postgres/PostgresConnectionCredentialsOptions'; import config from './config'; import { CronJob } from './entities/CronJob'; import { getEntities } from './entities/entities'; @@ -14,6 +15,16 @@ export class AppDataSource { const synchronize = (config.get('ENVIRONMENT') as string) === 'test'; const entities = getEntities(); const poolSize = Number(process.env.TYPEORM_DATABASE_POOL_SIZE) || 10; // 10 is the default value + const slaves: PostgresConnectionCredentialsOptions[] = []; + if (config.get('TYPEORM_DATABASE_HOST_READONLY')) { + slaves.push({ + database: config.get('TYPEORM_DATABASE_NAME_READONLY') as string, + username: config.get('TYPEORM_DATABASE_USER_READONLY') as string, + password: config.get('TYPEORM_DATABASE_PASSWORD_READONLY') as string, + port: config.get('TYPEORM_DATABASE_PORT_READONLY') as number, + host: config.get('TYPEORM_DATABASE_HOST_READONLY') as string, + }); + } AppDataSource.datasource = new DataSource({ schema: 'public', type: 'postgres', @@ -25,17 +36,7 @@ export class AppDataSource { port: config.get('TYPEORM_DATABASE_PORT') as number, host: config.get('TYPEORM_DATABASE_HOST') as string, }, - slaves: [ - { - database: config.get('TYPEORM_DATABASE_NAME_READONLY') as string, - username: config.get('TYPEORM_DATABASE_USER_READONLY') as string, - password: config.get( - 'TYPEORM_DATABASE_PASSWORD_READONLY', - ) as string, - port: config.get('TYPEORM_DATABASE_PORT_READONLY') as number, - host: config.get('TYPEORM_DATABASE_HOST_READONLY') as string, - }, - ], + slaves, }, entities, diff --git a/src/repositories/donationRepository.ts b/src/repositories/donationRepository.ts index b36bfc7fc..b7f8e53a8 100644 --- a/src/repositories/donationRepository.ts +++ b/src/repositories/donationRepository.ts @@ -5,7 +5,7 @@ import { Donation, DONATION_STATUS } from '../entities/donation'; import { ResourcesTotalPerMonthAndYear } from '../resolvers/donationResolver'; import { getProjectDonationsSqrtRootSum } from './qfRoundRepository'; import { logger } from '../utils/logger'; -import { ProjectDonationSummaryView } from '../entities/projectDonationSummaryView'; +import { ProjectDonationSummaryView } from '../views/projectDonationSummaryView'; import { ProjectEstimatedMatchingView } from '../entities/ProjectEstimatedMatchingView'; export const fillQfRoundDonationsUserScores = async (): Promise => { diff --git a/src/entities/projectDonationSummaryView.ts b/src/views/projectDonationSummaryView.ts similarity index 100% rename from src/entities/projectDonationSummaryView.ts rename to src/views/projectDonationSummaryView.ts diff --git a/test/pre-test-scripts.ts b/test/pre-test-scripts.ts index 1051749eb..45459d345 100644 --- a/test/pre-test-scripts.ts +++ b/test/pre-test-scripts.ts @@ -41,6 +41,7 @@ import { createDonationethUser1701756190381 } from '../migration/1701756190381-c import { ChainType } from '../src/types/network'; import { COINGECKO_TOKEN_IDS } from '../src/adapters/price/CoingeckoPriceAdapter'; import { ProjectActualMatchinView151713700147145 } from '../migration/1713700147145-project_actual_matchin_view_15'; +import { ProjectDonationSummeryV41713441337834 } from '../migration/1713441337834-ProjectDonationSummeryV4'; async function seedDb() { await seedUsers(); @@ -479,6 +480,7 @@ async function runMigrations() { ); await new createDonationethUser1701756190381().up(queryRunner); await new ProjectActualMatchinView151713700147145().up(queryRunner); + await new ProjectDonationSummeryV41713441337834().up(queryRunner); } finally { await queryRunner.release(); } From 13f8d8384d4e1c37702a1c904900dcf1a23e0507 Mon Sep 17 00:00:00 2001 From: Amin Latifi Date: Tue, 7 May 2024 12:58:15 +0330 Subject: [PATCH 2/3] Returned test to master pipeline --- .github/workflows/master-pipeline.yml | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/master-pipeline.yml b/.github/workflows/master-pipeline.yml index 803a2979a..6bcebcb83 100644 --- a/.github/workflows/master-pipeline.yml +++ b/.github/workflows/master-pipeline.yml @@ -89,26 +89,26 @@ jobs: - name: Run migrations run: npm run db:migrate:run:test -# - name: Run tests -# run: npm run test -# env: -# ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }} -# XDAI_NODE_HTTP_URL: ${{ secrets.XDAI_NODE_HTTP_URL }} -# INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }} -# INFURA_ID: ${{ secrets.INFURA_ID }} -# POLYGON_SCAN_API_KEY: ${{ secrets.POLYGON_SCAN_API_KEY }} -# OPTIMISTIC_SCAN_API_KEY: ${{ secrets.OPTIMISTIC_SCAN_API_KEY }} -# CELO_SCAN_API_KEY: ${{ secrets.CELO_SCAN_API_KEY }} -# CELO_ALFAJORES_SCAN_API_KEY: ${{ secrets.CELO_ALFAJORES_SCAN_API_KEY }} -# ARBITRUM_SCAN_API_KEY: ${{ secrets.ARBITRUM_SCAN_API_KEY }} -# ARBITRUM_SEPOLIA_SCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_SCAN_API_KEY }} -# MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }} -# ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }} -# DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_PROD }} -# SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }} -# SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }} -# SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }} -# MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }} + - name: Run tests + run: npm run test + env: + ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }} + XDAI_NODE_HTTP_URL: ${{ secrets.XDAI_NODE_HTTP_URL }} + INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }} + INFURA_ID: ${{ secrets.INFURA_ID }} + POLYGON_SCAN_API_KEY: ${{ secrets.POLYGON_SCAN_API_KEY }} + OPTIMISTIC_SCAN_API_KEY: ${{ secrets.OPTIMISTIC_SCAN_API_KEY }} + CELO_SCAN_API_KEY: ${{ secrets.CELO_SCAN_API_KEY }} + CELO_ALFAJORES_SCAN_API_KEY: ${{ secrets.CELO_ALFAJORES_SCAN_API_KEY }} + ARBITRUM_SCAN_API_KEY: ${{ secrets.ARBITRUM_SCAN_API_KEY }} + ARBITRUM_SEPOLIA_SCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_SCAN_API_KEY }} + MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }} + ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }} + DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_PROD }} + SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }} + SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }} + SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }} + MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }} publish: needs: test From 5806e4c8328d9c9ffeb4fb93b9cbfcf934f9ff1a Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Tue, 7 May 2024 14:03:35 +0330 Subject: [PATCH 3/3] Comment executing donation summary view --- test/pre-test-scripts.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/pre-test-scripts.ts b/test/pre-test-scripts.ts index 45459d345..1051749eb 100644 --- a/test/pre-test-scripts.ts +++ b/test/pre-test-scripts.ts @@ -41,7 +41,6 @@ import { createDonationethUser1701756190381 } from '../migration/1701756190381-c import { ChainType } from '../src/types/network'; import { COINGECKO_TOKEN_IDS } from '../src/adapters/price/CoingeckoPriceAdapter'; import { ProjectActualMatchinView151713700147145 } from '../migration/1713700147145-project_actual_matchin_view_15'; -import { ProjectDonationSummeryV41713441337834 } from '../migration/1713441337834-ProjectDonationSummeryV4'; async function seedDb() { await seedUsers(); @@ -480,7 +479,6 @@ async function runMigrations() { ); await new createDonationethUser1701756190381().up(queryRunner); await new ProjectActualMatchinView151713700147145().up(queryRunner); - await new ProjectDonationSummeryV41713441337834().up(queryRunner); } finally { await queryRunner.release(); }