@bash-app/bash-common 29.44.3 → 29.45.0

package/src/index.ts

@@ -1,16 +1,16 @@
-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 "./utils/sortUtils";
-export * from "./utils/apiUtils";
-export * from "./utils/urlUtils";
-export * from "./utils/promoCodesUtils";
-export * from "./utils/service/serviceUtils";
-export * from "./utils/service/venueUtils";
-export * from "./utils/stripeAccountUtils";
+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 "./utils/sortUtils";
+export * from "./utils/apiUtils";
+export * from "./utils/urlUtils";
+export * from "./utils/promoCodesUtils";
+export * from "./utils/service/serviceUtils";
+export * from "./utils/service/venueUtils";
+export * from "./utils/stripeAccountUtils";

package/src/utils/addressUtils.ts

@@ -1,173 +1,173 @@
-import {IAddress} from "../definitions";
-
-const ADDRESS_DELIM = '|';
-
-const googleMapsApiKey = process.env.REACT_APP_GOOGLE_MAP_API_KEY as 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 function addressToDisplayString(address: IAddress): string {
-  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}`;
-}
-
-
-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 {
-    googlePlaceId: place.place_id,
-    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}`);
-  }
-}
+import {IAddress} from "../definitions";
+
+const ADDRESS_DELIM = '|';
+
+const googleMapsApiKey = process.env.REACT_APP_GOOGLE_MAP_API_KEY as 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 function addressToDisplayString(address: IAddress): string {
+  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}`;
+}
+
+
+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 {
+    googlePlaceId: place.place_id,
+    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}`);
+  }
+}

package/src/utils/apiUtils.ts

