README.md

@@ -1,47 +1,17 @@
-
-```plantuml
-@startuml
-object location {
-  address
-  phone
-  id
-}
-
-object whisky {
-  label
-  price
-  average[52] : statewide average count per week
-  id
-  location[] --> location : count
-}
-
-object client 
-object server
-
-object user {
-  location
-  radius
-  whisky[]
-}
-user --> whisky : monitor
-
-@enduml
-```
-
 # Whisky Business
 
-Launch GraphQL server:
-
-```bash
-npm start
-```
-
 Refresh the OLCC DB:
 
 ```bash
 node whisky.js
 ```
 
+Launch GraphQL server:
+
+```bash
+npm start
+```
+
 Launch website:
 
 ```bash

graphql/whisky.js

@@ -53,9 +53,7 @@ const WhiskyType = new graphql.GraphQLObjectType({
     lastSeen: { type: graphql.GraphQLString },
     size: { type: graphql.GraphQLInt },      
     price: { type: graphql.GraphQLFloat },
-    inventories: { type: graphql.GraphQLList(InventoryType) },
+    inventories: { type: graphql.GraphQLList(InventoryType) }
-    quantity: { type: graphql.GraphQLInt },
-    updated: { type: graphql.GraphQLString }
   })
 });
 
@@ -93,9 +91,7 @@ const buildWhiskies = (rows) => {
         price: row.price, 
         size: row.size, 
         code: row.code,
-        inventories: [],
+        inventories: []
-        quantity: 0,
-        updated: 0
       }
       whiskies[row.code] = whisky;
     } else {
@@ -114,8 +110,6 @@ const buildWhiskies = (rows) => {
         quantity: row.quantity,
         updated: row.updated
       });
-      whisky.updated = (new Date(row.updated) > new Date(whisky.updated)) ? row.updated : whisky.updated;
-      whisky.quantity += row.quantity;
     }
   });
   const results = [];
@@ -182,20 +176,14 @@ var queryType = new graphql.GraphQLObjectType({
   fields: {
     Whiskies: {
       type: graphql.GraphQLList(WhiskyType),
-      args: {
+      resolve: (root, args, context, info) => {
-        code: { type: graphql.GraphQLString },
-      },
-      resolve: (root, {code}, context, info) => {
         return new Promise((resolve, reject) => {
-          if (code && code.trim() != "") {
-            code = `${code.replace(/%/g, '')}%`;
-          }
           database.all(
-            "SELECT w.*,i.quantity,i.updated " +
+            "SELECT w.*,l.code AS 'location',l.address,l.city,l.phone,l.latitude,l.longitude,i.quantity,i.updated " +
             "FROM Whiskies AS w " +
-            "LEFT JOIN Inventories AS i ON w.code=i.whisky " +
+            "LEFT JOIN Inventories AS i ON w.code=i.whisky "+
-            (code ? "WHERE w.code LIKE (?) OR w.description LIKE (?)" : "") +
+            "LEFT JOIN Locations AS l ON l.code=i.location " +
-            ";", [code, code], function(err, rows) {  
+            ";", function(err, rows) {  
             if (err) { console.error(err); return reject(null); }
             resolve(buildWhiskies(rows));
           });
@@ -210,9 +198,9 @@ var queryType = new graphql.GraphQLObjectType({
       resolve: (root, {code}, context, info) => {
         return new Promise((resolve, reject) => {
           database.all(
-            "SELECT w.*,l.code AS 'location',l.address,l.city,l.phone,l.latitude,l.longitude,i.quantity,i.updated " +
+            "SELECT w.*,l.code AS 'location',l.address,l.city,l.phone,l.latitude,l.longitude,i.quantity,i.updated "+
             "FROM Whiskies AS w " +
-            "LEFT JOIN Inventories AS i ON w.code=i.whisky " +
+            "LEFT JOIN Inventories AS i ON w.code=i.whisky "+
             "LEFT JOIN Locations AS l ON l.code=i.location " +
             "WHERE w.code = (?);", [code], function(err, rows) {  
             if (err) { console.error(err); return reject(null); }

whisky-business/App.tsx

@@ -1,6 +1,6 @@
 import { StatusBar } from 'expo-status-bar';
-import React, { useState, useReducer } from 'react';
+import React, { useState } from 'react';
-import { StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import { request, GraphQLClient, gql } from 'graphql-request';
 import moment from 'moment';
 import { buildExecutionContext } from 'graphql/execution/execute';
@@ -14,22 +14,20 @@ const Whisky = (props : { active?: boolean, whisky: any, style: any }) => {
 
   const locations: any[] = [];
 
-  if (whisky.inventories) {
+  whisky.inventories.forEach((item : { location: any, quantity: number, updated: string }) => {
-    whisky.inventories.forEach((item : { location: any, quantity: number, updated: string }) => {
+    quantity += item.quantity;
-      quantity += item.quantity;
+    const updated = moment(item.updated, 'YYYY-MM-DD');
-      const updated = moment(item.updated, 'YYYY-MM-DD');
+    if (time < updated) {
-      if (time < updated) {
+      time = updated;
-        time = updated;
+    }
-      }
+    locations.push(
-      locations.push(
+      <View key={item.location.code} style={[styles.horizontal,styles.container]}>
-        <View key={item.location.code} style={[styles.horizontal,styles.container]}>
+        <Text style={whiskyStyles.address}>{item.location.address}</Text>
-          <Text style={whiskyStyles.address}>{item.location.address}</Text>
+        <Text style={whiskyStyles.phone}>{item.location.phone}</Text>
-          <Text style={whiskyStyles.phone}>{item.location.phone}</Text>
+        <Text style={whiskyStyles.quantity}>{item.quantity}</Text>
-          <Text style={whiskyStyles.quantity}>{item.quantity}</Text>
+      </View>
-        </View>
+    )
-      )
+  });
-    });
-  }
   const date = (time.unix() == 0) ? "" : time.format("YYYY-MM-DD");
     
   return (
@@ -38,7 +36,7 @@ const Whisky = (props : { active?: boolean, whisky: any, style: any }) => {
         <View style={whiskyStyles.code}><Text>{whisky.code}</Text></View>
         <View style={whiskyStyles.description}><Text>{whisky.description}</Text></View>
         <View style={whiskyStyles.date}><Text>{date}</Text></View>
-        <View style={whiskyStyles.quantity}><Text>{whisky.quantity}</Text></View>
+        <View style={whiskyStyles.quantity}><Text>{quantity}</Text></View>
       </View>
       { props.active && <View style={styles.vertical}>
         { locations }
@@ -86,63 +84,14 @@ const whiskyStyles = StyleSheet.create({
 
 export default function App() {
   const [whiskies, setWhiskies] = useState<any>(null),
-    [search, setSearch] = useState<string>(""),
-    [lastSearch, setLastSearch] = useState<string>(""),
     [activeWhisky, setActiveWhisky] = useState<string>("");
-  
-  const [, forceUpdate] = useReducer(x => x + 1, 0);
-
-  const updateWhisky = (code : string) => {
-    const query = gql` {
-      Whisky(code: "${code}") {
-        inventories {
-          location {
-            code
-            address
-            city
-            phone
-            longitude
-            latitude
-          }
-          quantity
-          updated
-        }
-        code
-        size
-        description
-        updated
-        quantity
-      }
-    }`;
-    
-    client.request(query)
-    .then(data => {
-      for (let i = 0; i < whiskies.length; i++) {
-        if (whiskies[i].code == data.Whisky.code) {
-          whiskies[i] = data.Whisky;
-          break;
-        }
-      }
-      setWhiskies(whiskies);
-      forceUpdate();
-    })
-    .catch (error => {
-      console.error(error);
-    });
-  };
 
   const onPress = (code : string) => {
-    if (code == activeWhisky) {
+    setActiveWhisky(code == activeWhisky ? "" : code);
-      setActiveWhisky("");
-    } else {
-      setActiveWhisky(code);
-      updateWhisky(code);  
-    }
   };
 
   const items = whiskies ? whiskies
-    .filter((item : any) => item.size == 750)
+    .filter((item : any) => item.size == 750 && item.inventories.length)
-    .sort((a : any, b : any) => a.description.localeCompare(b.description))
     .map((whisky : any) => {
     const active = whisky.code == activeWhisky;
     return (
@@ -155,54 +104,39 @@ export default function App() {
     );
   }) : [];
 
-  const submitSearch = () => {
+  let query = gql` {
-    if (search.trim() == "") {
+    Whiskies {
-      setWhiskies([]);
+      code
-      return;
+      description
-    }
+      price
-
+      size
-    if (lastSearch == search) {
+      lastSeen
-      return;
+      inventories {
-    }
+        location {
-
+          code
-    const _query = gql` {
+          address
-      Whiskies(code:"${search}") {
+          city
-        code
+          phone
-        description
+          longitude
-        price
+          latitude
-        size
+        }
-        lastSeen
         quantity
         updated
       }
-    }`;
-
-    setLastSearch(search);
-  
-    client.request(_query)
-    .then(data => {
-      setWhiskies(data.Whiskies);
-    })
-    .catch (error => {
-      console.error(error);
-    });
-  };
-
-  const keyPress = (event : KeyboardEvent) => {
-    if (event.code == "\n") {
-      submitSearch();
     }
-  };
+  }`;
+  
+  client.request(query)
+  .then(data => {
+    setWhiskies(data.Whiskies);
+  })
+  .catch (error => {
+    console.error(error);
+  });
 
   return (
     <View style={[styles.container]}>
-      <TextInput style={[{borderWidth: 1 }]}
-        onBlur={submitSearch} 
-        onKeyPress={(event : any) => keyPress(event)} 
-        onChange={(value) => setSearch(value.target.value)}></TextInput>
-      <View style={[styles.container]}>
       { items }
-      </View>
     </View>
   );
 }

whisky.js

@@ -215,6 +215,7 @@ const rateLimit = async () => {
   }
   const delay = (lastFetch + (Math.random() * 5000 + 2500)) - Date.now();
   if (delay > 0) {
+//    console.log(`Rate limiting for ${delay}ms`);
     await wait(delay);
   }
   lastFetch = Date.now();
@@ -348,7 +349,7 @@ fs.stat("cache")
     })
     .then((response) => {
       if (response.status != 200) {
-        throw new Error("Error fetching resource from oregonliquorsearch");
+        throw "Error fetching resource from oregonliquorsearch";
       }
     });
   }).then(async () => {
@@ -381,7 +382,8 @@ fs.stat("cache")
 
   const rows = dom.window.document.querySelectorAll('table.list tr');
   const olccWhiskies = [];
-  const processRow = (row) => {
+
+  rows.forEach(row => {
     const th = row.querySelectorAll('table.list th a');
     if (th.length) {
       th.forEach(header => headers.push(header.textContent.trim()));
@@ -405,7 +407,7 @@ fs.stat("cache")
       case 'Proof':
         if (parseFloat(value) == value) {
           value = parseFloat(value);
-         }
+        }
         break;
 
       case 'Case Price':
@@ -431,9 +433,8 @@ fs.stat("cache")
       whisky[headers[index]] = value;
     });
     olccWhiskies.push(whisky);
-  };
+  });
 
-  rows.forEach(processRow);
   return olccWhiskies;
 }).then(async (olccWhiskies) => {
   await Promise.all(olccWhiskies.map(async (olccWhisky) => {