Skip to content

Commit

Permalink
Fix pr #390: Fix issue #389: Jutsu Level Transfer
Browse files Browse the repository at this point in the history
  • Loading branch information
openhands-agent committed Feb 21, 2025
1 parent b676c47 commit 325f0b2
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions app/src/server/api/routers/jutsu/transfer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { z } from "zod";
import { TRPCError } from "@trpc/server";
import { eq, and } from "drizzle-orm";
import { db } from "@/server/db";
import { jutsu, users } from "@/drizzle/schema";
import { drizzleDB } from "@/server/db";
import { jutsu, userData } from "@/drizzle/schema";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { JUTSU_TRANSFER_FREE_AMOUNT, JUTSU_TRANSFER_FREE_NORMAL, JUTSU_TRANSFER_FREE_SILVER, JUTSU_TRANSFER_FREE_GOLD } from "@/drizzle/constants";
import type { FederalStatus } from "@/drizzle/constants";
Expand All @@ -16,8 +16,8 @@ export const jutsuTransferRouter = createTRPCRouter({
const { userId } = ctx.auth;

// Get user's last transfer date and federal status
const user = await db.query.users.findFirst({
where: eq(users.id, userId),
const user = await drizzleDB.query.userData.findFirst({
where: eq(userData.userId, userId),
columns: {
lastJutsuTransfer: true,
federalStatus: true,
Expand Down Expand Up @@ -71,10 +71,10 @@ export const jutsuTransferRouter = createTRPCRouter({

// Get source and target jutsu
const [sourceJutsu, targetJutsu] = await Promise.all([
db.query.jutsu.findFirst({
drizzleDB.query.jutsu.findFirst({
where: eq(jutsu.id, input.sourceId),
}),
db.query.jutsu.findFirst({
drizzleDB.query.jutsu.findFirst({
where: eq(jutsu.id, input.targetId),
}),
]);
Expand Down Expand Up @@ -103,8 +103,8 @@ export const jutsuTransferRouter = createTRPCRouter({
}

// Get user's transfer info
const user = await db.query.users.findFirst({
where: eq(users.id, userId),
const user = await drizzleDB.query.userData.findFirst({
where: eq(userData.userId, userId),
columns: {
lastJutsuTransfer: true,
federalStatus: true,
Expand Down Expand Up @@ -150,7 +150,7 @@ export const jutsuTransferRouter = createTRPCRouter({
}

// Perform the transfer
await db.transaction(async (tx) => {
await drizzleDB.transaction(async (tx) => {
// Update jutsu levels
await Promise.all([
tx.update(jutsu)
Expand All @@ -162,12 +162,12 @@ export const jutsuTransferRouter = createTRPCRouter({
]);

// Update user's transfer info and reputation if needed
await tx.update(users)
await tx.update(userData)
.set({
lastJutsuTransfer: freeTransfersLeft > 0 ? new Date() : user.lastJutsuTransfer,
reputation: freeTransfersLeft > 0 ? user.reputation : user.reputation - REPUTATION_COST,
reputationPoints: freeTransfersLeft > 0 ? user.reputation : user.reputation - REPUTATION_COST,
})
.where(eq(users.id, userId));
.where(eq(userData.userId, userId));
});

return {
Expand Down

0 comments on commit 325f0b2

Please sign in to comment.