Large swathes of re-engineering

src/utilties/discord/guilds.ts

@@ -1,33 +1,29 @@
 import { Guild } from "discord.js";
-import { SQLCommon } from "../storage/interfaces";
-import { SQLResult } from "../storage/enumerations";
+import { Repository } from "typeorm";
+import { DBServer } from "../storage/entities/DBServer";
 
-export async function doesGuildExist(db: SQLCommon, guild : Guild) : Promise<boolean> {
-    const queryResult : Object[] = await db.getAllParameterized(
-        "SELECT * FROM servers WHERE server_snowflake = ?",
-        [guild.id]
-    )
-
-    return queryResult.length != 0
+export async function doesGuildExist(db: Repository<DBServer>, guild : Guild) : Promise<boolean> {
+    return (await db.findOne({"where": {server_snowflake: guild.id}})) != null
 }
 
-export async function insertGuild(db: SQLCommon, guild: Guild) : Promise<SQLResult> {
+export async function insertGuild(db: Repository<DBServer>, guild: Guild) : Promise<DBServer | null> {
     const alreadyExists: boolean = await doesGuildExist(db, guild)
 
     if (alreadyExists) {
-        return SQLResult.ALREADYEXISTS
+        return await db.findOne({"where": {server_snowflake: guild.id}})
     }
     try {
-        await db.runParameterized(
-            "INSERT INTO servers VALUES (?, ?, ?)",
-            [guild.id, guild.name, guild.description]
-        )
+        const server: DBServer = await db.create({
+            server_snowflake: guild.id,
+            server_name: guild.name,
+            server_description: guild.description ?? ""
+        })
 
-        return SQLResult.CREATED
+        return await db.save(server)
     } catch (err) {
         console.log("Insert Failed")
         //TODO Winston should handle this
         console.log(err)
-        return SQLResult.FAILED
+        return null
     }
 }