testilo 30.0.0 → 30.1.0

package/README.md

@@ -755,12 +755,13 @@ The `track()` function returns an ID and an HTML tracking report that shows data
 A user can invoke `track()` in one of these ways:
 
 ```javaScript
+node call track ttp99a
 node call track ttp99a 241016
 node call track ttp99a 241016 'ABC Foundation'
 ```
 
 When a user invokes `track()` in this example, the `call` module:
-- gets the summary report from the first file in the `summarized` subdirectory of the `REPORTDIR` directory whose name begins with `'241016'`.
+- gets the summary report from the last file in the `summarized` subdirectory of the `REPORTDIR` directory, or if the third argument to `call()` exists the last one whose name begins with `'241016'`.
 - selects the summarized data for all results in the summary report, or if the fourth argument to `call()` exists from all results whose `target.what` property has the value `'ABC Foundation'`.
 - uses tracker `ttp99a` to create a tracking report.
 - assigns an ID to the tracking report.

package/call.js

@@ -52,11 +52,17 @@ const fnArgs = process.argv.slice(3);
 
 // ########## FUNCTIONS
 
-// Gets a summary report.
+// Gets the last matching summary report.
 const getSummaryReport = async selector => {
   const summaryDir = `${reportDir}/summarized`;
   const summaryReportNames = await fs.readdir(summaryDir);
-  const summaryReportName = summaryReportNames.find(reportName => reportName.startsWith(selector));
+  let summaryReportName;
+  if (summaryReportNames && summaryReportNames.length) {
+    summaryReportName = summaryReportNames.findLast(reportName => reportName.startsWith(selector));
+  }
+  else {
+    summaryReportName = summaryReportNames.pop();
+  }
   if (summaryReportName) {
     const summaryReportJSON = await fs.readFile(`${summaryDir}/${summaryReportName}`, 'utf8');
     const summaryReport = JSON.parse(summaryReportJSON);
@@ -255,7 +261,7 @@ const callSummarize = async (what, selector = '') => {
     const summaryReport = {
       id: getFileID(2),
       what,
-      data: []
+      summaries: []
     };
     // For each report to be summarized:
     for (const reportID of reportIDs) {
@@ -263,7 +269,7 @@ const callSummarize = async (what, selector = '') => {
       const report = await getReport('scored', reportID);
       // Add a summary of it to the summary report.
       const summary = summarize(report);
-      summaryReport.data.push(summary);
+      summaryReport.summaries.push(summary);
     };
     // Save the summary report.
     const summaryDir = `${reportDir}/summarized`;
@@ -302,50 +308,21 @@ const callCompare = async (what, compareProcID, selector) => {
     }
   }
 };
-// Fulfills a credit request.
-const callCredit = async (what, selector = '') => {
-  // Get the IDs of the scored reports to be credited.
-  const reportIDs = await getReportIDs('scored', selector);
-  // If any exist:
-  if (reportIDs.length) {
-    // Get an array of the score properties of the reports to be credited.
-    const reportScores = [];
-    for (const id of reportIDs) {
-      const report = await getReport('scored', id);
-      reportScores.push(report.score);
-    }
-    // Credit the reports.
-    const tally = credit(what, reportScores);
-    // Save the credit report.
-    const creditDir = `${reportDir}/credit`;
-    await fs.mkdir(creditDir, {recursive: true});
-    const creditReportID = getFileID(2);
-    tally.id = creditReportID;
-    const reportPath = `${creditDir}/${creditReportID}.json`;
-    await fs.writeFile(reportPath, `${JSON.stringify(tally, null, 2)}\n`);
-    console.log(`Reports credited and credit report saved as ${reportPath}`);
-  }
-  // Otherwise, i.e. if no scored reports are to be credited:
-  else {
-    // Report this.
-    console.log('ERROR: No scored reports to be credited');
-  }
-};
 // Fulfills a tracking request.
 const callTrack = async (trackerID, selector, targetWhat) => {
   // Get the summary report.
   try {
     const summaryReport = await getSummaryReport(selector);
     // Remove unwanted results from it.
-    summaryReport.data = summaryReport.data.filter(
+    summaryReport.summaries = summaryReport.summaries.filter(
       result => targetWhat
       ? result.sources
       && result.sources.target
-      && result.sources.target.what !== targetWhat
+      && result.sources.target.what === targetWhat
       : true
     );
     // If any results remain:
-    if (summaryReport.data.length) {
+    if (summaryReport.summaries.length) {
       // Get the tracker.
       const {tracker} = require(`${functionDir}/track/${trackerID}/index`);
       // Track the results.
@@ -365,6 +342,35 @@ const callTrack = async (trackerID, selector, targetWhat) => {
     console.log(`ERROR: Tracking request invalid (${error.message})`);
   }
 };
+// Fulfills a credit request.
+const callCredit = async (what, selector = '') => {
+  // Get the IDs of the scored reports to be credited.
+  const reportIDs = await getReportIDs('scored', selector);
+  // If any exist:
+  if (reportIDs.length) {
+    // Get an array of the score properties of the reports to be credited.
+    const reportScores = [];
+    for (const id of reportIDs) {
+      const report = await getReport('scored', id);
+      reportScores.push(report.score);
+    }
+    // Credit the reports.
+    const tally = credit(what, reportScores);
+    // Save the credit report.
+    const creditDir = `${reportDir}/credit`;
+    await fs.mkdir(creditDir, {recursive: true});
+    const creditReportID = getFileID(2);
+    tally.id = creditReportID;
+    const reportPath = `${creditDir}/${creditReportID}.json`;
+    await fs.writeFile(reportPath, `${JSON.stringify(tally, null, 2)}\n`);
+    console.log(`Reports credited and credit report saved as ${reportPath}`);
+  }
+  // Otherwise, i.e. if no scored reports are to be credited:
+  else {
+    // Report this.
+    console.log('ERROR: No scored reports to be credited');
+  }
+};
 
 // ########## OPERATION
 

package/compare.js

@@ -11,6 +11,6 @@
 // Compares the summarized reports and returns a comparison.
 exports.compare = async (id, what, comparer, summaryReport) => {
   // Return the comparison.
-  console.log(`Comparison complete. Report count: ${summaryReport.data.length}`);
+  console.log(`Comparison complete. Report count: ${summaryReport.summaries.length}`);
   return comparer(id, what, summaryReport);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "30.0.0",
+  "version": "30.1.0",
   "description": "Prepares and processes Testaro reports",
   "main": "call.js",
   "scripts": {

package/procs/compare/tcp40/index.js

@@ -17,13 +17,13 @@ const innestJoiner = '\n          ';
 // ########## FUNCTIONS
 
 // Returns the maximum score.
-const getMaxScore = summaryReport => summaryReport.data.reduce(
+const getMaxScore = summaryReport => summaryReport.summaries.reduce(
   (max, result) => Math.max(max, result.score), 0
 );
 // Converts summary report data to a table body.
 const getTableBody = async summaryReport => {
   const maxScore = getMaxScore(summaryReport);
-  const rows = summaryReport.data
+  const rows = summaryReport.summaries
   .sort((a, b) => a.score - b.score)
   .map(result => {
     const {id, sources, score} = result;
@@ -42,7 +42,7 @@ const getTableBody = async summaryReport => {
 const populateQuery = async (id, what, summaryReport, query) => {
   query.id = id;
   query.what = what;
-  query.pageCount = summaryReport.data.length;
+  query.pageCount = summaryReport.summaries.length;
   query.tableBody = await getTableBody(summaryReport);
   query.dateISO = getNowDate();
   query.dateSlash = getNowDateSlash();

package/procs/track/ttp40/index.html

@@ -31,7 +31,7 @@
         const summaryReportJSON = '__summaryReportJSON__';
         const summaryReport = JSON.parse(summaryReportJSON);
         const graphData = [];
-        summaryReport.data.forEach(result => {
+        summaryReport.summaries.forEach(result => {
           graphData.push({
             target: result.sources.target.what,
             time: new Date(`20${result.endTime}Z`),

package/procs/track/ttp40/index.js

@@ -28,15 +28,15 @@ const populateQuery = async (id, summaryReport, query) => {
   query.dateISO = getNowDate();
   query.dateSlash = getNowDateSlash();
   // JSON of pruned summary report.
-  summaryReport.data.forEach(result => {
+  const {summaries} = summaryReport;
+  summaries.forEach(result => {
     delete result.sources.target.id;
   });
   query.summaryReportJSON = JSON.stringify(summaryReport);
   // For each score:
   const rows = [];
-  const results = summaryReport.data;
-  const targetWhats = Array.from(new Set(results.map(result => result.sources.target.what))).sort();
-  summaryReport.data.forEach(result => {
+  const targetWhats = Array.from(new Set(summaries.map(result => result.sources.target.what))).sort();
+  summaries.forEach(result => {
     // Create an HTML table row for it.
     const timeCell = `<td>${result.endTime}</td>`;
     const digestLinkDestination = digestURL.replace('__id__', result.id);

package/track.js

@@ -18,6 +18,5 @@ exports.track = async (tracker, summaryReport) => {
   // Use the tracker to create a tracking report.
   const id = getFileID(2);
   const trackingReport = await tracker(id, summaryReport);
-  console.log(`Tracking report ${id} created`);
   return [id, trackingReport];
 };