@bash-app/bash-common 15.1.2 → 15.3.0

package/package.json

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

package/prisma/schema.prisma

@@ -814,6 +814,7 @@ model Service {
   privacy               Privacy                 @default(Public)
   title                 String
   coverPhoto            String?
+  agreedToAgreement     Boolean?
   media                 Media[]
   serviceTypes          ServiceType[]
   subServiceTypes       SubServiceType[]

package/src/definitions.ts

@@ -11,7 +11,7 @@ import {
   User,
   YearsOfExperience
 } from "@prisma/client";
-import { CheckoutExt } from "./extendedSchemas";
+import { CheckoutExt, PublicUser } from "./extendedSchemas";
 
 export const PASSWORD_MIN_LENGTH = 10 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{${PASSWORD_MIN_LENGTH},}$`);
@@ -87,7 +87,7 @@ export const ASSET_MAX_MD5_BYTE_LENGTH = 1024 * 100; // 100kb
 
 export type DateTimeArgType = Date | string | undefined | null;
 export type RequiredStripeInfoMissingErrorDataType = { [k in keyof User]?: { type: string, label: string } };
-export type ContactOrUser = Contact | User;
+export type ContactOrUser = Contact | PublicUser;
 
 export type FilterFields = {
   price: string[];
@@ -110,7 +110,7 @@ export interface DeletedAndHiddenTiers {
 }
 
 export interface AttendeeOfBashEvent {
-  user: User;
+  user: PublicUser;
   tickets: Ticket[];
 }
 

package/src/extendedSchemas.ts

@@ -40,7 +40,7 @@ export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
   amountOfGuests?: AmountOfGuests;
   recurrence?: Recurrence;
-  creator?: User;
+  creator?: PublicUser;
   ticketTiers: TicketTierExt[];
   media: Media[];
   eventTasks: EventTask[];
@@ -49,17 +49,14 @@ export interface BashEventExt extends BashEvent {
   invitations: InvitationExt[];
 }
 
-export const BASH_EVENT_DATA_TO_SELECT = {
-  creator: {
-    select: FRONT_END_USER_DATA_TO_SELECT
-  }
-}
-
 export const TICKET_TIER_DATA_TO_INCLUDE = {
   promoCodes: true,
 }
 
 export const BASH_EVENT_DATA_TO_INCLUDE = {
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
   targetAudience: true,
   amountOfGuests: true,
   recurrence: true,
@@ -80,7 +77,7 @@ export const BASH_EVENT_DATA_TO_CLONE = [
 ] as const;
 
 export interface BashNotificationExt extends BashNotification {
-  creator?: User;
+  creator?: PublicUser;
   bashEvent?: BashEvent;
   eventTask?: EventTask;
   invitation?: Invitation;
@@ -88,19 +85,33 @@ export interface BashNotificationExt extends BashNotification {
 }
 
 export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
-    bashEvent: {
-      select: {
-        coverPhoto: true,
-      },
+  bashEvent: {
+    select: {
+      coverPhoto: true,
     },
-    creator: {
-      select: {
-        image: true,
-      },
+  },
+  creator: {
+    select: {
+      image: true,
     },
+  },
 
 }
 
+export interface EventTaskExt extends EventTask {
+  creator: PublicUser;
+  assignedTo?: PublicUser | null;
+}
+
+export const EVENT_TASK_DATA_TO_INCLUDE = {
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
+  assignedTo: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  }
+}
+
 type RemoveCommonProperties<T, U> = keyof (Omit<T, keyof U> & Omit<U, keyof T>);
 type UnionFromArray<T extends ReadonlyArray<any>> = T[number];
 type BashEventExtMinusDataToCloneType = Omit<BashEventExt, UnionFromArray<typeof BASH_EVENT_DATA_TO_CLONE>>;
@@ -122,7 +133,7 @@ export const VENUE_DATA_TO_INCLUDE = {
 }
 
 export interface ServiceExt extends Service {
-  owner: User;
+  owner: PublicUser;
   media: Media[];
   crowdSize: ServiceRange;
   serviceRange: ServiceRange;
@@ -155,15 +166,19 @@ export const SERVICE_DATA_TO_INCLUDE = {
 }
 
 export interface InvitationExt extends Invitation {
-  creator: User;
-  sentTo: User;
+  creator: PublicUser;
+  sentTo: PublicUser;
   tickets: Ticket[];
   associatedBash?: AssociatedBash | null;
 }
 
 export const INVITATION_DATA_TO_INCLUDE = {
-  creator: true,
-  sentTo: true,
+  creator: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
+  sentTo: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
   tickets: true,
 }
 
@@ -193,13 +208,13 @@ export interface TicketTierExt extends TicketTier {
 }
 
 export interface TicketExt extends Ticket {
-  owner: User;
-  forUser: User;
+  owner: PublicUser;
+  forUser: PublicUser;
   checkout?: Checkout;
 }
 
 export interface CheckoutExt extends Checkout {
-  owner: User;
+  owner: PublicUser;
   tickets: Ticket[]
 }
 
@@ -232,13 +247,13 @@ export interface UserExtraData extends User {
 }
 
 export interface UserExt extends User {
-  services?: Service[];
+  services?: Service[] | null;
 
   // Do not include in fetch as there could be thousands of these
-  associatedBashes?: AssociatedBash[]
-  reviews?: ReviewExt[];
-  contacts?: Contact[];
-  ticketsIOwn?: TicketExt[];
+  associatedBashes?: AssociatedBash[] | null;
+  reviews?: ReviewExt[] | null;
+  contacts?: Contact[] | null;
+  ticketsIOwn?: TicketExt[] | null;
 }
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
@@ -250,5 +265,5 @@ export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
 }
 
 
-export type Public_User = Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>
+export type PublicUser = Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>
   & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;

package/src/utils/apiUtils.ts

@@ -1,8 +1,8 @@
 import {BashEvent, Contact, User } from "@prisma/client";
 import {ContactOrUser} from "../definitions";
-import {Public_User} from "../extendedSchemas";
+import {PublicUser} from "../extendedSchemas";
 
-type CombinedUser = User | Public_User;
+type CombinedUser = User | PublicUser;
 type CombinedUserOrContact = CombinedUser | Contact;
 
 export function isContactAndNotUser(contactOrUser: Partial<ContactOrUser>): contactOrUser is Contact {