Merge pull request #11 from BSStudio/feature/let_speedtimer_start_at_given_timer

Feature: let speedtimer start at given time

Author: csikb

messaging/src/main/java/hu/bsstudio/robonaut/configuration/RabbitConfiguration.java

@@ -56,7 +56,7 @@ public Jackson2JsonMessageConverter jackson2JsonMessageConverter() {
     }
 
     @Bean
-    public ConnectionNameStrategy cns() {
+    public ConnectionNameStrategy connectionNameStrategy() {
         return new SimplePropertyValueConnectionNameStrategy("spring.application.name");
     }
 }

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/BroadcastingSpeedTimerService.java

@@ -17,8 +17,8 @@ public class BroadcastingSpeedTimerService implements SpeedTimerService {
     private final SpeedTimerService service;
 
     @Override
-    public Mono<SpeedTimer> startTimer() {
-        return service.startTimer()
+    public Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer) {
+        return service.startTimer(speedTimer)
             .doOnNext(this::sendTimerInformation);
     }
 

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/DefaultSpeedTimerService.java

@@ -8,16 +8,15 @@
 @RequiredArgsConstructor
 public class DefaultSpeedTimerService implements SpeedTimerService {
 
-    private static final int TIMER_INITIAL_VALUE = 0;
-
     @Override
-    public Mono<SpeedTimer> startTimer() {
-        return Mono.just(new SpeedTimer(TIMER_INITIAL_VALUE, TimerAction.START));
+    public Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer) {
+        return Mono.just(speedTimer)
+            .filter(timer -> timer.getTimerAction() == TimerAction.START);
     }
 
     @Override
     public Mono<SpeedTimer> stopTimerAt(final SpeedTimer speedTimer) {
         return Mono.just(speedTimer)
-            .filter(timer -> timer.getTimerAction().equals(TimerAction.STOP));
+            .filter(timer -> timer.getTimerAction() == TimerAction.STOP);
     }
 }

service/src/main/java/hu/bsstudio/robonaut/race/speed/timer/SpeedTimerService.java

@@ -4,7 +4,7 @@
 import reactor.core.publisher.Mono;
 
 public interface SpeedTimerService {
-    Mono<SpeedTimer> startTimer();
+    Mono<SpeedTimer> startTimer(final SpeedTimer speedTimer);
 
     Mono<SpeedTimer> stopTimerAt(final SpeedTimer speedTimer);
 }

service/src/test/java/hu/bsstudio/robonaut/race/speed/timer/BroadcastingSpeedTimerServiceTest.java

@@ -32,10 +32,10 @@ void setUp() {
 
     @Test
     void shouldReturnSpeedTimerFromUnderLyingServiceAndSendItWhenTimerIsStarted() {
-        when(mockService.startTimer())
+        when(mockService.startTimer(SPEED_TIMER))
             .thenReturn(Mono.just(SPEED_TIMER));
 
-        final var result = underTest.startTimer();
+        final var result = underTest.startTimer(SPEED_TIMER);
 
         StepVerifier.create(result)
             .expectNext(SPEED_TIMER)

service/src/test/java/hu/bsstudio/robonaut/race/speed/timer/DefaultSpeedTimerServiceTest.java

@@ -8,6 +8,9 @@
 
 final class DefaultSpeedTimerServiceTest {
 
+    private static final SpeedTimer SPEED_TIMER_START = new SpeedTimer(2020, TimerAction.START);
+    private static final SpeedTimer SPEED_TIMER_STOP = new SpeedTimer(2020, TimerAction.STOP);
+
     private DefaultSpeedTimerService underTest;
 
     @BeforeEach
@@ -16,30 +19,38 @@ void setUp() {
     }
 
     @Test
-    void shouldReturnTimerWithZeroInitialValueWhenTimerIsStarted() {
-        final var result = underTest.startTimer();
+    void shouldReturnTimerOnStart() {
+
+        final var result = underTest.startTimer(SPEED_TIMER_START);
+
+        StepVerifier.create(result)
+            .expectNext(SPEED_TIMER_START)
+            .verifyComplete();
+    }
+
+    @Test
+    void shouldReturnEmptyWhenActionDoesNotMatchOnStart() {
+
+        final var result = underTest.startTimer(SPEED_TIMER_STOP);
 
         StepVerifier.create(result)
-            .expectNext(new SpeedTimer(0, TimerAction.START))
             .verifyComplete();
     }
 
     @Test
     void shouldReturnTimerOnStop() {
-        final var speedTimer = new SpeedTimer(2020, TimerAction.STOP);
 
-        final var result = underTest.stopTimerAt(speedTimer);
+        final var result = underTest.stopTimerAt(SPEED_TIMER_STOP);
 
         StepVerifier.create(result)
-            .expectNext(speedTimer)
+            .expectNext(SPEED_TIMER_STOP)
             .verifyComplete();
     }
 
     @Test
-    void shouldReturnEmptyWhenActionDoesNotMatch() {
-        final var speedTimer = new SpeedTimer(2020, TimerAction.START);
+    void shouldReturnEmptyWhenActionDoesNotMatchOnStop() {
 
-        final var result = underTest.stopTimerAt(speedTimer);
+        final var result = underTest.stopTimerAt(SPEED_TIMER_START);
 
         StepVerifier.create(result)
             .verifyComplete();

web/src/main/java/hu/bsstudio/robonaut/speed/StartSpeedTimerHandler.java

@@ -17,7 +17,8 @@ public class StartSpeedTimerHandler implements HandlerFunction<ServerResponse> {
 
     @Override
     public Mono<ServerResponse> handle(final ServerRequest request) {
-        final var speedTimer = service.startTimer();
+        final var speedTimer = request.bodyToMono(SpeedTimer.class)
+            .flatMap(service::startTimer);
         return ServerResponse.ok().body(speedTimer, SpeedTimer.class);
     }
 }

web/src/main/resources/static/open-api.yaml

@@ -83,7 +83,7 @@ paths:
       tags:
         - skill
       summary: Stop Skill Timer
-      description: "Broadcast skill timer start state on `skill.timer` queue in JSON format.
+      description: "Broadcast skill timer stop state on `skill.timer` queue in JSON format.
                    If the _timerAction_ field don't match to the endpoint no action will be made"
       requestBody:
         content:
@@ -190,11 +190,11 @@ paths:
               $ref: '#/components/schemas/Timer'
       responses:
         200:
-          description: "The updated team"
+          description: "Timer state"
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/DetailedTeam'
+                $ref: '#/components/schemas/Timer'
   /api/speed/timer/stop:
     post:
       tags:
@@ -209,7 +209,7 @@ paths:
               $ref: '#/components/schemas/Timer'
       responses:
         200:
-          description: "The updated team"
+          description: "Timer state"
           content:
             application/json:
               schema:
@@ -276,7 +276,7 @@ paths:
                 - $ref: '#/components/schemas/QualifiedTeam'
       responses:
         200:
-          description: "The updated team"
+          description: "The updated teams"
           content:
             application/json:
               schema:
@@ -300,7 +300,7 @@ paths:
                 - $ref: '#/components/schemas/AudienceScoredTeam'
       responses:
         200:
-          description: "The updated team"
+          description: "The updated teams"
           content:
             application/json:
               schema:
@@ -324,7 +324,7 @@ paths:
                 - $ref: '#/components/schemas/EndResultedTeam'
       responses:
         200:
-          description: "The updated team"
+          description: "The updated teams"
           content:
             application/json:
               schema:

web/src/test/java/hu/bsstudio/robonaut/speed/StartSpeedTimerHandlerTest.java

@@ -19,6 +19,7 @@ final class StartSpeedTimerHandlerTest {
     private SpeedTimerService mockService;
 
     private WebTestClient webTestClient;
+    public static final SpeedTimer SPEED_TIMER = new SpeedTimer(0, TimerAction.START);
 
     @BeforeEach
     void setUp() {
@@ -31,12 +32,13 @@ void setUp() {
 
     @Test
     void shouldReturnSpeedTimerWithOkStatus() {
-        final var speedTimer = new SpeedTimer(0, TimerAction.START);
-        when(mockService.startTimer())
-            .thenReturn(Mono.just(speedTimer));
+        when(mockService.startTimer(SPEED_TIMER))
+            .thenReturn(Mono.just(SPEED_TIMER));
 
-        webTestClient.post().uri("/test").exchange()
+        webTestClient.post().uri("/test")
+            .bodyValue(SPEED_TIMER)
+            .exchange()
             .expectStatus().isOk()
-            .expectBody(SpeedTimer.class).isEqualTo(speedTimer);
+            .expectBody(SpeedTimer.class).isEqualTo(SPEED_TIMER);
     }
 }

web/src/test/java/hu/bsstudio/robonaut/speed/StopSpeedTimerHandlerTest.java

@@ -35,7 +35,9 @@ void shouldReturnSpeedTimerWithOkStatus() {
         when(mockService.stopTimerAt(speedTimer))
             .thenReturn(Mono.just(speedTimer));
 
-        webTestClient.post().uri("/test").bodyValue(speedTimer).exchange()
+        webTestClient.post().uri("/test")
+            .bodyValue(speedTimer)
+            .exchange()
             .expectStatus().isOk()
             .expectBody(SpeedTimer.class).isEqualTo(speedTimer);
     }