Merge pull request #912 from hmrc/BDOG-3170

Fix outbound service ordering
hmrc · Jun 28, 2024 · 8016737 · 8016737
2 parents 2065605 + ef6941c
commit 8016737
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsService.scala b/app/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsService.scala
@@ -114,20 +114,20 @@ class ServiceConfigsService @Inject()(
                         .map: repo =>
                           serviceCommissioningConnector
                             .getLifecycle(service)
-                            .map(status => ServiceRelationship(service, hasRepo = true, status.map(_.lifecycleStatus), repo.endOfLifeDate))
+                            .map: status =>
+                              ServiceRelationship(service, hasRepo = true, status.map(_.lifecycleStatus), repo.endOfLifeDate)
                         .getOrElse(Future.successful(ServiceRelationship(service, hasRepo = false, lifecycleStatus = None, endOfLifeDate = None)))
                         .map(_ +: acc)
       inbound  =  srs.inboundServices
                     .filterNot(_ == serviceName)
-                    .sorted
                     .map: service =>
                       ServiceRelationship(service, hasRepo = repos.exists(_.name == service.asString), lifecycleStatus = None, endOfLifeDate = None)
     yield
       ServiceRelationshipsEnriched(
-        inbound
+        inbound.sortBy(_.service)
       , outbound.sortBy: a =>
-        ( if a.lifecycleStatus.contains(LifecycleStatus.DecommissionInProgress) then 0 else 1
-        , a.service.asString.toLowerCase
+        ( !List(LifecycleStatus.Deprecated, LifecycleStatus.DecommissionInProgress).contains(a.lifecycleStatus)
+        , a.service
         )
       )