@bash-app/bash-common 3.1.1 → 3.2.0

package/src/extendedSchemas.ts

@@ -1,153 +1,153 @@
-import {
-  AmountOfGuests,
-  EventTask,
-  AssociatedBash,
-  BashEvent,
-  Invitation,
-  TargetAudience,
-  Ticket,
-  User,
-  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
-  BashNotification, BashEventPromoCode,
-  Reminder
-} from "@prisma/client";
-
-
-export interface BashEventExt extends BashEvent {
-  targetAudience?: TargetAudience;
-  amountOfGuests?: AmountOfGuests;
-  recurrence?: Recurrence;
-  creator?: User;
-  ticketTiers: TicketTierExt[];
-  media: Media[];
-  eventTasks: EventTask[];
-  promoCodes?: BashEventPromoCode[];
-  tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
-  // Do not include in fetch. Could be hundreds of these
-  invitations: InvitationExt[];
-}
-
-export interface BashNotificationsExt extends BashNotification {
-  creator?: User;
-  bashEvent?: BashEvent;
-  eventTask?: EventTask;
-  invitation?: Invitation;
-  reminders?: Reminder[];
-}
-
-export const BASH_EVENT_DATA_TO_INCLUDE = {
-  targetAudience: true,
-  amountOfGuests: true,
-  recurrence: true,
-  ticketTiers: true,
-  creator: true,
-  eventTasks: true,
-  media: true,
-  promoCodes: true,
-}
-
-export const BASH_EVENT_DATA_TO_CLONE = [
-  'targetAudience',
-  'amountOfGuests',
-  'ticketTiers',
-  'media',
-  'recurrence',
-  'invitations',
-  'promoCodes',
-] as const;
-
-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>>;
-
-export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
-  'creator',
-  'eventTasks',
-  'tickets'
-];
-
-export interface InvitationExt extends Invitation {
-  creator: User;
-  sentTo: User;
-  tickets: Ticket[];
-}
-
-export const INVITATION_DATA_TO_INCLUDE = {
-  creator: true,
-  sentTo: true,
-  tickets: true
-}
-
-export interface InvitationExtraData extends Invitation {
-  isFreeGuest?: boolean;
-  isOrganizer?: boolean;
-}
-
-export interface AssociatedBashExt extends AssociatedBash {
-  bashEvent: BashEventExt;
-  invitation: InvitationExt;
-}
-
-
-export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
-  bashEvent: {
-    include: BASH_EVENT_DATA_TO_INCLUDE
-  },
-  invitation: {
-    include: INVITATION_DATA_TO_INCLUDE
-  }
-}
-
-export interface TicketTierExt extends TicketTier {
-  bashEvent: BashEvent;
-  tickets: TicketExt[];
-}
-
-export interface TicketExt extends Ticket {
-  owner: User;
-  forUser: User;
-}
-
-export interface ReviewExt extends Review {
-  comments: BashComment[];
-}
-
-export interface UserExtraData extends User {
-  password: string;
-}
-
-export interface UserExt extends User {
-  services: Service[];
-
-  // Do not include in fetch as there could be thousands of these
-  associatedBashes?: AssociatedBash[]
-  reviews?: ReviewExt[];
-  contacts?: Contact[];
-}
-
-export const USER_DATA_TO_INCLUDE = {
-  services: true,
-}
-
-export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
-  reviews: {
-    include: {
-      comments: true
-    }
-  }
-}
-
-export const PUBLIC_USER_DATA_TO_SELECT = {
-  id: true,
-  email: true,
-  givenName: true,
-  familyName: true,
-  fullName: true,
-  username: true,
-  image: true,
-  uploadedImage: true,
-  services: true,
-}
-
-export type Public_User = Pick<UserExt, keyof typeof PUBLIC_USER_DATA_TO_SELECT>
-  & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;
+import {
+  AmountOfGuests,
+  EventTask,
+  AssociatedBash,
+  BashEvent,
+  Invitation,
+  TargetAudience,
+  Ticket,
+  User,
+  TicketTier, Service, Review, Media, BashComment, Recurrence, Contact,
+  BashNotification, BashEventPromoCode,
+  Reminder
+} from "@prisma/client";
+
+
+export interface BashEventExt extends BashEvent {
+  targetAudience?: TargetAudience;
+  amountOfGuests?: AmountOfGuests;
+  recurrence?: Recurrence;
+  creator?: User;
+  ticketTiers: TicketTierExt[];
+  media: Media[];
+  eventTasks: EventTask[];
+  promoCodes?: BashEventPromoCode[];
+  tickets?: Ticket[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
+  // Do not include in fetch. Could be hundreds of these
+  invitations: InvitationExt[];
+}
+
+export interface BashNotificationsExt extends BashNotification {
+  creator?: User;
+  bashEvent?: BashEvent;
+  eventTask?: EventTask;
+  invitation?: Invitation;
+  reminders?: Reminder[];
+}
+
+export const BASH_EVENT_DATA_TO_INCLUDE = {
+  targetAudience: true,
+  amountOfGuests: true,
+  recurrence: true,
+  ticketTiers: true,
+  creator: true,
+  eventTasks: true,
+  media: true,
+  promoCodes: true,
+}
+
+export const BASH_EVENT_DATA_TO_CLONE = [
+  'targetAudience',
+  'amountOfGuests',
+  'ticketTiers',
+  'media',
+  'recurrence',
+  'invitations',
+  'promoCodes',
+] as const;
+
+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>>;
+
+export const BASH_EVENT_DATA_TO_REMOVE: RemoveCommonProperties<BashEvent, BashEventExtMinusDataToCloneType>[] = [
+  'creator',
+  'eventTasks',
+  'tickets'
+];
+
+export interface InvitationExt extends Invitation {
+  creator: User;
+  sentTo: User;
+  tickets: Ticket[];
+}
+
+export const INVITATION_DATA_TO_INCLUDE = {
+  creator: true,
+  sentTo: true,
+  tickets: true
+}
+
+export interface InvitationExtraData extends Invitation {
+  isFreeGuest?: boolean;
+  isOrganizer?: boolean;
+}
+
+export interface AssociatedBashExt extends AssociatedBash {
+  bashEvent: BashEventExt;
+  invitation: InvitationExt;
+}
+
+
+export const ASSOCIATED_BASH_DATA_TO_INCLUDE = {
+  bashEvent: {
+    include: BASH_EVENT_DATA_TO_INCLUDE
+  },
+  invitation: {
+    include: INVITATION_DATA_TO_INCLUDE
+  }
+}
+
+export interface TicketTierExt extends TicketTier {
+  bashEvent: BashEvent;
+  tickets: TicketExt[];
+}
+
+export interface TicketExt extends Ticket {
+  owner: User;
+  forUser: User;
+}
+
+export interface ReviewExt extends Review {
+  comments: BashComment[];
+}
+
+export interface UserExtraData extends User {
+  password: string;
+}
+
+export interface UserExt extends User {
+  services: Service[];
+
+  // Do not include in fetch as there could be thousands of these
+  associatedBashes?: AssociatedBash[]
+  reviews?: ReviewExt[];
+  contacts?: Contact[];
+}
+
+export const USER_DATA_TO_INCLUDE = {
+  services: true,
+}
+
+export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
+  reviews: {
+    include: {
+      comments: true
+    }
+  }
+}
+
+export const PUBLIC_USER_DATA_TO_SELECT = {
+  id: true,
+  email: true,
+  givenName: true,
+  familyName: true,
+  fullName: true,
+  username: true,
+  image: true,
+  uploadedImage: true,
+  services: true,
+}
+
+export type Public_User = Pick<UserExt, keyof typeof PUBLIC_USER_DATA_TO_SELECT>
+  & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;

