Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I 960 Generate event-feed.ndjson as part of Results Export Report #961

Merged
merged 1 commit into from
May 7, 2024
Merged

I 960 Generate event-feed.ndjson as part of Results Export Report #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/edu/csus/ecs/pc2/core/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public final class Constants {

public final static String SCOREBOARD_JSON_FILENAME = "scoreboard.json";

public final static String EVENT_FEED_JSON_FILENAME = "event-feed.ndjson";

public static final long HOURS_PER_DAY = 24;

private Constants() {
Expand Down
25 changes: 21 additions & 4 deletions src/edu/csus/ecs/pc2/core/report/ExportFilesUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 1989-2023 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
// Copyright (C) 1989-2024 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
package edu.csus.ecs.pc2.core.report;

import java.io.File;
Expand All @@ -17,18 +17,19 @@
import edu.csus.ecs.pc2.core.log.StaticLog;
import edu.csus.ecs.pc2.core.model.IInternalContest;
import edu.csus.ecs.pc2.exports.ccs.ResultsFile;
import edu.csus.ecs.pc2.services.core.EventFeedJSON;
import edu.csus.ecs.pc2.services.core.ScoreboardJson;

public class ExportFilesUtilities {

/**
* Write contest results files to directory.
*
*
* Creates contest result files
* <li>{@link ResultsFile.RESULTS_FILENAME}
* <li>{@link Constants.SCOREBOARD_JSON_FILENAME}
* <li>{@link Constants.AWARDS_JSON_FILENAME}
*
*
* @param contest
* @param outputDirectory
* directory to write reports to.
Expand All @@ -44,6 +45,8 @@ public static String[] writeResultsFiles(IInternalContest contest, String output

String awardsFileName = outputDirectory + File.separator + Constants.AWARDS_JSON_FILENAME;

String eventfeedJsonFilename = outputDirectory + File.separator + Constants.EVENT_FEED_JSON_FILENAME;

try {
ResultsFile resultsFile = new ResultsFile();
String[] resultTSVLines = resultsFile.createTSVFileLines(contest);
Expand Down Expand Up @@ -85,6 +88,20 @@ public static String[] writeResultsFiles(IInternalContest contest, String output
ExecuteUtilities.rethrow(e);
}

return (String[]) filesCreated.toArray(new String[filesCreated.size()]);
try {
EventFeedJSON efEventFeedJSON = new EventFeedJSON(contest);
String json = efEventFeedJSON.createJSON(contest, null, null);
String[] eventfeedJsonLines = { json };
FileUtilities.writeFileContents(eventfeedJsonFilename, eventfeedJsonLines);

filesCreated.add(eventfeedJsonFilename);

} catch (Exception e) {
StaticLog.getLog().log(Level.WARNING, "Problem writing event-feed JSON file", e);
Utilities.printStackTrace(System.out, e);
ExecuteUtilities.rethrow(e);
}

return filesCreated.toArray(new String[filesCreated.size()]);
}
}
62 changes: 32 additions & 30 deletions src/edu/csus/ecs/pc2/core/report/ResultsExportReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 1989-2023 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
// Copyright (C) 1989-2024 PC2 Development Team: John Clevenger, Douglas Lane, Samir Ashoo, and Troy Boudreau.
package edu.csus.ecs.pc2.core.report;

import java.io.File;
Expand All @@ -24,7 +24,7 @@
import edu.csus.ecs.pc2.exports.ccs.ResultsFile;

public class ResultsExportReport implements IReport {

private IInternalContest contest;

private IInternalController controller;
Expand All @@ -34,11 +34,11 @@ public class ResultsExportReport implements IReport {
private Filter filter = new Filter();

private String pc2ResultsDir = null;

private String primaryCCSResultsDir = null;

/**
*
*
*/
private static final long serialVersionUID = -796328654541676730L;

Expand Down Expand Up @@ -67,7 +67,7 @@ public String getPluginTitle() {

@Override
public void createReportFile(String filename, Filter inFilter) throws IOException {

PrintWriter printWriter = new PrintWriter(new FileOutputStream(filename, false), true);
filter = inFilter;

Expand All @@ -85,7 +85,7 @@ public void createReportFile(String filename, Filter inFilter) throws IOExceptio

printWriter.close();
printWriter = null;

}

catch (RuntimeException rte) {
Expand All @@ -98,24 +98,24 @@ public void createReportFile(String filename, Filter inFilter) throws IOExceptio
printWriter.println("Exception generating report " + rte.getMessage());
throwable.printStackTrace(printWriter);
}

catch (Exception e) {
log.log(Log.INFO, "Exception writing report", e);
printWriter.println("Exception generating report " + e.getMessage());
}
}


public String getReportFileName (IReport selectedReport, String extension) {

return getReportBaseFileName(selectedReport, "txt");
}

public String getAltReportDirname (IReport selectedReport, String extension) {

return getReportBaseFileName(selectedReport, "files");
}

public String getReportBaseFileName(IReport selectedReport, String extension) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM.dd.SSS");
// "yyMMdd HHmmss.SSS");
Expand All @@ -124,14 +124,14 @@ public String getReportBaseFileName(IReport selectedReport, String extension) {
while (reportName.indexOf(' ') > -1) {
reportName = reportName.replace(" ", "_");
}

if (extension != null && extension.length() >= 0) {
extension = "." + extension;
}

return "report." + reportName + "." + simpleDateFormat.format(new Date()) + extension;
}

public String getFileName(IReport selectedReport, String extension) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM.dd.SSS"); // or maybe? "yyMMdd HHmmss.SSS");
String reportName = selectedReport.getReportTitle();
Expand All @@ -141,30 +141,31 @@ public String getFileName(IReport selectedReport, String extension) {
}
return "report." + reportName + "." + simpleDateFormat.format(new Date()) + "." + extension;
}

@Override
public String[] createReport(Filter filter) {

List<String> outList = new ArrayList<String>();


String resultsFilename = getPc2ResultsDir() + File.separator + ResultsFile.RESULTS_FILENAME;
String scoreboardJsonFilename = getPc2ResultsDir() + File.separator + Constants.SCOREBOARD_JSON_FILENAME;
String awardsFileName = getPc2ResultsDir() + File.separator + Constants.AWARDS_JSON_FILENAME;

String eventFeedJsonFileName = getPc2ResultsDir() + File.separator + Constants.EVENT_FEED_JSON_FILENAME;

ExportFilesUtilities.writeResultsFiles(contest, getPc2ResultsDir());

String finalizedStatus = "No. (Warning - contest is not finalized)";

FinalizeData finalizedDAta = contest.getFinalizeData();
if (finalizedDAta != null) {
if ( finalizedDAta.isCertified() ) {

finalizedStatus = "Yes. Finalized at "+
finalizedDAta.getCertificationDate();
}
}

String[] reportLinss = { //

"pc2 results dir : " + getPc2ResultsDir(), //
Expand All @@ -175,15 +176,16 @@ public String[] createReport(Filter filter) {
resultsFilename, //
scoreboardJsonFilename, //
awardsFileName, //
eventFeedJsonFileName, //
"", //

};

outList.addAll(0, Arrays.asList(reportLinss));
return (String[]) outList.toArray(new String[outList.size()]);



return outList.toArray(new String[outList.size()]);
}


Expand Down Expand Up @@ -244,7 +246,7 @@ public void printFooter(PrintWriter printWriter) {
printWriter.println("end report: " + getReportTitle());

}

public String getPc2ResultsDir() {
if (pc2ResultsDir == null) {
// ExecuteUtilities.ensureDirectory(Constants.REPORT_DIRECTORY_NAME);
Expand All @@ -266,7 +268,7 @@ public String getOutputDirectoryName() {
public String getPrimaryCCSResultsDir() {
return primaryCCSResultsDir;
}

public void setPrimaryCCSResultsDir(String primaryCCSResultsDir) {
this.primaryCCSResultsDir = primaryCCSResultsDir;
}
Expand Down
Loading