Updates

lematt1991 · lematt1991 · commit 849625166c35 · 2023-02-10T17:07:27.000-05:00
diff --git a/db.py b/db.py
@@ -47,7 +47,10 @@
         checkin_id INT PRIMARY KEY,
         created_at TIMESTAMP,
         distance REAL,
-        venue_id int references venues(venue_id)
+        venue_id int references venues(venue_id),
+        user_id int,
+        rating REAL,
+        feed TEXT references feeds(feed)
     )
     """)
 
@@ -58,4 +61,13 @@
     )
     """)
 
+    cur.execute("""
+    CREATE TABLE feeds (
+        feed TEXT PRIMARY KEY,
+        name TEXT,
+        lat REAL,
+        lon REAL
+    );
+    """)
+
 conn.commit()
diff --git a/fetch.py b/fetch.py
@@ -4,6 +4,12 @@
 import psycopg2
 from datetime import datetime
 import time
+import argparse
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--feed", default="nyc_feed")
+opt = parser.parse_args()
 
 
 conn = psycopg2.connect("postgres:///beer_feed")
@@ -26,7 +32,13 @@
 
 client.set_access_token(token)
 
-coords=40.714404, -73.942352
+
+
+with conn.cursor() as cur:
+    cur.execute("SELECT lat, lon FROM feeds WHERE feed=%s", (opt.feed,))
+    coords = cur.fetchone()
+    if coords is None:
+        raise ValueError(f"{opt.feed} does not exist!")
 
 
 def insert(tablename, data):
@@ -61,48 +73,86 @@ def process_checkin(checkin):
     })
 
     with conn.cursor() as cur:
-        cur.execute("SELECT * FROM beers WHERE beer_id=%s", (checkin["beer"]["bid"],))
+        cur.execute("SELECT rating_count, beer_id, pic FROM beers WHERE beer_id=%s", (checkin["beer"]["bid"],))
         res = cur.fetchall()
 
-        if len(res) == 0:
-            try:
-                time.sleep(2)
-                beer = client.beer.info(checkin["beer"]["bid"])
-            except Exception as e:
-                print(e)
-            insert("beers", {
-                "beer_id": beer["response"]["beer"]["bid"],
-                "auth_rating": beer["response"]["beer"]["auth_rating"],
-                "beer_abv": beer["response"]["beer"]["beer_abv"],
-                "beer_name": beer["response"]["beer"]["beer_name"],
-                "beer_style": beer["response"]["beer"]["beer_style"],
-                "rating_count": beer["response"]["beer"]["rating_count"],
-                "rating_score": beer["response"]["beer"]["rating_score"],
-                "last_updated": datetime.now()
-            })
+        update = False
+        if len(res) == 1:
+            rating_count, beer_id, pic = res[0]
+            if rating_count < 500:
+                update = True
+            if pic is None:
+                update = True
+
+
+
+        if len(res) == 0 or update:
+            time.sleep(2)
+            beer = client.beer.info(checkin["beer"]["bid"])
+
+            if update:
+                if pic is None:
+                    print("Updating beer because it doesn't have a picture")
+                else:
+                    print(f"Updating beer, because it only has {rating_count} ratings, now has {beer['response']['beer']['rating_count']}")
+                with conn.cursor() as cur:
+                    cur.execute("""
+                        UPDATE beers SET last_updated=now(), rating_score=%(score)s, rating_count=%(count)s
+                        WHERE beer_id=%(beer_id)s
+                    """, {
+                        "score": beer["response"]["beer"]["rating_score"],
+                        "count": beer["response"]["beer"]["rating_count"],
+                        "beer_id": beer["response"]["beer"]["bid"],
+                    })
+                conn.commit()
+            else:
+                print("Adding new beer to database")
+                insert("beers", {
+                    "beer_id": beer["response"]["beer"]["bid"],
+                    "auth_rating": beer["response"]["beer"]["auth_rating"],
+                    "beer_abv": beer["response"]["beer"]["beer_abv"],
+                    "beer_name": beer["response"]["beer"]["beer_name"],
+                    "beer_style": beer["response"]["beer"]["beer_style"],
+                    "rating_count": beer["response"]["beer"]["rating_count"],
+                    "rating_score": beer["response"]["beer"]["rating_score"],
+                    "last_updated": datetime.now(),
+                    "pic": beer["response"]["beer"]["beer_label"],
+                    "slug": beer["response"]["beer"]["beer_slug"]
+                })
+        else:
+            print("Beer cache hit!")
+
 
     insert("checkins", {
         "beer_id": checkin["beer"]["bid"],
         "brewery_id": checkin["brewery"]["brewery_id"],
         "checkin_comment": checkin["checkin_comment"],
         "checkin_id": checkin["checkin_id"],
+        "rating": checkin["rating_score"],
         "created_at": checkin["created_at"],
         "venue_id": checkin["venue"]["venue_id"],
+        "user_id": checkin["user"]["uid"],
+        "feed": opt.feed,
     })
 
 
 with conn.cursor() as cur:
