Now doesn't show food at Linsen if it is not the same week #132
Conversation
The1Penguin
requested review from
Rembane,
malmz,
rachelambda,
SwedishSubmarine,
Discomannen,
erikOrtenberg and
Multipacker
src/Model/Linsen.hs
Outdated
| @@ -72,6 +70,19 @@ parse day = | |||
| >=> (.: "richText") | |||
| >=> (.: "root") | |||
| >=> (.: "children") | |||
| >=> (\v' -> | |||
| withObject "asd" ( | |||
There was a problem hiding this comment.
It doesn't really matter
|
Reason for the change from checking week to checking date is that the "API" is not consistent with the format of weeks, but is consistent on date |
src/Model/Linsen.hs
Outdated
| >=> (\case | ||
| Nothing -> fail "Failed to index into richtext" | ||
| Just v -> pure v) . headMay |
There was a problem hiding this comment.
Isn't this the same as:
| >=> (\case | |
| Nothing -> fail "Failed to index into richtext" | |
| Just v -> pure v) . headMay | |
| >=> \case | |
| [] -> fail "Failed to index into richtext" | |
| (v:_) -> pure v |
...which removes one import and doesn't shift over into the realm of Maybes but stays in the list dimension. It's very much up to you how you want to do this though.
There was a problem hiding this comment.
Yeah, makes sense
src/Model/Linsen.hs
Outdated
| >=> pure . (== pure day) . parseTime defaultTimeLocale "%d-%m-%Y" | ||
| >=> \case | ||
| True -> pure v' | ||
| False -> pure [])) | ||
| >=> menuParser . (\v' -> if length v' >= 9 then v' else mempty) |
There was a problem hiding this comment.
Also, due to me being way too tired my brain fired up the pattern recognition module and went to town, so the changes proposed below are kinda optional. :D
| >=> pure . (== pure day) . parseTime defaultTimeLocale "%d-%m-%Y" | |
| >=> \case | |
| True -> pure v' | |
| False -> pure [])) | |
| >=> menuParser . (\v' -> if length v' >= 9 then v' else mempty) | |
| >=> \s -> if pure day == parseTime defaultTimeLocale "%d-%m-%Y" s | |
| && length v' >= 9 | |
| then pure v' | |
| else mempty)) | |
| >=> menuParser |
There was a problem hiding this comment.
Added this, but pure mempty instead of mempty since menuParser still expects a list (Test failed when it wasn't so I take their word for it)
|
Oh, maybe some tests would be useful? |
As we all have seen; Linsen shows food that was served last week, and this is not okay. This little fix would solve that issue.