i_1006 Remember scoreboard type in ContestInformation

src/edu/csus/ecs/pc2/clics/API202306/CLICSJudgement.java

@@ -3,12 +3,17 @@
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import edu.csus.ecs.pc2.core.IInternalController;
 import edu.csus.ecs.pc2.core.Utilities;
@@ -17,6 +22,7 @@
 import edu.csus.ecs.pc2.core.model.JudgementRecord;
 import edu.csus.ecs.pc2.core.model.Run;
 import edu.csus.ecs.pc2.core.util.IJSONTool;
+import edu.csus.ecs.pc2.services.core.JSONUtilities;
 
 /**
  * Contains the judgment for a submission (Accepted, Wrong Answer, etc).
@@ -38,9 +44,8 @@ public class CLICSJudgement {
     @JsonProperty
     private String judgement_type_id;
 
-//    Only for "score" type contests, N/A for ICPC pass/fail
-//    @JsonProperty
-//    private String score;
+    @JsonProperty
+    private double score;
 
     @JsonProperty
     private String start_time;
@@ -57,6 +62,8 @@ public class CLICSJudgement {
     @JsonProperty
     private double max_run_time;
 
+    private boolean isPointScoring = false;
+
     /**
      * Fill in properties for a judgment description.
      *
@@ -71,6 +78,9 @@ public CLICSJudgement(IInternalContest model, IInternalController controller, Ru
         id = submission.getElementId().toString();
         submission_id = IJSONTool.getSubmissionId(submission);
 
+        // Remember this for serialization
+        isPointScoring = model.getContestInformation().isScoreboardTypeScore();
+
         Date startJudgeDate = submission.getJudgeStartDate();
         if(startJudgeDate == null) {
             // Yikes! Using submission time since there is no judge start date... Something is amiss, but this is a last ditch guess
@@ -130,4 +140,33 @@ public CLICSJudgement(IInternalContest model, IInternalController controller, Ru
         }
         // else not much to do here if no start date.
     }
+
+    public String toJSON() {
+        Set<String> exceptProps = new HashSet<String>();
+
+        getExceptProps(exceptProps);
+        try {
+            ObjectMapper mapper = JSONUtilities.getObjectMapper();
+            // for this judgment, create filter to omit inappropriate properties,
+            // 'score' in this case if not Point Scoring contest
+            SimpleBeanPropertyFilter filter = SimpleBeanPropertyFilter.serializeAllExcept(exceptProps);
+            FilterProvider fp = new SimpleFilterProvider().addFilter("rtFilter", filter).setFailOnUnknownId(false);
+            mapper.setFilters(fp);
+            return mapper.writeValueAsString(this);
+        } catch (Exception e) {
+            return "Error creating JSON for judgment " + e.getMessage();
+        }
+    }
+
+    /**
+     * Get set of properties for which we do not want to serialize into JSON.
+     * This is so we don't serialize score for pass-fail contests
+     *
+     * @param exceptProps Set to fill in with property names to omit
+     */
+    public void getExceptProps(Set<String> exceptProps) {
+        if(!isPointScoring){
+            exceptProps.add("score");
+        }
+    }
 }

src/edu/csus/ecs/pc2/clics/API202306/CLICSProblem.java

@@ -1,14 +1,23 @@
 // Copyright (C) 1989-2025 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
 package edu.csus.ecs.pc2.clics.API202306;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import edu.csus.ecs.pc2.core.StringUtilities;
 import edu.csus.ecs.pc2.core.model.IInternalContest;
 import edu.csus.ecs.pc2.core.model.Problem;
+import edu.csus.ecs.pc2.core.model.ProblemDataFiles;
 import edu.csus.ecs.pc2.core.util.IJSONTool;
