Show only round anniversaries, for today and this month (RPB-46)

app/controllers/HomeController.java

@@ -19,6 +19,7 @@
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -107,8 +108,18 @@ public HomeController(WSClient httpClient) {
 	@Inject
 	IndexComponent index;
 
+	private Map<String, List<String>> anniversaries = new HashMap<>();
+
 	public static final Config CONFIG = ConfigFactory.load();
 
+	private static final List<Integer> ROUND_BIRTH = Arrays.asList(50, 70, 75, 100, 125, 150, 200,
+			250, 300, 350, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000, 1100,
+			1200, 1250, 1300, 1400, 1500, 1600, 1700, 1750, 1800, 1900, 2000);
+
+	private static final List<Integer> ROUND_DEATH = Arrays.asList(10, 25, 50, 75, 100, 125, 150,
+			200, 250, 300, 350, 400, 450, 500, 600, 700, 750, 800, 900, 950, 1000, 1100, 1200, 1250,
+			1300, 1400, 1500, 1600, 1700, 1750, 1800, 1900, 2000, 2100, 2200);
+
 	public static String config(String id) {
 		return CONFIG.getString(id);
 	}
@@ -140,24 +151,59 @@ public Result index() {
 			entity = entityWithImage(hit.getSourceAsString());
 		}
 		JsonNode dataset = Json.parse(readFile(config("dataset.file")));
-		return ok(views.html.index.render(entity, dataset, anniversaries(), allHits()));
+		return ok(views.html.index.render(entity, dataset, allAnniversaries(), allHits()));
+	}
+
+	private List<String> allAnniversaries() {
+		// starting with any anniversaries on this day, fill up
+		// (to 5 overall) with random anniversaries from this month,
+		// retaining order (today first) and avoiding duplicates:
+		int fullSize = 5;
+		List<String> anniversaries = anniversariesFor(thisDay());
+		if (anniversaries.size() < fullSize) {
+			List<String> thisMonth = anniversariesFor(thisMonth());
+			for (int i = 0; anniversaries.size() < fullSize && i < thisMonth.size(); i++) {
+				if (!anniversaries.contains(thisMonth.get(i))) {
+					anniversaries.add(thisMonth.get(i));
+				}
+			}
+		}
+		return anniversaries;
 	}
 
