@bash-app/bash-common 29.22.2 → 29.22.4

package/package.json

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

package/prisma/schema.prisma

@@ -881,7 +881,6 @@ model User {
   userSubscription              UserSubscription?
   serviceSubcriptions           ServiceSubscription[]
   volunteerService              VolunteerService[]
-  // rate                          Rate[]
   stripeAccounts                StripeAccount[]
 }
 

package/src/extendedSchemas.ts

@@ -108,6 +108,32 @@ export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEv
   'amountOfGuests',
 ];
 
+export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
+  serviceAddons: true
+} satisfies Prisma.ServicePackageInclude;
+
+export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceDailyRatesInclude;
+
+export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
+  serviceRate: true
+} satisfies Prisma.ServiceSpecialRatesInclude;
+
+export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
+  serviceGeneralRates: true,
+  serviceDailyRates: {
+    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
+  },
+  serviceSpecialRates: {
+    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
+  },
+  addons: true,
+  packages:  {
+    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
+  },
+} satisfies Prisma.ServiceRatesAssociationInclude;
+
 export const SERVICE_DATA_TO_INCLUDE = {
   creator: {
     select: FRONT_END_USER_DATA_TO_SELECT
@@ -128,7 +154,9 @@ export const SERVICE_DATA_TO_INCLUDE = {
   serviceLinks: {
     include: SERVICE_LINK_DATA_TO_INCLUDE
   },
-  serviceRatesAssociation: true
+  serviceRatesAssociation: {
+    include: SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE
+  }
 } satisfies Prisma.ServiceInclude;
 
 // Create the final object dynamically
@@ -177,32 +205,6 @@ export const SERVICE_FULL_DATA_TO_INCLUDE = {
   ...createAllTrueObject(serviceKeysArray)
 } satisfies Prisma.ServiceInclude;
 
-export const SERVICE_PACKAGE_DATA_TO_INCLUDE = {
-  serviceAddons: true
-} satisfies Prisma.ServicePackageInclude;
-
-export const SERVICE_DAILYRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
-} satisfies Prisma.ServiceDailyRatesInclude;
-
-export const SERVICE_SPECIALRATES_DATA_TO_INCLUDE = {
-  serviceRate: true
-} satisfies Prisma.ServiceSpecialRatesInclude;
-
-export const SERVICE_RATES_ASSOCIATION_DATA_TO_INCLUDE = {
-  serviceGeneralRates: true,
-  serviceDailyRates: {
-    include: SERVICE_DAILYRATES_DATA_TO_INCLUDE
-  },
-  serviceSpecialRates: {
-    include: SERVICE_SPECIALRATES_DATA_TO_INCLUDE
-  },
-  addons: true,
-  packages:  {
-    include: SERVICE_PACKAGE_DATA_TO_INCLUDE
-  },
-} satisfies Prisma.ServiceRatesAssociationInclude;
-
 export interface BashNotificationExt extends BashNotification {
   creator?: PublicUser;
   bashEvent?: BashEvent;
@@ -469,6 +471,8 @@ export interface UserExt extends User {
   reviews?: ReviewExt[] | null;
   contacts?: Contact[] | null;
   ticketsIOwn?: TicketExt[] | null;
+  ownedServices: ServiceExt[];
+  createdServices: ServiceExt[];
 }
 
 export const USER_DATA_SELECT_REVIEWS_COMMENTS = {

package/src/utils/dateTimeUtils.ts

@@ -167,6 +167,12 @@ export function formatDateTimeToTimeString(date: Date | string | undefined | nul
   return result;
 }
 
+export function formatDateTimeToTimeString24hr(date: Date | string | undefined | null): string {
+  date = new Date(date ?? Date.now());
+  const result = dayjs(date).format("h:mm");
+  return result;
+}
+
 export function parseTimeString(timeStr: string): ITime | null {
   const match = timeStr.match(PARSE_TIME_REG);