Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only change the time a beer was added to a tap if the beer changed #199

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e5d96e1
Only change the time a beer was added to a tap if the beer changed
drewbrew May 22, 2019
e29bdba
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jul 23, 2019
ef2a1d5
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jul 23, 2019
1bfbde5
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jul 23, 2019
a3647c6
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jul 26, 2019
59d6ecb
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 2, 2019
31b36c7
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 10, 2019
452de76
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 22, 2019
25f1db1
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 23, 2019
38bebc8
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 23, 2019
6546773
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Aug 27, 2019
800f7ed
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Sep 6, 2019
32500d2
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Sep 9, 2019
cd8f786
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Sep 11, 2019
37424ee
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Oct 1, 2019
f6111c6
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Oct 16, 2019
1506b5b
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 15, 2019
0cef057
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 15, 2019
8dc8b5b
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 16, 2019
ba6421f
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 17, 2019
0ad66e9
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 18, 2019
984ab64
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Dec 18, 2019
473bf54
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jan 18, 2020
84129d7
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Feb 21, 2020
4cdf95d
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Mar 5, 2020
800888e
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jun 2, 2020
c7f2333
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jun 2, 2020
afcbc59
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jun 22, 2020
0b0e78d
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jun 24, 2020
c2fee76
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Jul 22, 2020
7c2aa8b
Merge remote-tracking branch 'origin/master' into only-update-time-ad…
drewbrew Oct 5, 2020
a7057aa
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 20, 2020
3a5c16a
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 24, 2020
13ae2df
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 25, 2020
22a59df
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 25, 2020
a308d1f
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Nov 30, 2020
3963a3a
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Dec 8, 2020
b91102a
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Feb 20, 2021
7659818
Merge branch 'master' into only-update-time-added-if-beer-changed
drewbrew Feb 20, 2021
4f3a8ac
Merge branch 'main' into only-update-time-added-if-beer-changed
drewbrew May 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tap_list_providers/parsers/digitalpour.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def handle_venue(self, venue: Venue) -> datetime.datetime:
tap = taps[tap_info["tap_number"]]
except KeyError:
tap = Tap(venue=venue, tap_number=tap_info["tap_number"])
tap.time_added = tap_info["added"]
tap.time_updated = tap_info["updated"]
if tap.time_updated and tap.time_updated > self.update_date:
LOG.debug("Updating venue timestamp to %s", tap.time_updated)
Expand Down Expand Up @@ -123,6 +122,9 @@ def handle_venue(self, venue: Venue) -> datetime.datetime:
venue=venue,
**parsed_beer,
)
if beer and tap.beer_id != beer.id:
tap.time_added = tap_info["added"]

# 4. assign the beer to the tap
tap.beer = beer
tap.save()
Expand Down
5 changes: 5 additions & 0 deletions tap_list_providers/parsers/stemandstein.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from dateutil.parser import parse
from django.db.models import Q
from django.core.exceptions import ImproperlyConfigured, AppRegistryNotReady
from django.utils.timezone import now

# boilerplate code necessary for launching outside manage.py
try:
Expand Down Expand Up @@ -204,6 +205,7 @@ def fill_in_beer_details(self, beer):
return time_tapped

def handle_venue(self, venue):
timestamp = now()
self.venue = venue
self.fetch_root_html()
beers_found = self.parse_root_html()
Expand All @@ -223,6 +225,9 @@ def handle_venue(self, venue):
venue=self.venue,
tap_number=tap_number,
)
if beer and tap.beer_id != beer.id:
tap.time_added = timestamp
tap.time_updated = timestamp
tap.beer = beer
tap.time_added = time_tapped
tap.save()
Expand Down
4 changes: 3 additions & 1 deletion tap_list_providers/parsers/taphunter.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ def handle_venue(self, venue):
tap = taps[tap_number]
except KeyError:
tap = Tap(venue=venue, tap_number=tap_number)
tap.time_added = tap_info["added"]
tap.time_updated = tap_info["updated"]
parsed_time = parse(tap_info["updated"])
if parsed_time > latest_timestamp:
Expand Down Expand Up @@ -127,6 +126,9 @@ def handle_venue(self, venue):
venue=venue,
**parsed_beer,
)
if beer and tap.beer_id != beer.id:
tap.time_added = tap_info["added"]

# 4. assign the beer to the tap
tap.beer = beer
tap.save()
Expand Down
4 changes: 3 additions & 1 deletion tap_list_providers/parsers/taplist_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ def handle_venue(self, venue):
current_tap.time_updated = timestamp
current_tap.save()
continue
current_tap.time_added = tap_dict.pop("time_added")
time_added = tap_dict.pop("time_added")
mfg_dict = tap_dict.pop("manufacturer")
manufacturer = self.get_manufacturer(**mfg_dict)
beer = self.get_beer(manufacturer=manufacturer, venue=venue, **tap_dict)
if beer and current_tap.beer_id != beer.id:
current_tap.time_added = time_added
current_tap.beer = beer
if current_tap.time_updated != timestamp:
current_tap.time_updated = timestamp
Expand Down
3 changes: 3 additions & 0 deletions tap_list_providers/parsers/untappd.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ def handle_venue(self, venue):
pricing=tap_info["pricing"],
**tap_info["beer"],
)
if beer and tap.beer_id != beer.id and tap_info["added"]:
# only change the time added if the beer on tap changed
tap.time_added = tap_info["added"]
# 4. assign the beer to the tap
tap.beer = beer
tap.save()
Expand Down