DB updates, removed all CRUD func's from repositories as prisma's func's are sufficient and reduces boilerplate.
This commit is contained in:
parent
6131a8455a
commit
34d6aa3d1b
@ -0,0 +1,5 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE `Character` MODIFY `position_x` INTEGER NOT NULL DEFAULT 0,
|
||||||
|
MODIFY `position_y` INTEGER NOT NULL DEFAULT 0,
|
||||||
|
MODIFY `rotation` INTEGER NOT NULL DEFAULT 0,
|
||||||
|
MODIFY `zoneId` INTEGER NOT NULL DEFAULT 1;
|
12
prisma/migrations/20240722001138_field_updates/migration.sql
Normal file
12
prisma/migrations/20240722001138_field_updates/migration.sql
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE `Item` MODIFY `description` VARCHAR(191) NULL;
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE `Zone` MODIFY `width` INTEGER NOT NULL DEFAULT 10,
|
||||||
|
MODIFY `height` INTEGER NOT NULL DEFAULT 10,
|
||||||
|
MODIFY `tiles` JSON NULL;
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE `ZoneObject` MODIFY `depth` INTEGER NOT NULL DEFAULT 0,
|
||||||
|
MODIFY `position_x` INTEGER NOT NULL DEFAULT 0,
|
||||||
|
MODIFY `position_y` INTEGER NOT NULL DEFAULT 0;
|
@ -59,7 +59,7 @@ model Object {
|
|||||||
model Item {
|
model Item {
|
||||||
id String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
name String
|
name String
|
||||||
description String
|
description String?
|
||||||
stackable Boolean @default(false)
|
stackable Boolean @default(false)
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
@ -83,10 +83,10 @@ model Character {
|
|||||||
level Int @default(1)
|
level Int @default(1)
|
||||||
experience Int @default(0)
|
experience Int @default(0)
|
||||||
role String @default("player")
|
role String @default("player")
|
||||||
position_x Int
|
position_x Int @default(0)
|
||||||
position_y Int
|
position_y Int @default(0)
|
||||||
rotation Int
|
rotation Int @default(0)
|
||||||
zoneId Int
|
zoneId Int @default(1)
|
||||||
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
|
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
|
||||||
chats Chat[]
|
chats Chat[]
|
||||||
items CharacterItem[]
|
items CharacterItem[]
|
||||||
@ -104,9 +104,9 @@ model CharacterItem {
|
|||||||
model Zone {
|
model Zone {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
name String
|
name String
|
||||||
width Int
|
width Int @default(10)
|
||||||
height Int
|
height Int @default(10)
|
||||||
tiles Json
|
tiles Json?
|
||||||
pvp Boolean @default(false)
|
pvp Boolean @default(false)
|
||||||
zoneEventTiles ZoneEventTile[]
|
zoneEventTiles ZoneEventTile[]
|
||||||
zoneObjects ZoneObject[]
|
zoneObjects ZoneObject[]
|
||||||
@ -122,9 +122,9 @@ model ZoneObject {
|
|||||||
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
|
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
|
||||||
objectId String
|
objectId String
|
||||||
object Object @relation(fields: [objectId], references: [id], onDelete: Cascade)
|
object Object @relation(fields: [objectId], references: [id], onDelete: Cascade)
|
||||||
depth Int
|
depth Int @default(0)
|
||||||
position_x Int
|
position_x Int @default(0)
|
||||||
position_y Int
|
position_y Int @default(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
enum ZoneEventTileType {
|
enum ZoneEventTileType {
|
||||||
|
@ -3,6 +3,7 @@ import { TSocket } from '../../utilities/Types'
|
|||||||
import { Character } from '@prisma/client'
|
import { Character } from '@prisma/client'
|
||||||
import CharacterRepository from '../../repositories/CharacterRepository'
|
import CharacterRepository from '../../repositories/CharacterRepository'
|
||||||
import { ZCharacterCreate } from '../../utilities/ZodTypes'
|
import { ZCharacterCreate } from '../../utilities/ZodTypes'
|
||||||
|
import prisma from '../../utilities/Prisma'
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (socket: TSocket, io: Server) {
|
||||||
socket.on('character:create', async (data: any) => {
|
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' })
|
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]
|
characters = [...characters, character]
|
||||||
|
|
||||||
socket.emit('character:create:success')
|
socket.emit('character:create:success')
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../utilities/Types'
|
import { TSocket } from '../../utilities/Types'
|
||||||
import CharacterRepository from '../../repositories/CharacterRepository'
|
|
||||||
import ZoneManager from '../../managers/ZoneManager'
|
import ZoneManager from '../../managers/ZoneManager'
|
||||||
|
import prisma from '../../utilities/Prisma'
|
||||||
|
|
||||||
type SocketResponseT = {
|
type SocketResponseT = {
|
||||||
position_x: number
|
position_x: number
|
||||||
@ -21,7 +21,16 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
socket.character.position_x = data.position_x
|
socket.character.position_x = data.position_x
|
||||||
socket.character.position_y = data.position_y
|
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)
|
ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character)
|
||||||
console.log(socket.character)
|
console.log(socket.character)
|
||||||
|
|
||||||
|
@ -2,13 +2,16 @@ import { Server } from 'socket.io'
|
|||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import prisma from '../../../utilities/Prisma'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
tags: string[]
|
tags: string[]
|
||||||
origin_x: number
|
origin_x: number
|
||||||
origin_y: number
|
origin_y: number
|
||||||
isAnimated: boolean
|
isAnimated: boolean
|
||||||
|
frameSpeed: number
|
||||||
|
frameWidth: number
|
||||||
|
frameHeight: number
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -17,7 +20,7 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -32,7 +35,10 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
tags: data.tags,
|
tags: data.tags,
|
||||||
origin_x: data.origin_x,
|
origin_x: data.origin_x,
|
||||||
origin_y: data.origin_y,
|
origin_y: data.origin_y,
|
||||||
isAnimated: data.isAnimated
|
isAnimated: data.isAnimated,
|
||||||
|
frameSpeed: data.frameSpeed,
|
||||||
|
frameWidth: data.frameWidth,
|
||||||
|
frameHeight: data.frameHeight
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
callback(true)
|
callback(true)
|
||||||
|
@ -33,8 +33,7 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
name: key,
|
name: key,
|
||||||
tags: [],
|
tags: [],
|
||||||
origin_x: 0,
|
origin_x: 0,
|
||||||
origin_y: 0,
|
origin_y: 0
|
||||||
isAnimated: false
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -2,10 +2,10 @@ import { Server } from 'socket.io'
|
|||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
import SpriteRepository from '../../../repositories/SpriteRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
sprite: string
|
id: string
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -14,19 +14,23 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await SpriteRepository.delete(data.sprite)
|
await prisma.sprite.delete({
|
||||||
|
where: {
|
||||||
|
id: data.id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
// get root path
|
// get root path
|
||||||
const public_folder = path.join(process.cwd(), 'public', 'sprites')
|
const public_folder = path.join(process.cwd(), 'public', 'sprites')
|
||||||
|
|
||||||
// remove the tile from the disk
|
// 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) => {
|
fs.unlink(finalFilePath, (err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import SpriteRepository from '../../../repositories/SpriteRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
import { Sprite } from '@prisma/client'
|
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
origin_x: number
|
origin_x: number
|
||||||
@ -16,13 +15,22 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
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)
|
callback(true)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
@ -3,7 +3,7 @@ import { TSocket } from '../../../utilities/Types'
|
|||||||
import { writeFile } from 'node:fs/promises'
|
import { writeFile } from 'node:fs/promises'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
import fs from 'fs/promises'
|
import fs from 'fs/promises'
|
||||||
import spriteRepository from '../../../repositories/SpriteRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface ISpriteData {
|
interface ISpriteData {
|
||||||
[key: string]: Buffer
|
[key: string]: Buffer
|
||||||
@ -28,7 +28,11 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
await fs.mkdir(public_folder, { recursive: true })
|
await fs.mkdir(public_folder, { recursive: true })
|
||||||
|
|
||||||
const uploadPromises = Object.entries(data).map(async ([key, spriteData]) => {
|
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 uuid = sprite.id
|
||||||
const filename = `${uuid}.png`
|
const filename = `${uuid}.png`
|
||||||
const finalFilePath = path.join(public_folder, filename)
|
const finalFilePath = path.join(public_folder, filename)
|
||||||
|
@ -2,10 +2,10 @@ import { Server } from 'socket.io'
|
|||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
import TileRepository from '../../../repositories/TileRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
tile: string
|
id: string
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -14,19 +14,23 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await TileRepository.delete(data.tile)
|
await prisma.tile.delete({
|
||||||
|
where: {
|
||||||
|
id: data.id
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
// get root path
|
// get root path
|
||||||
const public_folder = path.join(process.cwd(), 'public', 'tiles')
|
const public_folder = path.join(process.cwd(), 'public', 'tiles')
|
||||||
|
|
||||||
// remove the tile from the disk
|
// 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) => {
|
fs.unlink(finalFilePath, (err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import TileRepository from '../../../repositories/TileRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
id: string
|
id: string
|
||||||
name: string
|
name: string
|
||||||
tags: string[]
|
tags: string[]
|
||||||
@ -14,13 +14,21 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
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)
|
callback(true)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
@ -3,7 +3,7 @@ import { TSocket } from '../../../utilities/Types'
|
|||||||
import { writeFile } from 'node:fs/promises'
|
import { writeFile } from 'node:fs/promises'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
import fs from 'fs/promises'
|
import fs from 'fs/promises'
|
||||||
import tileRepository from '../../../repositories/TileRepository'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface ITileData {
|
interface ITileData {
|
||||||
[key: string]: Buffer
|
[key: string]: Buffer
|
||||||
@ -28,7 +28,11 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
await fs.mkdir(public_folder, { recursive: true })
|
await fs.mkdir(public_folder, { recursive: true })
|
||||||
|
|
||||||
const uploadPromises = Object.entries(data).map(async ([key, tileData]) => {
|
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 uuid = tile.id
|
||||||
const filename = `${uuid}.png`
|
const filename = `${uuid}.png`
|
||||||
const finalFilePath = path.join(public_folder, filename)
|
const finalFilePath = path.join(public_folder, filename)
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import ZoneRepository from '../../../repositories/ZoneRepository'
|
import ZoneRepository from '../../../repositories/ZoneRepository'
|
||||||
import ZoneManager from '../../../managers/ZoneManager'
|
import { Zone } from '@prisma/client'
|
||||||
import { Character, Zone } from '@prisma/client'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
name: string
|
name: string
|
||||||
width: number
|
width: number
|
||||||
height: number
|
height: number
|
||||||
@ -16,7 +16,7 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
console.log(`---Character #${socket.character?.id} is not a game master.`)
|
console.log(`---Character #${socket.character?.id} is not a game master.`)
|
||||||
return
|
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.`)
|
console.log(`---GM ${socket.character?.id} has created a new zone via zone editor.`)
|
||||||
let zoneList: Zone[] = []
|
let zoneList: Zone[] = []
|
||||||
try {
|
try {
|
||||||
const zone = await ZoneRepository.create(
|
const zone = await prisma.zone.create({
|
||||||
data.name,
|
data: {
|
||||||
data.width,
|
name: data.name,
|
||||||
data.height,
|
width: data.width,
|
||||||
Array.from({ length: data.height }, () => Array.from({ length: data.width }, () => 'blank_tile'))
|
height: data.height,
|
||||||
)
|
tiles: Array.from({ length: data.height }, () => Array.from({ length: data.width }, () => 'blank_tile'))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
zoneList = await ZoneRepository.getAll()
|
zoneList = await ZoneRepository.getAll()
|
||||||
callback(zoneList)
|
callback(zoneList)
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import ZoneRepository from '../../../repositories/ZoneRepository'
|
import ZoneRepository from '../../../repositories/ZoneRepository'
|
||||||
import ZoneManager from '../../../managers/ZoneManager'
|
import prisma from '../../../utilities/Prisma'
|
||||||
import { Character, Zone } from '@prisma/client'
|
|
||||||
|
|
||||||
interface IPayload {
|
type Payload = {
|
||||||
zoneId: number
|
zoneId: number
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -14,7 +13,7 @@ interface IPayload {
|
|||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
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') {
|
if (socket.character?.role !== 'gm') {
|
||||||
console.log(`---Character #${socket.character?.id} is not a game master.`)
|
console.log(`---Character #${socket.character?.id} is not a game master.`)
|
||||||
return
|
return
|
||||||
@ -30,7 +29,11 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
await ZoneRepository.delete(data.zoneId)
|
await prisma.zone.delete({
|
||||||
|
where: {
|
||||||
|
id: data.zoneId
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
callback(true)
|
callback(true)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/Types'
|
import { TSocket } from '../../../utilities/Types'
|
||||||
import ZoneRepository from '../../../repositories/ZoneRepository'
|
import ZoneRepository from '../../../repositories/ZoneRepository'
|
||||||
import ZoneManager from '../../../managers/ZoneManager'
|
import { ZoneEventTile, ZoneObject } from '@prisma/client'
|
||||||
import { Character, Zone, ZoneEventTile, ZoneObject } from '@prisma/client'
|
import prisma from '../../../utilities/Prisma'
|
||||||
|
|
||||||
interface IPayload {
|
interface IPayload {
|
||||||
zoneId: number
|
zoneId: number
|
||||||
@ -41,7 +41,40 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
return
|
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)
|
zone = await ZoneRepository.getById(data.zoneId)
|
||||||
|
|
||||||
|
@ -11,33 +11,6 @@ class SpriteRepository {
|
|||||||
async getAll(): Promise<Sprite[]> {
|
async getAll(): Promise<Sprite[]> {
|
||||||
return prisma.sprite.findMany()
|
return prisma.sprite.findMany()
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(name: string, origin_x: number, origin_y: number): Promise<Sprite> {
|
|
||||||
return prisma.sprite.create({
|
|
||||||
data: {
|
|
||||||
name,
|
|
||||||
origin_x,
|
|
||||||
origin_y
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id: string, name: string, origin_x: number, origin_y: number): Promise<Sprite> {
|
|
||||||
return prisma.sprite.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
name,
|
|
||||||
origin_x,
|
|
||||||
origin_y
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete(id: string): Promise<Sprite> {
|
|
||||||
return prisma.sprite.delete({
|
|
||||||
where: { id }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new SpriteRepository()
|
export default new SpriteRepository()
|
||||||
|
@ -11,37 +11,6 @@ class TileRepository {
|
|||||||
async getAll(): Promise<Tile[]> {
|
async getAll(): Promise<Tile[]> {
|
||||||
return prisma.tile.findMany()
|
return prisma.tile.findMany()
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(name: string): Promise<Tile> {
|
|
||||||
return prisma.tile.create({
|
|
||||||
data: {
|
|
||||||
name,
|
|
||||||
tags: []
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id: string, name: string, tags: string[]): Promise<Tile> {
|
|
||||||
return prisma.tile.update({
|
|
||||||
where: { id },
|
|
||||||
data: {
|
|
||||||
name,
|
|
||||||
tags
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete(id: string): Promise<boolean> {
|
|
||||||
try {
|
|
||||||
await prisma.tile.delete({
|
|
||||||
where: { id }
|
|
||||||
})
|
|
||||||
return true
|
|
||||||
} catch (error) {
|
|
||||||
console.log('Error deleting tile:', error)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new TileRepository()
|
export default new TileRepository()
|
||||||
|
@ -26,19 +26,6 @@ class UserRepository {
|
|||||||
throw new Error(`Failed to get user by username: ${error.message}`)
|
throw new Error(`Failed to get user by username: ${error.message}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
async create(username: string, password: string): Promise<User> {
|
|
||||||
try {
|
|
||||||
return await prisma.user.create({
|
|
||||||
data: {
|
|
||||||
username,
|
|
||||||
password
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (error: any) {
|
|
||||||
// Handle error
|
|
||||||
throw new Error(`Failed to create user: ${error.message}`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new UserRepository()
|
export default new UserRepository()
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Zone, ZoneEventTile, ZoneObject } from '@prisma/client'
|
import { Zone } from '@prisma/client'
|
||||||
import prisma from '../utilities/Prisma' // Import the global Prisma instance
|
import prisma from '../utilities/Prisma' // Import the global Prisma instance
|
||||||
|
|
||||||
class ZoneRepository {
|
class ZoneRepository {
|
||||||
@ -44,77 +44,6 @@ class ZoneRepository {
|
|||||||
throw new Error(`Failed to get zone by id: ${error.message}`)
|
throw new Error(`Failed to get zone by id: ${error.message}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(name: string, width: number, height: number, tiles: string[][]): Promise<Zone> {
|
|
||||||
try {
|
|
||||||
return await prisma.zone.create({
|
|
||||||
data: {
|
|
||||||
name: name,
|
|
||||||
width: width,
|
|
||||||
height: height,
|
|
||||||
tiles: tiles
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (error: any) {
|
|
||||||
// Handle error
|
|
||||||
throw new Error(`Failed to create zone: ${error.message}`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async update(id: number, name: string, width: number, height: number, tiles: string[][], zoneEventTiles: ZoneEventTile[], zoneObjects: ZoneObject[]): Promise<Zone> {
|
|
||||||
try {
|
|
||||||
return await prisma.zone.update({
|
|
||||||
where: {
|
|
||||||
id: id
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
name,
|
|
||||||
width,
|
|
||||||
height,
|
|
||||||
tiles,
|
|
||||||
zoneEventTiles: {
|
|
||||||
deleteMany: {
|
|
||||||
zoneId: id // Ensure only event tiles related to the zone are deleted
|
|
||||||
},
|
|
||||||
// Save new zone event tiles
|
|
||||||
create: zoneEventTiles.map((zoneEventTile) => ({
|
|
||||||
type: zoneEventTile.type,
|
|
||||||
position_x: zoneEventTile.position_x,
|
|
||||||
position_y: zoneEventTile.position_y
|
|
||||||
}))
|
|
||||||
},
|
|
||||||
zoneObjects: {
|
|
||||||
deleteMany: {
|
|
||||||
zoneId: id // Ensure only objects related to the zone are deleted
|
|
||||||
},
|
|
||||||
// Save new zone objects
|
|
||||||
create: zoneObjects.map((zoneObject) => ({
|
|
||||||
objectId: zoneObject.objectId,
|
|
||||||
depth: zoneObject.depth,
|
|
||||||
position_x: zoneObject.position_x,
|
|
||||||
position_y: zoneObject.position_y
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (error: any) {
|
|
||||||
// Handle error
|
|
||||||
throw new Error(`Failed to update zone: ${error.message}`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete(id: number): Promise<Zone> {
|
|
||||||
try {
|
|
||||||
return await prisma.zone.delete({
|
|
||||||
where: {
|
|
||||||
id: id
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (error: any) {
|
|
||||||
// Handle error
|
|
||||||
throw new Error(`Failed to delete zone: ${error.message}`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new ZoneRepository()
|
export default new ZoneRepository()
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import bcrypt from 'bcryptjs'
|
import bcrypt from 'bcryptjs'
|
||||||
import UserRepository from '../repositories/UserRepository'
|
import UserRepository from '../repositories/UserRepository'
|
||||||
|
import prisma from '../utilities/Prisma'
|
||||||
|
import { User } from '@prisma/client'
|
||||||
|
|
||||||
class UserService {
|
class UserService {
|
||||||
async login(username: string, password: string): Promise<boolean | any> {
|
async login(username: string, password: string): Promise<boolean | User> {
|
||||||
const user = await UserRepository.getByUsername(username)
|
const user = await UserRepository.getByUsername(username)
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return false
|
return false
|
||||||
@ -16,14 +18,19 @@ class UserService {
|
|||||||
return user
|
return user
|
||||||
}
|
}
|
||||||
|
|
||||||
async register(username: string, password: string): Promise<boolean | any> {
|
async register(username: string, password: string): Promise<boolean | User> {
|
||||||
const user = await UserRepository.getByUsername(username)
|
const user = await UserRepository.getByUsername(username)
|
||||||
if (user) {
|
if (user) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
const hashedPassword = await bcrypt.hash(password, 10)
|
const hashedPassword = await bcrypt.hash(password, 10)
|
||||||
return await UserRepository.create(username, hashedPassword)
|
return prisma.user.create({
|
||||||
|
data: {
|
||||||
|
username,
|
||||||
|
password: hashedPassword
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
import { Zone } from '@prisma/client'
|
import prisma from '../utilities/Prisma'
|
||||||
import ZoneRepository from '../repositories/ZoneRepository'
|
|
||||||
|
|
||||||
class ZoneService {
|
class ZoneService {
|
||||||
async createDemoZone(): Promise<boolean> {
|
async createDemoZone(): Promise<boolean> {
|
||||||
await ZoneRepository.create('Demo Zone', 10, 10, [
|
const tiles = [
|
||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
||||||
@ -14,7 +13,17 @@ class ZoneService {
|
|||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile'],
|
||||||
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile']
|
['blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile', 'blank_tile']
|
||||||
])
|
]
|
||||||
|
|
||||||
|
await prisma.zone.create({
|
||||||
|
data: {
|
||||||
|
name: 'Demo Zone',
|
||||||
|
width: 10,
|
||||||
|
height: 10,
|
||||||
|
tiles
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
console.log('Demo zone created.')
|
console.log('Demo zone created.')
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@ import path from 'path'
|
|||||||
import { TAsset } from './Types'
|
import { TAsset } from './Types'
|
||||||
import tileRepository from '../repositories/TileRepository'
|
import tileRepository from '../repositories/TileRepository'
|
||||||
import objectRepository from '../repositories/ObjectRepository'
|
import objectRepository from '../repositories/ObjectRepository'
|
||||||
import spriteRepository from '../repositories/SpriteRepository'
|
|
||||||
|
|
||||||
async function addHttpRoutes(app: Application) {
|
async function addHttpRoutes(app: Application) {
|
||||||
app.get('/assets', async (req: Request, res: Response) => {
|
app.get('/assets', async (req: Request, res: Response) => {
|
||||||
@ -69,8 +68,7 @@ async function addHttpRoutes(app: Application) {
|
|||||||
const userService = new UserService()
|
const userService = new UserService()
|
||||||
const user = await userService.login(username, password)
|
const user = await userService.login(username, password)
|
||||||
|
|
||||||
if (user) {
|
if (user && typeof user !== 'boolean') {
|
||||||
//test
|
|
||||||
const token = jwt.sign({ id: user.id }, config.JWT_SECRET, { expiresIn: '4h' })
|
const token = jwt.sign({ id: user.id }, config.JWT_SECRET, { expiresIn: '4h' })
|
||||||
return res.status(200).json({ token })
|
return res.status(200).json({ token })
|
||||||
}
|
}
|
||||||
@ -91,8 +89,7 @@ async function addHttpRoutes(app: Application) {
|
|||||||
const user = await userService.register(username, password)
|
const user = await userService.register(username, password)
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
const token = jwt.sign({ id: user.id }, config.JWT_SECRET, { expiresIn: '4h' })
|
return res.status(200)
|
||||||
return res.status(200).json({ token })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return res.status(400).json({ message: 'Failed to register user' })
|
return res.status(400).json({ message: 'Failed to register user' })
|
||||||
|
Loading…
x
Reference in New Issue
Block a user