-    cur.execute("SELECT MAX(checkin_id) FROM checkins")
+    cur.execute("SELECT MAX(checkin_id) FROM checkins WHERE feed=%s", (opt.feed,))
     max_id, = cur.fetchone()
 
-checkins = client.thepub.local(lat=coords[0], lng=coords[1], radius=10, dist_pref="km", min_id=max_id)
-print(f'Fetched {len(checkins["response"]["checkins"]["items"])} new checkins!')
+try:
+    checkins = client.thepub.local(lat=coords[0], lng=coords[1], radius=12, dist_pref="km", min_id=max_id)
+    print(f'Fetched {len(checkins["response"]["checkins"]["items"])} new checkins!')
 
-# iterate in reverse order to process the oldest first.  That way if we crash, we won't create gaps in the feed
-for checkin in checkins["response"]["checkins"]["items"][::-1]:
-    process_checkin(checkin)
+    # iterate in reverse order to process the oldest first.  That way if we crash, we won't create gaps in the feed
+    for checkin in checkins["response"]["checkins"]["items"][::-1]:
+        print(f"Processing {checkin['checkin_id']}")
+        process_checkin(checkin)
 
 
-with conn.cursor() as cur:
-    cur.execute("UPDATE tokens SET last_used=now() WHERE token=%s", (token,))
-conn.commit()
+except Exception as e:
+    print(e)
+    print("Rotating token")
+    with conn.cursor() as cur:
+        cur.execute("UPDATE tokens SET last_used=now() WHERE token=%s", (token,))
+    conn.commit()
diff --git a/mobile/package.json b/mobile/package.json
@@ -23,6 +23,7 @@
     "axios": "^0.18.0",
     "babel-preset-react-native-stage-0": "^1.0.1",
     "expo": "^26.0.0",
+    "expo-cli": "^2.18.2",
     "immutability-helper": "^2.6.6",
     "react": "16.3.2",
     "react-native": "https://github.com/expo/react-native/archive/sdk-26.0.0.tar.gz",
