diff --git a/portal-rest-api/src/main/java/no/nav/portal/rest/api/EntityDtoMappers.java b/portal-rest-api/src/main/java/no/nav/portal/rest/api/EntityDtoMappers.java index 1bd33825..68b0ad13 100644 --- a/portal-rest-api/src/main/java/no/nav/portal/rest/api/EntityDtoMappers.java +++ b/portal-rest-api/src/main/java/no/nav/portal/rest/api/EntityDtoMappers.java @@ -71,12 +71,24 @@ public static ServiceDto toServiceDtoShallow(ServiceEntity entity){ dto.setName(entity.getName()); dto.setType(ServiceTypeDto.fromValue(entity.getType().getDbRepresentation())); dto.setTeam(mapTeamNavnTeamKatalog(entity.getTeam())); + dto.setTeamId(getTeamUidIfPresent(entity.getTeam())); dto.setPollingUrl(entity.getPolling_url()); dto.setMonitorlink(entity.getMonitorlink()); dto.setStatusNotFromTeam(entity.getStatusNotFromTeam()); return dto; } + private static UUID getTeamUidIfPresent(String teamId){ + UUID uuid = null; + try{ + uuid = UUID.fromString(teamId); + } + catch (Exception ignored){ + + } + return uuid; + + } private static String mapTeamNavnTeamKatalog(String teamId){ UUID uuid; try{ @@ -151,6 +163,7 @@ public static ServiceDto toServiceDtoDeep(Map.Entry