Skip to content

Commit 2066f9e

Browse files
committed
fix: temporary fix for testing
1 parent 06a2e33 commit 2066f9e

4 files changed

Lines changed: 20 additions & 14 deletions

File tree

src/db/database.ts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
import { DataSource } from "typeorm";
2-
import { CollectedReward } from "@/model/staking/CollectedRewards";
3-
import { EstimatedReward } from "@/model/staking/EstimatedRewards";
4-
import { NodeProofRate } from "@/model/staking/NodeProofRate";
2+
import { CollectedReward } from "../model/staking/CollectedRewards";
3+
import { NodeProofRate } from "../model/staking/NodeProofRate";
4+
import { EstimatedReward } from "../model/staking/EstimatedRewards";
5+
56

67
let AppDataSource: DataSource;
78

8-
export function initDatabase() {
9+
export async function initDatabase() {
10+
const schema = process.env.DB_SCHEMA || "computed";
11+
912
AppDataSource = new DataSource({
1013
type: "postgres",
11-
host: process.env.PG_HOST,
14+
host: "postgres",
1215
port: parseInt(process.env.DB_PORT) || 5432,
1316
username: process.env.DB_USER,
14-
password: process.env.DB_PASSWORD,
17+
password: process.env.DB_PASS,
1518
database: process.env.DB_NAME,
1619
entities: [CollectedReward, EstimatedReward, NodeProofRate],
1720
// This means we always update the database schema to match the entities
1821
synchronize: true,
19-
schema: process.env.DB_SCHEMA || "computed",
22+
schema,
2023
});
2124

22-
AppDataSource.initialize().catch((error) => console.log(error));
23-
console.log("[✔] Type ORM Data Source initialized. Using schema:", process.env.DB_SCHEMA);
25+
await AppDataSource.initialize()
26+
.then(() => {
27+
console.log("[✔] Type ORM Data Source initialized. Using schema:", schema);
28+
})
29+
.catch((error) => console.log(error));
30+
2431
return AppDataSource;
2532
}

src/db/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { initDatabase } from "./database";
22
import { processStakingData } from "./procedures/staking";
33

44
export async function processData(blocks: Number[]) {
5-
const db = initDatabase();
6-
5+
const db = await initDatabase();
76
await processStakingData(db, blocks);
87
}

src/db/procedures/staking.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DataSource } from "typeorm";
2-
import { CollectedReward } from "@/model/staking/CollectedRewards";
3-
import { NodeProofRate } from "@/model/staking/NodeProofRate";
2+
import { CollectedReward } from "../../model/staking/CollectedRewards";
3+
import { NodeProofRate } from "../../model/staking/NodeProofRate";
44
// import { EstimatedReward } from "@/model/staking/EstimatedRewards";
55

66
async function _processCollectedReward(AppDataSource: DataSource, blocks: Number[]) {

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"baseUrl": ".",
1212
"paths": {
1313
"@/*": ["src/*"],
14-
"@model/*": ["src/model/generated/*"]
14+
"@model/*": ["src/model/*"]
1515
}
1616
},
1717
"ts-node": {

0 commit comments

Comments
 (0)