Added CRUD logic for character hair, made some minor improvements, npm update

package-lock.json

@@ -729,9 +729,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.17.6",
+      "version": "20.17.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.6.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.7.tgz",
-      "integrity": "sha512-VEI7OdvK2wP7XHnsuXbAJnEpEkF6NjSN45QJlL4VGqZSXsnicpesdTWsg9RISeSdYd3yeRj/y3k5KGjUXYnFwQ==",
+      "integrity": "sha512-sZXXnpBFMKbao30dUAvzKbdwA2JM1fwUtVEq/kxKuPI5mMwZiRElCpTXb0Biq/LMEVpXDZL5G5V0RPnxKeyaYg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -949,9 +949,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/bullmq": {
-      "version": "5.28.1",
+      "version": "5.29.1",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.28.1.tgz",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.29.1.tgz",
-      "integrity": "sha512-iSoqziPLKH//mmoc4Aj3/opTmk1PgFdITwUrx/wDqrTxfBRjnTGInsu129LCEY6d+SmhZWnA9PYU6ciX+NT64A==",
+      "integrity": "sha512-TZWiwRlPnpaN+Qwh4D8IQf2cYLpkiDX1LbaaWEabc6y37ojIttWOSynxDewpVHyW233LssSIC4+aLMSvAjtpmg==",
       "license": "MIT",
       "dependencies": {
         "cron-parser": "^4.6.0",
@@ -2774,9 +2774,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.3",
+      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",

prisma/migrations/20241123140835_lol/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `CharacterHair` ADD COLUMN `gender` ENUM('MALE', 'FEMALE') NOT NULL DEFAULT 'MALE';

prisma/migrations/20241123141319_lol2/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `CharacterHair` ADD COLUMN `isEnabledForCharCreation` BOOLEAN NOT NULL DEFAULT false;

prisma/schema/user.prisma

@@ -43,11 +43,13 @@ model CharacterType {
 }
 
 model CharacterHair {
-  id         Int         @id @default(autoincrement())
+  id                       Int             @id @default(autoincrement())
-  name       String
+  name                     String
-  sprite     Sprite?     @relation(fields: [spriteId], references: [id], onDelete: Cascade)
+  gender                   CharacterGender @default(MALE)
-  spriteId   String?
+  isEnabledForCharCreation Boolean         @default(false)
-  characters Character[]
+  sprite                   Sprite?         @relation(fields: [spriteId], references: [id], onDelete: Cascade)
+  spriteId                 String?
+  characters               Character[]
   // @TODO: Do we need addedAt and updatedAt?
 }
 

src/repositories/characterHairRepository.ts

@@ -0,0 +1,10 @@
+import prisma from '../utilities/prisma' // Import the global Prisma instance
+import { CharacterHair } from '@prisma/client'
+
+class CharacterHairRepository {
+  async getAll(): Promise<CharacterHair[]> {
+    return prisma.characterHair.findMany()
+  }
+}
+
+export default new CharacterHairRepository()

src/socketEvents/gameMaster/assetManager/characterHair/create.ts

@@ -0,0 +1,37 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../../utilities/types'
+import prisma from '../../../../utilities/prisma'
+import characterRepository from '../../../../repositories/characterRepository'
+
+export default class CharacterHairCreateEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('gm:characterHair:create', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
+    try {
+      const character = await characterRepository.getById(this.socket.characterId as number)
+      if (!character) return callback(false)
+
+      if (character.role !== 'gm') {
+        return callback(false)
+      }
+
+      const newCharacterHair = await prisma.characterHair.create({
+        data: {
+          name: 'New hair'
+        }
+      })
+
+      callback(true, newCharacterHair)
+    } catch (error) {
+      console.error('Error creating character hair:', error)
+      callback(false)
+    }
+  }
+}

src/socketEvents/gameMaster/assetManager/characterHair/delete.ts

@@ -0,0 +1,40 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../../utilities/types'
+import prisma from '../../../../utilities/prisma'
+import characterRepository from '../../../../repositories/characterRepository'
+import { gameMasterLogger } from '../../../../utilities/logger'
+
+interface IPayload {
+  id: number
+}
+
+export default class characterHairDeleteEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('gm:characterHair:remove', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
+    const character = await characterRepository.getById(this.socket.characterId as number)
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
+      return callback(false)
+    }
+
+    try {
+      await prisma.characterHair.delete({
+        where: { id: data.id }
+      })
+
+      callback(true)
+    } catch (error) {
+      gameMasterLogger.error(`Error deleting character type ${data.id}: ${error instanceof Error ? error.message : String(error)}`)
+      callback(false)
+    }
+  }
+}

src/socketEvents/gameMaster/assetManager/characterHair/list.ts

@@ -0,0 +1,36 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../../utilities/types'
+import { CharacterHair } from '@prisma/client'
+import characterRepository from '../../../../repositories/characterRepository'
+import { gameMasterLogger } from '../../../../utilities/logger'
+import characterHairRepository from '../../../../repositories/characterHairRepository'
+
+interface IPayload {}
+
+export default class characterHairListEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('gm:characterHair:list', this.handleEvent.bind(this))
+  }
+
+  private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
+    const character = await characterRepository.getById(this.socket.characterId as number)
+    if (!character) {
+      gameMasterLogger.error('gm:characterHair:list error', 'Character not found')
+      return callback([])
+    }
+
+    if (character.role !== 'gm') {
+      gameMasterLogger.info(`User ${character.id} tried to list character hair but is not a game master.`)
+      return callback([])
+    }
+
+    // get all objects
+    const items = await characterHairRepository.getAll()
+    callback(items)
+  }
+}

src/socketEvents/gameMaster/assetManager/characterHair/update.ts

@@ -0,0 +1,51 @@
+import { Server } from 'socket.io'
+import { TSocket } from '../../../../utilities/types'
+import prisma from '../../../../utilities/prisma'
+import characterRepository from '../../../../repositories/characterRepository'
+import { CharacterGender, CharacterRace } from '@prisma/client'
+import { gameMasterLogger } from '../../../../utilities/logger'
+
+type Payload = {
+  id: number
+  name: string
+  gender: CharacterGender
+  isEnabledForCharCreation: boolean
+  spriteId: string
+}
+
+export default class CharacterHairUpdateEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('gm:characterHair:update', this.handleObjectUpdate.bind(this))
+  }
+
+  private async handleObjectUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
+    const character = await characterRepository.getById(this.socket.characterId as number)
+    if (!character) return callback(false)
+
+    if (character.role !== 'gm') {
+      return callback(false)
+    }
+
+    try {
+      await prisma.characterHair.update({
+        where: { id: data.id },
+        data: {
+          name: data.name,
+          gender: data.gender,
+          isEnabledForCharCreation: data.isEnabledForCharCreation,
+          spriteId: data.spriteId
+        }
+      })
+
+      return callback(true)
+    } catch (error) {
+      gameMasterLogger.error(`Error updating character hair: ${error instanceof Error ? error.message : String(error)}`)
+      return callback(false)
+    }
+  }
+}

src/socketEvents/gameMaster/assetManager/characterType/delete.ts

@@ -1,9 +1,7 @@
-import fs from 'fs'
 import { Server } from 'socket.io'
 import { TSocket } from '../../../../utilities/types'
 import prisma from '../../../../utilities/prisma'
 import characterRepository from '../../../../repositories/characterRepository'
-import { getPublicPath } from '../../../../utilities/storage'
 import { gameMasterLogger } from '../../../../utilities/logger'
 
 interface IPayload {