fixed fetching rewe discounts

FaserF · Sep 21, 2022 · 0e66ecb · 0e66ecb
1 parent 5f8cb27
commit 0e66ecb
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/custom-components/hacs)
+[![hacs_badge](https://img.shields.io/badge/HACS-Custom-41BDF5.svg?style=for-the-badge)](https://github.com/hacs/integration)
 # Rewe.de Homeassistant Discounts Sensor
 Gets discounts and highlights from the [rewe.de API](https://shop.rewe.de/mc/api/markets-stationary).
 
@@ -7,7 +7,7 @@ Gets discounts and highlights from the [rewe.de API](https://shop.rewe.de/mc/api
 
 
 
-This integration provides the following informations with a refresh rate of 30 minutes until now:
+This integration provides the following informations until now:
 
 
 Sensors:

diff --git a/custom_components/rewe/const.py b/custom_components/rewe/const.py
@@ -1,14 +1,11 @@
 DOMAIN = "rewe"
 ATTRIBUTION = "Data provided by rewe.de api"
 
-ATTR_DISCOUNTS = "baskets"
-ATTR_HIGHLIGHTS = "hghlights"
-ATTR_DISCOUNT_NAME = "Discount Name"
-ATTR_DISCOUNT_PRICE = "Discount Price"
-ATTR_DISCOUNT_DESCRIPTION = "Discount Description"
-ATTR_HIGHLIGHT_NAME = "Highlight Name"
-ATTR_HIGHLIGHT_PRICE = "Highlight Price"
-ATTR_HIGHLIGHT_DESCRIPTION = "Highlight Description"
+ATTR_DISCOUNTS = "discounts"
+ATTR_DISCOUNT_TITLE = "product"
+ATTR_DISCOUNT_PRICE = "price"
+ATTR_BASE_PRICE = "base price"
+ATTR_PICTURE = "picture link"
 
 CONF_MARKET_ID = "REWE Market ID"
 CONF_SCAN_INTERVAL = "Scan interval in minutes"
diff --git a/custom_components/rewe/manifest.json b/custom_components/rewe/manifest.json
@@ -11,6 +11,6 @@
   ],
   "domain": "rewe",
   "name": "Rewe Discounts",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "iot_class": "cloud_polling"
 }
diff --git a/custom_components/rewe/sensor.py b/custom_components/rewe/sensor.py
@@ -29,6 +29,10 @@
     CONF_MARKET_ID,
     CONF_SCAN_INTERVAL,
     ATTR_DISCOUNTS,
+    ATTR_DISCOUNT_TITLE,
+    ATTR_DISCOUNT_PRICE,
+    ATTR_BASE_PRICE,
+    ATTR_PICTURE,
 
     DOMAIN,
 )
@@ -86,7 +90,7 @@ def available(self) -> bool:
 
     @property
     def icon(self) -> str:
-        return "mdi:basket-unfill"
+        return "mdi:cart-percent"
 
     @property
     def state(self) -> Optional[str]:
@@ -108,73 +112,7 @@ def session(self):
     def extra_state_attributes(self):
         """Return extra attributes."""
         return self.attrs
-
-    async def async_wait_session(self, hass):
-        url = 'https://mobile-api.rewe.de/api/v3/all-offers?marketCode=' + market_id
-        data = await hass.async_add_executor_job(self._session.get(url).json())
-        _LOGGER.debug(f"Fetching URL: '{url}'")
-        _LOGGER.debug(f"Getting Discounts: '{response}")
-
-        # Reformat categories for easier access. ! are highlighted products, and ? are uncategorized ones.
-        # Order of definition here determines printing order later on.
-        categories = data['categories']
-        categories_id_mapping = {'!': 'Vorgemerkte Produkte'}
-        categorized_products = {'!': []}
-        for n in range(0, len(categories)):
-            if 'PAYBACK' in categories[n]['title']:  # ignore payback offers
-                continue
-            categories_id_mapping.update({n: categories[n]['title']})
-            categorized_products.update({n: []})
-        categories_id_mapping.update({'?': 'Unbekannte Kategorie'})
-        categorized_products.update({'?': []})
-
-        # Get maximum valid date of offers
-        offers_valid_date = time.strftime('%Y-%m-%d', time.localtime(data['untilDate'] / 1000))
-
-        # Stores product data in a dict with categories as keys for a sorted printing experience.
-        # Sometimes the data from Rewe is mixed/missing, so that's why we need all those try/excepts.
-        n = 0
-        for category in data['categories']:
-            if 'PAYBACK' in category['title']:  # ignore payback offers
-                n += 1
-                continue
-            for item in category['offers']:
-                NewProduct = Product()
-                try:
-                    NewProduct.name = item['title']
-                    NewProduct.price = item['priceData']['price']
-                    NewProduct.base_price = item['subtitle']
-                except KeyError:  # sometimes an item is blank or does not contain price information, skip it
-                    continue
-                try:
-                    NewProduct.category = n
-                except KeyError:  # if category not defined in _meta, assign to unknown category
-                    NewProduct.category = '?'
-
-                # Move product into the respective category list ...
-                try:
-                    categorized_products[n].append(NewProduct)
-                except KeyError:
-                    categorized_products['?'].append(NewProduct)
-                # ... but highlighted products are the only ones in two categories
-                if any(x in NewProduct.name for x in product_highlights):
-                    categorized_products['!'].append(NewProduct)
-            n += 1
-
-            #name = name.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #price = price.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #discount = discount.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #discount_valid = discount_valid.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #base_price = base_price.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            category = category.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #currency = currency.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-            #description = description.replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
-
-            self.attrs[ATTR_DISCOUNTS] = categorized_products
-            self.attrs[ATTR_ATTRIBUTION] = f"last updated {datetime.now()} \n{ATTRIBUTION}"
-            self._state = offers_valid_date
-            self._available = True
-
+
     async def async_update(self):
 
         try:
@@ -194,7 +132,55 @@ async def async_update(self):
             # Craft query and load JSON stuff.
             try:
                 with async_timeout.timeout(30):
-                    response = self.async_wait_session(hass)
+                    data = await hass.async_add_executor_job(
+                        fetch_rewe_discounts, hass, self
+                    )
+
+                    # Reformat categories for easier access. ! are highlighted products, and ? are uncategorized ones.
+                    # Order of definition here determines printing order later on.
+                    categories = data['categories']
+                    categories_id_mapping = {'!': 'Vorgemerkte Produkte'}
+                    categorized_products = {'!': []}
+                    for n in range(0, len(categories)):
+                        if 'PAYBACK' in categories[n]['title']:  # ignore payback offers
+                            continue
+                        categories[n]['title'] = categories[n]['title'].replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
+                        categories_id_mapping.update({n: categories[n]['title']})
+                        categorized_products.update({n: []})
+                    categories_id_mapping.update({'?': 'Unbekannte Kategorie'})
+                    categorized_products.update({'?': []})
+
+                    # Get maximum valid date of offers
+                    offers_valid_date = time.strftime('%Y-%m-%d', time.localtime(data['untilDate'] / 1000))
+
+                    # Stores product data in a dict with categories as keys for a sorted printing experience.
+                    # Sometimes the data from Rewe is mixed/missing, so that's why we need all those try/excepts.
+                    discounts = []
+                    n = 0
+                    for category in data['categories']:
+                        if 'PAYBACK' in category['title']:  # ignore payback offers
+                            n += 1
+                            continue
+                        for item in category['offers']:
+                            #_LOGGER.debug(f"Processing: '{item}")
+                            item['title'] = item['title'].replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
+                            #item['subtitle'] = item['subtitle'].replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
+                            #item['priceData']['price'] = item['priceData']['price'].replace('\n', ' ').replace('\u2028', ' ').replace('\u000A', ' ').rstrip().lstrip()
+                            discounts.append(
+                                {
+                                    ATTR_DISCOUNT_TITLE: item['title'],
+                                    #ATTR_DISCOUNT_PRICE: item['priceData']['price'],
+                                    ATTR_DISCOUNT_PRICE: item['priceData'],
+                                    #ATTR_BASE_PRICE: item['subtitle']
+                                    ATTR_PICTURE: item['images'],
+                                }
+                            )
+                        n += 1
+
+                        self.attrs[ATTR_DISCOUNTS] = discounts
+                        self.attrs[ATTR_ATTRIBUTION] = f"last updated {datetime.now()} \n{ATTRIBUTION}"
+                        self._state = offers_valid_date
+                        self._available = True
             except:
                 self._available = False
                 _LOGGER.exception(f"Cannot retrieve discounts for: {self.market_id} - Maybe a typo or the server rejected the request.")
@@ -203,3 +189,10 @@ async def async_update(self):
             self._available = False
             _LOGGER.exception(f"Cannot retrieve data for: '{self.market_id}'")
 
+def fetch_rewe_discounts(hass, self):
+    market_id = self.market_id
+    url = 'https://mobile-api.rewe.de/api/v3/all-offers?marketCode=' + market_id
+    data = self._session.get(url).json()
+    _LOGGER.debug(f"Fetching URL: '{url}'")
+    #_LOGGER.debug(f"Getting Discounts: '{data}")
+    return data