+import edu.csus.ecs.pc2.imports.ccs.TestDataGroup;
 import edu.csus.ecs.pc2.services.core.JSONUtilities;
 
 /**
@@ -19,6 +28,7 @@
  *
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonFilter("rtFilter")
 public class CLICSProblem {
 
     @JsonProperty
@@ -48,9 +58,8 @@ public class CLICSProblem {
     @JsonProperty
     private int test_data_count;
 
-// only for "score" type contests, N/A for pc2/wf pass-fail type contests
-//    @JsonProperty
-//    private int max_score;
+    @JsonProperty
+    private double max_score;
 
     // The next two will be 'null' for now until we implement the new json CPF
     @JsonProperty("package")
@@ -59,6 +68,8 @@ public class CLICSProblem {
     @JsonProperty
     private CLICSFileReference [] statement;
 
+    private boolean isPointScoring = false;
+
     /**
      * Fill in properties for a Problem description.
      *
@@ -82,15 +93,45 @@ public CLICSProblem(IInternalContest model, Problem problem, int ordinal) {
         }
         test_data_count = problem.getNumberTestCases();
         time_limit = problem.getTimeOutInSeconds();
+        if(model.getContestInformation().isScoreboardTypeScore()) {
+            isPointScoring = true;
+            ProblemDataFiles problemDataFiles = model.getProblemDataFile(problem);
+            if(problemDataFiles != null) {
+                TestDataGroup [] testDataGroups = problemDataFiles.getJudgesDataGroups();
+                // Really, there's only 1 top level TestDataGruop
+                if(testDataGroups != null && testDataGroups.length > 0) {
+                    max_score = testDataGroups[0].getRangeMax();
+                }
+            }
+        }
     }
 
     public String toJSON() {
+        Set<String> exceptProps = new HashSet<String>();
 
+        getExceptProps(exceptProps);
         try {
             ObjectMapper mapper = JSONUtilities.getObjectMapper();
+            // for this problem, create filter to omit inappropriate properties,
+            // 'max_score' in this case if not Point Scoring contest
+            SimpleBeanPropertyFilter filter = SimpleBeanPropertyFilter.serializeAllExcept(exceptProps);
+            FilterProvider fp = new SimpleFilterProvider().addFilter("rtFilter", filter).setFailOnUnknownId(false);
+            mapper.setFilters(fp);
             return mapper.writeValueAsString(this);
         } catch (Exception e) {
-            return "Error creating JSON for CLICS problem info " + e.getMessage();
+            return "Error creating JSON for CLICSProblem " + e.getMessage();
+        }
+    }
+
+    /**
+     * Get set of properties for which we do not want to serialize into JSON.
+     * This is so we don't serialize max_score for pass-fail contests
+     *
+     * @param exceptProps Set to fill in with property names to omit
+     */
+    public void getExceptProps(Set<String> exceptProps) {
+        if(!isPointScoring){
+            exceptProps.add("max_score");
         }
     }
 }

src/edu/csus/ecs/pc2/clics/API202306/CLICSProblemScore.java

@@ -2,13 +2,22 @@
 package edu.csus.ecs.pc2.clics.API202306;
 
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import edu.csus.ecs.pc2.core.StringUtilities;
 import edu.csus.ecs.pc2.core.Utilities;
+import edu.csus.ecs.pc2.core.model.IInternalContest;
 import edu.csus.ecs.pc2.core.standings.ProblemSummaryInfo;
+import edu.csus.ecs.pc2.services.core.JSONUtilities;
 
 /**
  * Contains information about the score a team received for a single problem.
@@ -19,6 +28,7 @@
  *
  */
 
+@JsonFilter("rtFilter")
 public class CLICSProblemScore {
 
     @JsonProperty
@@ -33,13 +43,14 @@ public class CLICSProblemScore {
     @JsonProperty
     private boolean solved;
 
-// Not needed for pass-fail contest
-//  @JsonProperty
-//  private double score;
+    @JsonProperty
+    private double score;
 
     @JsonProperty
     private int time;
 
+    private boolean isPointScoring = false;
+
     /**
      * Provide empty constructor for Jackson deserialization
      */
@@ -54,7 +65,7 @@ public CLICSProblemScore() {
      * @param probEleToShort hashmap for mapping problem elementid to shortname
      * @param versionInfo
      */
-    public CLICSProblemScore(HashMap<String, String> probEleToShort, ProblemSummaryInfo psi) {
+    public CLICSProblemScore(IInternalContest model, HashMap<String, String> probEleToShort, ProblemSummaryInfo psi) {
         num_judged = Utilities.nullSafeToInt(psi.getAttempts(), 0);
         num_pending = Utilities.nullSafeToInt(psi.getIsPending(), 0);
         problem_id = psi.getProblemId();
@@ -67,6 +78,38 @@ public CLICSProblemScore(HashMap<String, String> probEleToShort, ProblemSummaryI
             // Problem solution time is in minutes
             time = StringUtilities.getIntegerValue(psi.getSolutionTime(), 0);
         }
+        if(model != null) {
+            isPointScoring = model.getContestInformation().isScoreboardTypeScore();
+        }
+    }
+
+    public String toJSON() {
+        Set<String> exceptProps = new HashSet<String>();
+
+        getExceptProps(exceptProps);
+        try {
+            ObjectMapper mapper = JSONUtilities.getObjectMapper();
+            // for this problem's score, create filter to omit inappropriate properties,
+            // 'score' in this case if not Point Scoring contest
+            SimpleBeanPropertyFilter filter = SimpleBeanPropertyFilter.serializeAllExcept(exceptProps);
+            FilterProvider fp = new SimpleFilterProvider().addFilter("rtFilter", filter).setFailOnUnknownId(false);
+            mapper.setFilters(fp);
+            return mapper.writeValueAsString(this);
+        } catch (Exception e) {
+            return "Error creating JSON for CLICSProblemScore " + e.getMessage();
+        }
+    }
+
+    /**
+     * Get set of properties for which we do not want to serialize into JSON.
+     * This is so we don't serialize score for pass-fail contests
+     *
+     * @param exceptProps Set to fill in with property names to omit
+     */
+    public void getExceptProps(Set<String> exceptProps) {
+        if(!isPointScoring){
+            exceptProps.add("score");
+        }
     }
 
     /**