Strip exact matches from brewery name during beer lookup

Addresses #300
hsv-dot-beer · Jan 16, 2020 · b26f3cc · b26f3cc
1 parent f252c9c
commit b26f3cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tap_list_providers/base.py b/tap_list_providers/base.py
@@ -121,6 +121,7 @@ def get_beer(self, name, manufacturer, pricing=None, venue=None, **defaults):
             'get_beer(): name %s, mfg %s, defaults %s',
             name, manufacturer, defaults,
         )
+        name = name.replace(manufacturer.name, '').strip()
         unique_fields = (
             'manufacturer_url', 'untappd_url', 'beer_advocate_url',
             'taphunter_url', 'taplist_io_pk', 'beermenus_slug',

diff --git a/tap_list_providers/test/test_beermenus.py b/tap_list_providers/test/test_beermenus.py
@@ -101,7 +101,7 @@ def test_import_beermenus_data(self):
             self.assertEqual(Manufacturer.objects.count(), 22)
             self.assertEqual(Tap.objects.count(), 24)
             taps = Tap.objects.filter(
-                venue=self.venue, tap_number__in=[1, 17],
+                venue=self.venue, tap_number__in=[1, 17, 2],
             ).select_related(
                 'beer__style', 'beer__manufacturer',
             ).order_by('tap_number')
@@ -121,6 +121,10 @@ def test_import_beermenus_data(self):
             self.assertEqual(price.serving_size.volume_oz, 16)
 
             tap = taps[1]
+            self.assertEqual(tap.beer.name, 'Crisp Apple Cider')
+            self.assertEqual(tap.beer.manufacturer.name, 'Angry Orchard')
+
+            tap = taps[2]
             self.assertEqual(
                 tap.beer.name,
                 'Modelo Especial',