diff --git a/misc/database.drawio b/misc/database.drawio index ac00c45..e70c9a1 100644 --- a/misc/database.drawio +++ b/misc/database.drawio @@ -1,99 +1,82 @@ - + - - + + + + + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - + - - + + - + - + - - + + - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + @@ -107,52 +90,52 @@ - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + @@ -163,19 +146,19 @@ - + - - + + - - + + - - + + @@ -185,206 +168,183 @@ - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - - - - + - + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - + - - + + - - + + - - + + @@ -395,11 +355,11 @@ - - + + - - + + @@ -409,15 +369,15 @@ - + - - + + - - + + @@ -433,13 +393,13 @@ - - + + - + @@ -447,25 +407,25 @@ - - + + - - + + - + - - + + - - + + - + @@ -473,19 +433,19 @@ - + - - + + - - + + - + @@ -493,51 +453,51 @@ - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - - + + - - + + @@ -551,19 +511,21 @@ - - + + - + - - + + - - + + + + @@ -577,87 +539,67 @@ - - + + - + - - + + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + @@ -668,21 +610,22 @@ - + - + - - + + - + + - + @@ -690,155 +633,271 @@ - - + + - - - - - + + - - + + - - + + - + - + - + - - + + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - + - + - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/images/database.png b/misc/images/database.png index d9aa36d..7372c99 100644 Binary files a/misc/images/database.png and b/misc/images/database.png differ diff --git a/software/backend/data/orders.json b/software/backend/data/orders.json index 8a1b6fb..20f13e8 100644 --- a/software/backend/data/orders.json +++ b/software/backend/data/orders.json @@ -2,6 +2,7 @@ "orders": [ { "username": "hagemeister93", + "shipped": true, "tickets": [ { "date": "2024-10-18", diff --git a/software/backend/models/acts/bandGenre.model.ts b/software/backend/models/acts/bandGenre.model.ts index 2908164..1930e4d 100644 --- a/software/backend/models/acts/bandGenre.model.ts +++ b/software/backend/models/acts/bandGenre.model.ts @@ -1,4 +1,4 @@ -import { AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table, Unique } from "sequelize-typescript"; +import { Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript"; import { Genre } from "./genre.model"; import { Band } from "./band.model"; diff --git a/software/backend/routes/order.routes.ts b/software/backend/routes/order.routes.ts index 319bd3e..b51e05f 100644 --- a/software/backend/routes/order.routes.ts +++ b/software/backend/routes/order.routes.ts @@ -10,12 +10,35 @@ import { City } from "../models/locations/city.model"; import { Seat } from "../models/locations/seat.model"; import { SeatRow } from "../models/locations/seatRow.model"; import { SeatGroup } from "../models/locations/seatGroup.model"; +import { Account } from "../models/user/account.model"; export const order = Router() // Get all orders order.get("/", (req: Request, res: Response) => { - Order.findAll() + Order.findAll({ + include: [ + Account, + Address, + { + model: Ticket, + include: [ + { + model: Concert, + include: [ + { + model: Band + }, + { + model: Location, + include: [ City ] + } + ] + } + ] + } + ] + }) .then(orders => { res.status(200).json(orders) }) diff --git a/software/src/data/models/ordering/orderModel.ts b/software/src/data/models/ordering/orderModel.ts index d8f01a3..ea059f8 100644 --- a/software/src/data/models/ordering/orderModel.ts +++ b/software/src/data/models/ordering/orderModel.ts @@ -1,8 +1,5 @@ export class OrderModel { id: number - accountId: number orderedAt: string - addressId: number - paymentId: number shipped: boolean } \ No newline at end of file diff --git a/software/src/pages/admin/ordersAdminPage/index.vue b/software/src/pages/admin/ordersAdminPage/index.vue new file mode 100644 index 0000000..09482c0 --- /dev/null +++ b/software/src/pages/admin/ordersAdminPage/index.vue @@ -0,0 +1,67 @@ + + + \ No newline at end of file diff --git a/software/src/router/admin.routes.ts b/software/src/router/admin.routes.ts index 9a949c9..7183295 100644 --- a/software/src/router/admin.routes.ts +++ b/software/src/router/admin.routes.ts @@ -5,6 +5,7 @@ import AccountsAdminPage from "@/pages/admin/accountsAdminPage/index.vue" import GenresAdminPage from "@/pages/admin/genresAdminPage/index.vue" import LocationsAdminPage from "@/pages/admin/locationsAdminPage/index.vue" import FilesAdminPage from "@/pages/admin/filesAdminPage/index.vue" +import OrdersAdminPage from "@/pages/admin/ordersAdminPage/index.vue" export const adminRoutes = [ { @@ -34,5 +35,9 @@ export const adminRoutes = [ { path: '/admin/files', component: FilesAdminPage + }, + { + path: '/admin/orders', + component: OrdersAdminPage } ] \ No newline at end of file diff --git a/software/src/stores/order.store.ts b/software/src/stores/order.store.ts index d5904ce..532821e 100644 --- a/software/src/stores/order.store.ts +++ b/software/src/stores/order.store.ts @@ -34,6 +34,10 @@ export const useOrderStore = defineStore("orderStore", { .then(res => { this.orders = res.data }) + }, + + async deleteOrder(order: OrderApiModel) { + } } }) \ No newline at end of file