Merge branch 'main' into local-dev-docker-compose

Author: kschelonka

README.md

@@ -269,7 +269,7 @@ To test the HIBP breach alerts endpoint, use:
 ```sh
 export SERVER_URL=...
 export HIBP_NOTIFY_TOKEN=...
-npm run loadtest:hbibp-webhook
+npm run loadtest:hibp-webhook
 ```
 
 You can customise the number of requests to send in parallel ("virtual users") by setting the

package-lock.json

@@ -92,7 +92,7 @@
     "@types/react-dom": "19.1.7",
     "canvas-confetti": "^1.9.3",
     "dotenv-flow": "^4.1.0",
-    "ioredis": "^5.6.1",
+    "ioredis": "^5.7.0",
     "jsdom": "^27.0.0",
     "jsonwebtoken": "^9.0.2",
     "jwk-to-pem": "^2.0.7",

package.json

@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export async function up(knex) {
+  await knex.schema.dropTableIfExists("subscriber_churns");
+  await knex.schema.dropTableIfExists("subscriber_coupons");
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+export async function down(knex) {
+  await knex.schema.createTable("subscriber_churns", function (table) {
+    table.increments("id").primary();
+    table.string("userid").unique();
+    table.string("customer").unique();
+    table.string("plan_id");
+    table.string("product_id");
+    table.string("intervl");
+    table.string("nickname");
+    table.timestamp("created");
+    table.timestamp("current_period_end");
+  });
+  await knex.schema.createTable("subscriber_coupons", (table) => {
+    table.increments("id").primary();
+    table
+      .integer("subscriber_id")
+      .references("subscribers.id")
+      .notNullable()
+      .onDelete("CASCADE")
+      .onUpdate("CASCADE");
+    table.string("coupon_code").notNullable();
+    table.timestamp("created_at").defaultTo(knex.fn.now());
+    table.unique(["subscriber_id", "coupon_code"]);
+  });
+}

src/db/migrations/20251002092700_drop_coupon_subcriber_churn.js

@@ -26,16 +26,6 @@ declare module "knex/types/tables" {
     updated_at: Date;
   }
 
-  interface SubscriberChurnRow {
-    userid: string;
-    customer: string;
-    nickname: string;
-    intervl: string;
-    plan_id: string;
-    product_id: string;
-    current_period_end: Date;
-  }
-
   interface OnerepScanResultDataBrokerRow extends OnerepScanResultRow {
     scan_result_status: RemovalStatus;
     broker_status: DataBrokerRemovalStatus;
@@ -213,17 +203,6 @@ declare module "knex/types/tables" {
     "id" | "created_at" | "updated_at"
   >;
 
-  interface SubscriberCouponRow {
-    id: number;
-    subscriber_id: number;
-    coupon_code: string;
-    created_at: Date;
-  }
-  type SubscriberCouponAutoInsertedColumns = Extract<
-    keyof SubscriberCouponRow,
-    "id" | "subscriber_id" | "created_at"
-  >;
-
   interface SubscriberEmailPreferencesRow {
     id: number;
     subscriber_id: number;
@@ -530,18 +509,6 @@ declare module "knex/types/tables" {
       >
     >;
 
-    subscriber_coupons: Knex.CompositeTableType<
-      SubscriberCouponRow,
-      // On inserts, auto-generated columns cannot be set, and nullable columns are optional:
-      WritableDateColumns<
-        Omit<SubscriberCouponRow, SubscriberAutoInsertedColumns>
-      >,
-      // On updates, don't allow updating the ID; all other fields are optional:
-      WritableDateColumns<Partial<Omit<SubscriberCouponRow, "id">>>
-    >;
-
-    subscriber_churns: SubscriberChurnRow;
-
     subscriber_email_preferences: Knex.CompositeTableType<
       SubscriberEmailPreferencesRow,
       // On inserts, auto-generated columns cannot be set, and nullable columns are optional: