From 571dc1e73527e9eb29ba4a89c423c55464fca214 Mon Sep 17 00:00:00 2001
From: Benedikt Magnus <magnus@magnuscraft.de>
Date: Sat, 13 Nov 2021 14:08:48 +0100
Subject: [PATCH] Moved the database class into its own subfolder.
---
scripts/wichtelbot.ts | 2 +-
scripts/wichtelbot/{ => database}/database.ts | 16 ++++++++--------
scripts/wichtelbot/message/messageHandler.ts | 2 +-
.../message/modules/assignmentModule.ts | 2 +-
.../wichtelbot/message/modules/generalModule.ts | 2 +-
.../message/modules/informationModule.ts | 2 +-
tests/performance/assignment.ts | 2 +-
tests/performance/database.ts | 2 +-
tests/tests/messages/statefulCommands.ts | 2 +-
tests/tests/messages/statelessCommands.ts | 2 +-
tests/tests/wichtelbot.database.ts | 2 +-
tests/tests/wichtelbot.message.handler.ts | 2 +-
.../wichtelbot.message.module.assignment.ts | 2 +-
tests/utility/message.ts | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
rename scripts/wichtelbot/{ => database}/database.ts (98%)
diff --git a/scripts/wichtelbot.ts b/scripts/wichtelbot.ts
index 4c0274a..8596512 100644
--- a/scripts/wichtelbot.ts
+++ b/scripts/wichtelbot.ts
@@ -1,5 +1,5 @@
import * as DiscordEndpoint from './wichtelbot/endpoint/implementations/discord';
-import Database from './wichtelbot/database';
+import Database from './wichtelbot/database/database';
import MessageHandler from './wichtelbot/message/messageHandler';
export default class Wichtelbot
diff --git a/scripts/wichtelbot/database.ts b/scripts/wichtelbot/database/database.ts
similarity index 98%
rename from scripts/wichtelbot/database.ts
rename to scripts/wichtelbot/database/database.ts
index 13966ac..c417075 100644
--- a/scripts/wichtelbot/database.ts
+++ b/scripts/wichtelbot/database/database.ts
@@ -1,12 +1,12 @@
import * as fs from 'fs';
-import Contact, { ContactCoreData, ContactData } from './classes/contact';
-import { Exclusion, ExclusionData } from './classes/exclusion';
-import { Relationship, RelationshipData } from './classes/relationship';
-import Config from '../utility/config';
-import ContactType from './types/contactType';
-import { InformationData } from './classes/information';
-import Member from './classes/member';
-import Utils from '../utility/utils';
+import Contact, { ContactCoreData, ContactData } from '../classes/contact';
+import { Exclusion, ExclusionData } from '../classes/exclusion';
+import { Relationship, RelationshipData } from '../classes/relationship';
+import Config from '../../utility/config';
+import ContactType from '../types/contactType';
+import { InformationData } from '../classes/information';
+import Member from '../classes/member';
+import Utils from '../../utility/utils';
import Sqlite = require('better-sqlite3');
export default class Database
diff --git a/scripts/wichtelbot/message/messageHandler.ts b/scripts/wichtelbot/message/messageHandler.ts
index 19d0e33..0cd6a9c 100644
--- a/scripts/wichtelbot/message/messageHandler.ts
+++ b/scripts/wichtelbot/message/messageHandler.ts
@@ -2,7 +2,7 @@ import { ChannelType, Message, State } from '../endpoint/definitions';
import Localisation, { CommandInfo } from '../../utility/localisation';
import { CommandHandlerFunction } from './handlingTools/handlerFunctions';
import Config from '../../utility/config';
-import Database from '../database';
+import Database from '../database/database';
import GeneralModule from './modules/generalModule';
import HandlingDefinition from './handlingDefinition';
import InformationModule from './modules/informationModule';
diff --git a/scripts/wichtelbot/message/modules/assignmentModule.ts b/scripts/wichtelbot/message/modules/assignmentModule.ts
index d016816..a78d584 100644
--- a/scripts/wichtelbot/message/modules/assignmentModule.ts
+++ b/scripts/wichtelbot/message/modules/assignmentModule.ts
@@ -1,4 +1,4 @@
-import Database from '../../database';
+import Database from '../../database/database';
import { Exclusion } from '../../classes/exclusion';
import { ExclusionReason } from '../../types/exclusionReason';
import GiftType from '../../types/giftType';
diff --git a/scripts/wichtelbot/message/modules/generalModule.ts b/scripts/wichtelbot/message/modules/generalModule.ts
index 1a4c841..a28942d 100644
--- a/scripts/wichtelbot/message/modules/generalModule.ts
+++ b/scripts/wichtelbot/message/modules/generalModule.ts
@@ -3,7 +3,7 @@ import { Additions } from '../../endpoint/definitions';
import Config from '../../../utility/config';
import Contact from '../../classes/contact';
import ContactType from '../../types/contactType';
-import Database from '../../database';
+import Database from '../../database/database';
import { KeyValuePairList } from '../../../utility/keyValuePair';
import Member from '../../classes/member';
import Message from '../../endpoint/definitions/message';
diff --git a/scripts/wichtelbot/message/modules/informationModule.ts b/scripts/wichtelbot/message/modules/informationModule.ts
index 0f2c384..6f5ac22 100644
--- a/scripts/wichtelbot/message/modules/informationModule.ts
+++ b/scripts/wichtelbot/message/modules/informationModule.ts
@@ -1,7 +1,7 @@
import { Visualisation, VisualisationType } from "../../endpoint/definitions";
import Config from "../../../utility/config";
import ContactType from "../../types/contactType";
-import Database from "../../database";
+import Database from "../../database/database";
import GiftType from "../../types/giftType";
import { KeyValuePairList } from "../../../utility/keyValuePair";
import Localisation from "../../../utility/localisation";
diff --git a/tests/performance/assignment.ts b/tests/performance/assignment.ts
index df20748..71ce59a 100644
--- a/tests/performance/assignment.ts
+++ b/tests/performance/assignment.ts
@@ -1,7 +1,7 @@
import 'mocha';
import { AssignmentModule } from '../../scripts/wichtelbot/message/modules/assignmentModule';
import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import Member from '../../scripts/wichtelbot/classes/member';
const testCount = 1000;
diff --git a/tests/performance/database.ts b/tests/performance/database.ts
index 97cb95c..a048e9a 100644
--- a/tests/performance/database.ts
+++ b/tests/performance/database.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
import Contact from '../../scripts/wichtelbot/classes/contact';
import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import Member from '../../scripts/wichtelbot/classes/member';
const testCount = 100;
diff --git a/tests/tests/messages/statefulCommands.ts b/tests/tests/messages/statefulCommands.ts
index 1d3faa7..7acfb45 100644
--- a/tests/tests/messages/statefulCommands.ts
+++ b/tests/tests/messages/statefulCommands.ts
@@ -6,7 +6,7 @@ import Config from '../../../scripts/utility/config';
import ConfigTestUtility from '../../utility/config';
import Contact from '../../../scripts/wichtelbot/classes/contact';
import ContactType from '../../../scripts/wichtelbot/types/contactType';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
import GiftType from '../../../scripts/wichtelbot/types/giftType';
import Information from '../../../scripts/wichtelbot/classes/information';
import { KeyValuePairList } from '../../../scripts/utility/keyValuePair';
diff --git a/tests/tests/messages/statelessCommands.ts b/tests/tests/messages/statelessCommands.ts
index 526949e..a3f6fd2 100644
--- a/tests/tests/messages/statelessCommands.ts
+++ b/tests/tests/messages/statelessCommands.ts
@@ -3,7 +3,7 @@ import { assert } from 'chai';
import { ChannelType } from '../../../scripts/wichtelbot/endpoint/definitions';
import Config from '../../../scripts/utility/config';
import ConfigTestUtility from '../../utility/config';
-import Database from '../../../scripts/wichtelbot/database';
+import Database from '../../../scripts/wichtelbot/database/database';
import Localisation from '../../../scripts/utility/localisation';
import MessageHandler from '../../../scripts/wichtelbot/message/messageHandler';
import { TestMessageWithFixedAuthor } from '../../utility/message';
diff --git a/tests/tests/wichtelbot.database.ts b/tests/tests/wichtelbot.database.ts
index e4f83bd..e813f36 100644
--- a/tests/tests/wichtelbot.database.ts
+++ b/tests/tests/wichtelbot.database.ts
@@ -2,7 +2,7 @@ import 'mocha';
import { assert } from 'chai';
import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import GeneralTestUtility from '../utility/general';
import Member from '../../scripts/wichtelbot/classes/member';
diff --git a/tests/tests/wichtelbot.message.handler.ts b/tests/tests/wichtelbot.message.handler.ts
index b68a58e..06f02a8 100644
--- a/tests/tests/wichtelbot.message.handler.ts
+++ b/tests/tests/wichtelbot.message.handler.ts
@@ -4,7 +4,7 @@ import { TestMessage, TestMessageWithFixedAuthor } from '../utility/message';
import { assert } from 'chai';
import Config from '../../scripts/utility/config';
import ConfigTestUtility from '../utility/config';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import { KeyValuePairList } from '../../scripts/utility/keyValuePair';
import Localisation from '../../scripts/utility/localisation';
import MessageHandler from '../../scripts/wichtelbot/message/messageHandler';
diff --git a/tests/tests/wichtelbot.message.module.assignment.ts b/tests/tests/wichtelbot.message.module.assignment.ts
index 4d1fad8..4eb5c4a 100644
--- a/tests/tests/wichtelbot.message.module.assignment.ts
+++ b/tests/tests/wichtelbot.message.module.assignment.ts
@@ -2,7 +2,7 @@ import 'mocha';
import { assert } from 'chai';
import { AssignmentModule } from '../../scripts/wichtelbot/message/modules/assignmentModule';
import ContactTestUtility from '../utility/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import GiftType from '../../scripts/wichtelbot/types/giftType';
import Member from '../../scripts/wichtelbot/classes/member';
import { RelationshipTestUtility } from '../utility/relationship';
diff --git a/tests/utility/message.ts b/tests/utility/message.ts
index 604e8e8..bcd44b1 100644
--- a/tests/utility/message.ts
+++ b/tests/utility/message.ts
@@ -1,7 +1,7 @@
import { Channel, ChannelType, Client, Component, Message, State, User } from '../../scripts/wichtelbot/endpoint/definitions';
import Contact from '../../scripts/wichtelbot/classes/contact';
-import Database from '../../scripts/wichtelbot/database';
+import Database from '../../scripts/wichtelbot/database/database';
import GeneralTestUtility from '../utility/general';
import Information from '../../scripts/wichtelbot/classes/information';
import Member from '../../scripts/wichtelbot/classes/member';
--
GitLab