@bash-app/bash-common 29.14.1 → 29.14.3

package/package.json

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

package/prisma/schema.prisma

@@ -594,16 +594,21 @@ enum Privacy {
 }
 
 model TargetAudience {
-  id               String       @id @default(cuid())
-  ageRange         AgeRange[]
-  gender           Gender[]
-  occupation       Occupation[]
-  education        Education[]
-  showOnDetailPage Boolean      @default(true)
-  bashEvent        BashEvent?
-  service          Service?
+  id                String       @id @default(cuid())
+  primaryAgeRange    AgeRange[]
+  secondaryAgeRange  AgeRange[]
+  primaryGender      Gender[]
+  secondaryGender    Gender[]
+  primaryOccupation  Occupation[]
+  secondaryOccupation Occupation[]
+  primaryEducation   Education[]
+  secondaryEducation Education[]
+  showOnDetailPage   Boolean      @default(true)
+  bashEvent          BashEvent?
+  service            Service?
 }
 
+
 enum AgeRange {
   Sixteen_17
   Eighteen_20

package/src/definitions.ts

@@ -102,6 +102,62 @@ export const SERVICE_DATA_TO_INCLUDE = {
   },
 } satisfies Prisma.ServiceInclude;
 
+// export type ServiceSpecificName = keyof Pick<
+//   ServiceExt,
+//   "eventService" | 
+//   "entertainmentService" | 
+//   "vendor" | 
+//   "exhibitor" | 
+//   "sponsor" | 
+//   "venue" | 
+//   "organization"
+// >;
+
+// Define the keys and values in a single object
+const serviceKeysObject = {
+  eventService: true,
+  entertainmentService: true,
+  vendor: true,
+  exhibitor: true,
+  sponsor: true,
+  venue: true,
+  organization: true,
+} as const;
+
+export type ServiceSpecificName = keyof typeof serviceKeysObject;
+
+const serviceKeysArray = Object.keys(serviceKeysObject);
+
+// Create the final object dynamically
+function createAllTrueObject<T extends string>(keys: T[]): Record<T, true> {
+  return keys.reduce((acc, key) => {
+    acc[key] = true;
+    return acc;
+  }, {} as Record<T, true>);
+}
+
+export type ServiceSpecificType = ServiceExt[ServiceSpecificName];
+
+export const serviceTypeToField = (serviceType : ServiceTypes) : ServiceSpecificName => {
+  const specificServiceMap : Record<ServiceTypes, ServiceSpecificName> = {
+    "EventServices": "eventService",
+    "EntertainmentServices": "entertainmentService",
+    "Vendors": "vendor",
+    "Exhibitors": "exhibitor",
+    "Sponsors": "sponsor",
+    "Venues": "venue",
+    "Organizations": "organization"
+  };
+
+  return specificServiceMap[serviceType];
+}
+
+//full service data to include, includes specific service data
+export const SERVICE_FULL_DATA_TO_INCLUDE = {
+  ...SERVICE_DATA_TO_INCLUDE,
+  ...createAllTrueObject(serviceKeysArray)
+} satisfies Prisma.ServiceInclude;
+
 export const VENUE_DATA_TO_INCLUDE = {
 
 } satisfies Prisma.VenueInclude;
@@ -523,31 +579,4 @@ export interface IAddress {
   state: string;
   zipCode: string;
   country: string;
-}
-
-export type ServiceSpecificName = keyof Pick<
-  ServiceExt,
-  "eventService" | 
-  "entertainmentService" | 
-  "vendor" | 
-  "exhibitor" | 
-  "sponsor" | 
-  "venue" | 
-  "organization"
->;
-
-export type ServiceSpecificType = ServiceExt[ServiceSpecificName];
-
-export const serviceTypeToField = (serviceType : ServiceTypes) : ServiceSpecificName => {
-  const specificServiceMap : Record<ServiceTypes, ServiceSpecificName> = {
-    "EventServices": "eventService",
-    "EntertainmentServices": "entertainmentService",
-    "Vendors": "vendor",
-    "Exhibitors": "exhibitor",
-    "Sponsors": "sponsor",
-    "Venues": "venue",
-    "Organizations": "organization"
-  };
-
-  return specificServiceMap[serviceType];
 }