Fix Issue# 365: PVP Rank

app/drizzle/constants.ts

@@ -155,6 +155,19 @@ export const UserRanks = [
 ] as const;
 export type UserRank = (typeof UserRanks)[number];
 
+export const RankedDivisions = [
+  { key: "UNRANKED", name: "Unranked", rankedLp: 0 },
+  { key: "WOOD", name: "Wood", rankedLp: 150 },
+  { key: "ADEPT", name: "Adept", rankedLp: 300 },
+  { key: "MASTER", name: "Master", rankedLp: 600 },
+  { key: "LEGEND", name: "Legend", rankedLp: 900 },
+  { key: "SANNIN", name: "Sannin", rankedLp: Infinity },
+] as const;
+
+// Type Definitions
+export type RankedDivision = (typeof RankedDivisions)[number]["name"];
+export type RankedDivisionEntry = (typeof RankedDivisions)[number];
+
 export const ItemTypes = [
   "WEAPON",
   "CONSUMABLE",
@@ -260,6 +273,7 @@ export const BattleTypes = [
   "QUEST",
   "VILLAGE_PROTECTOR",
   "TRAINING",
+  "RANKED",
 ] as const;
 export type BattleType = (typeof BattleTypes)[number];
 
@@ -268,6 +282,7 @@ export const PvpBattleTypes: BattleType[] = [
   "SPARRING",
   "CLAN_BATTLE",
   "TOURNAMENT",
+  "RANKED",
 ];
 
 export const TournamentTypes = ["CLAN"] as const;
@@ -311,6 +326,9 @@ export const TrainingSpeeds = ["15min", "1hr", "4hrs", "8hrs"] as const;
 export type TrainingSpeed = (typeof TrainingSpeeds)[number];
 
 export const JUTSU_MAX_RESIDUAL_EQUIPPED = 4;
+export const JUTSU_MAX_SHIELD_EQUIPPED = 2;
+export const JUTSU_MAX_GROUND_EQUIPPED = 1;
+export const JUTSU_MAX_MOVEPREVENT_EQUIPPED = 1;
 
 export const UserAssociations = ["MARRIAGE", "DIVORCED"] as const;
 

app/drizzle/migrations/0201_dancing_walrus.sql

@@ -0,0 +1,64 @@
+ALTER TABLE `UserData` ADD `rankedLp` INT DEFAULT 150 NOT NULL;
+ALTER TABLE `BattleHistory` MODIFY COLUMN `battleType` ENUM('ARENA', 'COMBAT', 'SPARRING', 'KAGE_AI', 'KAGE_PVP', 'CLAN_CHALLENGE', 'CLAN_BATTLE', 'TOURNAMENT', 'QUEST', 'VILLAGE_PROTECTOR', 'TRAINING', 'RANKED') NOT NULL; 
+CREATE TABLE RankedPvpQueue (
+  id varchar(191) NOT NULL,
+  userId varchar(191) NOT NULL,
+  rankedLp int NOT NULL,
+  createdAt datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  CONSTRAINT RankedPvpQueue_id PRIMARY KEY(id)
+);
+CREATE INDEX RankedPvpQueue_userId_idx ON RankedPvpQueue (userId);
+CREATE INDEX RankedPvpQueue_rankedLp_idx ON RankedPvpQueue (rankedLp);
+ALTER TABLE RankedPvpQueue ADD COLUMN queueStartTime timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE Battle MODIFY COLUMN battleType ENUM('ARENA', 'COMBAT', 'SPARRING', 'KAGE_AI', 'KAGE_PVP', 'CLAN_CHALLENGE', 'CLAN_BATTLE', 'TOURNAMENT', 'QUEST', 'VILLAGE_PROTECTOR', 'TRAINING', 'RANKED') NOT NULL;
+ALTER TABLE DataBattleAction MODIFY COLUMN battleType ENUM('ARENA', 'COMBAT', 'SPARRING', 'KAGE_AI', 'KAGE_PVP', 'CLAN_CHALLENGE', 'CLAN_BATTLE', 'TOURNAMENT', 'QUEST', 'VILLAGE_PROTECTOR', 'TRAINING', 'RANKED') NOT NULL;
+ALTER TABLE UserData ADD COLUMN rankedBattles int NOT NULL DEFAULT 0, ADD COLUMN rankedWins int NOT NULL DEFAULT 0, ADD COLUMN rankedStreak int NOT NULL DEFAULT 0; 
+-- Create the ranked jutsu loadout table
+CREATE TABLE `RankedJutsuLoadout` (
+    `id` varchar(191) NOT NULL,
+    `userId` varchar(191) NOT NULL,
+    `jutsuIds` json NOT NULL,
+    `createdAt` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    PRIMARY KEY (`id`),
+    INDEX `RankedJutsuLoadout_userId_idx` (`userId`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- Add the ranked jutsu loadout reference to UserData
+ALTER TABLE `UserData` 
+ADD COLUMN `rankedJutsuLoadout` varchar(191),
+ADD INDEX `UserData_rankedJutsuLoadout_idx` (`rankedJutsuLoadout`);
+ALTER TABLE `UserJutsu` ADD COLUMN `rankedEquipped` tinyint NOT NULL DEFAULT 0;
+CREATE INDEX `Jutsu_rankedEquipped_idx` ON `UserJutsu` (`rankedEquipped`); 
+
+CREATE TABLE "rankedUserJutsu" (
+  "id" text PRIMARY KEY,
+  "userId" text NOT NULL REFERENCES "userData"("userId"),
+  "jutsuId" text NOT NULL REFERENCES "jutsu"("id"),
+  "level" integer NOT NULL DEFAULT 1,
+  "experience" integer NOT NULL DEFAULT 0,
+  "equipped" integer NOT NULL DEFAULT 0,
+  "createdAt" timestamp NOT NULL DEFAULT now(),
+  "updatedAt" timestamp NOT NULL DEFAULT now()
+);
+
+-- Create an index on userId for faster lookups
+CREATE INDEX "rankedUserJutsu_userId_idx" ON "rankedUserJutsu"("userId");
+
+ALTER TABLE UserJutsu ADD COLUMN rankedEquipped tinyint NOT NULL DEFAULT 0;
+CREATE INDEX Jutsu_rankedEquipped_idx ON UserJutsu (rankedEquipped);
+
+-- Create a unique constraint to prevent duplicate jutsu entries for the same user
+CREATE UNIQUE INDEX "rankedUserJutsu_userId_jutsuId_unique" ON "rankedUserJutsu"("userId", "jutsuId");
+CREATE TABLE RankedUserJutsu (
+  id varchar(191) PRIMARY KEY NOT NULL,
+  userId varchar(191) NOT NULL,
+  jutsuId varchar(191) NOT NULL,
+  createdAt datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  updatedAt datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  level int NOT NULL DEFAULT 1,
+  equipped tinyint NOT NULL DEFAULT 0,
+  finishTraining datetime(3),
+  UNIQUE KEY RankedUserJutsu_userId_jutsuId_key (userId, jutsuId),
+  INDEX RankedUserJutsu_jutsuId_idx (jutsuId),
+  INDEX RankedUserJutsu_equipped_idx (equipped)
+)

app/drizzle/schema.ts

@@ -19,6 +19,7 @@ import {
   double,
   primaryKey,
   unique,
+  timestamp,
 } from "drizzle-orm/mysql-core";
 import * as consts from "@/drizzle/constants";
 import { createInsertSchema } from "drizzle-zod";
@@ -1032,6 +1033,23 @@ export const jutsuLoadout = mysqlTable(
   },
 );
 
+export const rankedJutsuLoadout = mysqlTable(
+  "RankedJutsuLoadout",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    userId: varchar("userId", { length: 191 }).notNull(),
+    jutsuIds: json("content").$type<string[]>().notNull(),
+    createdAt: datetime("createdAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+  },
+  (table) => {
+    return {
+      userIdIdx: index("RankedJutsuLoadout_userId_idx").on(table.userId),
+    };
+  },
+);
+
 export const notification = mysqlTable(
   "Notification",
   {
@@ -1328,6 +1346,7 @@ export const userData = mysqlTable(
     anbuId: varchar("anbuId", { length: 191 }),
     clanId: varchar("clanId", { length: 191 }),
     jutsuLoadout: varchar("jutsuLoadout", { length: 191 }),
+    rankedJutsuLoadout: varchar("rankedJutsuLoadout", { length: 191 }),
     nRecruited: int("nRecruited").default(0).notNull(),
     lastIp: varchar("lastIp", { length: 191 }),
     username: varchar("username", { length: 191 }).notNull(),
@@ -1461,6 +1480,10 @@ export const userData = mysqlTable(
     tavernMessages: int("tavernMessages").default(0).notNull(),
     audioOn: boolean("audioOn").default(true).notNull(),
     tutorialStep: tinyint("tutorialStep", { unsigned: true }).default(0).notNull(),
+    rankedLp: int("rankedLp").notNull().default(150),
+    rankedBattles: int("rankedBattles").notNull().default(0),
+    rankedWins: int("rankedWins").notNull().default(0),
+    rankedStreak: int("rankedStreak").notNull().default(0),
   },
   (table) => {
     return {
@@ -1471,6 +1494,7 @@ export const userData = mysqlTable(
       clanIdIdx: index("UserData_clanId_idx").on(table.clanId),
       anbuIdIdx: index("UserData_anbuId_idx").on(table.anbuId),
       jutsuLoadoutIdx: index("UserData_jutsuLoadout_idx").on(table.jutsuLoadout),
+      rankedJutsuLoadoutIdx: index("UserData_rankedJutsuLoadout_idx").on(table.rankedJutsuLoadout),
       levelIdx: index("UserData_level_idx").on(table.level),
       usernameKey: uniqueIndex("UserData_username_key").on(table.username),
       bloodlineIdIdx: index("UserData_bloodlineId_idx").on(table.bloodlineId),
@@ -1541,6 +1565,7 @@ export const userDataRelations = relations(userData, ({ one, many }) => ({
   conversations: many(user2conversation),
   items: many(userItem),
   jutsus: many(userJutsu),
+  rankedUserJutsus: many(rankedUserJutsu),
   badges: many(userBadge),
   recruitedUsers: many(userData, { relationName: "recruiter" }),
   recruiter: one(userData, {
@@ -1566,6 +1591,10 @@ export const userDataRelations = relations(userData, ({ one, many }) => ({
     fields: [userData.jutsuLoadout],
     references: [jutsuLoadout.id],
   }),
+  rankedLoadout: one(rankedJutsuLoadout, {
+    fields: [userData.rankedJutsuLoadout],
+    references: [rankedJutsuLoadout.id],
+  }),
   creatorBlacklist: many(userBlackList, { relationName: "creatorBlacklist" }),
   mpvpBattles: many(mpvpBattleUser),
   associations: many(userAssociation),
@@ -1673,6 +1702,7 @@ export const userJutsu = mysqlTable(
     level: int("level").default(1).notNull(),
     experience: int("experience").default(0).notNull(),
     equipped: tinyint("equipped").default(0).notNull(),
+    rankedEquipped: tinyint("rankedEquipped").default(0).notNull(),
     finishTraining: datetime("finishTraining", { mode: "date", fsp: 3 }),
   },
   (table) => {
@@ -1683,11 +1713,41 @@ export const userJutsu = mysqlTable(
       ),
       jutsuIdIdx: index("UserJutsu_jutsuId_idx").on(table.jutsuId),
       equippedIdx: index("Jutsu_equipped_idx").on(table.equipped),
+      rankedEquippedIdx: index("Jutsu_rankedEquipped_idx").on(table.rankedEquipped),
     };
   },
 );
 export type UserJutsu = InferSelectModel<typeof userJutsu>;
 
+export const rankedUserJutsu = mysqlTable(
+  "RankedUserJutsu",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    userId: varchar("userId", { length: 191 }).notNull(),
+    jutsuId: varchar("jutsuId", { length: 191 }).notNull(),
+    createdAt: datetime("createdAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+    updatedAt: datetime("updatedAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+    level: int("level").default(1).notNull(),
+    equipped: tinyint("equipped").default(0).notNull(),
+    finishTraining: datetime("finishTraining", { mode: "date", fsp: 3 }),
+  },
+  (table) => {
+    return {
+      userIdJutsuIdKey: uniqueIndex("RankedUserJutsu_userId_jutsuId_key").on(
+        table.userId,
+        table.jutsuId,
+      ),
+      jutsuIdIdx: index("RankedUserJutsu_jutsuId_idx").on(table.jutsuId),
+      equippedIdx: index("RankedUserJutsu_equipped_idx").on(table.equipped),
+    };
+  },
+);
+export type RankedUserJutsu = InferSelectModel<typeof rankedUserJutsu>;
+
 export const userJutsuRelations = relations(userJutsu, ({ one }) => ({
   jutsu: one(jutsu, {
     fields: [userJutsu.jutsuId],
@@ -1699,6 +1759,17 @@ export const userJutsuRelations = relations(userJutsu, ({ one }) => ({
   }),
 }));
 
+export const rankedUserJutsuRelations = relations(rankedUserJutsu, ({ one }) => ({
+  jutsu: one(jutsu, {
+    fields: [rankedUserJutsu.jutsuId],
+    references: [jutsu.id],
+  }),
+  user: one(userData, {
+    fields: [rankedUserJutsu.userId],
+    references: [userData.userId],
+  }),
+}));
+
 export const userReport = mysqlTable(
   "UserReport",
   {
@@ -2575,8 +2646,6 @@ export const userPollVote = mysqlTable(
   },
 );
 
-export type UserPollVote = InferSelectModel<typeof userPollVote>;
-
 export const userPollVoteRelations = relations(userPollVote, ({ one }) => ({
   user: one(userData, {
     fields: [userPollVote.userId],
@@ -2592,6 +2661,36 @@ export const userPollVoteRelations = relations(userPollVote, ({ one }) => ({
   }),
 }));
 
+export type UserPollVote = InferSelectModel<typeof userPollVote>;
+
+export const rankedPvpQueue = mysqlTable(
+  "RankedPvpQueue",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    userId: varchar("userId", { length: 191 })
+      .notNull()
+      .references(() => userData.userId),
+    rankedLp: int("rankedLp").notNull(),
+    queueStartTime: timestamp("queueStartTime").notNull().defaultNow(),
+    createdAt: timestamp("createdAt").notNull().defaultNow(),
+  },
+  (table) => {
+    return {
+      userIdIdx: index("RankedPvpQueue_userId_idx").on(table.userId),
+      rankedLpIdx: index("RankedPvpQueue_rankedLp_idx").on(table.rankedLp),
+    };
+  },
+);
+
+export type RankedPvpQueue = InferSelectModel<typeof rankedPvpQueue>;
+
+export const rankedPvpQueueRelations = relations(rankedPvpQueue, ({ one }) => ({
+  user: one(userData, {
+    fields: [rankedPvpQueue.userId],
+    references: [userData.userId],
+  }),
+}));
+
 // User upload schema
 export const userUpload = mysqlTable(
   "UserUpload",

app/src/app/profile/edit/page.tsx

@@ -70,6 +70,7 @@ import { canSwapVillage } from "@/utils/permissions";
 import { canSwapBloodline } from "@/utils/permissions";
 import { useInfinitePagination } from "@/libs/pagination";
 import { capitalizeFirstLetter } from "@/utils/sanitize";
+import { canEditPublicUser } from "@/utils/permissions";
 import UserSearchSelect from "@/layout/UserSearchSelect";
 import UserRequestSystem from "@/layout/UserRequestSystem";
 import type { Gender } from "@/validators/register";
@@ -275,6 +276,16 @@ export default function EditProfile() {
             <SwapVillage />
           </Accordion>
         )}
+        {canEditPublicUser({ ...userData, role: userData.role }) && (
+          <Accordion
+            title="Admin Controls"
+            selectedTitle={activeElement}
+            unselectedSubtitle="Advanced admin controls"
+            onClick={setActiveElement}
+          >
+            <AdminControls />
+          </Accordion>
+        )}
       </div>
     </ContentBox>
   );
@@ -1648,3 +1659,48 @@ const ChangeGender: React.FC = () => {
     </div>
   );
 };
+
+const AdminControls: React.FC = () => {
+  const { mutate: massUnequipAll, isPending: isUnequippingRegular } = api.jutsu.massUnequipAll.useMutation({
+    onSuccess: (result) => {
+      showMutationToast(result);
+    },
+  });
+
+  const { mutate: massUnequipAllRanked, isPending: isUnequippingRanked } = api.jutsu.massUnequipAllRanked.useMutation({
+    onSuccess: (result) => {
+      showMutationToast(result);
+    },
+  });
+
+  const isPending = isUnequippingRegular || isUnequippingRanked;
+
+  return (
+    <div className="flex flex-col gap-4 p-4">
+      <div className="flex items-center justify-between">
+        <div>
+          <h3 className="text-lg font-semibold">Mass Unequip All Jutsu</h3>
+          <p className="text-sm text-muted-foreground">
+            This will unequip all jutsu from all users. Use with caution.
+          </p>
+        </div>
+        <div className="flex gap-2">
+          <Button 
+            variant="destructive" 
+            onClick={() => massUnequipAll()}
+            disabled={isPending}
+          >
+            {isUnequippingRegular ? "Processing..." : "Unequip All Regular"}
+          </Button>
+          <Button 
+            variant="destructive" 
+            onClick={() => massUnequipAllRanked()}
+            disabled={isPending}
+          >
+            {isUnequippingRanked ? "Processing..." : "Unequip All Ranked"}
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};