Merge pull request #20 from hannesknutsson/ripfuttan

Rip futtan
hannesknutsson · Nov 12, 2024 · b53a5a9 · b53a5a9
2 parents 1c83478 + d91c14e
commit b53a5a9
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 102 deletions.
diff --git a/Api/src/main/java/com/github/hannesknutsson/hungryboii/api/ApiApplication.java b/Api/src/main/java/com/github/hannesknutsson/hungryboii/api/ApiApplication.java
@@ -1,6 +1,5 @@
 package com.github.hannesknutsson.hungryboii.api;
 
-import com.github.hannesknutsson.hungryboii.api.dataclasses.restaurants.Futurum;
 import com.github.hannesknutsson.hungryboii.api.dataclasses.restaurants.Kok11;
 import com.github.hannesknutsson.hungryboii.api.dataclasses.restaurants.MKCatering;
 import com.github.hannesknutsson.hungryboii.api.dataclasses.restaurants.Ostergatan;
@@ -22,7 +21,6 @@ public class ApiApplication {
     public static void main(String[] args) {
         SpringApplication.run(ApiApplication.class, args);
         // Register any new restaurants here (implementations of interface "Restaurant")
-        RestaurantManager.getInstance().register(new Futurum());
         RestaurantManager.getInstance().register(new Ostergatan());
         RestaurantManager.getInstance().register(new Kok11());
         RestaurantManager.getInstance().register(new VidaArena());

diff --git a/...c/main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Futurum.java b/...c/main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Futurum.java
diff --git a/...src/main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Kok11.java b/...src/main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Kok11.java
@@ -15,8 +15,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.*;
-
 public class Kok11 extends SimpleRestaurant {
 
     private static final Logger LOG = LoggerFactory.getLogger(Kok11.class);

diff --git a/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/MKCatering.java b/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/MKCatering.java
@@ -14,15 +14,12 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.OK;
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.PARSING_BROKEN;
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.WEBSITE_BROKEN;
 import static com.github.hannesknutsson.hungryboii.api.statichelpers.TimeHelper.getDayOfWeek;
 
 public class MKCatering extends SimpleRestaurant {
 
-    private static final String targetUrl = "https://mkcatering.se/dagens.html";
-    private static final String filterQuery = "body > div > div > div > div > div.dagens";
+    private static final String targetUrl = "https://www.mkcatering.se/#lunch";
+    private static final String filterQuery = "div.elementor-image-box-content";
 
     public MKCatering() {
         super("MK Catering", targetUrl, new OpenHours(new Time(11, 30), new Time(14, 0)));
@@ -54,7 +51,7 @@ private List<Element> filterWebpage(Document toFilter, String filterQuery) {
     private Map<Weekday, List<String>> parseElementsToMealMap(List<Element> elementList) {
         Map<Weekday, List<String>> mealsGroupedByDays = new HashMap<>();
 
-        for (Element e : elementList) {
+        for (Element e : elementList.subList(0, 5)) {
             var meals = e.select("p")
                     .get(0)
                     .childNodesCopy()

diff --git a/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Ostergatan.java b/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Ostergatan.java
@@ -18,7 +18,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.*;
 import static com.github.hannesknutsson.hungryboii.api.statichelpers.TimeHelper.getDayOfWeek;
 
 public class Ostergatan extends SimpleRestaurant {

diff --git a/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Restaurant.java b/...ain/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/Restaurant.java
@@ -3,8 +3,6 @@
 import com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus;
 import com.github.hannesknutsson.hungryboii.api.dataclasses.Dish;
 import com.github.hannesknutsson.hungryboii.api.dataclasses.OpenHours;
-import com.github.hannesknutsson.hungryboii.api.exceptions.ParsingOutdated;
-import com.github.hannesknutsson.hungryboii.api.exceptions.WebPageBroken;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 

diff --git a/...main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/VidaArena.java b/...main/java/com/github/hannesknutsson/hungryboii/api/dataclasses/restaurants/VidaArena.java
@@ -7,8 +7,6 @@
 import com.github.hannesknutsson.hungryboii.api.exceptions.ParsingOutdated;
 import com.github.hannesknutsson.hungryboii.api.exceptions.WebPageBroken;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -23,7 +21,6 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.github.hannesknutsson.hungryboii.api.enumerations.RestaurantStatus.*;
 import static com.github.hannesknutsson.hungryboii.api.statichelpers.TimeHelper.getDayOfWeek;
 
 public class VidaArena extends SimpleRestaurant {

diff --git a/Api/src/main/java/com/github/hannesknutsson/hungryboii/api/exceptions/OCRException.java b/Api/src/main/java/com/github/hannesknutsson/hungryboii/api/exceptions/OCRException.java
diff --git a/.../java/com/github/hannesknutsson/hungryboii/api/exceptions/TotallyBrokenDudeException.java b/.../java/com/github/hannesknutsson/hungryboii/api/exceptions/TotallyBrokenDudeException.java