diff --git a/package.json b/package.json
@@ -26,50 +26,50 @@
     "fsevents": "*"
   },
   "dependencies": {
-    "axios": "^0.18.0",
-    "bluebird": "^3.5.1",
-    "body-parser": "^1.18.2",
+    "axios": "^0.18.1",
+    "bluebird": "^3.7.2",
+    "body-parser": "^1.20.1",
     "dotenv": "^5.0.1",
-    "express": "^4.16.3",
-    "history": "^4.7.2",
-    "immutability-helper": "^2.6.6",
-    "lodash": "^4.17.5",
-    "mongoose": "^5.0.15",
+    "express": "^4.18.2",
+    "history": "^4.10.1",
+    "immutability-helper": "^2.9.1",
+    "lodash": "^4.17.21",
+    "mongoose": "^5.13.15",
     "node-untappd": "git+https://github.com/lematt1991/node-untappd.git",
-    "pg": "^7.4.1",
-    "react": "^16.3.2",
-    "react-bootstrap": "^0.32.1",
-    "react-cookie": "^2.1.4",
-    "react-dom": "^16.3.2",
+    "pg": "^7.18.2",
+    "react": "^16.14.0",
+    "react-bootstrap": "^0.32.4",
+    "react-cookie": "^2.2.0",
+    "react-dom": "^16.14.0",
     "react-google-maps": "^9.4.5",
-    "react-redux": "^5.0.7",
-    "react-router": "^4.2.0",
+    "react-redux": "^5.1.2",
+    "react-router": "^4.3.1",
     "react-router-bootstrap": "^0.24.4",
-    "react-router-dom": "^4.2.2",
-    "react-router-redux": "^5.0.0-alpha.6",
-    "react-scripts": "^1.1.4",
+    "react-router-dom": "^4.3.1",
+    "react-router-redux": "^5.0.0-alpha.8",
+    "react-scripts": "^1.1.5",
     "react-search-input": "^0.11.3",
-    "react-select": "^1.2.1",
+    "react-select": "^1.3.0",
     "react-spinkit": "^3.0.0",
-    "redux": "^4.0.0",
+    "redux": "^4.2.1",
     "redux-logger": "^3.0.6",
-    "request": "^2.85.0",
-    "twit": "^2.2.9",
-    "universal-cookie": "^2.1.2",
+    "request": "^2.88.2",
+    "twit": "^2.2.11",
+    "universal-cookie": "^2.2.0",
     "untappd-js": "^1.0.3",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "babel-preset-env": "^1.6.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-0": "^6.24.1",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1",
-    "enzyme-to-json": "^3.3.3",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.7",
+    "enzyme-to-json": "^3.6.2",
     "flow-bin": "^0.70.0",
-    "jest": "^22.4.3",
-    "jest-cli": "^22.4.3",
+    "jest": "^22.4.4",
+    "jest-cli": "^22.4.4",
     "react-addons-test-utils": "^15.6.2",
-    "react-test-renderer": "^16.3.2",
+    "react-test-renderer": "^16.14.0",
     "sinon": "^4.5.0"
   },
   "proxy": "http://localhost:3001",
