add: merge configs

package.json

@@ -7,7 +7,7 @@
     "private": true,
     "scripts": {
         "tsc": "tsc",
-        "build": "",
+        "build": "yarn tsc -p tsconfig.json",
         "lint": "yarn eslint \"src/**/*\"",
         "lint-fix": "yarn lint --fix",
         "start": "ts-node src/index.ts",

src/config.ts

@@ -1,5 +1,36 @@
 import dotenv from 'dotenv';
-dotenv.config();
+import { DataSourceOptions } from 'typeorm';
+import { BotServer } from './entity/BotServer';
+import { NewsDate } from './entity/NewsDate';
+import * as fs from 'fs';
+
+const fileName = 'src/bot.env'
+if (fs.existsSync(fileName))
+    dotenv.config({path:fileName});
+else
+    dotenv.config();
+
+export const dataSourceOption: DataSourceOptions = {
+    type: 'postgres',
+    host: process.env.dbHost || 'database host',
+    port: parseInt(process.env.dbPort)|| 5432,
+    username: process.env.dbUsername||'db user name',
+    database: process.env.dbName||'db name',
+    password: process.env.dbPWD ||'database password',
+    synchronize: false,
+    logging: false,
+    entities: [BotServer, NewsDate],
+    migrations: ['./migration/*.ts', './migration/*.js'],
+    subscribers: ['./subscriber/*.ts', './subscriber/*.js'],
+    ssl: false,
+    extra: {
+        insecureAuth: true,
+        ssl: {
+            rejectUnauthorized: false,
+        },
+    },
+};
+
 
 export const CyphersApiKey =
     process.env.cyphersKey || 'Your Neople Open API Key';

src/data-sources.ts

@@ -1,29 +1,7 @@
 import 'reflect-metadata';
-import dotenv from 'dotenv';
 import { DataSource, DataSourceOptions } from 'typeorm';
-import { BotServer } from './entity/BotServer';
-import { NewsDate } from './entity/NewsDate';
+import { dataSourceOption } from './config';
 
-dotenv.config();
-const dataSourceOption: DataSourceOptions = {
-    type: 'postgres',
-    host: process.env.dbHost || 'database host',
-    port: parseInt(process.env.dbPort)|| 5432,
-    username: process.env.dbUsername||'db user name',
-    database: process.env.dbName||'db name',
-    password: process.env.dbPWD ||'database password',
-    synchronize: false,
-    logging: false,
-    entities: [BotServer, NewsDate],
-    migrations: ['./migration/*.ts', './migration/*.js'],
-    subscribers: ['./subscriber/*.ts', './subscriber/*.js'],
-    ssl: false,
-    extra: {
-        insecureAuth: true,
-        ssl: {
-            rejectUnauthorized: false,
-        },
-    },
-};
-const AppDataSource = new DataSource(dataSourceOption);
+
+const AppDataSource = new DataSource(dataSourceOption as DataSourceOptions);
 export default AppDataSource;

src/utils/guild.ts

@@ -11,20 +11,20 @@ export const deleteGuild = async (guild: Guild): Promise<void> => {
     await botServerRepository.remove(server);
 };
 
-const registerGuildStr = async (guildID: string): Promise<boolean> => {
+const registerGuildStr = async (guildID: string): Promise<BotServer | null> => {
     try {
         const server = new BotServer();
         server.serverId = guildID;
         await botServerRepository.insert(server);
-        return true;
+        return server;
     } catch {
-        return false;
+        return null;
     }
 };
 
 export const registerGuild = async (guild: Guild): Promise<void> => {
     const result = await registerGuildStr(guild.id.toString());
-    if (result === false) {
+    if (result === null) {
         guild.systemChannel?.send('failed to register server');
         guild.leave();
     }
@@ -34,13 +34,10 @@ export const getGuildInfoStr = async (
     guildID: string
 ): Promise<BotServer | null> => {
     if (guildID === undefined || guildID === '') return null;
-    let server: BotServer | null = await botServerRepository.findOne({
+    const server: BotServer | null = await botServerRepository.findOne({
         where: { serverId: guildID },
     });
-    if (server === null) {
-        registerGuildStr(guildID);
-        server = new BotServer();
-    }
+    if (server === null) return registerGuildStr(guildID);
     server.serverId = guildID;
     return server;
 };