Merge branch 'bonapp-fix-menus' into frogpond-data

* bonapp-fix-menus:
  prettify globals
  switch to naming menus
  switch to naming olaf menus

Author: hawkrives

source/globals.js

@@ -3,13 +3,13 @@
 import qs from 'querystring'
 
 const root = 'https://stolaf.api.frogpond.tech/v1'
-export const API = (pth: string, query: ?Object=null) => {
+export const API = (pth: string, query: ?Object = null) => {
 	if (process.env.NODE_ENV !== 'production') {
 		if (!pth.startsWith('/')) {
 			throw new Error('invalid path requested from the api!')
 		}
 	}
-	let url = root + pth 
+	let url = root + pth
 	if (query) {
 		url += `?${qs.stringify(query)}`
 	}

source/views/menus/carleton-menus.js

@@ -11,7 +11,7 @@ export const CarletonBurtonMenuScreen = ({
 	navigation,
 }: TopLevelViewPropsType) => (
 	<BonAppHostedMenu
-		cafeId="35"
+		cafe="burton"
 		loadingMessage={['Searching for Schiller…']}
 		name="Burton"
 		navigation={navigation}
@@ -24,7 +24,7 @@ CarletonBurtonMenuScreen.navigationOptions = {
 
 export const CarletonLDCMenuScreen = ({navigation}: TopLevelViewPropsType) => (
 	<BonAppHostedMenu
-		cafeId="36"
+		cafe="ldc"
 		loadingMessage={['Tracking down empty seats…']}
 		name="LDC"
 		navigation={navigation}
@@ -39,7 +39,7 @@ export const CarletonWeitzMenuScreen = ({
 	navigation,
 }: TopLevelViewPropsType) => (
 	<BonAppHostedMenu
-		cafeId="458"
+		cafe="weitz"
 		loadingMessage={['Observing the artwork…', 'Previewing performances…']}
 		name="Weitz Center"
 		navigation={navigation}
@@ -54,7 +54,7 @@ export const CarletonSaylesMenuScreen = ({
 	navigation,
 }: TopLevelViewPropsType) => (
 	<BonAppHostedMenu
-		cafeId="34"
+		cafe="sayles"
 		loadingMessage={['Engaging in people-watching…', 'Checking the mail…']}
 		name="Sayles Hill"
 		navigation={navigation}

source/views/menus/dev-bonapp-picker.js

@@ -62,7 +62,7 @@ export class BonAppPickerView extends React.PureComponent<Props, State> {
 				</Toolbar>
 				<BonAppHostedMenu
 					key={this.state.cafeId}
-					cafeId={this.state.cafeId}
+					cafe={{id: this.state.cafeId}}
 					loadingMessage={['Loading…']}
 					name="BonApp"
 					navigation={this.props.navigation}

source/views/menus/index.js

@@ -20,7 +20,7 @@ export const MenusView = TabNavigator({
 	StavHallMenuView: {
 		screen: ({navigation}) => (
 			<BonAppHostedMenu
-				cafeId="261"
+				cafe="stav-hall"
 				loadingMessage={[
 					'Hunting Ferndale Turkey…',
 					'Tracking wild vegan burgers…',
@@ -42,7 +42,7 @@ export const MenusView = TabNavigator({
 	TheCageMenuView: {
 		screen: ({navigation}) => (
 			<BonAppHostedMenu
-				cafeId="262"
+				cafe="the-cage"
 				ignoreProvidedMenus={true}
 				loadingMessage={[
 					'Checking for vegan cookies…',

source/views/menus/menu-bonapp.js

@@ -5,8 +5,8 @@ import {NoticeView} from '../components/notice'
 import type {TopLevelViewPropsType} from '../types'
 import {FancyMenu} from './components/fancy-menu'
 import type {
-	BonAppMenuInfoType as MenuInfoType,
-	BonAppCafeInfoType as CafeInfoType,
+	EditedBonAppMenuInfoType as MenuInfoType,
+	EditedBonAppCafeInfoType as CafeInfoType,
 	StationMenuType,
 	ProcessedMealType,
 	DayPartMenuType,
@@ -45,13 +45,13 @@ const DEFAULT_MENU = [
 ]
 
 type Props = TopLevelViewPropsType & {
-	cafeId: string,
+	cafe: string | {id: string},
 	ignoreProvidedMenus?: boolean,
 	loadingMessage: string[],
 	name: string,
 }
 type State = {
-	cachedCafeId: string,
+	cachedCafe: string | {id: string},
 	errormsg: ?string,
 	loading: boolean,
 	refreshing: boolean,
@@ -62,7 +62,7 @@ type State = {
 
 export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 	state = {
-		cachedCafeId: this.props.cafeId,
+		cachedCafe: this.props.cafe,
 		errormsg: null,
 		loading: true,
 		refreshing: false,
@@ -78,7 +78,12 @@ export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 	}
 
 	componentDidUpdate() {
-		if (this.state.cachedCafeId !== this.props.cafeId) {
+		if (
+			(typeof this.state.cachedCafe === 'string' &&
+				this.state.cachedCafe !== this.props.cafe) ||
+			(typeof this.state.cachedCafe !== 'string' &&
+				this.state.cachedCafe.id !== this.props.cafe.id)
+		) {
 			this.fetchData(this.props)
 		}
 	}
@@ -89,17 +94,26 @@ export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 		})
 	}
 
-	requestMenu = (cafeId: string) => () => fetchJson(API(`/food/menu/${cafeId}`))
-	requestCafe = (cafeId: string) => () => fetchJson(API(`/food/cafe/${cafeId}`))
-
 	fetchData = async (props: Props) => {
 		let cafeMenu: ?MenuInfoType = null
 		let cafeInfo: ?CafeInfoType = null
 
+		let menuUrl
+		let cafeUrl
+		if (typeof props.cafe === 'string') {
+			menuUrl = API(`/food/named/menu/${props.cafe}`)
+			cafeUrl = API(`/food/named/cafe/${props.cafe}`)
+		} else if (props.cafe.hasOwnProperty('id')) {
+			menuUrl = API(`/food/menu/${props.cafe.id}`)
+			cafeUrl = API(`/food/cafe/${props.cafe.id}`)
+		} else {
+			throw new Error('invalid cafe passed to BonappMenu!')
+		}
+
 		try {
 			;[cafeMenu, cafeInfo] = await Promise.all([
-				retry(this.requestMenu(props.cafeId), {retries: 3}),
-				retry(this.requestCafe(props.cafeId), {retries: 3}),
+				retry(() => fetchJson(menuUrl), {retries: 3}),
+				retry(() => fetchJson(cafeUrl), {retries: 3}),
 			])
 		} catch (error) {
 			if (error.message === "JSON Parse error: Unrecognized token '<'") {
@@ -129,11 +143,8 @@ export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 		this.setState(() => ({refreshing: false}))
 	}
 
-	findCafeMessage(cafeId: string, cafeInfo: CafeInfoType, now: momentT) {
-		const actualCafeInfo = cafeInfo.cafes[cafeId]
-		if (!actualCafeInfo) {
-			return 'BonApp did not return a menu for that café'
-		}
+	findCafeMessage(cafeInfo: CafeInfoType, now: momentT) {
+		const actualCafeInfo = cafeInfo.cafe
 
 		const todayDate = now.format('YYYY-MM-DD')
 		const todayMenu = actualCafeInfo.days.find(({date}) => date === todayDate)
@@ -199,16 +210,15 @@ export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 
 	getMeals(args: {
 		cafeMenu: MenuInfoType,
-		cafeId: string,
 		ignoreProvidedMenus: boolean,
 		foodItems: MenuItemContainerType,
 	}) {
-		const {cafeMenu, cafeId, ignoreProvidedMenus, foodItems} = args
+		const {cafeMenu, ignoreProvidedMenus, foodItems} = args
 
 		// We hard-code to the first day returned because we're only requesting
 		// one day. `cafes` is a map of cafe ids to cafes, but we only request one
 		// cafe at a time, so we just grab the one we requested.
-		const dayparts = cafeMenu.days[0].cafes[cafeId].dayparts
+		const dayparts = cafeMenu.days[0].cafe.dayparts
 
 		// either use the meals as provided by bonapp, or make our own
 		const mealInfoItems = dayparts[0].length ? dayparts[0] : DEFAULT_MENU
@@ -243,30 +253,31 @@ export class BonAppHostedMenu extends React.PureComponent<Props, State> {
 		}
 
 		if (!this.state.cafeMenu || !this.state.cafeInfo) {
-			const err = new Error(
-				`Something went wrong loading BonApp cafe #${this.props.cafeId}`,
-			)
+			let cafe =
+				typeof this.props.cafe === 'string'
+					? this.props.cafe
+					: this.props.cafe.id
+			const err = new Error(`Something went wrong loading BonApp cafe #${cafe}`)
 			tracker.trackException(err.message)
 			bugsnag.notify(err)
 
 			const msg = 'Something went wrong. Email [email protected] to let them know?'
 			return <NoticeView text={msg} />
 		}
 
-		const {cafeId, ignoreProvidedMenus = false} = this.props
+		const {ignoreProvidedMenus = false} = this.props
 		const {now, cafeMenu, cafeInfo} = this.state
 
 		// We grab the "today" info from here because BonApp returns special
 		// messages in this response, like "Closed for Christmas Break"
-		const specialMessage = this.findCafeMessage(cafeId, cafeInfo, now)
+		const specialMessage = this.findCafeMessage(cafeInfo, now)
 
 		// prepare all food items from bonapp for rendering
 		const foodItems = this.prepareFood(cafeMenu)
 
 		const meals = this.getMeals({
 			foodItems,
 			ignoreProvidedMenus,
-			cafeId,
 			cafeMenu,
 		})
 

source/views/menus/types.js

@@ -78,12 +78,23 @@ export type MenuForDayType = {
 	cafes: {[key: string]: CafeMenuType},
 }
 
+export type EditedMenuForDayType = {
+	date: string,
+	cafe: CafeMenuType,
+}
+
 export type BonAppMenuInfoType = {
 	cor_icons: {[key: string]: Object},
 	days: MenuForDayType[],
 	items: MenuItemContainerType,
 }
 
+export type EditedBonAppMenuInfoType = {
+	cor_icons: {[key: string]: Object},
+	days: EditedMenuForDayType[],
+	items: MenuItemContainerType,
+}
+
 export type CorIconType = {
 	sort: string,
 	label: string,
@@ -99,43 +110,49 @@ export type ItemCorIconMapType =
 	| Array<void>
 export type MasterCorIconMapType = {[key: NumericStringType]: CorIconType}
 
-export type BonAppCafeInfoType = {
-	cafes: {
-		[key: string]: {
-			name: string,
-			address: string,
-			city: string,
-			state: string,
-			zip: string,
-			latitude: string,
-			longitude: string,
-			description: string,
-			message: string,
-			eod: string,
-			timezone: string,
-			menu_type: string,
-			menu_html: string,
-			weekly_schedule: string,
-			days: [
+type BonAppSingleCafeInfo = {
+	name: string,
+	address: string,
+	city: string,
+	state: string,
+	zip: string,
+	latitude: string,
+	longitude: string,
+	description: string,
+	message: string,
+	eod: string,
+	timezone: string,
+	menu_type: string,
+	menu_html: string,
+	weekly_schedule: string,
+	days: [
+		{
+			date: string,
+			dayparts: [
 				{
-					date: string,
-					dayparts: [
-						{
-							id: string,
-							starttime: string,
-							endtime: string,
-							message: string,
-							label: string,
-						},
-					],
-					status: 'open' | 'closed' | string,
-					message: false | string,
+					id: string,
+					starttime: string,
+					endtime: string,
+					message: string,
+					label: string,
 				},
 			],
+			status: 'open' | 'closed' | string,
+			message: false | string,
 		},
+	],
+}
+
+export type BonAppCafeInfoType = {
+	cafes: {
+		[key: string]: BonAppSingleCafeInfo,
 	},
 }
 
+export type EditedBonAppCafeInfoType = {
+	cafe: BonAppSingleCafeInfo,
+}
+
 export type ProcessedMealType = {|
 	starttime: MilitaryTimeStringType,
 	endtime: MilitaryTimeStringType,