goals

Author: hollesse

bruno-collection/mob.timer.sh/Delete goal for room.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Delete goal for room
+  type: http
+  seq: 4
+}
+
+delete {
+  url: {{baseUrl}}/{{roomId}}/goal
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "user": "{{user}}"
+  }
+}
+
+vars:pre-request {
+  roomId: test123
+  user: TestUser
+}

bruno-collection/mob.timer.sh/Get goal for room.bru

@@ -0,0 +1,15 @@
+meta {
+  name: Get goal for room
+  type: http
+  seq: 5
+}
+
+get {
+  url: {{baseUrl}}/{{roomId}}/goal
+  body: none
+  auth: none
+}
+
+vars:pre-request {
+  roomId: test123
+}

bruno-collection/mob.timer.sh/Set goal for room.bru

@@ -0,0 +1,24 @@
+meta {
+  name: Set goal for room
+  type: http
+  seq: 3
+}
+
+put {
+  url: {{baseUrl}}/{{roomId}}/goal
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "goal": "{{goal}}",
+    "user": "{{user}}"
+  }
+}
+
+vars:pre-request {
+  roomId: test123
+  user: TestUser
+  goal: This is an awesome goal!
+}

src/main/java/sh/mob/timer/web/Room.java

@@ -21,11 +21,12 @@ final class Room {
   public static final TimerRequest NULL_TIMER_REQUEST =
       new TimerRequest(0L, null, null, null, null);
   private final String name;
+
   private final List<TimerRequest> timerRequests = new CopyOnWriteArrayList<>();
-  private final Sinks.Many<TimerRequest> sink =
+  private final Sinks.Many<TimerRequest> timerRequestSink =
       Sinks.many().replay().latestOrDefault(NULL_TIMER_REQUEST);
-  private Goal currentGoal = Goal.NO_GOAL;
 
+  private Goal currentGoal = Goal.NO_GOAL;
   private final Sinks.Many<Goal> goalRequestSink =
       Sinks.many().replay().latestOrDefault(Goal.NO_GOAL);
 
@@ -37,19 +38,19 @@ public void addTimer(Long timer, String user, Instant requested) {
     var nextUser = findNextUser(user);
     var timerRequest = new TimerRequest(timer, requested, user, nextUser, TimerType.TIMER);
     timerRequests.add(timerRequest);
-    sink.tryEmitNext(timerRequest);
+    timerRequestSink.tryEmitNext(timerRequest);
   }
 
   public void setGoal(String text, String user, Instant requested) {
-    var newGoal = new Goal(text, requested, user);
+    var newGoal = new Goal(text, user, requested);
     currentGoal = newGoal ;
     goalRequestSink.tryEmitNext(newGoal);
   }
 
-  public void deleteGoal(String user) {
-    if(currentGoal != Goal.NO_GOAL){
-      currentGoal = Goal.NO_GOAL;
-      goalRequestSink.tryEmitNext(Goal.NO_GOAL);
+  public void deleteGoal(String user, Instant requested) {
+    if(currentGoal.goal() != null){
+      currentGoal = Goal.deleted(user, requested);
+      goalRequestSink.tryEmitNext(currentGoal);
       log.info(
               "Delete current goal by user {} for room {}",
               user,
@@ -93,11 +94,11 @@ public void addBreaktimer(Long breaktimer, String user) {
             lastTimerRequest().map(TimerRequest::getNextUser).orElse(null),
             TimerType.BREAKTIMER);
     timerRequests.add(timerRequest);
-    sink.tryEmitNext(timerRequest);
+    timerRequestSink.tryEmitNext(timerRequest);
   }
 
   public Sinks.Many<TimerRequest> timerRequestSink() {
-    return sink;
+    return timerRequestSink;
   }
 
   public Sinks.Many<Goal> goalRequestSink() {
@@ -116,7 +117,7 @@ public void removeOldTimerRequests() {
     this.timerRequests.removeIf(
         timerRequest -> now.minus(24, HOURS).isAfter(timerRequest.getRequested()));
     if (timerRequests.isEmpty()) {
-      sink.tryEmitNext(NULL_TIMER_REQUEST);
+      timerRequestSink.tryEmitNext(NULL_TIMER_REQUEST);
       log.info("Emptied room {}", name);
     }
   }
@@ -129,6 +130,10 @@ public Goal currentGoal() {
     return currentGoal;
   }
 
+  public boolean hasGoal() {
+    return currentGoal.goal != null;
+  }
+
   public List<TimerRequest> historyWithoutLatest() {
     if (timerRequests.isEmpty()) {
       return List.of();
@@ -148,8 +153,12 @@ private static boolean isTimerActive(TimerRequest timerRequest, Instant now) {
         && timerRequest.getRequested().plus(timerRequest.getTimer(), MINUTES).isAfter(now);
   }
 
-  public record Goal(String goal, Instant requested, String user){
+  public record Goal(String goal, String user, Instant requested){
     public static final Goal NO_GOAL = new Goal(null, null, null);
+
+    public static Goal deleted(String user, Instant requested){
+      return new Goal(null, user, requested);
+    }
   }
 
   public static final class TimerRequest {

src/main/java/sh/mob/timer/web/RoomApiController.java

@@ -19,7 +19,6 @@
 @RequestMapping()
 public class RoomApiController {
 
-  private static final String SMOKETEST_ROOM_NAME = "testroom-310a9c47-515c-4ad7-a229-ae8efbab7387";
   private static final Logger log = LoggerFactory.getLogger(RoomApiController.class);
   private final RoomRepository roomRepository;
   private final Clock clock;
@@ -84,7 +83,7 @@ public void publishEvent(@PathVariable String roomId, @RequestBody PutTimerReque
           timerRequest.timer,
           timerRequest.user,
           room.name());
-      incrementTimerStatsExceptForTestRoom(room, timer);
+      stats.incrementTimer(room.name(), timer);
     } else if (timerRequest.breaktimer() != null) {
       long breaktimer = truncateTooLongTimers(timerRequest.breaktimer());
       room.addBreaktimer(breaktimer, timerRequest.user());
@@ -93,7 +92,7 @@ public void publishEvent(@PathVariable String roomId, @RequestBody PutTimerReque
           timerRequest.breaktimer(),
           timerRequest.user,
           room.name());
-      incrementBreakTimerStatsExceptForTestRoom(room, breaktimer);
+      stats.incrementBreaktimer(room.name(), breaktimer);
     } else {
       log.warn("Could not understand PUT request for room {}", roomId);
     }
@@ -112,35 +111,27 @@ public void putGoal(@PathVariable String roomId, @RequestBody PutGoalRequest goa
               goalRequest.goal(),
               goalRequest.user(),
               room.name());
+      stats.incrementGoalCount(room.name());
     } else {
       log.warn("Could not understand PUT goal request for room {}", roomId);
     }
   }
 
   @DeleteMapping("/{roomId:[A-Za-z0-9-_]+}/goal")
   @ResponseStatus(HttpStatus.ACCEPTED)
-  public void putGoal(@PathVariable String roomId, @RequestBody DeleteGoalRequest deleteGoalRequest) {
+  public void deleteGoal(@PathVariable String roomId, @RequestBody DeleteGoalRequest deleteGoalRequest) {
     var room = roomRepository.get(roomId);
-    room.deleteGoal(deleteGoalRequest.user());
+    room.deleteGoal(deleteGoalRequest.user(), Instant.now(clock));
   }
 
   @GetMapping("/{roomId:[A-Za-z0-9-_]+}/goal")
-  @ResponseStatus(HttpStatus.ACCEPTED)
+  @ResponseStatus(HttpStatus.NO_CONTENT)
   public ResponseEntity<GoalResponse> getGoal(@PathVariable String roomId) {
     var room = roomRepository.get(roomId);
-    return ResponseEntity.ofNullable(GoalResponse.of(room.currentGoal()));
-  }
-
-  private void incrementBreakTimerStatsExceptForTestRoom(Room room, long breaktimer) {
-    if (!Objects.equals(room.name(), SMOKETEST_ROOM_NAME)) {
-      stats.incrementBreaktimer(breaktimer);
-    }
-  }
-
-  private void incrementTimerStatsExceptForTestRoom(Room room, long timer) {
-    if (!Objects.equals(room.name(), SMOKETEST_ROOM_NAME)) {
-      stats.incrementTimer(timer);
+    if (!room.hasGoal()){
+      return ResponseEntity.noContent().build();
     }
+    return ResponseEntity.ofNullable(GoalResponse.of(room.currentGoal()));
   }
 
   private static long truncateTooLongTimers(Long timer) {
@@ -159,69 +150,5 @@ public static GoalResponse of(Room.Goal goal){
 
   public record PutGoalRequest(String goal, String user){}
   public record DeleteGoalRequest(String user){}
-  static final class PutTimerRequest {
-
-    private final Long timer;
-    private final Long breaktimer;
-    private final String user;
-
-    PutTimerRequest(Long timer, Long breaktimer, String user) {
-      this.timer = timer;
-      this.user = user;
-      this.breaktimer = breaktimer;
-    }
-
-    public Long timer() {
-      return timer;
-    }
-
-    public Long breaktimer() {
-      return breaktimer;
-    }
-
-    public String user() {
-      return user;
-    }
-
-    public Long getTimer() {
-      return timer;
-    }
-
-    public Long getBreaktimer() {
-      return breaktimer;
-    }
-
-    public String getUser() {
-      return user;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (obj == this) return true;
-      if (obj == null || obj.getClass() != this.getClass()) return false;
-      var that = (PutTimerRequest) obj;
-      return Objects.equals(this.timer, that.timer)
-          && Objects.equals(this.breaktimer, that.breaktimer)
-          && Objects.equals(this.user, that.user);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(timer, breaktimer, user);
-    }
-
-    @Override
-    public String toString() {
-      return "PutTimerRequest["
-          + "timer="
-          + timer
-          + ", "
-          + "breaktimer="
-          + breaktimer
-          + ", "
-          + "user="
-          + user
-          + ']';
-    }
-  }
+  public record PutTimerRequest(Long timer, Long breaktimer, String user){}
 }

src/main/java/sh/mob/timer/web/RoomRepository.java

@@ -31,6 +31,10 @@ Room get(String room) {
         });
   }
 
+  void deleteAll(){
+    repository.clear();
+  }
+
   @Scheduled(fixedRateString = "PT1M")
   void cleanUpUnusedRooms() {
     repository.forEach((key, room) -> room.removeOldTimerRequests());

src/main/java/sh/mob/timer/web/Stats.java

@@ -1,19 +1,27 @@
 package sh.mob.timer.web;
 
 import java.time.Instant;
+import java.util.Objects;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.springframework.stereotype.Component;
 
 @Component
 public class Stats {
 
+  private static final String SMOKETEST_ROOM_NAME = "testroom-310a9c47-515c-4ad7-a229-ae8efbab7387";
   private final Instant statisticsSince = Instant.now();
   private ConcurrentHashMap<Long, Long> timerCounts = new ConcurrentHashMap<Long, Long>();
   private ConcurrentHashMap<Long, Long> breaktimerCounts = new ConcurrentHashMap<Long, Long>();
+  private AtomicLong goalCount = new AtomicLong(0);
 
-  public void incrementTimer(long timer) {
+  public void incrementTimer(String roomname, long timer) {
+    if (Objects.equals(roomname, SMOKETEST_ROOM_NAME)) {
+      return;
+    }
     Long count = timerCounts.get(timer);
     if (count == null) {
       count = 0L;
@@ -22,7 +30,10 @@ public void incrementTimer(long timer) {
     timerCounts.put(timer, count);
   }
 
-  public void incrementBreaktimer(long breakTimer) {
+  public void incrementBreaktimer(String roomname, long breakTimer) {
+    if (Objects.equals(roomname, SMOKETEST_ROOM_NAME)) {
+      return;
+    }
     Long count = breaktimerCounts.get(breakTimer);
     if (count == null) {
       count = 0L;
@@ -31,6 +42,17 @@ public void incrementBreaktimer(long breakTimer) {
     breaktimerCounts.put(breakTimer, count);
   }
 
+  public void incrementGoalCount(String roomname) {
+    if(Objects.equals(roomname, SMOKETEST_ROOM_NAME)){
+      return;
+    }
+    goalCount.incrementAndGet();
+  }
+
+  public long getGoalCount() {
+    return goalCount.get();
+  }
+
   public SortedMap<Long, Long> getTimer() {
     return new TreeMap<>(timerCounts);
   }