From 41ec6276e2b9f62a4682a07c3f8abf2cc60e2bcb Mon Sep 17 00:00:00 2001
From: Hanen Alrwasheda <alrwasheda@mi.fu-berlin.de>
Date: Sun, 12 Dec 2021 10:59:07 +0100
Subject: [PATCH] unnecessary log eliminated + log sugar
---
server/src/db/index.ts | 25 +++++++++++++++----------
server/src/db/showAllDBs.ts | 2 +-
server/src/db/showDBTables.ts | 2 +-
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/server/src/db/index.ts b/server/src/db/index.ts
index 57cfa05..18146d2 100644
--- a/server/src/db/index.ts
+++ b/server/src/db/index.ts
@@ -2,9 +2,9 @@ import { Client } from "pg";
import { Dialect, Sequelize } from "sequelize";
import envVars from "../config";
import { initBoat } from "./models/Boat";
-import {initCheckIn} from "./models/CheckIn";
-import {initCustomer} from "./models/Customer";
-import {initWorker} from "./models/Worker";
+import { initCheckIn } from "./models/CheckIn";
+import { initCustomer } from "./models/Customer";
+import { initWorker } from "./models/Worker";
const initializeDatabase = async () => {
const client = new Client({
@@ -15,22 +15,27 @@ const initializeDatabase = async () => {
// https://stackoverflow.com/questions/18389124/simulate-create-database-if-not-exists-for-postgresql
await client.connect();
- console.log(envVars.DB_NAME);
+ console.log(`DB Name: ${envVars.DB_NAME}`);
const isDatabaseExistingQuery = await client.query(
`SELECT * FROM pg_database WHERE datname='${envVars.DB_NAME}'`
);
- console.log(isDatabaseExistingQuery);
+ // console.log(isDatabaseExistingQuery);
const isDatabaseExisting = isDatabaseExistingQuery.rowCount === 1;
if (!isDatabaseExisting) {
await client.query(`CREATE DATABASE "${envVars.DB_NAME}"`);
}
client.end();
- const sequelize = new Sequelize(envVars.DB_NAME, envVars.DB_USER, envVars.DB_PASSWORD, {
- host: envVars.DB_HOST,
- dialect: envVars.DB_DRIVER as Dialect,
- logging: false,
- });
+ const sequelize = new Sequelize(
+ envVars.DB_NAME,
+ envVars.DB_USER,
+ envVars.DB_PASSWORD,
+ {
+ host: envVars.DB_HOST,
+ dialect: envVars.DB_DRIVER as Dialect,
+ logging: false,
+ }
+ );
await initBoat(sequelize);
await initCheckIn(sequelize);
diff --git a/server/src/db/showAllDBs.ts b/server/src/db/showAllDBs.ts
index 23050b6..f0a907e 100644
--- a/server/src/db/showAllDBs.ts
+++ b/server/src/db/showAllDBs.ts
@@ -7,7 +7,7 @@ const showAllDBs = async (sequelizeConnection: Sequelize) => {
console.log(
"----------Found Databases----------\n",
res,
- "\n--------------------\n"
+ "\n-----------------------------------\n"
);
});
};
diff --git a/server/src/db/showDBTables.ts b/server/src/db/showDBTables.ts
index a985cb7..9b20e79 100644
--- a/server/src/db/showDBTables.ts
+++ b/server/src/db/showDBTables.ts
@@ -11,7 +11,7 @@ const showTables = async (sequelizeConnection: Sequelize) => {
)
.then((res) => {
//------------------------------------------------then
- console.log(`TABELS IN ${envVars.DB_NAME}\n-------------\n`, res);
+ console.log(`-----TABELS IN ${envVars.DB_NAME}------\n`, res,"\n-----------------------------------\n");
});
};
--
GitLab