Finally finished the massive refactor... transitions still broke but it's fine for now.

private/database/DatabaseConnection.js

@@ -44,17 +44,16 @@ class DatabaseConnection {
 
     //Load queries into cache
     let queries = {};
-    let types = fs.readdirSync(__dirname + '/' + QUERIES_DIRECTORY);
+    let queryDir = `${__dirname}/${QUERIES_DIRECTORY}`
+    let types = fs.readdirSync(queryDir);
     for(let i = 0; i < types.length; i++) {
       //Now Scan each file in this directory
-      let dir = __dirname + '/' + QUERIES_DIRECTORY + '/' + types[i];
+      let dir = `${queryDir}/${types[i]}`;
       let dirContents = fs.readdirSync(dir);
       for(let x = 0; x < dirContents.length; x++) {
         //Now read each file within this dir..
-        let filePath = dir + '/' + dirContents[x];
-        console.log(filePath);
+        let filePath = `${dir}/${dirContents[x]}`;
         let query = fs.readFileSync(filePath, 'utf8');
-
         //Now Save our query as filename minus extension.
         queries[dirContents[x].split('.')[0]] = query;
       }

private/database/queries/create/CreateFormatsTable.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS "Formats" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL,
+  "gameId" BIGSERIAL NOT NULL
+);

private/database/queries/create/CreateGamesTable.sql

@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS "Games" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL UNIQUE
+);

private/database/queries/create/CreateSeasonsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "Seasons" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL,
+  "formatId" BIGSERIAL NOT NULL,
+  "startDate" TIMESTAMP NOT NULL,
+  "endDate" TIMESTAMP NOT NULL
+);

private/database/queries/create/CreateTeamUsersSeasonsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "TeamUsersSeasons" (
+  "teamId" BIGSERIAL NOT NULL,
+  "userId" BIGSERIAL NOT NULL,
+  "seasonId" BIGSERIAL NOT NULL,
+  "registered" TIMESTAMP NOT NULL,
+  PRIMARY KEY("teamId", "userId", "seasonId")
+);

private/database/queries/create/CreateTeamsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "Teams" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" varchar(32) NOT NULL UNIQUE,
+  "motto" text NULL,
+  "image" text NULL,
+  "registered" TIMESTAMP NOT NULL
+);

private/database/queries/create/CreateUsersTable.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS "Users" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "discordId" text NULL UNIQUE,
+  "steamId" text NULL UNIQUE,
+  "email" text NULL UNIQUE
+);

private/database/queries/format/AddFormat.sql

@@ -0,0 +1 @@
+INSERT INTO "Formats" ("name", "gameId") VALUES (${name}, ${gameId}) RETURNING *;

private/database/queries/format/GetFormatsByGame.sql

@@ -0,0 +1 @@
+SELECT * FROM "Formats" WHERE "gameId"=${gameId};

private/database/queries/game/AddGame.sql

@@ -0,0 +1 @@
+INSERT INTO "Games" (name) VALUES (${name}) RETURNING *;

private/database/queries/game/GetGameByName.sql

@@ -0,0 +1 @@
+SELECT * FROM "Games" WHERE LOWER("name") = LOWER(${name}) LIMIT 1;

private/database/queries/season/GetSeasonById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Season" WHERE id = ${id} LIMIT 1;

private/database/queries/season/GetSeasonForDate.sql

@@ -0,0 +1,5 @@
+SELECT * FROM "Seasons"
+WHERE
+  "startDate" <= ${date} AND
+  "endDate" >= ${date}
+LIMIT 1;

private/database/queries/team/AddTeam.sql

@@ -0,0 +1,5 @@
+INSERT INTO "Teams" (
+  "name", "motto", "image", "registered"
+) VALUES (
+  ${name}, ${motto}, ${image}, ${registered}
+) RETURNING *;

private/database/queries/team/AddTeamUserSeason.sql

@@ -0,0 +1,5 @@
+INSERT INTO "TeamUsersSeasons" (
+  "teamId", "userId", "seasonId", "registered"
+) VALUES (
+  ${teamId}, ${userId}, ${seasonId}, ${registered}
+) RETURNING *;

private/database/queries/team/GetTeamById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Teams" WHERE "id"=${id} LIMIT 1;

private/database/queries/team/GetTeamByName.sql

@@ -0,0 +1 @@
+SELECT * FROM "Teams" WHERE LOWER("name") = LOWER(${name}) LIMIT 1;

private/database/queries/team/GetTeamBySeasonAndUser.sql

@@ -0,0 +1,10 @@
+SELECT
+  *
+FROM
+  "Teams"
+INNER JOIN
+  "TeamUsersSeasons" ON "TeamUsersSeasons"."teamId" = "Teams"."id"
+WHERE
+  "TeamUsersSeasons"."userId" = ${userId} AND
+  "TeamUsersSeasons"."seasonId" = ${seasonId}
+LIMIT 1;

private/database/queries/team/GetTeamUsersBySeason.sql

@@ -0,0 +1 @@
+SELECT * FROM "TeamUsersSeasons" WHERE "teamId" = ${teamId};

private/database/queries/team/GetTeamsBySeason.sql

@@ -0,0 +1,11 @@
+SELECT
+  "Teams".*
+FROM
+  "Teams"
+INNER JOIN
+  "TeamUsersSeasons" ON "TeamUsersSeasons"."teamId" = "Teams"."id"
+WHERE
+  "TeamUsersSeasons"."seasonId" = ${seasonId}
+GROUP BY
+  "Teams"."id"
+;

private/database/queries/user/AddUser.sql

@@ -0,0 +1,9 @@
+INSERT INTO "Users" (
+  "discordId",
+  "steamId",
+  "email"
+) VALUES (
+  ${discordId},
+  ${steamId},
+  ${email}
+) RETURNING *;

private/database/queries/user/GetUserByDiscordId.sql

@@ -0,0 +1 @@
+SELECT * FROM "Users" WHERE "discordId" = ${discordId} LIMIT 1;

private/database/queries/user/GetUserById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Users" WHERE "id"=${id} LIMIT 1;