Merge-mercury

src/http-server/controllers/SyncRepositoriesController.ts

@@ -1,5 +1,6 @@
 import { Request, Response } from "express";
 import { SimpleGit, simpleGit, SimpleGitOptions } from "simple-git";
+import { dataSource } from "src/shared/db/postgres/infrastructure/data-source";
 
 import { SQLiteTypeORM } from "../../shared/db/postgres/infrastructure/SQLiteTypeORM";
 import { Logger } from "../../shared/logger/domain/Logger";
@@ -49,7 +50,7 @@ export class SyncRepositoriesController {
 
 		this.logger.info(`Databases difference: ${JSON.stringify(diffSummary)}`);
 
-		const database = new SQLiteTypeORM();
+		const database = new SQLiteTypeORM(dataSource, "./databases/evolution");
 		await database.initialize();
 	}
 }

src/index.ts

@@ -8,6 +8,7 @@ import { Pino } from "src/shared/logger/infrastructure/Pino";
 
 import { Server } from "./http-server/Server";
 import { MercuryBanListLoader } from "./mercury/ban-list/infrastructure/MercuryBanListLoader";
+import { dataSource, mercuryDataSource } from "./shared/db/postgres/infrastructure/data-source";
 import { HostServer } from "./socket-server/HostServer";
 import { MercuryServer } from "./socket-server/MercuryServer";
 import WebSocketSingleton from "./web-socket-server/WebSocketSingleton";
@@ -19,13 +20,16 @@ async function start(): Promise<void> {
 	const server = new Server(logger);
 	const mercuryServer = new MercuryServer(logger);
 	const hostServer = new HostServer(logger);
-	const database = new SQLiteTypeORM();
+	const database = new SQLiteTypeORM(dataSource, "./databases/evolution");
+	const mercuryDatabase = new SQLiteTypeORM(mercuryDataSource, "./databases/mercury");
 	const banListLoader = new BanListLoader();
 	await banListLoader.loadDirectory("./banlists/evolution");
 	await BanListMemoryRepository.backup();
 	await MercuryBanListLoader.load("./mercury/lflist.conf");
 	await database.connect();
 	await database.initialize();
+	await mercuryDatabase.connect();
+	await mercuryDatabase.initialize();
 	await server.initialize();
 	WebSocketSingleton.getInstance();
 	hostServer.initialize();

src/shared/db/postgres/infrastructure/SQLiteTypeORM.ts

@@ -5,15 +5,9 @@ import { DataSource } from "typeorm";
 import { CardEntity } from "../../../../edopro/card/infrastructure/postgres/CardEntity";
 import { CardTextEntity } from "../../../../edopro/card/infrastructure/postgres/CardTextEntity";
 import { Database } from "../../domain/Database";
-import { dataSource } from "./data-source";
 
 export class SQLiteTypeORM implements Database {
-	private readonly dataSource: DataSource;
-	private readonly directoryPath = "./databases/evolution";
-
-	constructor() {
-		this.dataSource = dataSource;
-	}
+	constructor(private readonly dataSource: DataSource, private readonly directoryPath: string) {}
 
 	async connect(): Promise<void> {
 		await this.dataSource.initialize();
@@ -34,7 +28,7 @@ export class SQLiteTypeORM implements Database {
 	}
 
 	private async merge(path: string): Promise<void> {
-		const queryRunner = dataSource.createQueryRunner();
+		const queryRunner = this.dataSource.createQueryRunner();
 		await queryRunner.connect();
 		await queryRunner.startTransaction();
 		try {
@@ -52,8 +46,8 @@ export class SQLiteTypeORM implements Database {
 	}
 
 	private async isLoaded(): Promise<boolean> {
-		const cardRepository = dataSource.getRepository(CardEntity);
-		const cardTextRepository = dataSource.getRepository(CardTextEntity);
+		const cardRepository = this.dataSource.getRepository(CardEntity);
+		const cardTextRepository = this.dataSource.getRepository(CardTextEntity);
 
 		const cardsCount = await cardRepository.count();
 		const cardTextsCount = await cardTextRepository.count();

src/shared/db/postgres/infrastructure/data-source.ts

@@ -3,13 +3,18 @@ import { DataSource, DataSourceOptions } from "typeorm";
 import { CardEntity } from "../../../../edopro/card/infrastructure/postgres/CardEntity";
 import { CardTextEntity } from "../../../../edopro/card/infrastructure/postgres/CardTextEntity";
 
-const options: DataSourceOptions = {
+const createDataSourceOptions = (databasePath: string): DataSourceOptions => ({
 	type: "sqlite",
-	database: "jtp_evolution_cards.db",
+	database: databasePath,
 	synchronize: true,
 	logging: false,
 	entities: [CardEntity, CardTextEntity],
 	subscribers: [],
 	migrations: [],
-};
+});
+
+const options = createDataSourceOptions("jtp_evolution_cards.db");
+const mercuryOptions = createDataSourceOptions("./mercury/pre-releases/cards.cdb");
+
 export const dataSource = new DataSource(options);
+export const mercuryDataSource = new DataSource(mercuryOptions);