DB updates, removed all CRUD func's from repositories as prisma's func's are sufficient and reduces boilerplate.

src/events/character/CharacterCreate.ts

@@ -3,6 +3,7 @@ import { TSocket } from '../../utilities/Types'
 import { Character } from '@prisma/client'
 import CharacterRepository from '../../repositories/CharacterRepository'
 import { ZCharacterCreate } from '../../utilities/ZodTypes'
+import prisma from '../../utilities/Prisma'
 
 export default function (socket: TSocket, io: Server) {
   socket.on('character:create', async (data: any) => {
@@ -25,7 +26,13 @@ export default function (socket: TSocket, io: Server) {
         return socket.emit('notification', { message: 'You can only have 4 characters' })
       }
 
-      const character: Character = (await CharacterRepository.create(user_id, data.name, 'player')) as Character
+      const character: Character = await prisma.character.create({
+        data: {
+          name: data.name,
+          userId: user_id
+        }
+      })
+
       characters = [...characters, character]
 
       socket.emit('character:create:success')

src/events/character/CharacterMove.ts

@@ -1,7 +1,7 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/Types'
-import CharacterRepository from '../../repositories/CharacterRepository'
 import ZoneManager from '../../managers/ZoneManager'
+import prisma from '../../utilities/Prisma'
 
 type SocketResponseT = {
   position_x: number
@@ -21,7 +21,16 @@ export default function (socket: TSocket, io: Server) {
       socket.character.position_x = data.position_x
       socket.character.position_y = data.position_y
 
-      await CharacterRepository.updatePosition(socket.character.id as number, data.position_x, data.position_y)
+      await prisma.character.update({
+        where: {
+          id: socket.character.id
+        },
+        data: {
+          position_x: data.position_x,
+          position_y: data.position_y
+        }
+      })
+
       ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character)
       console.log(socket.character)
 

src/events/gm/object/GmObjectUpdate.ts

@@ -2,13 +2,16 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
+type Payload = {
   id: string
   name: string
   tags: string[]
   origin_x: number
   origin_y: number
   isAnimated: boolean
+  frameSpeed: number
+  frameWidth: number
+  frameHeight: number
 }
 
 /**
@@ -17,7 +20,7 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:object:update', async (data: IPayload, callback: (success: boolean) => void) => {
+  socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       return
     }
@@ -32,7 +35,10 @@ export default function (socket: TSocket, io: Server) {
           tags: data.tags,
           origin_x: data.origin_x,
           origin_y: data.origin_y,
-          isAnimated: data.isAnimated
+          isAnimated: data.isAnimated,
+          frameSpeed: data.frameSpeed,
+          frameWidth: data.frameWidth,
+          frameHeight: data.frameHeight
         }
       })
       callback(true)

src/events/gm/object/GmObjectUpload.ts

@@ -33,8 +33,7 @@ export default function (socket: TSocket, io: Server) {
             name: key,
             tags: [],
             origin_x: 0,
-            origin_y: 0,
-            isAnimated: false
+            origin_y: 0
           }
         })
 

src/events/gm/sprite/Remove.ts

@@ -2,10 +2,10 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import path from 'path'
 import fs from 'fs'
-import SpriteRepository from '../../../repositories/SpriteRepository'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
-  sprite: string
+type Payload = {
+  id: string
 }
 
 /**
@@ -14,19 +14,23 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:sprite:remove', async (data: IPayload, callback: (response: boolean) => void) => {
+  socket.on('gm:sprite:remove', async (data: Payload, callback: (response: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       return
     }
 
     try {
-      await SpriteRepository.delete(data.sprite)
+      await prisma.sprite.delete({
+        where: {
+          id: data.id
+        }
+      })
 
       // get root path
       const public_folder = path.join(process.cwd(), 'public', 'sprites')
 
       // remove the tile from the disk
-      const finalFilePath = path.join(public_folder, data.sprite + '.png')
+      const finalFilePath = path.join(public_folder, data.id + '.png')
       fs.unlink(finalFilePath, (err) => {
         if (err) {
           console.log(err)

src/events/gm/sprite/Update.ts

@@ -1,9 +1,8 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
-import SpriteRepository from '../../../repositories/SpriteRepository'
-import { Sprite } from '@prisma/client'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
+type Payload = {
   id: string
   name: string
   origin_x: number
@@ -16,13 +15,22 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:sprite:update', async (data: IPayload, callback: (success: boolean) => void) => {
+  socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       return
     }
 
     try {
-      const sprite = await SpriteRepository.update(data.id, data.name, data.origin_x, data.origin_y)
+      const sprite = await prisma.sprite.update({
+        where: {
+          id: data.id
+        },
+        data: {
+          name: data.name,
+          origin_x: data.origin_x,
+          origin_y: data.origin_y
+        }
+      })
 
       callback(true)
     } catch (error) {

src/events/gm/sprite/Upload.ts

@@ -3,7 +3,7 @@ import { TSocket } from '../../../utilities/Types'
 import { writeFile } from 'node:fs/promises'
 import path from 'path'
 import fs from 'fs/promises'
-import spriteRepository from '../../../repositories/SpriteRepository'
+import prisma from '../../../utilities/Prisma'
 
 interface ISpriteData {
   [key: string]: Buffer
@@ -28,7 +28,11 @@ export default function (socket: TSocket, io: Server) {
       await fs.mkdir(public_folder, { recursive: true })
 
       const uploadPromises = Object.entries(data).map(async ([key, spriteData]) => {
-        const sprite = await spriteRepository.create('New sprite', 0, 0)
+        const sprite = await prisma.sprite.create({
+          data: {
+            name: 'New sprite'
+          }
+        })
         const uuid = sprite.id
         const filename = `${uuid}.png`
         const finalFilePath = path.join(public_folder, filename)

src/events/gm/tile/GmTileRemove.ts

@@ -2,10 +2,10 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import path from 'path'
 import fs from 'fs'
-import TileRepository from '../../../repositories/TileRepository'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
-  tile: string
+type Payload = {
+  id: string
 }
 
 /**
@@ -14,19 +14,23 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:tile:remove', async (data: IPayload, callback: (response: boolean) => void) => {
+  socket.on('gm:tile:remove', async (data: Payload, callback: (response: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       return
     }
 
     try {
-      await TileRepository.delete(data.tile)
+      await prisma.tile.delete({
+        where: {
+          id: data.id
+        }
+      })
 
       // get root path
       const public_folder = path.join(process.cwd(), 'public', 'tiles')
 
       // remove the tile from the disk
-      const finalFilePath = path.join(public_folder, data.tile + '.png')
+      const finalFilePath = path.join(public_folder, data.id + '.png')
       fs.unlink(finalFilePath, (err) => {
         if (err) {
           console.log(err)

src/events/gm/tile/GmTileUpdate.ts

@@ -1,8 +1,8 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
-import TileRepository from '../../../repositories/TileRepository'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
+type Payload = {
   id: string
   name: string
   tags: string[]
@@ -14,13 +14,21 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:tile:update', async (data: IPayload, callback: (success: boolean) => void) => {
+  socket.on('gm:tile:update', async (data: Payload, callback: (success: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       return
     }
 
     try {
-      const Tile = await TileRepository.update(data.id, data.name, data.tags)
+      const Tile = await prisma.tile.update({
+        where: {
+          id: data.id
+        },
+        data: {
+          name: data.name,
+          tags: data.tags
+        }
+      })
 
       callback(true)
     } catch (error) {

src/events/gm/tile/GmTileUpload.ts

@@ -3,7 +3,7 @@ import { TSocket } from '../../../utilities/Types'
 import { writeFile } from 'node:fs/promises'
 import path from 'path'
 import fs from 'fs/promises'
-import tileRepository from '../../../repositories/TileRepository'
+import prisma from '../../../utilities/Prisma'
 
 interface ITileData {
   [key: string]: Buffer
@@ -28,7 +28,11 @@ export default function (socket: TSocket, io: Server) {
       await fs.mkdir(public_folder, { recursive: true })
 
       const uploadPromises = Object.entries(data).map(async ([key, tileData]) => {
-        const tile = await tileRepository.create('New tile')
+        const tile = await prisma.tile.create({
+          data: {
+            name: 'New tile'
+          }
+        })
         const uuid = tile.id
         const filename = `${uuid}.png`
         const finalFilePath = path.join(public_folder, filename)

src/events/gm/zone/GmZoneEditorZoneCreate.ts

@@ -1,10 +1,10 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import ZoneRepository from '../../../repositories/ZoneRepository'
-import ZoneManager from '../../../managers/ZoneManager'
-import { Character, Zone } from '@prisma/client'
+import { Zone } from '@prisma/client'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
+type Payload = {
   name: string
   width: number
   height: number
@@ -16,7 +16,7 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:zone_editor:zone:create', async (data: IPayload, callback: (response: Zone[]) => void) => {
+  socket.on('gm:zone_editor:zone:create', async (data: Payload, callback: (response: Zone[]) => void) => {
     if (socket.character?.role !== 'gm') {
       console.log(`---Character #${socket.character?.id} is not a game master.`)
       return
@@ -25,12 +25,14 @@ export default function (socket: TSocket, io: Server) {
     console.log(`---GM ${socket.character?.id} has created a new zone via zone editor.`)
     let zoneList: Zone[] = []
     try {
-      const zone = await ZoneRepository.create(
-        data.name,
-        data.width,
-        data.height,
-        Array.from({ length: data.height }, () => Array.from({ length: data.width }, () => 'blank_tile'))
-      )
+      const zone = await prisma.zone.create({
+        data: {
+          name: data.name,
+          width: data.width,
+          height: data.height,
+          tiles: Array.from({ length: data.height }, () => Array.from({ length: data.width }, () => 'blank_tile'))
+        }
+      })
 
       zoneList = await ZoneRepository.getAll()
       callback(zoneList)

src/events/gm/zone/GmZoneEditorZoneDelete.ts

@@ -1,10 +1,9 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import ZoneRepository from '../../../repositories/ZoneRepository'
-import ZoneManager from '../../../managers/ZoneManager'
-import { Character, Zone } from '@prisma/client'
+import prisma from '../../../utilities/Prisma'
 
-interface IPayload {
+type Payload = {
   zoneId: number
 }
 
@@ -14,7 +13,7 @@ interface IPayload {
  * @param io
  */
 export default function (socket: TSocket, io: Server) {
-  socket.on('gm:zone_editor:zone:delete', async (data: IPayload, callback: (response: boolean) => void) => {
+  socket.on('gm:zone_editor:zone:delete', async (data: Payload, callback: (response: boolean) => void) => {
     if (socket.character?.role !== 'gm') {
       console.log(`---Character #${socket.character?.id} is not a game master.`)
       return
@@ -30,7 +29,11 @@ export default function (socket: TSocket, io: Server) {
         return
       }
 
-      await ZoneRepository.delete(data.zoneId)
+      await prisma.zone.delete({
+        where: {
+          id: data.zoneId
+        }
+      })
 
       callback(true)
     } catch (e) {

src/events/gm/zone/GmZoneEditorZoneUpdate.ts

@@ -1,8 +1,8 @@
 import { Server } from 'socket.io'
 import { TSocket } from '../../../utilities/Types'
 import ZoneRepository from '../../../repositories/ZoneRepository'
-import ZoneManager from '../../../managers/ZoneManager'
-import { Character, Zone, ZoneEventTile, ZoneObject } from '@prisma/client'
+import { ZoneEventTile, ZoneObject } from '@prisma/client'
+import prisma from '../../../utilities/Prisma'
 
 interface IPayload {
   zoneId: number
@@ -41,7 +41,40 @@ export default function (socket: TSocket, io: Server) {
         return
       }
 
-      await ZoneRepository.update(data.zoneId, data.name, data.width, data.height, data.tiles, data.zoneEventTiles, data.zoneObjects)
+      await prisma.zone.update({
+        where: {
+          id: data.zoneId
+        },
+        data: {
+          name: data.name,
+          width: data.width,
+          height: data.height,
+          tiles: data.tiles,
+          zoneEventTiles: {
+            deleteMany: {
+              zoneId: data.zoneId // Ensure only event tiles related to the zone are deleted
+            },
+            // Save new zone event tiles
+            create: data.zoneEventTiles.map((zoneEventTile) => ({
+              type: zoneEventTile.type,
+              position_x: zoneEventTile.position_x,
+              position_y: zoneEventTile.position_y
+            }))
+          },
+          zoneObjects: {
+            deleteMany: {
+              zoneId: data.zoneId // Ensure only objects related to the zone are deleted
+            },
+            // Save new zone objects
+            create: data.zoneObjects.map((zoneObject) => ({
+              objectId: zoneObject.objectId,
+              depth: zoneObject.depth,
+              position_x: zoneObject.position_x,
+              position_y: zoneObject.position_y
+            }))
+          }
+        }
+      })
 
       zone = await ZoneRepository.getById(data.zoneId)