From f76cc38df0340244186f60aa5f10efe2b9c272c1 Mon Sep 17 00:00:00 2001 From: smyalygames Date: Fri, 10 Mar 2023 22:57:35 +0000 Subject: [PATCH] refactor(arabot): change naming for xp to next level --- .../migration.sql | 9 +++++++++ prisma/schema.prisma | 14 +++++++------- src/utils/database/xp.ts | 16 ++++++++-------- 3 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 prisma/migrations/20230310225334_refactor_name_for_xp_to_next_level/migration.sql diff --git a/prisma/migrations/20230310225334_refactor_name_for_xp_to_next_level/migration.sql b/prisma/migrations/20230310225334_refactor_name_for_xp_to_next_level/migration.sql new file mode 100644 index 0000000..af07a56 --- /dev/null +++ b/prisma/migrations/20230310225334_refactor_name_for_xp_to_next_level/migration.sql @@ -0,0 +1,9 @@ +/* + Warnings: + + - You are about to drop the column `xpToNextLevel` on the `Xp` table. All the data in the column will be lost. + +*/ +-- AlterTable +ALTER TABLE "Xp" DROP COLUMN "xpToNextLevel", +ADD COLUMN "xpForNextLevel" INTEGER NOT NULL DEFAULT 0; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 2174ae5..ce654a5 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -98,13 +98,13 @@ model Verify { } model Xp { - user User @relation(fields: [userId], references: [id]) - userId String @id - level Int @default(0) - xp Int @default(0) - xpToNextLevel Int @default(0) - messageCount Int @default(0) - lastMessage DateTime @default(now()) + user User @relation(fields: [userId], references: [id]) + userId String @id + level Int @default(0) + xp Int @default(0) + xpForNextLevel Int @default(0) + messageCount Int @default(0) + lastMessage DateTime @default(now()) } // Economy diff --git a/src/utils/database/xp.ts b/src/utils/database/xp.ts index b70bc8c..cf9e759 100644 --- a/src/utils/database/xp.ts +++ b/src/utils/database/xp.ts @@ -13,7 +13,7 @@ export async function getUser(userId: Snowflake) { }, select: { xp: true, - xpToNextLevel: true, + xpForNextLevel: true, level: true, }, }); @@ -22,16 +22,16 @@ export async function getUser(userId: Snowflake) { export async function addXp(userId: Snowflake, xp: number) { const user = await getUser(userId); - let xpNextLevel = xp; + let xpForNextLevel = xp; let level = 0; if (user !== null) { - xpNextLevel = xpToNextLevel(user.level, user.xpToNextLevel + xp); - if (xpNextLevel < 0) { - xpNextLevel = -xpNextLevel; + xpForNextLevel = xpToNextLevel(user.level, user.xpForNextLevel + xp); + if (xpForNextLevel < 0) { + xpForNextLevel = -xpForNextLevel; level = 1; } else { - xpNextLevel = user.xpToNextLevel + xp; + xpForNextLevel = user.xpForNextLevel + xp; } } @@ -41,7 +41,7 @@ export async function addXp(userId: Snowflake, xp: number) { }, update: { xp: { increment: xp }, - xpToNextLevel: xpNextLevel, + xpForNextLevel, level: { increment: level }, messageCount: { increment: 1 }, lastMessage: new Date(), @@ -59,7 +59,7 @@ export async function addXp(userId: Snowflake, xp: number) { }, messageCount: 1, xp, - xpToNextLevel: xp, + xpForNextLevel: xp, }, }); }