@bash-app/bash-common 13.10.0 → 13.11.0

package/package.json

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

package/src/definitions.ts

@@ -96,11 +96,13 @@ export type FilterFields = {
   crowd: string[];
   vibe: string[];
   included: string[];
-  hostRating: string[];      
-  specialOffers: string[];   
-  eventFormat: string[];     
+  hostRating: string[];
+  specialOffers: string[];
+  eventFormat: string[];
 };
 
+export type TicketTierWherePriceIsAString = Omit<TicketTier, 'price'> & {price: string} & {cannotDelete: boolean};
+
 export interface DeletedAndHiddenTiers {
   deletedTiers: TicketTier[];
   hiddenTiers: TicketTier[];

package/src/extendedSchemas.ts

@@ -55,11 +55,17 @@ export const BASH_EVENT_DATA_TO_SELECT = {
   }
 }
 
+export const TICKET_TIER_DATA_TO_INCLUDE = {
+  promoCodes: true,
+}
+
 export const BASH_EVENT_DATA_TO_INCLUDE = {
   targetAudience: true,
   amountOfGuests: true,
   recurrence: true,
-  ticketTiers: true,
+  ticketTiers: {
+    include: TICKET_TIER_DATA_TO_INCLUDE
+  },
   eventTasks: true,
   media: true,
 }
@@ -169,7 +175,7 @@ export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
 export interface TicketTierExt extends TicketTier {
   bashEvent: BashEvent;
   tickets: TicketExt[];
-  promoCodes?: BashEventPromoCode[];
+  promoCodes: BashEventPromoCode[];
 }
 
 export interface TicketExt extends Ticket {

package/src/utils/promoCodesUtils.ts

@@ -7,12 +7,8 @@ export function getPromoCodesFromBashEvent(bashEvent: BashEventExt | undefined |
   return ticketTiersWithPromoCode.map(ticketTier => ticketTier.promoCodes).flat() as BashEventPromoCode[] ?? [];
 }
 
-export function updatePromoCodesOnBashEventTicketTiers(bashEvent: BashEventExt | undefined | null, promoCodes: BashEventPromoCode[]): void {
-  bashEvent?.ticketTiers.forEach((tier) => {
-    tier.promoCodes = [];
-    const promoCodeWithUpdatedData = promoCodes.find((pc) => tier.id === pc.id);
-    if (promoCodeWithUpdatedData) {
-      tier.promoCodes.push(promoCodeWithUpdatedData);
-    }
+export function updatePromoCodesOnBashEventTicketTiers(bashEvent: BashEventExt, promoCodes: BashEventPromoCode[]): void {
+  bashEvent.ticketTiers.forEach((tier) => {
+    tier.promoCodes = promoCodes.filter((pc) => tier.id === pc.ticketTierId);
   });
 }