Filterable tours

software/src/data/models/acts/bandModel.ts

@@ -1,5 +1,3 @@
-import { GenreModel } from "./genreModel"
-import { MemberModel } from "./memberModel"
 import { RatingModel } from "./ratingModel"
 
 export class BandModel {
@@ -11,8 +9,11 @@ export class BandModel {
   images: Array<string>
   logo: string
   ratings: Array<RatingModel>
-  members: Array<MemberModel>
-  genres: {
+  members: Array<{
+    name: string,
+    image: string
+  }>
+  genres: Array<{
     name: string
-  }
+  }>
 }

software/src/data/models/acts/genreModel.ts

@@ -1,4 +1,3 @@
-import { MemberModel } from "./memberModel"
 import { RatingModel } from "./ratingModel"
 
 export class GenreModel {
@@ -7,13 +6,9 @@ export class GenreModel {
   bands: Array<
     {
       name: string
-      foundingYear: number
-      descriptionEn: string
-      descriptionDe: string
       images: Array<string>
       logo: string
       ratings: Array<RatingModel>
-      members: Array<MemberModel>
     }
   >
 }

software/src/data/models/acts/locationModel.ts

@@ -4,7 +4,6 @@ export class LocationModel {
   address: string
   image: string
   city: {
-    id: number
     name: string
     country: string
   }

software/src/data/models/acts/tourModel.ts

@@ -7,5 +7,5 @@ export class TourModel {
   offered: boolean
   band: BandModel
   image: string
-  shows: Array<ConcertModel>
+  concerts: Array<ConcertModel>
 }

software/src/data/models/memberModel.ts

@@ -1,7 +0,0 @@
-import { BandModel } from "./bandModel"
-
-export class MemberModel {
-  id: Number
-  name: string
-  image: string
-}

software/src/data/models/ordering/basketItemModel.ts

@@ -1,4 +1,4 @@
-import { ConcertModel } from "./concertModel"
+import { ConcertModel } from "../acts/concertModel"
 
 export class BasketItemModel {
   id: number = -1

software/src/data/models/ordering/orderItemModel.ts

@@ -1,4 +1,4 @@
-import { ConcertModel } from "./concertModel"
+import { ConcertModel } from "../acts/concertModel"
 
 export class OrderItemModel {
   orderId: number = -1

software/src/data/models/ordering/orderModel.ts

@@ -1,6 +1,6 @@
-import { AddressModel } from "./addressModel"
+import { AddressModel } from "../user/addressModel"
 import { OrderItemModel } from "./orderItemModel"
-import { PaymentModel } from "./paymentModel"
+import { PaymentModel } from "../user/paymentModel"
 
 export class OrderModel {
   id: number