@bash-app/bash-common 28.0.0 → 28.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "28.0.0",
+  "version": "28.2.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -788,7 +788,8 @@ model User {
   gender                        Gender?
   sex                           Sex?
   roles                         UserRole[]            @default([User])
-  createdServices               Service[]             @relation("CreatedService") //check: why this and
+  ownedServices                 Service[]             @relation("OwnedService")
+  createdServices               Service[]             @relation("CreatedService")
   createdEvents                 BashEvent[]           @relation("CreatedEvent")
   ticketsISent                  Ticket[]              @relation("TicketsISent")
   ticketsIOwn                   Ticket[]              @relation("TicketsIOwn")
@@ -834,7 +835,7 @@ model User {
   bookingForMe                  Booking[]
   userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
-  VolunteerService              VolunteerService[]
+  volunteerService              VolunteerService[]
 }
 
 model Contact {
@@ -873,8 +874,13 @@ model Service {
   serviceType   ServiceTypes
   serviceStatus ServiceStatus @default(Draft)
 
+  //current owner
   ownerId String?
-  owner   User?   @relation("CreatedService", fields: [ownerId], references: [id])
+  owner   User?   @relation("OwnedService", fields: [ownerId], references: [id])
+
+  //original creator
+  creatorId String?
+  creator   User?   @relation("CreatedService", fields: [creatorId], references: [id])
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt

package/src/extendedSchemas.ts

@@ -173,37 +173,37 @@ export interface ServiceExt extends Service {
 }
 
 export interface EventServiceExt extends EventService {
-  service: Service;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface EntertainmentServiceExt extends EntertainmentService {
-  service: Service;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface ExhibitorExt extends Exhibitor {
-  service: Service;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface SponsorExt extends Sponsor {
-  service: Service;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface VendorExt extends Vendor {
-  service: Service;
+  service: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface VenueExt extends Venue {
-  service?: Service;
+  service?: ServiceExt;
   crowdSize?: AmountOfGuests;
 }
 
 export interface OrganizationExt extends Organization {
-  service?: Service;
+  service?: ServiceExt;
   amountOfGuests?: AmountOfGuests;
 }
 //-----------------------------------------