Add bad day report controller

OddJava/build.gradle

@@ -1,39 +1,41 @@
 plugins {
-	id 'org.springframework.boot' version '3.3.2'
+	id 'org.springframework.boot' version '3.5.6'
 	id 'io.spring.dependency-management' version '1.1.6'
 	id 'java'
+	id 'groovy'
 }
 
 group = 'com.oddball'
 version = '0.0.2-SNAPSHOT'
 
-configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
-}
-
 repositories {
 	mavenCentral()
+    mavenLocal()
 }
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(21)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }
 
 dependencies {
-	annotationProcessor 'org.projectlombok:lombok'
-	compileOnly 'org.projectlombok:lombok'
-	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	runtimeOnly 'com.h2database:h2:2.3.230'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.apache.commons:commons-csv:1.11.0'
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.postgresql:postgresql'
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    annotationProcessor 'org.projectlombok:lombok'
+    compileOnly 'org.projectlombok:lombok'
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.apache.commons:commons-csv:1.11.0'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.postgresql:postgresql'
+
+    runtimeOnly 'com.h2database:h2:2.3.230'
+    runtimeOnly 'org.springframework.boot:spring-boot-starter-actuator'
+    runtimeOnly 'com.github.tylerwilliams:performance-tracer:0.0.1'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.spockframework:spock-core:2.4-M6-groovy-4.0'
+    testImplementation 'org.spockframework:spock-spring:2.4-M6-groovy-4.0'
 }
 
 test {

OddJava/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

OddJava/src/main/java/com/oddball/challenges/BadDay.java

@@ -0,0 +1,5 @@
+package com.oddball.challenges;
+
+import java.time.LocalDate;
+
+public record BadDay(long userId, String userName, LocalDate date) {}

OddJava/src/main/java/com/oddball/challenges/BadDayController.java

@@ -0,0 +1,27 @@
+package com.oddball.challenges;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@RestController
+@RequestMapping("/bad-day")
+@RequiredArgsConstructor
+public class BadDayController {
+    private final BadDayService badDayService;
+
+    @GetMapping("/weeks/{weekToCheck}")
+    public List<BadWeek> getBadWeeks(@PathVariable LocalDate weekToCheck) {
+        return badDayService.getBadWeeks(weekToCheck);
+    }
+
+    @GetMapping("/streaks")
+    public List<BadDayStreak> getBadDayStreaks() {
+        return badDayService.getBadDayStreaks();
+    }
+}

OddJava/src/main/java/com/oddball/challenges/BadDayService.java

@@ -0,0 +1,93 @@
+package com.oddball.challenges;
+
+import com.oddball.challenges.mood.MoodRepository;
+import com.oddball.challenges.stress.StressRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.stream.Stream;
+
+import static java.util.Comparator.comparing;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toCollection;
+
+@Service
+@RequiredArgsConstructor
+public class BadDayService {
+    private static final int MIN_BAD_DAYS_THRESHOLD = 2;
+    private static final int MAX_BAD_DAY_STREAKS = 5;
+
+    private final MoodRepository moodRepository;
+    private final StressRepository stressRepository;
+
+    public List<BadWeek> getBadWeeks(LocalDate weekToCheck) {
+        LocalDate startOfWeek = getStartOfWeek(weekToCheck);
+        LocalDate endOfWeek = startOfWeek.plusDays(6);
+
+        Map<Long, TreeSet<BadDay>> badDaysByUser = getBadDaysByUser(startOfWeek, endOfWeek);
+
+        return badDaysByUser.values()
+            .stream()
+            .map(userBadDays -> {
+                // each batch of bad days belong to a single user, so we can just grab the first one to get the username
+                String userName = userBadDays.getFirst().userName();
+                return new BadWeek(userName, userBadDays.size());
+            })
+            .filter(bw -> bw.numberOfBadDays() >= MIN_BAD_DAYS_THRESHOLD)
+            .sorted(comparing(BadWeek::numberOfBadDays).reversed())
+            .toList();
+    }
+
+    public List<BadDayStreak> getBadDayStreaks() {
+        Map<Long, TreeSet<BadDay>> allBadDays = getBadDaysByUser(null, null);
+
+        List<List<BadDay>> allBadDayStreaks = new ArrayList<>();
+        for (TreeSet<BadDay> userBadDays : allBadDays.values()) {
+            List<List<BadDay>> userStreaks = userBadDays.stream()
+                .gather(BadDayStreakGatherer.INSTANCE)
+//                .peek(streak ->
+//                    System.out.println("Found streak:\n" + streak.stream().map(o -> "    " + o).collect(joining("\n"))))
+                .toList();
+            allBadDayStreaks.addAll(userStreaks);
+        }
+
+        return allBadDayStreaks.stream()
+            .sorted((a, b) -> Integer.compare(b.size(), a.size())) // largest streaks to smallest
+            .limit(MAX_BAD_DAY_STREAKS)
+            .map(streak -> {
+                BadDay firstBadDay = streak.getFirst();
+                return new BadDayStreak(firstBadDay.userName(), firstBadDay.date(), streak.size());
+            })
+            .toList();
+    }
+
+    /**
+     * Get all bad days (from mood and stress) grouped by user for a given date range inclusive
+     * @param from Starting day (inclusive) to retrieve bad days for. Null = no lower bound
+     * @param to Ending day (inclusive) to retrieve bad days for. Null = no upper bound
+     * @return A mapping of user IDs to a sorted set of bad days (sorted by day) which fall within the specified date range
+     */
+    private Map<Long, TreeSet<BadDay>> getBadDaysByUser(LocalDate from, LocalDate to) {
+        List<BadDay> badMoodDays = moodRepository.getBadMoodDays(from, to);
+        List<BadDay> badStressDays = stressRepository.getBadStressDays(from, to);
+
+        Stream<BadDay> allBadDays = Stream.concat(badMoodDays.stream(), badStressDays.stream());
+        return allBadDays.collect(
+            groupingBy(BadDay::userId, toCollection(() -> new TreeSet<>(comparing(BadDay::date)))));
+    }
+
+    /**
+     * @return The Sunday of the week that the given date falls within
+     */
+    private static LocalDate getStartOfWeek(LocalDate date) {
+        return date.getDayOfWeek() == DayOfWeek.SUNDAY
+            ? date
+            : date.minusDays(date.getDayOfWeek().getValue());
+    }
+}

OddJava/src/main/java/com/oddball/challenges/BadDayStreak.java

@@ -0,0 +1,6 @@
+package com.oddball.challenges;
+
+import java.time.LocalDate;
+
+public record BadDayStreak(String userName, LocalDate startDate, int streakLength) {
+}

OddJava/src/main/java/com/oddball/challenges/BadDayStreakGatherer.java

@@ -0,0 +1,57 @@
+package com.oddball.challenges;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import java.util.stream.Gatherer;
+
+/**
+ * A {@link Gatherer} that collects consecutive {@link BadDay}s into streaks and emits each one as a list.
+ * This gatherer assumes that the input stream of {@link BadDay}s are sorted in chronological order.
+ */
+class BadDayStreakGatherer implements Gatherer<BadDay, List<BadDay>, List<BadDay>> {
+    static final BadDayStreakGatherer INSTANCE = new BadDayStreakGatherer();
+
+    private BadDayStreakGatherer() {}
+
+    @Override
+    public Supplier<List<BadDay>> initializer() {
+        return ArrayList::new;
+    }
+
+    @Override
+    public Gatherer.Integrator<List<BadDay>, BadDay, List<BadDay>> integrator() {
+        return Integrator.ofGreedy((currentStreak, nextDay, downstream) -> {
+            if (currentStreak.isEmpty()) {
+                // initial streak
+                currentStreak.add(nextDay);
+                return true;
+            }
+
+            BadDay previousBadDay = currentStreak.getLast();
+            boolean isConsecutive = nextDay.date().minusDays(1).equals(previousBadDay.date());
+            if (isConsecutive) {
+                // streak continues
+                currentStreak.add(nextDay);
+                return true;
+            }
+
+            // streak is broken - emit the current streak and start a new one
+            downstream.push(List.copyOf(currentStreak));
+            currentStreak.clear();
+            currentStreak.add(nextDay);
+            return true;
+        });
+    }
+
+    @Override
+    public BiConsumer<List<BadDay>, Downstream<? super List<BadDay>>> finisher() {
+        // emit the last streak if we have a running one
+        return (currentStreak, downstream) -> {
+            if (!currentStreak.isEmpty()) {
+                downstream.push(List.copyOf(currentStreak));
+            }
+        };
+    }
+}

OddJava/src/main/java/com/oddball/challenges/BadWeek.java

@@ -0,0 +1,3 @@
+package com.oddball.challenges;
+
+public record BadWeek(String userName, int numberOfBadDays) {}

OddJava/src/main/java/com/oddball/challenges/OddJavaApp.java

@@ -5,7 +5,7 @@
 
 @SpringBootApplication
 public class OddJavaApp {
-	public static void main(String[] args) {
+	static void main(String[] args) {
 		SpringApplication.run(OddJavaApp.class, args);
 	}
 }

OddJava/src/main/java/com/oddball/challenges/mood/Mood.java

@@ -1,21 +1,23 @@
 package com.oddball.challenges.mood;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import java.util.Date;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.time.LocalDate;
+
 @Getter
 @Setter
 @NoArgsConstructor
 @Entity
-@Table(name = "moods")
+@Table(
+    name = "moods",
+    indexes = {
+        @Index(name = "idx_mood_date", columnList = "date"),
+        @Index(name = "idx_mood_user", columnList = "userId"),
+    }
+)
 public class Mood {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -26,18 +28,11 @@ public class Mood {
     private long userId;
 
     @Column(name = "date", columnDefinition = "date")
-    private Date date;
+    private LocalDate date;
 
     @Column(name = "mood", length = 1)
     private int mood;
 
-    @Column(name = "description", length = 255)
+    @Column(name = "description")
     private String description;
-
-    Mood(long userId, Date date, int mood, String description) {
-        this.userId = userId;
-        this.date = date;
-        this.mood = mood;
-        this.description = description;
-    }
 }

OddJava/src/main/java/com/oddball/challenges/mood/MoodRepository.java

@@ -1,10 +1,27 @@
 package com.oddball.challenges.mood;
 
+import com.oddball.challenges.BadDay;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDate;
+import java.util.List;
+
 @Repository
 public interface MoodRepository extends CrudRepository<Mood, Long> {
 
+    @Query("""
+        select new com.oddball.challenges.BadDay(m.userId, u.userName, m.date)
+        from Mood m
+        join User u on m.userId = u.id
+        where m.mood in (1, 2)
+        and (:startDate is null or m.date >= :startDate)
+        and (:endDate is null or m.date <= :endDate)
+    """)
+    List<BadDay> getBadMoodDays(@Param("startDate") LocalDate startDate,
+                                @Param("endDate") LocalDate endDate);
+
 }