Merge pull request #964 from hmrc/BDOG-3289

BDOG-3289 extend JobType enum
hmrc · Nov 8, 2024 · 10a24c7 · 10a24c7
2 parents 1fdb836 + b2ef454
commit 10a24c7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/app/uk/gov/hmrc/cataloguefrontend/CatalogueController.scala b/app/uk/gov/hmrc/cataloguefrontend/CatalogueController.scala
@@ -153,7 +153,7 @@ class CatalogueController @Inject() (
       testJobMap                <- testRepos.foldLeftM[Future, Map[String, Seq[JenkinsJob]]](Map.empty): (xs, r) =>
                                      teamsAndRepositoriesConnector
                                        .lookupLatestJenkinsJobs(r)
-                                       .map(x => xs ++ Map(r -> x.filter(_.jobType == BuildJobType.Job)))
+                                       .map(x => xs ++ Map(r -> x.filter(_.jobType == BuildJobType.Test)))
       logMetrics                <- serviceMetricsConnector.logMetrics(serviceName)
       envDatas                  <- Environment.values.toSeq
                                      .traverse: env =>

diff --git a/app/uk/gov/hmrc/cataloguefrontend/connector/TeamsAndRepositoriesConnector.scala b/app/uk/gov/hmrc/cataloguefrontend/connector/TeamsAndRepositoriesConnector.scala
@@ -113,6 +113,7 @@ enum BuildJobType(
 ) extends FromString
   derives Ordering, Reads:
   case Job         extends BuildJobType("job"         )
+  case Test        extends BuildJobType("test"        )
   case Pipeline    extends BuildJobType("pipeline"    )
   case PullRequest extends BuildJobType("pull-request")
 

diff --git a/app/uk/gov/hmrc/cataloguefrontend/users/CreateUserController.scala b/app/uk/gov/hmrc/cataloguefrontend/users/CreateUserController.scala
@@ -25,7 +25,6 @@ import uk.gov.hmrc.cataloguefrontend.auth.CatalogueAuthBuilders
 import uk.gov.hmrc.cataloguefrontend.connector.UserManagementConnector
 import uk.gov.hmrc.cataloguefrontend.model.TeamName
 import uk.gov.hmrc.cataloguefrontend.users.view.html.{CreateUserPage, CreateUserRequestSentPage}
-import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.internalauth.client.*
 import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendController
 

diff --git a/test/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsServiceSpec.scala b/test/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsServiceSpec.scala
@@ -23,7 +23,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.scalatestplus.mockito.MockitoSugar
 import uk.gov.hmrc.cataloguefrontend.connector.{GitRepository, TeamsAndRepositoriesConnector}
-import uk.gov.hmrc.cataloguefrontend.cost.{DeploymentConfig, Zone}
+import uk.gov.hmrc.cataloguefrontend.cost.Zone
 import uk.gov.hmrc.cataloguefrontend.model.{Environment, ServiceName}
 import uk.gov.hmrc.cataloguefrontend.servicecommissioningstatus.LifecycleStatus.{Active, DecommissionInProgress, Deprecated}
 import uk.gov.hmrc.cataloguefrontend.servicecommissioningstatus.{Lifecycle, ServiceCommissioningStatusConnector}