Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/master test #1541

Merged
merged 4 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/master-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/entities/entities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down
23 changes: 12 additions & 11 deletions src/orm.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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',
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/repositories/donationRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> => {
Expand Down
2 changes: 2 additions & 0 deletions test/pre-test-scripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
}
Expand Down
Loading