From 1e9e43718141c0e407cf3beb993d44db4394df1b Mon Sep 17 00:00:00 2001 From: Mat Allen Date: Tue, 1 Aug 2023 16:07:43 -0500 Subject: [PATCH] fixing charts output by adding hitorical colors and a check argument to provide detailed debug if charts were to fail (#160) --- src/main/java/com/redhat/sso/ninja/ChartsController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/redhat/sso/ninja/ChartsController.java b/src/main/java/com/redhat/sso/ninja/ChartsController.java index 95709c76..dc6a5b45 100644 --- a/src/main/java/com/redhat/sso/ninja/ChartsController.java +++ b/src/main/java/com/redhat/sso/ninja/ChartsController.java @@ -22,6 +22,7 @@ import org.codehaus.jackson.map.JsonMappingException; import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.gdata.util.common.base.Pair; import com.redhat.sso.ninja.chart.ChartJson; @@ -128,9 +129,12 @@ public ChartJson getParticipants(Integer max) throws JsonGenerationException, Js .put("GREY", new Pair("rgba(130,130,130,0.7)", "rgba(130,130,130,0.8)")) .put("RED", new Pair("rgba(163,0,0,0.7)", "rgba(163,0,0,0.8)")) .put("BLACK", new Pair("rgba(20,20,20,0.7)", "rgba(20,20,20,0.8)")) + .put("GREEN", new Pair("rgb(65, 168, 95,0.7)", "rgba(rgb(65, 168, 95,0.8)")) + .put("GOLD", new Pair("rgba(250, 197, 28,0.7)", "rgba(250, 197, 28,0.8)")) .put("ZERO", new Pair("rgba(255,255,255,0.7)", "rgba(255,255,255,0.8)")) - // ZERO??? .build(); + + Preconditions.checkArgument(colors.containsKey(userInfo.get("level").toUpperCase()), "Color ["+userInfo.get("level")+"] does not exist in our color mapping for charts - user = "+Json.newObjectMapper(false).writeValueAsString(userInfo)); c.getDatasets().get(0).getBackgroundColor().add(colors.get(userInfo.get("level").toUpperCase()).getFirst()); c.getDatasets().get(0).getBorderColor().add(colors.get(userInfo.get("level").toUpperCase()).getSecond());