fix: update function name

Author: BravoNatalie

billing/functions/billing-cron.js

@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/serverless'
 import { expect } from './lib.js'
 import { createCustomerStore } from '../tables/customer.js'
 import { createCustomerBillingQueue } from '../queues/customer.js'
-import { startOfDay, startOfYesterday } from '../lib/util.js'
+import { startOfToday, startOfYesterday } from '../lib/util.js'
 import { enqueueCustomerBillingInstructions } from '../lib/billing-cron.js'
 import { mustGetEnv } from '../../lib/env.js'
 
@@ -38,7 +38,7 @@ export const handler = Sentry.AWSLambda.wrapHandler(
     // the sum of all daily usage records equals the total monthly usage for Stripe billing.
     let period = {
       from: startOfYesterday(now),  // at 00:00 UTC
-      to: startOfDay(now)  // at 00:00 UTC
+      to: startOfToday(now)  // at 00:00 UTC
     }                                          
 
     if ('rawQueryString' in event) {

billing/lib/space-billing-queue.js

@@ -80,7 +80,7 @@ export const calculatePeriodUsage = async (instruction, ctx) => {
     console.log(`Total ${totalDiffs} diffs processed for space: ${instruction.space}...`)
   }
 
-  console.log(`Total size of ${instruction.space} is ${size} bytes @ ${instruction.to.toISOString()}`)
+  console.log(`Final total size of ${instruction.space} is ${size} bytes and usage ${usage} byte/ms @ ${instruction.to.toISOString()}`)
 
   return { ok: { size, usage } }
 }

billing/lib/util.js

@@ -1,15 +1,15 @@
 export const GB = 1024 * 1024 * 1024
 
 /** @param {string|number|Date} now */                                                                                               
-export const startOfDay = (now) => {                                                                                                 
+export const startOfToday = (now) => {                                                                                                 
   const d = new Date(now)                                                                                                            
   d.setUTCHours(0, 0, 0, 0)                                                                                                          
   return d                                                                                                                           
 }                                                                                                                                    
 
 /** @param {string|number|Date} now */                                                                                               
 export const startOfYesterday = (now) => {                                                                                           
-  const d = startOfDay(now)                                                                                                          
+  const d = startOfToday(now)                                                                                                          
   d.setUTCDate(d.getUTCDate() - 1)                                                                                                   
   return d                                                                                                                           
 }

billing/scripts/replay-usage-reporting.js

@@ -22,6 +22,7 @@ import fs from 'node:fs'
 import { mustGetEnv } from '../../lib/env.js'
 import * as Usage from '../data/usage.js'
 import { reportUsage } from '../functions/usage-table.js'
+import { createUsageStore } from '../tables/usage.js'
 
 dotenv.config({ path: '.env.local' })
 
@@ -32,6 +33,7 @@ const customerIndex = args.indexOf('--customer')
 const CUSTOMER = customerIndex !== -1 ? args[customerIndex + 1] : undefined
 
 const STORACHA_ENV = mustGetEnv('STORACHA_ENV')
+const AWS_REGION = mustGetEnv('AWS_REGION')
 const STRIPE_SECRET_KEY = mustGetEnv('STRIPE_SECRET_KEY')
 const USAGE_TABLE_NAME = `${STORACHA_ENV}-w3infra-usage`
 
@@ -152,7 +154,10 @@ async function main() {
   const timestamp = new Date().toISOString().replace(/[.:]/g, '-')
   const errorsFilename = `./replay-failures-${timestamp}.jsonl`
 
-  const ctx = { stripe }
+  const ctx = {
+    stripe,
+    usageStore: createUsageStore({ region: AWS_REGION }, { tableName: USAGE_TABLE_NAME })
+  }
 
   const records = CUSTOMER ? queryUsageRecordsForCustomer(CUSTOMER) : scanUsageRecords()
   for await (const usage of records) {

billing/test/lib/billing-cron.js

@@ -1,4 +1,4 @@
-import { startOfYesterday, startOfDay } from '../../lib/util.js'
+import { startOfYesterday, startOfToday } from '../../lib/util.js'
 import { enqueueCustomerBillingInstructions } from '../../lib/billing-cron.js'
 import { randomCustomer } from '../helpers/customer.js'
 import { collectQueueMessages } from '../helpers/queue.js'
@@ -19,7 +19,7 @@ export const test = {
     assert.ok(!error)
 
     const now = new Date()
-    const period = { from: startOfYesterday(now), to: startOfDay(now) }
+    const period = { from: startOfYesterday(now), to: startOfToday(now) }
     const handled = await enqueueCustomerBillingInstructions(period, ctx)
     assert.ok(handled.ok)
 

billing/test/lib/customer-billing-queue.js

@@ -1,5 +1,5 @@
 import { enqueueSpaceBillingInstructions } from '../../lib/customer-billing-queue.js'
-import { startOfYesterday, startOfDay } from '../../lib/util.js'
+import { startOfYesterday, startOfToday } from '../../lib/util.js'
 import { randomConsumer } from '../helpers/consumer.js'
 import { randomCustomer } from '../helpers/customer.js'
 import { collectQueueMessages } from '../helpers/queue.js'
@@ -40,7 +40,7 @@ export const test = {
       account: customer.account,
       product: customer.product,
       from: startOfYesterday(now),
-      to: startOfDay(now)
+      to: startOfToday(now)
     }
 
     const handled = await enqueueSpaceBillingInstructions(instruction, ctx)

billing/test/lib/space-billing-queue.js

@@ -1,5 +1,5 @@
 import { calculatePeriodUsage, storeSpaceUsage } from '../../lib/space-billing-queue.js'
-import { startOfYesterday, startOfDay } from '../../lib/util.js'
+import { startOfYesterday, startOfToday } from '../../lib/util.js'
 import { randomConsumer } from '../helpers/consumer.js'
 import { randomCustomer } from '../helpers/customer.js'
 import { randomLink } from '../helpers/dag.js'
@@ -11,7 +11,7 @@ export const test = {
     const consumer = await randomConsumer()
     const now = new Date()
     const from = startOfYesterday(now)
-    const to = startOfDay(now)
+    const to = startOfToday(now)
     const delta = 1024 * 1024 * 1024 // 1GiB
 
     await ctx.spaceDiffStore.batchPut([{
@@ -64,7 +64,7 @@ export const test = {
     const consumer = await randomConsumer()
     const now = new Date()
     const from = startOfYesterday(now)
-    const to = startOfDay(now)
+    const to = startOfToday(now)
     const delta = 1024 * 1024 * 1024 // 1GiB
 
     await ctx.spaceSnapshotStore.put({
@@ -140,7 +140,7 @@ export const test = {
     const size = BigInt(1024 * 1024 * 1024 * 1024) // 1TiB
     const now = new Date()
     const from = startOfYesterday(now)
-    const to = startOfDay(now)
+    const to = startOfToday(now)
     const delta = 1024 * 1024 * 1024 // 1GiB
 
     await ctx.spaceSnapshotStore.put({