@bash-app/bash-common 27.3.3 → 27.5.0

package/package.json

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

package/prisma/schema.prisma

@@ -17,7 +17,7 @@ model Club {
   street  String
   userId  String
   price   Int?
-  events  BashEvent[] 
+  events  BashEvent[]
   members ClubMember[]
   admin   ClubAdmin[]
 }
@@ -895,15 +895,16 @@ model AssociatedBash {
 
 model Service {
   id                    String                 @id @default(cuid())
-  // ownerId               String
-  // owner                 User                   @relation(fields: [ownerId], references: [id], onDelete: Cascade)
+  // userId                String
+  // user                  User                   @relation(fields: [userId], references: [id], onDelete: Cascade)
   // stripeServiceCustomerId              String?               @unique
   stripeBusinessId      String                 @unique
   // stripeBusinessType  String  @default("Individual")
-  serviceType ServiceTypes
+  serviceType           ServiceTypes
   creatorId             String
   creator               User                   @relation("CreatedService", fields: [creatorId], references: [id], onDelete: Cascade)
-  dateCreated           DateTime               @default(now())
+  createdAt           DateTime               @default(now())
+  updatedAt DateTime  @updatedAt
   email                 String
   place                 String?
   street                String
@@ -977,7 +978,7 @@ model VolunteerService {
   address            String?
   email              String?
   phone              String?
-  agreedToAgreement  Boolean?                 @default(false)
+  agreedToAgreement  Boolean?                @default(false)
   description        String?
   status             VolunteerServiceStatus?
 }

package/src/definitions.ts

@@ -91,7 +91,7 @@ export type ContactOrUser = Contact | PublicUser;
 export type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
 export type ValueOf<T> = T[keyof T];
 
-export type ValueOfServiceType = ValueOf<typeof ServiceTypes>;
+export type ValueOfServiceType = typeof ServiceTypes[keyof typeof ServiceTypes];
 
 export const ServiceTypes = {
   'EventServices': 'eventServices',
@@ -101,12 +101,14 @@ export const ServiceTypes = {
   'Sponsors': 'sponsors',
   'Exhibitors': 'exhibitors',
   'EntertainmentServices': 'entertainmentServices',
-} satisfies {[key: string]: keyof ServiceExt}
+} as const;
 
-// export const ServiceStatus = {
-//   'Draft': 'draft',
-//   'Created': 'created',
-// } satisfies {[key: string]: keyof Service}
+export type ValueOfServiceStatus = typeof ServiceStatus[keyof typeof ServiceStatus];
+
+export const ServiceStatus = {
+  'Draft': 'draft',
+  'Created': 'created',
+} as const;
 
 export type FilterFields = {
   price: string[];