From 72ac9d3895c20e21ab22783b4e393c8a76acf2c2 Mon Sep 17 00:00:00 2001
From: Axel Olausson Holtenas <vermium@zyner.org>
Date: Sat, 21 Jan 2023 17:41:38 +0100
Subject: [PATCH] fix issue #596

---
 src/helpers/credits/give.ts     |  6 +++++-
 src/helpers/credits/set.ts      | 11 +++--------
 src/helpers/credits/take.ts     | 11 +++--------
 src/helpers/credits/transfer.ts | 22 ++++++----------------
 4 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/helpers/credits/give.ts b/src/helpers/credits/give.ts
index 5225eb0..ded74c9 100644
--- a/src/helpers/credits/give.ts
+++ b/src/helpers/credits/give.ts
@@ -1,5 +1,6 @@
 import { Guild, User } from "discord.js";
 import prisma from "../../handlers/database";
+import logger from "../../middlewares/logger";
 import transactionRules from "./transactionRules";
 
 export default async (guild: Guild, user: User, amount: number) => {
@@ -17,7 +18,10 @@ export default async (guild: Guild, user: User, amount: number) => {
       create: {
         GuildMember: {
           connectOrCreate: {
-            create: { userId: user.id, guildId: guild.id },
+            create: {
+              user: { connectOrCreate: { create: { id: user.id }, where: { id: user.id } } },
+              guild: { connectOrCreate: { create: { id: guild.id }, where: { id: guild.id } } }
+            },
             where: { userId_guildId: { userId: user.id, guildId: guild.id } },
           },
         },
diff --git a/src/helpers/credits/set.ts b/src/helpers/credits/set.ts
index a09c400..e738c82 100644
--- a/src/helpers/credits/set.ts
+++ b/src/helpers/credits/set.ts
@@ -16,15 +16,10 @@ export default async (guild: Guild, user: User, amount: number) => {
         GuildMember: {
           connectOrCreate: {
             create: {
-              userId: user.id,
-              guildId: guild.id,
-            },
-            where: {
-              userId_guildId: {
-                userId: user.id,
-                guildId: guild.id,
-              },
+              user: { connectOrCreate: { create: { id: user.id }, where: { id: user.id } } },
+              guild: { connectOrCreate: { create: { id: guild.id }, where: { id: guild.id } } }
             },
+            where: { userId_guildId: { userId: user.id, guildId: guild.id } },
           },
         },
         balance: amount,
diff --git a/src/helpers/credits/take.ts b/src/helpers/credits/take.ts
index 6305677..0a4dc6e 100644
--- a/src/helpers/credits/take.ts
+++ b/src/helpers/credits/take.ts
@@ -18,15 +18,10 @@ export default async (guild: Guild, user: User, amount: number) => {
         GuildMember: {
           connectOrCreate: {
             create: {
-              userId: user.id,
-              guildId: guild.id,
-            },
-            where: {
-              userId_guildId: {
-                userId: user.id,
-                guildId: guild.id,
-              },
+              user: { connectOrCreate: { create: { id: user.id }, where: { id: user.id } } },
+              guild: { connectOrCreate: { create: { id: guild.id }, where: { id: guild.id } } }
             },
+            where: { userId_guildId: { userId: user.id, guildId: guild.id } },
           },
         },
         balance: -amount,
diff --git a/src/helpers/credits/transfer.ts b/src/helpers/credits/transfer.ts
index ebc13b2..d3a3d7d 100644
--- a/src/helpers/credits/transfer.ts
+++ b/src/helpers/credits/transfer.ts
@@ -15,15 +15,10 @@ export default async (guild: Guild, from: User, to: User, amount: number) => {
         GuildMember: {
           connectOrCreate: {
             create: {
-              userId: from.id,
-              guildId: guild.id,
-            },
-            where: {
-              userId_guildId: {
-                userId: from.id,
-                guildId: guild.id,
-              },
+              user: { connectOrCreate: { create: { id: from.id }, where: { id: from.id } } },
+              guild: { connectOrCreate: { create: { id: guild.id }, where: { id: guild.id } } }
             },
+            where: { userId_guildId: { userId: from.id, guildId: guild.id } },
           },
         },
         balance: -amount,
@@ -59,15 +54,10 @@ export default async (guild: Guild, from: User, to: User, amount: number) => {
         GuildMember: {
           connectOrCreate: {
             create: {
-              userId: to.id,
-              guildId: guild.id,
-            },
-            where: {
-              userId_guildId: {
-                userId: to.id,
-                guildId: guild.id,
-              },
+              user: { connectOrCreate: { create: { id: to.id }, where: { id: to.id } } },
+              guild: { connectOrCreate: { create: { id: guild.id }, where: { id: guild.id } } }
             },
+            where: { userId_guildId: { userId: to.id, guildId: guild.id } },
           },
         },
         balance: amount,