diff --git a/server.py b/server.py
@@ -0,0 +1,79 @@
+from typing import Union
+from fastapi import FastAPI, Depends
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+from fastapi import Request
+import psycopg2
+import psycopg2.extras
+
+templates = Jinja2Templates(directory="build")
+
+app = FastAPI()
+
+
+conn = psycopg2.connect("postgres:///beer_feed")
+
+@app.get("/items/{item_id}")
+def read_item(item_id: int, q: Union[str, None] = None):
+    return {"item_id": item_id, "q": q}
+
+
+app.mount("/static", StaticFiles(directory="build/static"), name="static")
+app.mount("/js", StaticFiles(directory="build/static/js"), name="js")
+
+
+@app.get("/Feed/{location}/{id}",)
+def feed_limit(location: str, id: int):
+
+    threshold = {
+        "nyc_feed": 4,
+    }.get(location, 3.75)
+
+    with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+        # cur.execute("SELECT * FROM checkins ORDER BY checkin_id DESC LIMIT 25")
+        cur.execute(f"""
+        SELECT 
+            COALESCE(beers.pic, 'https://assets.untappd.com/site/assets/images/temp/badge-beer-default.png') AS pic,
+            checkin_id,
+            venue_id,
+            checkins.created_at AS created,
+            beer_id AS bid,
+            beer_name,
+            venues.lat,
+            breweries.brewery_name AS brewery,
+            venues.lng as lon,
+            rating_count AS checkin_count,
+            venue_name AS venue,
+            rating_score AS beer_rating,
+            beer_style AS beer_style
+        FROM checkins
+        JOIN venues USING(venue_id)
+        JOIN breweries USING (brewery_id)
+        JOIN beers USING(beer_id)
+        WHERE created_at > now() - INTERVAL '2 day' AND rating_score >= {threshold} AND feed=%s
+        """, (location,))
+        rows = cur.fetchall()
+    last_id = rows[0]["checkin_id"]
+    return {"lastID": last_id, "checkins": rows}
+
+@app.get("/Feed/{location}")
+def feed(location: str):
+    return feed_limit(location, 0)
+
+@app.get("/Feeds")
+def feeds():
+    with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
+        cur.execute("SELECT feed AS name, feed AS id, lat, lon, name AS city FROM feeds")
+        return cur.fetchall()
+
+    return [{"name": "nyc", "id": "nyc_feed",  "lat": 40.713342, "lon": -73.945931, "city": "New York"}]
+    # return [{"name": "nyc", "lat": 40.714404, "lng": -73.942352, "city": "New York"}]
+
+@app.get("/{path_name:path}")
+def feed(request: Request, path_name: str):
+    return templates.TemplateResponse("index.html", {"request": request})
+
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=3000, log_level="debug")
diff --git a/src/actions/DataActions.js b/src/actions/DataActions.js
@@ -13,7 +13,7 @@ export const updateData = (feed, lastID) => ({
 	type : UPDATE_DATA,
 	payload : {
 		method : 'GET',
-		url : `/FEED/${feed}/${lastID}`
+		url : `/Feed/${feed}/${lastID}`
 	},
 	meta : 'API'
 })
diff --git a/src/components/FeedRow.jsx b/src/components/FeedRow.jsx
@@ -7,7 +7,7 @@ export default class FeedRow extends Component{
 	constructor(props){
 		super(props);
 		this.state = {
-			picSrc : props.beer.pic,
+			picSrc : props.pic,
 			error : false
 		}
 	}
@@ -21,7 +21,7 @@ export default class FeedRow extends Component{
 	handleError = () => {
 		if(!this.state.error){
 			this.setState(_.extend({}, this.state, {
-				picSrc : 'https://untappd.akamaized.net/site/assets/images/temp/badge-beer-default.png',
+				picSrc : 'https://assets.untappd.com/site/assets/images/temp/badge-beer-default.png',
 				error : true
 			}))
 		}
@@ -37,7 +37,7 @@ export default class FeedRow extends Component{
 		}
 		var date = new Date(this.props.created)
 		date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
-		var beerLink = `https://untappd.com/b/${this.props.beer.slug}/${this.props.bid}`
+		var beerLink = `https://untappd.com/b/${this.props.beer_slug}/${this.props.bid}`
 		return(	
 			<div className="media">
 				<div className="media-left media-middle">
@@ -57,10 +57,10 @@ export default class FeedRow extends Component{
 						Brewery: {this.props.brewery}
 					</h4>
 					<h4>
-						Beer: <a target="_blank" href={beerLink}>{this.props.beer.name}</a>
+						Beer: <a target="_blank" href={beerLink}>{this.props.beer_name}</a>
 					</h4>
 					<h4>
-						Score: {this.props.beer.rating}
+						Score: {this.props.beer_rating}
 					</h4>
 					<h4>	
 						Found at: <SafeAnchor id='goto-map'
@@ -70,7 +70,7 @@ export default class FeedRow extends Component{
 						Number of checkins: {this.props.checkin_count}
 					</h4>
 					<h4>
-						Style: {this.props.beer.style}
+						Style: {this.props.beer_style}
 					</h4>
 				</div>
 			</div>
diff --git a/src/components/Map.jsx b/src/components/Map.jsx
diff --git a/src/middleware/API.js b/src/middleware/API.js
