Change day from timestamp to date

PRX · May 3, 2024 · 0067d13 · 0067d13
1 parent d0813e3
commit 0067d13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/bigquery.js b/lib/bigquery.js
@@ -33,7 +33,7 @@ exports.latestRollupDay = async () => {
   lower.setDate(lower.getDate() - logExp);
 
   // see if BQ has a day later than that
-  const sql = `SELECT MAX(day) AS day FROM dt_bytes WHERE day >= @lower`;
+  const sql = `SELECT MAX(day) AS day FROM dt_bytes WHERE day >= DATE(@lower)`;
   const rows = await exports.query(sql, { lower });
   if (rows[0]?.day) {
     return new Date(rows[0].day.value);
@@ -46,7 +46,7 @@ exports.latestRollupDay = async () => {
  * Get the current total bytes for a day
  */
 exports.totalBytes = async (day) => {
-  const sql = `SELECT SUM(bytes) AS total_bytes FROM dt_bytes WHERE day = @day`;
+  const sql = `SELECT SUM(bytes) AS total_bytes FROM dt_bytes WHERE day = DATE(@day)`;
   const rows = await exports.query(sql, { day });
   return rows[0]?.total_bytes || 0;
 };
@@ -55,7 +55,7 @@ exports.totalBytes = async (day) => {
  * Delete a day of bytes data
  */
 exports.deleteDay = async (day) => {
-  const sql = `DELETE FROM dt_bytes WHERE day = @day`;
+  const sql = `DELETE FROM dt_bytes WHERE day = DATE(@day)`;
   await exports.query(sql, { day });
   return true;
 };

diff --git a/lib/util.js b/lib/util.js
@@ -50,11 +50,12 @@ exports.elapsed = async (fn) => {
  *   <feeder_podcast>/<feeder_episode>
  *   <feeder_podcast>/<feeder_feed>/<feeder_episode>
  */
-exports.parseUsage = (day, rows) =>
+exports.parseUsage = (dayDate, rows) =>
   rows
     .map(([uri, byteStr]) => {
       const parts = uri.split("/");
       const bytes = parseInt(byteStr, 10);
+      const day = dayDate.toISOString().split("T").shift();
 
       if (parts[0].match(/^[0-9]+$/)) {
         /* eslint-disable camelcase */

diff --git a/lib/util.test.js b/lib/util.test.js
@@ -69,20 +69,20 @@ describe("util", () => {
         feeder_podcast: 1234,
         feeder_episode: "some-guid",
         bytes: 99,
-        day,
+        day: "2024-03-04",
       });
       expect(rows[1]).toEqual({
         feeder_podcast: 1234,
         feeder_episode: "another-guid",
         bytes: 88,
-        day,
+        day: "2024-03-04",
       });
       expect(rows[2]).toEqual({
         feeder_podcast: 5678,
         feeder_feed: "my-feed",
         feeder_episode: "the-guid",
         bytes: 77,
-        day,
+        day: "2024-03-04",
       });
     });