Merge pull request #78 from hmrc/BDOG-238

BDOG-238 Ensure all shuttered services appear, even without events, b…

Author: colin-lamed

app/uk/gov/hmrc/cataloguefrontend/shuttering/ShutterService.scala

@@ -43,11 +43,21 @@ class ShutterService @Inject()(
   def outagePageByAppAndEnv(serviceName: String, env: Environment)(implicit hc: HeaderCarrier): Future[Option[OutagePage]] =
     shutterConnector.outagePageByAppAndEnv(serviceName, env)
 
-  def findCurrentState(env: Environment)(implicit hc: HeaderCarrier): Future[Seq[ShutterStateChangeEvent]] =
+
+  def findCurrentState(env: Environment)(implicit hc: HeaderCarrier): Future[Seq[ShutterStateData]] =
     for {
+      states <- shutterConnector.shutterStates
       events <- shutterConnector.latestShutterEvents(env)
-      sorted =  events.sortWith {
-                  case (l, r) => l.status == ShutterStatusValue.Shuttered ||
+      status =  states.map { state =>
+                  ShutterStateData(
+                      serviceName = state.name
+                    , environment = env
+                    , status      = state.statusFor(env)
+                    , lastEvent   = events.find(_.serviceName == state.name)
+                    )
+                }
+      sorted =  status.sortWith {
+                  case (l, r) => l.status      == ShutterStatusValue.Shuttered ||
                                  l.serviceName <  r.serviceName
                 }
     } yield sorted
@@ -99,3 +109,10 @@ class ShutterService @Inject()(
   def shutterGroups: Future[Seq[ShutterGroup]] =
     shutterGroupsConnector.shutterGroups
 }
+
+case class ShutterStateData(
+    serviceName: String
+  , environment: Environment
+  , status     : ShutterStatus
+  , lastEvent  : Option[ShutterStateChangeEvent]
+  )

app/views/shuttering/ShutterStatePage.scala.html

@@ -14,14 +14,14 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.cataloguefrontend.shuttering.{Environment, EventData, ShutterStatusValue, ShutterStateChangeEvent}
+@import uk.gov.hmrc.cataloguefrontend.shuttering.{Environment, EventData, ShutterStatusValue, ShutterStateData}
 @import uk.gov.hmrc.cataloguefrontend.ViewMessages
 @import java.time.ZoneId
 @import java.time.format.DateTimeFormatter
 
 @this(viewMessages: ViewMessages)
 
-@( shutterStates: Seq[ShutterStateChangeEvent]
+@( shutterStates: Seq[ShutterStateData]
  , selectedEnv  : Environment
  , isSignedIn   : Boolean
  )(implicit request: Request[_])
@@ -48,7 +48,7 @@ <h1>Shutter Status: @selectedEnv.toString</h1>
               <tr>
                   <th>Service</th>
                   <th>Status</th>
-                  <th>Shuttered by</th>
+                  <th>Last updated by</th>
                   <th>Date</th>
                   @if(isSignedIn) { <th>Update</th> }
               </tr>
@@ -85,16 +85,16 @@ <h1>Shutter Status: @selectedEnv.toString</h1>
   }
 }
 
-@shutterRow(event: ShutterStateChangeEvent) = {
-  <tr class="shutter-row @classFor(event.status.value)">
-      <td class="shutter-service">@event.serviceName</td>
-      <td class="shutter-state">@event.status.value</td>
-      <td class="shutter-user">@event.username</td>
-      <td class="shutter-date">@DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:SS z").withZone(ZoneId.systemDefault).format(event.timestamp)</td>
+@shutterRow(state: ShutterStateData) = {
+  <tr class="shutter-row @classFor(state.status.value)">
+      <td class="shutter-service">@state.serviceName</td>
+      <td class="shutter-state">@state.status.value</td>
+      <td class="shutter-user">@state.lastEvent.map(_.username).getOrElse("")</td>
+      <td class="shutter-date">@state.lastEvent.map(e => DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:SS z").withZone(ZoneId.systemDefault).format(e.timestamp)).getOrElse("")</td>
       @if(isSignedIn) {
         <td>
-          <a id="shutter-link" href="@uk.gov.hmrc.cataloguefrontend.shuttering.routes.ShutterServiceController.step1Get(Some(event.environment.asString), Some(event.serviceName))">
-            @changeValueFor(event.status.value)
+          <a id="shutter-link" href="@uk.gov.hmrc.cataloguefrontend.shuttering.routes.ShutterServiceController.step1Get(Some(state.environment.asString), Some(state.serviceName))">
+            @changeValueFor(state.status.value)
           </a>
         </td>
       }

test/uk/gov/hmrc/cataloguefrontend/shuttering/ShutterServiceSpec.scala

@@ -31,6 +31,33 @@ import scala.concurrent.duration.Duration
 
 class ShutterServiceSpec extends WordSpec with MockitoSugar with Matchers {
 
+  val mockShutterStates = Seq(
+      ShutterState(
+        name         = "abc-frontend"
+      , production   = ShutterStatus.Shuttered(reason = None, outageMessage = None)
+      , staging      = ShutterStatus.Unshuttered
+      , qa           = ShutterStatus.Unshuttered
+      , externalTest = ShutterStatus.Unshuttered
+      , development  = ShutterStatus.Unshuttered
+      )
+    , ShutterState(
+        name         = "zxy-frontend"
+      , production   = ShutterStatus.Unshuttered
+      , staging      = ShutterStatus.Unshuttered
+      , qa           = ShutterStatus.Unshuttered
+      , externalTest = ShutterStatus.Unshuttered
+      , development  = ShutterStatus.Unshuttered
+      )
+    , ShutterState(
+        name         = "ijk-frontend"
+      , production   = ShutterStatus.Shuttered(reason = None, outageMessage = None)
+      , staging      = ShutterStatus.Unshuttered
+      , qa           = ShutterStatus.Unshuttered
+      , externalTest = ShutterStatus.Unshuttered
+      , development  = ShutterStatus.Unshuttered
+      )
+    )
+
   val mockEvents = Seq(
       ShutterStateChangeEvent(
           username    = "test.user"
@@ -63,6 +90,7 @@ class ShutterServiceSpec extends WordSpec with MockitoSugar with Matchers {
       val boot = Boot.init
       implicit val hc = new HeaderCarrier()
 
+      when(boot.mockShutterConnector.shutterStates).thenReturn(Future(mockShutterStates))
       when(boot.mockShutterConnector.latestShutterEvents(Environment.Production)).thenReturn(Future(mockEvents))
 
       val Seq(a,b,c) = Await.result(boot.shutterService.findCurrentState(Environment.Production), Duration(10, "seconds"))