tobias/eventmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Atomize model classes

Browse Source
This commit is contained in:
Tobias Zoghaib
2024-10-11 17:42:21 +02:00
parent 8e7c9a949d
commit 8f0de99634
59 changed files with 432 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
software/backend/routes/city.routes.ts
View File

@@ -15,12 +15,12 @@ city.get("/", (req: Request, res: Response) => {
]
})
.then(cities => {
for (let city of cities) {
for (let location of city.dataValues.locations) {
location.dataValues.nrOfConcerts = location.dataValues.concerts.length
delete location.dataValues.concerts
}
}
// for (let city of cities) {
// for (let location of city.dataValues.locations) {
// location.dataValues.nrOfConcerts = location.dataValues.concerts.length
// delete location.dataValues.concerts
// }
// }
res.status(200).json(cities)
})
})

36
software/backend/routes/location.routes.ts
View File

@@ -20,7 +20,12 @@ location.get("/", (req: Request, res: Response) => {
City,
{
model: Concert,
include: [ Event ],
include: [
{
model: Event,
include: [ Band ]
}
],
attributes: {
exclude: [ "locationId", "tourId" ]
}
@@ -40,18 +45,6 @@ location.get("/", (req: Request, res: Response) => {
}
})
.then(async locations => {
for (let location of locations) {
for (let concert of location.dataValues.concerts) {
let event = concert.dataValues.event
await Band.findByPk(event.dataValues.bandId)
.then(band => {
event.dataValues.bandName = band.dataValues.name
delete event.dataValues.bandId
})
}
}
if (sort != undefined) {
locations.sort((location1, location2) => {
if (sort == "desc") {
@@ -77,7 +70,12 @@ location.get("/location/:urlName", (req: Request, res: Response) => {
City,
{
model: Concert,
include: [ Event ],
include: [
{
model: Event,
include: [ Band ]
}
],
attributes: {
exclude: [ "locationId", "tourId" ]
}
@@ -97,16 +95,6 @@ location.get("/location/:urlName", (req: Request, res: Response) => {
}
})
.then(async location => {
for (let concert of location.dataValues.concerts) {
let event = concert.dataValues.event
await Band.findByPk(event.dataValues.bandId)
.then(band => {
event.dataValues.bandName = band.dataValues.name
delete event.dataValues.bandId
})
}
for (let seatGroup of location.dataValues.seatGroups) {
for (let seatRow of seatGroup.dataValues.seatRows) {
for (let seat of seatRow.dataValues.seats) {