@bash-app/bash-common 10.5.0 → 10.7.0

package/package.json

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

package/prisma/schema.prisma

@@ -555,6 +555,11 @@ enum BashStatus {
   Published
 }
 
+enum ServiceStatus {
+  Draft
+  Created
+}
+
 model DocumentID {
   id            String  @id @default(cuid())
   givenName     String?
@@ -830,6 +835,7 @@ model Service {
   serviceRange          ServiceRange            @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
   availableDateTimes    String[] /// Stored in format: ["startDateTime,endDateTime",...]
   serviceTargetAudience ServiceTargetAudience[]
+  status                ServiceStatus           @default(Draft)
 
   @@index([email])
   @@index([phone])

package/src/extendedSchemas.ts

@@ -13,7 +13,7 @@ import {
   ServiceTargetAudience,
   Checkout,
   ServiceLink,
-  Link
+  Link,
 } from "@prisma/client";
 
 export const FRONT_END_USER_DATA_TO_SELECT = {
@@ -67,7 +67,6 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
   eventTasks: true,
   media: true,
   promoCodes: true,
-  ...BASH_EVENT_DATA_TO_SELECT,
 }
 
 export const BASH_EVENT_DATA_TO_CLONE = [
@@ -205,6 +204,18 @@ export interface ReviewExt extends Review {
   comments: BashComment[];
 }
 
+export interface ContactExt extends Contact {
+  contactUser: User;
+}
+
+export const CONTACT_DATA_TO_INCLUDE = {
+  user: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
+  media: true
+};
+
+
 export interface UserExtraData extends User {
   password?: string;
   otp?: string;