@oneuptime/common 12.0.2 → 12.0.3

package/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts

@@ -17,6 +17,10 @@ import TableColumn, {
   getTableColumns,
 } from "../../../Types/Database/TableColumn";
 import TableColumnType from "../../../Types/Database/TableColumnType";
+import {
+  coerceNumericColumnValue,
+  isNumericTableColumnType,
+} from "../../../Types/Database/NumericColumnValue";
 import { getFirstColorFieldColumn } from "../../../Types/Database/ColorField";
 import Dictionary from "../../../Types/Dictionary";
 import Email from "../../../Types/Email";
@@ -727,6 +731,16 @@ export default class DatabaseBaseModel extends BaseEntity {
             json[key] as JSONArray,
             tableColumnMetadata.modelType,
           );
+        } else if (isNumericTableColumnType(tableColumnMetadata.type)) {
+          /*
+           * An `<input type="number">` hands back a string, so the dashboard
+           * posts "10" for a number column. This is the one place that knows
+           * the column's declared type, and it runs on both sides of the
+           * wire — ModelForm on the way out, BaseAPI on the way in — so a
+           * number column holds a number before any hook or validator reads
+           * it. See Types/Database/NumericColumnValue.
+           */
+          (baseModel as any)[key] = coerceNumericColumnValue(json[key]);
         } else {
           (baseModel as any)[key] = json[key];
         }

package/Models/DatabaseModels/Index.ts

@@ -375,6 +375,7 @@ import MonitorOwnerRule from "./MonitorOwnerRule";
 import MonitorLabelRule from "./MonitorLabelRule";
 import StatusPageOwnerRule from "./StatusPageOwnerRule";
 import StatusPageLabelRule from "./StatusPageLabelRule";
+import StatusPageMonitorRule from "./StatusPageMonitorRule";
 import HostOwnerRule from "./HostOwnerRule";
 import HostLabelRule from "./HostLabelRule";
 import ServiceOwnerRule from "./ServiceOwnerRule";
@@ -559,6 +560,7 @@ const AllModelTypes: Array<{
   MonitorLabelRule,
   StatusPageOwnerRule,
   StatusPageLabelRule,
+  StatusPageMonitorRule,
   HostOwnerRule,
   HostLabelRule,
   ServiceOwnerRule,

package/Models/DatabaseModels/LogDropFilter.ts

@@ -7,6 +7,7 @@ import TableAccessControl from "../../Types/Database/AccessControl/TableAccessCo
 import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
+import { getBigIntDatabaseTransformer } from "../../Types/Database/BigIntColumnTransformer";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import TableColumn from "../../Types/Database/TableColumn";
@@ -436,26 +437,14 @@ export default class LogDropFilter extends BaseModel {
     type: ColumnType.BigPositiveNumber,
     nullable: false,
     default: 0,
-    transformer: {
-      to: (value: number | null | undefined): string | null => {
-        if (value === null || value === undefined) {
-          return null;
-        }
-        return Math.trunc(value).toString();
-      },
-      /*
-       * Postgres bigint comes back from the driver as a string. The UI
-       * renders this as a number, so normalize here rather than making
-       * every reader remember.
-       */
-      from: (value: string | null | undefined): number | null => {
-        if (value === null || value === undefined) {
-          return null;
-        }
-        const parsed: number = parseInt(value, 10);
-        return isNaN(parsed) ? null : parsed;
-      },
-    },
+    /*
+     * Shared transformer, not an inline one: it has to preserve `undefined`
+     * so this NOT NULL column's DEFAULT 0 is what a create actually gets.
+     * An inline transformer that mapped `undefined` to `null` made every
+     * drop-filter insert fail the not-null constraint. See
+     * Types/Database/BigIntColumnTransformer.
+     */
+    transformer: getBigIntDatabaseTransformer(),
   })
   public droppedCount?: number = undefined;