pricing control -- make version required field for PurchaseInfo

Author: williamstein

src/packages/frontend/site-licenses/purchase/purchase.tsx

@@ -42,9 +42,9 @@ import {
   discount_yearly_pct,
 } from "@cocalc/util/licenses/purchase/consts";
 import { compute_cost } from "@cocalc/util/licenses/purchase/compute-cost";
-import {
+import type {
   Cost,
-  PurchaseInfoQuota,
+  PurchaseInfo,
   Subscription,
   Upgrade,
   User,
@@ -71,6 +71,7 @@ import { create_quote_support_ticket } from "./get-a-quote";
 import { PurchaseMethod } from "./purchase-method";
 import { QuotaEditor } from "./quota-editor";
 import { RadioGroup } from "./radio-group";
+import { CURRENT_VERSION } from "@cocalc/util/licenses/purchase/consts";
 
 const { RangePicker } = DatePicker;
 
@@ -173,6 +174,7 @@ export const PurchaseOneLicense: React.FC<Props> = React.memo(({ onClose }) => {
       return undefined;
     }
     return compute_cost({
+      version: CURRENT_VERSION,
       type: "quota",
       quantity,
       user,
@@ -589,7 +591,8 @@ export const PurchaseOneLicense: React.FC<Props> = React.memo(({ onClose }) => {
       quote == null
     )
       return;
-    const info: PurchaseInfoQuota = {
+    const info: PurchaseInfo = {
+      version: CURRENT_VERSION,
       type: "quota",
       quantity,
       user,

src/packages/next/pages/pricing/subscriptions.tsx

@@ -32,6 +32,7 @@ import { Customize } from "lib/customize";
 import withCustomize from "lib/with-customize";
 import { Paragraph, Title } from "components/misc";
 import dayjs from "dayjs";
+import { CURRENT_VERSION } from "@cocalc/util/licenses/purchase/consts";
 
 function addMonth(date: Date): Date {
   return dayjs(date).add(30, "days").add(12, "hours").toDate();
@@ -64,6 +65,7 @@ const hobby: Item = (() => {
   } as const;
 
   const info: PurchaseInfo = {
+    version: CURRENT_VERSION,
     type: "quota",
     user: conf.user,
     upgrade: "custom",
@@ -109,6 +111,7 @@ const academic: Item = (() => {
   } as const;
 
   const info: PurchaseInfo = {
+    version: CURRENT_VERSION,
     type: "quota",
     user: conf.user,
     upgrade: "custom",
@@ -155,6 +158,7 @@ const business: Item = (() => {
   } as const;
 
   const info: PurchaseInfo = {
+    version: CURRENT_VERSION,
     type: "quota",
     user: conf.user,
     upgrade: "custom",

src/packages/server/prices.test.ts

@@ -6,10 +6,7 @@
 // test product ID and pricing
 
 import { ONE_DAY_MS } from "@cocalc/util/consts/billing";
-import type {
-  PurchaseInfo,
-  PurchaseInfoQuota,
-} from "@cocalc/util/licenses/purchase/types";
+import type { PurchaseInfo } from "@cocalc/util/licenses/purchase/types";
 import { compute_cost } from "@cocalc/util/licenses/purchase/compute-cost";
 import { round2 } from "@cocalc/util/misc";
 import {
@@ -31,7 +28,8 @@ describe("product id and compute cost", () => {
   // (since it isn't!) we set it back to run this test.
   // @ts-ignore
   COSTS.online_discount = 0.75;
-  const info1: Omit<PurchaseInfoQuota, "quantity"> = {
+  const info1 = {
+    version: "1",
     type: "quota",
     user: "academic",
     upgrade: "custom",
@@ -75,6 +73,7 @@ describe("product id and compute cost", () => {
         new Date((info1.start as Date).getTime() + days * ONE_DAY_MS),
       ),
     };
+    // @ts-ignore
     info2.cost = compute_cost(info2);
     // console.log(days, info2, Math.round(info2.cost.cost_per_unit * 10000));
     const unit_amount = unitAmount(info2);
@@ -89,6 +88,7 @@ describe("product id and compute cost", () => {
       start: new Date("2022-04-28T10:08:10.072Z"),
       end: new Date("2022-05-05T10:08:10.072Z"),
     };
+    // @ts-ignore
     info2.cost = compute_cost(info2);
     expect(unitAmount(info2)).toEqual(111);
   });
@@ -152,6 +152,7 @@ describe("dedicated disk", () => {
   it("calculates subscription price of one disk", () => {
     const start = startOfDay(new Date());
     const purchaseInfo: PurchaseInfo = {
+      version: "1",
       type: "disk",
       start,
       end: dayjs(start).add(30, "days").add(12, "hours").toDate(), // adding exact amount of time to make test well defined

src/packages/server/vouchers/charge-for-unpaid-vouchers.ts

@@ -20,6 +20,7 @@ import { getLogger } from "@cocalc/backend/logger";
 import { chargeUser } from "@cocalc/server/licenses/purchase/charge";
 import { StripeClient } from "@cocalc/server/stripe/client";
 import type { PurchaseInfo } from "@cocalc/util/db-schema/vouchers";
+import { CURRENT_VERSION } from "@cocalc/util/licenses/purchase/consts";
 
 const log = getLogger("charge-for-unpaid-vouchers");
 
@@ -34,7 +35,7 @@ export default async function chargeForUnpaidVouchers(): Promise<Result> {
 
   const pool = getPool();
   const { rows } = await pool.query(
-    "SELECT id, cost, tax, created_by, title FROM vouchers WHERE purchased is NULL AND when_pay='invoice' AND expire < NOW()"
+    "SELECT id, cost, tax, created_by, title FROM vouchers WHERE purchased is NULL AND when_pay='invoice' AND expire < NOW()",
   );
   const result: Result = {};
   for (const row of rows) {
@@ -67,7 +68,7 @@ async function chargeForUnpaidVoucher({
   const pool = getPool();
   const { rows } = await pool.query(
     "SELECT COUNT(*) AS quantity FROM voucher_codes WHERE id=$1 AND when_redeemed IS NOT NULL AND canceled IS NULL",
-    [id]
+    [id],
   );
   const quantity = rows[0].quantity;
   let purchased: PurchaseInfo;
@@ -76,6 +77,8 @@ async function chargeForUnpaidVoucher({
   } else {
     const stripe = new StripeClient({ account_id: created_by });
     const info = {
+      // version doesn't really matter since the cost is already explicitly given below
+      version: CURRENT_VERSION,
       type: "vouchers",
       quantity,
       cost,

src/packages/util/licenses/purchase/cost-versions.ts

@@ -50,6 +50,23 @@ const COST = {
     ALWAYS_RUNNING_FACTOR: 2,
   },
 
+  2: {
+    SUB_DISCOUNT: { no: 1, monthly: 0.85, yearly: 0.8 },
+    GCE_COSTS: {
+      ram: 0.67,
+      cpu: 5,
+      disk: 0.05,
+      non_pre_factor: 3.5,
+    },
+    COST_MULTIPLIER: 1.2,
+    NONMEMBER_DENSITY: 2,
+    ACADEMIC_DISCOUNT: 0.6,
+    DISK_FACTOR: 20,
+    RAM_OVERCOMMIT: 5,
+    CPU_OVERCOMMIT: 10,
+    ALWAYS_RUNNING_FACTOR: 2,
+  },
+
   // this version is PURELY for testing purposes
   test_1: {
     SUB_DISCOUNT: { no: 1, monthly: 0.9, yearly: 0.85 },