-	private List<String> anniversaries() {
-		String today = todayQuery();
-		QueryBuilder query = randomScoreQuery(anniversaryQuery(today));
-		SearchHits hits = prepareSearch().setQuery(query).setFrom(0).setSize(5).execute()
-				.actionGet().getHits();
-		return Arrays.asList(hits.getHits()).stream().map(hit -> hitToAnniversary(today, hit))
-				.collect(Collectors.toList());
+	private List<String> anniversariesFor(String datePattern) {
+		// don't query on each reload...
+		List<String> result = anniversaries.computeIfAbsent(datePattern, list -> {
+			QueryBuilder query = randomScoreQuery(anniversaryQuery(datePattern));
+			SearchHits hits = prepareSearch().setQuery(query).setFrom(0).setSize((int) allHits())
+					.execute().actionGet().getHits();
+			return Arrays.asList(hits.getHits()).stream().filter(hit -> hasRound(datePattern, hit))
+					.map(hit -> hitToAnniversary(datePattern, hit)).collect(Collectors.toList());
+		});
+		// ...but provide new selection/subset
+		Collections.shuffle(result);
+		return result.stream().limit(5).collect(Collectors.toList());
+
+	}
+
+	private boolean hasRound(String datePattern, SearchHit hit) {
+		JsonNode json = Json.parse(hit.getSourceAsString());
+		JsonNode birthNode = json.get("dateOfBirth");
+		JsonNode deathNode = json.get("dateOfDeath");
+		return isRound(birthNode, ROUND_BIRTH, datePattern)
+				|| isRound(deathNode, ROUND_DEATH, datePattern);
+	}
+
+	private boolean isRound(JsonNode node, List<Integer> round, String datePattern) {
+		return node != null && is(datePattern, node.get(0).asText(), round);
 	}
 
 	private FunctionScoreQueryBuilder randomScoreQuery(QueryBuilder query) {
 		return QueryBuilders.functionScoreQuery(query,
 				ScoreFunctionBuilders.randomFunction(System.currentTimeMillis()));
 	}
 
-	private String hitToAnniversary(String today, SearchHit hit) {
+	private String hitToAnniversary(String datePattern, SearchHit hit) {
 		JsonNode fullJson = Json.parse("[" + hit.getSourceAsString() + "]");
 		JsonNode suggestion = Json
 				.parse(toSuggestions(fullJson,
@@ -166,28 +212,29 @@ private String hitToAnniversary(String today, SearchHit hit) {
 		JsonNode json = Json.toJson(ImmutableMap.of( //
 				"label", suggestion.get("label").asText(), //
 				"url", suggestion.get("id").asText().replace(AuthorityResource.GND_PREFIX, "/"), //
-				"details", details(today, fullJson)));
+				"details", details(datePattern, fullJson)));
 		return Json
 				.stringify(json);
 	}
 
-	private String details(String today, JsonNode json) {
+	private String details(String datePattern, JsonNode json) {
 		String details = "";
 		JsonNode dateOfBirth = json.findValue("dateOfBirth");
 		String date;
 		if (dateOfBirth != null
-				&& is(today, date = dateOfBirth.get(0).asText())) {
+				&& is(datePattern, date = dateOfBirth.get(0).asText(), ROUND_BIRTH)) {
 				details = String.format("%s. Geburtstag, geb. am %s", //
 					yearsSince(date), AuthorityResource.germanDate(date));
-		} else if (is(today, date = json.findValue("dateOfDeath").get(0).asText())) {
+		} else if (is(datePattern, date = json.findValue("dateOfDeath").get(0).asText(), ROUND_DEATH)) { 
 			details = String.format("%s. Todestag, gest. am %s", //
 					yearsSince(date), AuthorityResource.germanDate(date));
 		}
 		return details;
 	}
 
-	private boolean is(String today, String date) {
-		return date.endsWith(today.replace("*", "")) && yearsSince(date) != -1;
+	private boolean is(String datePattern, String date, List<Integer> round) {
+		return date.contains(datePattern.replace("*", ""))
+				&& round.contains((int) yearsSince(date));
 	}
 
 	private SearchRequestBuilder prepareSearch() {
@@ -196,7 +243,8 @@ private SearchRequestBuilder prepareSearch() {
 
 	private QueryStringQueryBuilder anniversaryQuery(String today) {
 		String queryString = String.format(
-				"(dateOfBirth:(%s) OR dateOfDeath:(%s)) AND NOT gndIdentifier:(%s)", today, today,
+				"(dateOfBirth:(%s) OR dateOfDeath:(%s)) AND NOT gndIdentifier:(%s) AND _exists_:dateOfDeath",
+				today, today,
 				CONFIG.getStringList("dontShowOnMainPage").stream()
 						.collect(Collectors.joining(" OR ")));
 		QueryStringQueryBuilder query = index.queryStringQuery(queryString);
@@ -205,19 +253,22 @@ private QueryStringQueryBuilder anniversaryQuery(String today) {
 
 	private long yearsSince(String date) {
 		try {
-		return ChronoUnit.YEARS.between(
-				LocalDate.from(DateTimeFormatter.ISO_LOCAL_DATE
-							.parse(AuthorityResource.cleanDate(date))),
-				ZonedDateTime.now());
+			int year = Integer.parseInt(AuthorityResource.cleanDate(date).substring(0, 4));
+			return ChronoUnit.YEARS.between( //
+					LocalDate.of(year, 1, 1), LocalDate.of(ZonedDateTime.now().getYear(), 1, 1));
 		} catch (DateTimeParseException e) {
 			e.printStackTrace();
 			return -1;
 		}
 	}
 
-	public static String todayQuery() {
-		return ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE)
-				.replaceAll("\\d{4}", "*");
+	public static String thisDay() {
+		return ZonedDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("\\d{4}",
+				"*"); // e.g return "*-01-09";
+	}
+
+	private static String thisMonth() {
+		return thisDay().replaceAll("\\d{2}$", "*"); // e.g. return "*-01-*";
 	}
 
 	/**

app/views/index.scala.html

@@ -4,7 +4,7 @@
 
 @import helper._
 @import controllers.HomeController.formatCount
-@import controllers.HomeController.todayQuery
+@import controllers.HomeController.thisDay
 @import play.api.libs.json._
 @import controllers.HomeController.CONFIG
 
@@ -15,7 +15,7 @@ <h1>@dataset.get("alternateName").get("de").asText()<br/><small>@formatCount(all
     </div>
     <div class="row">
         <div class="col-md-3">
-           <p><strong>Aktuelle Jahrestage</strong></p>
+           <p><strong>Jubiläen</strong></p>
            @for(resource <- anniversaries) {
                <div>
                <small>
@@ -29,7 +29,7 @@ <h1>@dataset.get("alternateName").get("de").asText()<br/><small>@formatCount(all
                 </small>
                 </div>
            }
-           <p><a href='@routes.HomeController.search(date=todayQuery)'>Alle heutigen Jahrestage</a></p>
+           <p><a href='@routes.HomeController.search(date=thisDay)'>Aktuelle Jahrestage</a></p>
         </div>
         <div class="col-md-@if(entity!=null){6}else{9} intro">
            @Html(dataset.get("description").get("de").asText())

transformAndIndexRppd.sh

@@ -5,3 +5,4 @@ cd ../rpb
 bash transformRppd.sh
 cd -
 sbt "runMain apps.Index baseline"
+curl -S -s -o /dev/null https://rppd.lobid.org