From ef6941c4222ae5c8924dba9568ab1548861422ca Mon Sep 17 00:00:00 2001 From: colin-lamed <9568290+colin-lamed@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:38:23 +0100 Subject: [PATCH] Fix outbound service ordering --- .../serviceconfigs/ServiceConfigsService.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsService.scala b/app/uk/gov/hmrc/cataloguefrontend/serviceconfigs/ServiceConfigsService.scala index 01bf2c9c3..e7ea05109 100644 --- 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 ) )