Merge branch 'hotfix/963' into hotfix/3.1.229

mediathekview · Mar 4, 2024 · 442fc32 · 442fc32
2 parents cd33467 + 699bf4a
commit 442fc32
Showing 1 changed file with 29 additions and 6 deletions.
diff --git a/src/main/java/mServer/crawler/sender/ard/json/ArdTopicsLetterDeserializer.java b/src/main/java/mServer/crawler/sender/ard/json/ArdTopicsLetterDeserializer.java
@@ -10,6 +10,7 @@
 import mServer.crawler.sender.base.JsonUtils;
 
 import java.lang.reflect.Type;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -23,9 +24,13 @@ public class ArdTopicsLetterDeserializer implements JsonDeserializer<PaginationU
   private static final String ELEMENT_TOTAL_ELEMENTS = "totalElements";
   private static final String ELEMENT_PAGE_SIZE = "pageSize";
   private static final String ELEMENT_PAGINATION = "pagination";
+  private static final String ELEMENT_PUBLICATION_SERVICE = "publicationService";
+  private static final String ATTRIBUTE_NAME = "name";
 
   private static final String ATTRIBUTE_ID = "id";
 
+  private static final String[] IGNORED_SENDER = new String[] {"zdf", "kika", "3sat", "arte"};
+
   @Override
   public PaginationUrlDto deserialize(
           final JsonElement jsonElement, final Type type, final JsonDeserializationContext context) {
@@ -79,13 +84,31 @@ private Set<CrawlerUrlDTO> parseTeaser(final JsonObject teaserObject) {
       id = JsonUtils.getAttributeAsString(teaserObject, ATTRIBUTE_ID);
     }
 
-    id.ifPresent(
-            nonNullId ->
-                    results.add(
-                            new CrawlerUrlDTO(
-                                    String.format(
-                                            ArdConstants.TOPIC_URL, nonNullId, ArdConstants.TOPIC_PAGE_SIZE))));
+    if (isRelevant(teaserObject)) {
+      id.ifPresent(
+              nonNullId ->
+                      results.add(
+                              new CrawlerUrlDTO(
+                                      String.format(
+                                              ArdConstants.TOPIC_URL, nonNullId, ArdConstants.TOPIC_PAGE_SIZE))));
+    }
 
     return results;
   }
+
+  private boolean isRelevant(final JsonObject teaserObject) {
+    if (teaserObject.has(ELEMENT_PUBLICATION_SERVICE)) {
+      final JsonObject publicationService =
+              teaserObject.get(ELEMENT_PUBLICATION_SERVICE).getAsJsonObject();
+      final Optional<String> attributeAsString =
+              JsonUtils.getAttributeAsString(publicationService, ATTRIBUTE_NAME);
+      if (attributeAsString.isPresent()) {
+
+        return !Arrays.stream(IGNORED_SENDER)
+                .anyMatch(sender -> sender.equalsIgnoreCase(attributeAsString.get()));
+      }
+    }
+
+    return true;
+  }
 }