package/src/index.ts

@@ -1,9 +1,9 @@
-export * from "./extendedSchemas";
-export * from "./definitions";
-export * from "./utils/ticketListUtils";
-export * from "./utils/dateTimeUtils";
-export * from "./utils/recurrenceUtils";
-export * from "./utils/addressUtils";
-export * from "./utils/paymentUtils";
-export * from "./utils/awsS3Utils";
-export * from "./utils/qrCodeUtils";
+export * from "./extendedSchemas";
+export * from "./definitions";
+export * from "./utils/ticketListUtils";
+export * from "./utils/dateTimeUtils";
+export * from "./utils/recurrenceUtils";
+export * from "./utils/addressUtils";
+export * from "./utils/paymentUtils";
+export * from "./utils/awsS3Utils";
+export * from "./utils/qrCodeUtils";

package/src/utils/addressUtils.ts

@@ -1,173 +1,173 @@
-
-const ADDRESS_DELIM = '|';
-
-const googleMapsApiKey = process.env.REACT_APP_GOOGLE_MAP_API_KEY as string;
-
-
-export interface IAddress {
-  place: string;
-  street: string;
-  city: string;
-  state: string;
-  zipCode: string;
-  country: string;
-}
-
-export function addressHasEnoughDataForGeolocation(address: IAddress): boolean {
-  return !!((address.place && address.city && address.state) || (address.street && address.city && address.state));
-}
-
-export function addressValuesToDatabaseAddressString(addressValues: IAddress): string {
-  const { place = '', street, city, state, zipCode, country } = addressValues;
-  return [place, street, city, state, zipCode, country].join(ADDRESS_DELIM);
-}
-
-export function databaseAddressStringToAddressValues(addressString: string | undefined | null): IAddress {
-  if (addressString) {
-    const addressArray = addressString.split(ADDRESS_DELIM);
-    return {
-      place: addressArray[0],
-      street: addressArray[1],
-      city: addressArray[2],
-      state: addressArray[3],
-      zipCode: addressArray[4],
-      country: 'USA'
-    }
-  }
-  return { place: '', street: '', city: '', state: '', zipCode: '', country: '' };
-}
-
-
-export function databaseAddressStringToOneLineString(addressString: string | undefined | null): string {
-  if (addressString) {
-    const address = databaseAddressStringToAddressValues(addressString);
-    let addressArr = address.place ? [address.place] : [];
-    addressArr = [...addressArr, address.street, address.city, address.state];
-    const addressStr = addressArr.filter((str) => !!str).join(', ');
-    return `${addressStr} ${address.zipCode}`;
-  }
-  return '';
-}
-
-export function databaseAddressStringToDisplayString(addressString: string | undefined | null): string {
-  if (addressString) {
-    const oneLineString = databaseAddressStringToOneLineString(addressString);
-    const formatted = oneLineString.replace(/([A-Z])(?=[A-Z][a-z])/g, "$1 ") // Add space between a single uppercase letter and a capitalized word
-                 .replace(/(\d)(?=[A-Z])/g, "$1 ") // Add space between numbers and letters
-                 .replace(/,/g, ", "); // Add space after commas
-    return formatted;
-  }
-  return '';
-}
-
-
-export async function getAddressFromCoordinates( lat: number, lng: number ): Promise<IAddress> {
-  const apiUrl = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${googleMapsApiKey}&loading=async`;
-  try {
-    const response = await fetch(apiUrl);
-    const data = await response.json();
-    if (data.results.length > 0) {
-      const addressComponents = data.results[0].address_components;
-
-      let street = "";
-      let city = "";
-      let state = "";
-      let zipCode = "";
-
-      addressComponents.forEach((component: any) => {
-        if (component.types.includes("route")) {
-          street = component.long_name;
-        } else if (component.types.includes("locality")) {
-          city = component.long_name;
-        } else if (component.types.includes("administrative_area_level_1")) {
-          state = component.short_name;
-        } else if (component.types.includes("postal_code")) {
-          zipCode = component.long_name;
-        }
-      });
-
-      return { place: '',  street, city, state, zipCode, country: 'USA' };
-    } else {
-      throw new Error("No address found");
-    }
-  } catch (error) {
-    console.error(error);
-    return {
-      place: '',
-      street: "",
-      city: "",
-      state: "",
-      zipCode: "",
-      country: 'USA'
-    };
-  }
-}
-
-export function extractAddressComponents(place: any): IAddress {
-  const addressComponents = place.address_components;
-  let streetNumber = '';
-  let streetName = '';
-  let city = '';
-  let state = '';
-  let zipCode = '';
-  let country = 'USA';
-
-  addressComponents.forEach((component: any) => {
-    const types = component.types;
-    if (types.includes('street_number')) {
-      streetNumber = component.long_name;
-    }
-    if (types.includes('route')) {
-      streetName = component.long_name;
-    }
-    if (types.includes('locality')) {
-      city = component.long_name;
-    }
-    if (types.includes('administrative_area_level_1')) {
-      state = component.short_name;
-    }
-    if (types.includes('postal_code')) {
-      zipCode = component.long_name;
-    }
-    if (types.includes('country')) {
-      country = component.long_name;
-    }
-  });
-
-  const street = `${streetNumber} ${streetName}`.trim();
-
-  return {
-    place: place.name || '',
-    street,
-    city,
-    state,
-    zipCode,
-    country
-  };
-}
-
-
-export async function getGeoCoordinatesFromAddress(address: IAddress): Promise<{lat: number, lng: number} | undefined> {
-  const addressStr = `${address.street}, ${address.city}, ${address.state} ${address.zipCode}, ${address.country}`;
-
-  const response = await fetch(
-    `https://maps.googleapis.com/maps/api/geocode/json?address=${encodeURIComponent(addressStr)}&key=${googleMapsApiKey}`
-  );
-  if (!response.ok) {
-    console.error('Geocode response was not ok for address: ' + addressStr);
-  }
-
-  const data = await response.json();
-
-  if (data.status === 'OK') {
-    if (data.results?.length) {
-      return data.results[0].geometry.location;
-    }
-    else {
-      console.error('Geocode results were empty with address: ' + addressStr);
-    }
-  }
-  else {
-    console.error(`Geocode was not successful with address: ${addressStr}\nfor the following reason: ${data.status}`);
-  }
-}
+
+const ADDRESS_DELIM = '|';
+
+const googleMapsApiKey = process.env.REACT_APP_GOOGLE_MAP_API_KEY as string;
+
+
+export interface IAddress {
+  place: string;
+  street: string;
+  city: string;
+  state: string;
+  zipCode: string;
+  country: string;
+}
+
+export function addressHasEnoughDataForGeolocation(address: IAddress): boolean {
+  return !!((address.place && address.city && address.state) || (address.street && address.city && address.state));
+}
+
+export function addressValuesToDatabaseAddressString(addressValues: IAddress): string {
+  const { place = '', street, city, state, zipCode, country } = addressValues;
+  return [place, street, city, state, zipCode, country].join(ADDRESS_DELIM);
+}
+
+export function databaseAddressStringToAddressValues(addressString: string | undefined | null): IAddress {
+  if (addressString) {
+    const addressArray = addressString.split(ADDRESS_DELIM);
+    return {
+      place: addressArray[0],
+      street: addressArray[1],
+      city: addressArray[2],
+      state: addressArray[3],
+      zipCode: addressArray[4],
+      country: 'USA'
+    }
+  }
+  return { place: '', street: '', city: '', state: '', zipCode: '', country: '' };
+}
+
+
+export function databaseAddressStringToOneLineString(addressString: string | undefined | null): string {
+  if (addressString) {
+    const address = databaseAddressStringToAddressValues(addressString);
+    let addressArr = address.place ? [address.place] : [];
+    addressArr = [...addressArr, address.street, address.city, address.state];
+    const addressStr = addressArr.filter((str) => !!str).join(', ');
+    return `${addressStr} ${address.zipCode}`;
+  }
+  return '';
+}
+
+export function databaseAddressStringToDisplayString(addressString: string | undefined | null): string {
+  if (addressString) {
+    const oneLineString = databaseAddressStringToOneLineString(addressString);
+    const formatted = oneLineString.replace(/([A-Z])(?=[A-Z][a-z])/g, "$1 ") // Add space between a single uppercase letter and a capitalized word
+                 .replace(/(\d)(?=[A-Z])/g, "$1 ") // Add space between numbers and letters
+                 .replace(/,/g, ", "); // Add space after commas
+    return formatted;
+  }
+  return '';
+}
+
+
+export async function getAddressFromCoordinates( lat: number, lng: number ): Promise<IAddress> {
+  const apiUrl = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${googleMapsApiKey}&loading=async`;
+  try {
+    const response = await fetch(apiUrl);
+    const data = await response.json();
+    if (data.results.length > 0) {
+      const addressComponents = data.results[0].address_components;
+
+      let street = "";
+      let city = "";
+      let state = "";
+      let zipCode = "";
+
+      addressComponents.forEach((component: any) => {
+        if (component.types.includes("route")) {
+          street = component.long_name;
+        } else if (component.types.includes("locality")) {
+          city = component.long_name;
+        } else if (component.types.includes("administrative_area_level_1")) {
+          state = component.short_name;
+        } else if (component.types.includes("postal_code")) {
+          zipCode = component.long_name;
+        }
+      });
+
+      return { place: '',  street, city, state, zipCode, country: 'USA' };
+    } else {
+      throw new Error("No address found");
+    }
+  } catch (error) {
+    console.error(error);
+    return {
+      place: '',
+      street: "",
+      city: "",
+      state: "",
+      zipCode: "",
+      country: 'USA'
+    };
+  }
+}
+
+export function extractAddressComponents(place: any): IAddress {
+  const addressComponents = place.address_components;
+  let streetNumber = '';
+  let streetName = '';
+  let city = '';
+  let state = '';
+  let zipCode = '';
+  let country = 'USA';
+
+  addressComponents.forEach((component: any) => {
+    const types = component.types;
+    if (types.includes('street_number')) {
+      streetNumber = component.long_name;
+    }
+    if (types.includes('route')) {
+      streetName = component.long_name;
+    }
+    if (types.includes('locality')) {
+      city = component.long_name;
+    }
+    if (types.includes('administrative_area_level_1')) {
+      state = component.short_name;
+    }
+    if (types.includes('postal_code')) {
+      zipCode = component.long_name;
+    }
+    if (types.includes('country')) {
+      country = component.long_name;
+    }
+  });
+
+  const street = `${streetNumber} ${streetName}`.trim();
+
+  return {
+    place: place.name || '',
+    street,
+    city,
+    state,
+    zipCode,
+    country
+  };
+}
+
+
+export async function getGeoCoordinatesFromAddress(address: IAddress): Promise<{lat: number, lng: number} | undefined> {
+  const addressStr = `${address.street}, ${address.city}, ${address.state} ${address.zipCode}, ${address.country}`;
+
+  const response = await fetch(
+    `https://maps.googleapis.com/maps/api/geocode/json?address=${encodeURIComponent(addressStr)}&key=${googleMapsApiKey}`
+  );
+  if (!response.ok) {
+    console.error('Geocode response was not ok for address: ' + addressStr);
+  }
+
+  const data = await response.json();
+
+  if (data.status === 'OK') {
+    if (data.results?.length) {
+      return data.results[0].geometry.location;
+    }
+    else {
+      console.error('Geocode results were empty with address: ' + addressStr);
+    }
+  }
+  else {
+    console.error(`Geocode was not successful with address: ${addressStr}\nfor the following reason: ${data.status}`);
+  }
+}