Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Vsechny vyznamne zmeny v tomto projektu budou dokumentovany v tomto souboru.
- `cancel_meals` funkce
- Overovani uspesnosti objednani/odhlaseni

### Fixed
- Filtrace prazdnych jidel, vcetne svatku a prazdnin

### Fixed
- Opravene filtrovani prazdnych jidel

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,16 @@ strava.logout()
- [x] Lepe zorganizovat kod
- [x] Lepsi datum format
- [x] Moznost detailnejsi filtrace jidelnicku
- [x] Kontrola stavu po objednani
- [ ] Lepe zdokumentovat pouziti
- [ ] Rate limiting
- [ ] Balance check pred objednanim
- [ ] Kontrola stavu po objednani
- [ ] Filtrace dnu, ktere nejdou objednat
- [ ] Lepsi testing


## Known bugs

- Procesovani jidelnicku necha projit statni svatek. problem je, ze nazev je sice statni svatek, ale hodnota `druhPopis` obsahuje popis nejakeho jidla - neni prazdna, tudiz si program mysli, ze na tento den nejake jidlo je. list alergenu je ovsem prazdny, takze by byla moznost ridit se ciste podle listu alergenu, ale mohla by nastat situace, ze je nejake realne jidlo bez alergenu a mohlo by se oznacit jako prazdne




## Co bude dal?
Expand Down
5 changes: 4 additions & 1 deletion src/strava_cz/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ def _parse_menu_response(
if not include_empty:
has_no_description = not meal["delsiPopis"] and not meal["alergeny"]
is_unnamed_meal = meal["nazev"] == meal["druh_popis"]
if has_no_description or is_unnamed_meal:
cant_be_ordered = (
"CO" in meal["omezeniObj"]["den"] or "VP" in meal["omezeniObj"]["den"]
) # Hardcoded values for meals that can't be ordered, there may be more
if has_no_description or is_unnamed_meal or cant_be_ordered:
continue

if not include_soup and meal["druh_popis"] == "Polévka":
Expand Down
2 changes: 2 additions & 0 deletions tests/test_strava_cz.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ def test_get_menu(self, mock_Session):
"nazev": "Vývar",
"zakazaneAlergeny": None,
"alergeny": [["01", "brambory"]],
"omezeniObj": {"den": ""},
"pocet": 0,
"veta": "75",
"cena": "40.00"
Expand All @@ -153,6 +154,7 @@ def test_get_menu(self, mock_Session):
"nazev": "Rajská omáčka s těstovinami",
"zakazaneAlergeny": None,
"alergeny": [["69", "pavel"]],
"omezeniObj": {"den": ""},
"pocet": 1,
"veta": "1",
"cena": "40.00"
Expand Down