@@ -1,76 +1,76 @@
-import {BashEvent, Contact, User } from "@prisma/client";
-import {ContactOrUser} from "../definitions";
-import {PublicUser} from "../extendedSchemas";
-
-type CombinedUser = User | PublicUser;
-type CombinedUserOrContact = CombinedUser | Contact;
-
-export function isContactAndNotUser(contactOrUser: Partial<ContactOrUser>): contactOrUser is Contact {
-  return !!(contactOrUser as Contact).contactOwnerId;
-}
-
-export function getUserName(contactOrUser: Partial<CombinedUserOrContact> | undefined): string {
-  if (!contactOrUser) {
-    return '';
-  }
-  if (isContactAndNotUser(contactOrUser)) {
-    return contactOrUser.fullName ?? (contactOrUser as Contact).contactEmail ?? '';
-  }
-  const user = contactOrUser as CombinedUser;
-  const combinedName = user.givenName && user.familyName ? `${user.givenName} ${user.familyName}` : null;
-  return combinedName ?? user.email;
-}
-
-export function getUserImage(contactOrUser: CombinedUserOrContact | undefined): string {
-  if (!contactOrUser) {
-    return '';
-  }
-  const noProfilePicture = '/noProfilePicture.svg';
-  if (isContactAndNotUser(contactOrUser)) {
-    return noProfilePicture;
-  }
-  const user = contactOrUser as CombinedUser;
-  return user.uploadedImage ?? user.image ?? noProfilePicture;
-}
-
-export function getContactOrUserEmail(contactOrUser: Partial<ContactOrUser>): string {
-  return isContactAndNotUser(contactOrUser)
-    ? (contactOrUser as Contact).contactEmail ?? ''
-    : (contactOrUser as User).email;
-}
-
-export function getUserIdAndNotContactId(contactOrUser: Partial<ContactOrUser>): string | null {
-  return isContactAndNotUser(contactOrUser)
-    ? null
-    : (contactOrUser as User).id;
-}
-
-export function getBashEventDetailUrlParamsFromBashEvent(bashEvent: BashEvent | undefined, coverPhoto?: string): string {
-  if (!bashEvent) {
-    return '';
-  }
-  return getBashEventDetailUrlParams(bashEvent.title, bashEvent.description, coverPhoto ?? bashEvent.coverPhoto);
-}
-
-function getBashEventDetailUrlParams(bashEventTitle: string | undefined,
-                                     bashEventDescription: string | undefined | null,
-                                     coverPhoto?: string | null): string {
-  // Don't let the description be huge
-  const desc = bashEventDescription && bashEventDescription.length > 10 ? bashEventDescription?.slice(0, 10) + '...' : bashEventDescription;
-  // Need to add characters if any of the args is undefined or else the params get thrown off
-  const params: string[] = [];
-  if (bashEventTitle) {
-    // params.push(`${URL_PARAMS_BASH_EVENT_TITLE}=${encodeURIComponent(bashEventTitle)}`);
-  }
-  if (desc) {
-    // params.push(`${URL_PARAMS_BASH_EVENT_DESC}=${encodeURIComponent(desc)}`);
-  }
-  if (coverPhoto) {
-    // params.push(`${URL_PARAMS_BASH_EVENT_COVER_PHOTO}=${encodeURIComponent(coverPhoto)}`);
-  }
-  return params.join('&');
-}
-
-export function isProduction(): boolean {
-  return process.env.NODE_ENV === 'production';
-}
+import {BashEvent, Contact, User } from "@prisma/client";
+import {ContactOrUser} from "../definitions";
+import {PublicUser} from "../extendedSchemas";
+
+type CombinedUser = User | PublicUser;
+type CombinedUserOrContact = CombinedUser | Contact;
+
+export function isContactAndNotUser(contactOrUser: Partial<ContactOrUser>): contactOrUser is Contact {
+  return !!(contactOrUser as Contact).contactOwnerId;
+}
+
+export function getUserName(contactOrUser: Partial<CombinedUserOrContact> | undefined): string {
+  if (!contactOrUser) {
+    return '';
+  }
+  if (isContactAndNotUser(contactOrUser)) {
+    return contactOrUser.fullName ?? (contactOrUser as Contact).contactEmail ?? '';
+  }
+  const user = contactOrUser as CombinedUser;
+  const combinedName = user.givenName && user.familyName ? `${user.givenName} ${user.familyName}` : null;
+  return combinedName ?? user.email;
+}
+
+export function getUserImage(contactOrUser: CombinedUserOrContact | undefined): string {
+  if (!contactOrUser) {
+    return '';
+  }
+  const noProfilePicture = '/noProfilePicture.svg';
+  if (isContactAndNotUser(contactOrUser)) {
+    return noProfilePicture;
+  }
+  const user = contactOrUser as CombinedUser;
+  return user.uploadedImage ?? user.image ?? noProfilePicture;
+}
+
+export function getContactOrUserEmail(contactOrUser: Partial<ContactOrUser>): string {
+  return isContactAndNotUser(contactOrUser)
+    ? (contactOrUser as Contact).contactEmail ?? ''
+    : (contactOrUser as User).email;
+}
+
+export function getUserIdAndNotContactId(contactOrUser: Partial<ContactOrUser>): string | null {
+  return isContactAndNotUser(contactOrUser)
+    ? null
+    : (contactOrUser as User).id;
+}
+
+export function getBashEventDetailUrlParamsFromBashEvent(bashEvent: BashEvent | undefined, coverPhoto?: string): string {
+  if (!bashEvent) {
+    return '';
+  }
+  return getBashEventDetailUrlParams(bashEvent.title, bashEvent.description, coverPhoto ?? bashEvent.coverPhoto);
+}
+
+function getBashEventDetailUrlParams(bashEventTitle: string | undefined,
+                                     bashEventDescription: string | undefined | null,
+                                     coverPhoto?: string | null): string {
+  // Don't let the description be huge
+  const desc = bashEventDescription && bashEventDescription.length > 10 ? bashEventDescription?.slice(0, 10) + '...' : bashEventDescription;
+  // Need to add characters if any of the args is undefined or else the params get thrown off
+  const params: string[] = [];
+  if (bashEventTitle) {
+    // params.push(`${URL_PARAMS_BASH_EVENT_TITLE}=${encodeURIComponent(bashEventTitle)}`);
+  }
+  if (desc) {
+    // params.push(`${URL_PARAMS_BASH_EVENT_DESC}=${encodeURIComponent(desc)}`);
+  }
+  if (coverPhoto) {
+    // params.push(`${URL_PARAMS_BASH_EVENT_COVER_PHOTO}=${encodeURIComponent(coverPhoto)}`);
+  }
+  return params.join('&');
+}
+
+export function isProduction(): boolean {
+  return process.env.NODE_ENV === 'production';
+}