@oneuptime/common 10.0.93 → 10.0.96

package/Server/API/MonitorTemplateAPI.ts

@@ -0,0 +1,182 @@
+import UserMiddleware from "../Middleware/UserAuthorization";
+import MonitorTemplateService, {
+  Service as MonitorTemplateServiceType,
+  SyncLinkedMonitorsResult,
+} from "../Services/MonitorTemplateService";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+import CommonAPI from "./CommonAPI";
+import MonitorTemplate from "../../Models/DatabaseModels/MonitorTemplate";
+import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
+
+/**
+ * Pull a `fields` whitelist out of the request body for a sync endpoint.
+ * Returns undefined when the caller didn't ask to scope the sync — the
+ * service treats that as "sync everything syncable".
+ */
+function readSyncFields(req: ExpressRequest): Array<string> | undefined {
+  const raw: unknown = (req.body as Record<string, unknown> | undefined)?.[
+    "fields"
+  ];
+  if (raw === undefined || raw === null) {
+    return undefined;
+  }
+  if (!Array.isArray(raw)) {
+    throw new BadDataException("`fields` must be an array of strings");
+  }
+  for (const entry of raw) {
+    if (typeof entry !== "string") {
+      throw new BadDataException("`fields` must be an array of strings");
+    }
+  }
+  return raw as Array<string>;
+}
+
+export default class MonitorTemplateAPI extends BaseAPI<
+  MonitorTemplate,
+  MonitorTemplateServiceType
+> {
+  public constructor() {
+    super(MonitorTemplate, MonitorTemplateService);
+
+    // Push the template's current configuration onto every linked monitor.
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/:monitorTemplateId/sync-to-linked-monitors`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const monitorTemplateId: ObjectID = new ObjectID(
+            req.params["monitorTemplateId"] as string,
+          );
+
+          const props: DatabaseCommonInteractionProps =
+            await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+          const fields: Array<string> | undefined = readSyncFields(req);
+
+          const result: SyncLinkedMonitorsResult =
+            await MonitorTemplateService.syncLinkedMonitors({
+              monitorTemplateId,
+              props,
+              ...(fields !== undefined ? { fields } : {}),
+            });
+
+          return Response.sendJsonObjectResponse(req, res, {
+            ...result,
+          });
+        } catch (e) {
+          next(e);
+        }
+        return;
+      },
+    );
+
+    // Push the template's current configuration onto a single linked monitor.
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/:monitorTemplateId/sync-to-monitor/:monitorId`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const monitorTemplateId: ObjectID = new ObjectID(
+            req.params["monitorTemplateId"] as string,
+          );
+          const monitorId: ObjectID = new ObjectID(
+            req.params["monitorId"] as string,
+          );
+
+          const props: DatabaseCommonInteractionProps =
+            await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+          const fields: Array<string> | undefined = readSyncFields(req);
+
+          await MonitorTemplateService.syncToMonitor({
+            monitorTemplateId,
+            monitorId,
+            props,
+            ...(fields !== undefined ? { fields } : {}),
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (e) {
+          next(e);
+        }
+        return;
+      },
+    );
+
+    // Link an existing monitor to this template.
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/:monitorTemplateId/link-monitor/:monitorId`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const monitorTemplateId: ObjectID = new ObjectID(
+            req.params["monitorTemplateId"] as string,
+          );
+          const monitorId: ObjectID = new ObjectID(
+            req.params["monitorId"] as string,
+          );
+
+          const props: DatabaseCommonInteractionProps =
+            await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+          await MonitorTemplateService.linkMonitor({
+            monitorTemplateId,
+            monitorId,
+            props,
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (e) {
+          next(e);
+        }
+        return;
+      },
+    );
+
+    // Detach a monitor from this template.
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/:monitorTemplateId/unlink-monitor/:monitorId`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const monitorTemplateId: ObjectID = new ObjectID(
+            req.params["monitorTemplateId"] as string,
+          );
+          const monitorId: ObjectID = new ObjectID(
+            req.params["monitorId"] as string,
+          );
+
+          const props: DatabaseCommonInteractionProps =
+            await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+          await MonitorTemplateService.unlinkMonitor({
+            monitorTemplateId,
+            monitorId,
+            props,
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (e) {
+          next(e);
+        }
+        return;
+      },
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1777933061000-MigrationName.ts

@@ -0,0 +1,41 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1777933061000 implements MigrationInterface {
+  public name: string = "MigrationName1777933061000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" ADD "monitorTemplateId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_620a223938dfac49fed7ab46e9" ON "Monitor" ("monitorTemplateId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" ADD CONSTRAINT "FK_620a223938dfac49fed7ab46e9e" FOREIGN KEY ("monitorTemplateId") REFERENCES "MonitorTemplate"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" DROP CONSTRAINT "FK_620a223938dfac49fed7ab46e9e"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_620a223938dfac49fed7ab46e9"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Monitor" DROP COLUMN "monitorTemplateId"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1777972687018-MigrationName.ts

@@ -0,0 +1,69 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1777972687018 implements MigrationInterface {
+  public name: string = "MigrationName1777972687018";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "DockerResource" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "dockerHostId" uuid NOT NULL, "kind" character varying(100) NOT NULL, "name" character varying(100) NOT NULL, "containerId" character varying(100), "imageName" character varying(100), "state" character varying(100), "labels" jsonb, "latestCpuPercent" numeric, "latestMemoryBytes" bigint, "metricsUpdatedAt" TIMESTAMP WITH TIME ZONE, "lastSeenAt" TIMESTAMP WITH TIME ZONE NOT NULL, "resourceCreationTimestamp" TIMESTAMP WITH TIME ZONE, "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_fe18834da4418412424e36df7ed" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_85a3903c05939d0e6faf7dc30e" ON "DockerResource" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_84fba362f2ac3a2550e08d16fb" ON "DockerResource" ("dockerHostId") `,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_0355903ed10c35eed76eacefb4" ON "DockerResource" ("projectId", "dockerHostId", "kind", "name") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" ADD CONSTRAINT "FK_85a3903c05939d0e6faf7dc30ed" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" ADD CONSTRAINT "FK_84fba362f2ac3a2550e08d16fb2" FOREIGN KEY ("dockerHostId") REFERENCES "DockerHost"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" ADD CONSTRAINT "FK_a9223bb731acb6a93f503978184" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" ADD CONSTRAINT "FK_2fda4244a259a6e28de2df1b479" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" DROP CONSTRAINT "FK_2fda4244a259a6e28de2df1b479"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" DROP CONSTRAINT "FK_a9223bb731acb6a93f503978184"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" DROP CONSTRAINT "FK_84fba362f2ac3a2550e08d16fb2"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "DockerResource" DROP CONSTRAINT "FK_85a3903c05939d0e6faf7dc30ed"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0355903ed10c35eed76eacefb4"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_84fba362f2ac3a2550e08d16fb"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_85a3903c05939d0e6faf7dc30e"`,
+    );
+    await queryRunner.query(`DROP TABLE "DockerResource"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -296,6 +296,8 @@ import { AddMonitorTemplate1777201966799 } from "./1777201966799-AddMonitorTempl
 import { MigrationName1777550162848 } from "./1777550162848-MigrationName";
 import { MigrationName1777571961028 } from "./1777571961028-MigrationName";
 import { MigrationName1777629313843 } from "./1777629313843-MigrationName";
+import { MigrationName1777933061000 } from "./1777933061000-MigrationName";
+import { MigrationName1777972687018 } from "./1777972687018-MigrationName";
 export default [
   InitialMigration,
   MigrationName1717678334852,
@@ -595,4 +597,6 @@ export default [
   MigrationName1777550162848,
   MigrationName1777571961028,
   MigrationName1777629313843,
+  MigrationName1777933061000,
+  MigrationName1777972687018,
 ];

package/Server/Services/BillingInvoiceService.ts

@@ -56,7 +56,7 @@ export class Service extends DatabaseService<Model> {
       } as LogAttributes);
     }
 
-    let project: Project | null = await ProjectService.findOneById({
+    const project: Project | null = await ProjectService.findOneById({
       id: data.projectId,
       props: {
         isRoot: true,
@@ -82,12 +82,12 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Payment provider customer id not found.");
     }
 
-    let subscriptionState: SubscriptionStatus =
+    const subscriptionState: SubscriptionStatus =
       await BillingService.getSubscriptionStatus(
         project.paymentProviderSubscriptionId as string,
       );
 
-    let meteredSubscriptionState: SubscriptionStatus =
+    const meteredSubscriptionState: SubscriptionStatus =
       await BillingService.getSubscriptionStatus(
         project.paymentProviderMeteredSubscriptionId as string,
       );
@@ -129,37 +129,26 @@ export class Service extends DatabaseService<Model> {
       }
 
       if (allInvoicesPaid) {
-        await ProjectService.reactiveSubscription(project.id!);
-        project = await ProjectService.findOneById({
-          id: data.projectId,
-          props: {
-            isRoot: true,
-          },
-          select: {
-            _id: true,
-            paymentProviderCustomerId: true,
-            paymentProviderSubscriptionId: true,
-            paymentProviderMeteredSubscriptionId: true,
-          },
-        });
-
-        if (!project) {
-          throw new BadDataException("Project not found");
+        try {
+          await ProjectService.reactiveSubscription(project.id!);
+        } catch (err) {
+          logger.error(err, {
+            projectId: data.projectId?.toString(),
+          } as LogAttributes);
         }
 
-        subscriptionState = await BillingService.getSubscriptionStatus(
-          project.paymentProviderSubscriptionId as string,
-        );
-
-        meteredSubscriptionState = await BillingService.getSubscriptionStatus(
-          project.paymentProviderMeteredSubscriptionId as string,
-        );
-
+        /*
+         * No Open/Uncollectible invoices means the project has no outstanding
+         * payment obligations, so we mark the subscription as Active. Stripe may
+         * still report the (re)created subscription as "incomplete" until the
+         * first payment confirms, which would otherwise surface a misleading
+         * "invoices are unpaid" banner.
+         */
         await ProjectService.updateOneById({
           id: project.id!,
           data: {
-            paymentProviderSubscriptionStatus: subscriptionState,
-            paymentProviderMeteredSubscriptionStatus: meteredSubscriptionState,
+            paymentProviderSubscriptionStatus: SubscriptionStatus.Active,
+            paymentProviderMeteredSubscriptionStatus: SubscriptionStatus.Active,
           },
           props: {
             isRoot: true,