@oneuptime/common 7.0.3018 → 7.0.3026

package/Models/DatabaseModels/BillingInvoice.ts

@@ -336,4 +336,37 @@ export default class BillingInvoice extends BaseModel {
     unique: false,
   })
   public paymentProviderInvoiceId?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadInvoices,
+    ],
+    update: [],
+  })
+  @TableColumn({ type: TableColumnType.Date })
+  @Column({
+    type: ColumnType.Date,
+    nullable: true,
+  })
+  public invoiceDate?: Date = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ReadInvoices,
+    ],
+    update: [],
+  })
+  @TableColumn({ type: TableColumnType.LongText })
+  @Column({
+    type: ColumnType.LongText,
+    length: ColumnLength.LongText,
+    nullable: true,
+  })
+  public invoiceNumber?: string = undefined;
 }

package/Models/DatabaseModels/CopilotAction.ts

@@ -736,4 +736,36 @@ export default class CopilotAction extends BaseModel {
     default: false,
   })
   public isPriority?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.CreateCopilotAction,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadCopilotAction,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.EditCopilotAction,
+    ],
+  })
+  @TableColumn({
+    required: false,
+    type: TableColumnType.Date,
+    title: "Status Changed at",
+    description: "When the status of this action was changed",
+  })
+  @Column({
+    nullable: true,
+    type: ColumnType.Date,
+  })
+  public statusChangedAt?: Date = undefined;
 }

package/Models/DatabaseModels/CopilotActionTypePriority.ts

@@ -25,15 +25,30 @@ import ColumnLength from "../../Types/Database/ColumnLength";
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableAccessControl({
-  create: [],
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.CreateCopilotAction,
+  ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ReadCopilotAction,
   ],
-  delete: [],
-  update: [],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.DeleteCopilotAction,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.EditCopilotAction,
+  ],
 })
 @EnableWorkflow({
   create: true,

package/Models/DatabaseModels/CopilotPullRequest.ts

@@ -411,6 +411,7 @@ export default class CopilotPullRequest extends BaseModel {
     type: TableColumnType.ShortText,
     required: false,
     isDefaultValueColumn: false,
+    canReadOnRelationQuery: true,
     title: "Pull Request ID",
     description:
       "ID of Pull Request in the repository where this event was executed and then PR was created.",

package/Models/DatabaseModels/StatusPageAnnouncement.ts

@@ -260,7 +260,7 @@ export default class StatusPageAnnouncement extends BaseModel {
   @TableColumn({
     title: "End At",
     type: TableColumnType.Date,
-    required: true,
+    required: false,
     description: "When should this announcement hidden?",
   })
   @ColumnAccessControl({
@@ -284,7 +284,7 @@ export default class StatusPageAnnouncement extends BaseModel {
     ],
   })
   @Column({
-    nullable: false,
+    nullable: true,
     type: ColumnType.Date,
   })
   public endAnnouncementAt?: Date = undefined;

package/Server/API/CopilotActionAPI.ts

@@ -19,6 +19,10 @@ import CopilotActionStatus from "../../Types/Copilot/CopilotActionStatus";
 import CopilotActionTypePriority from "../../Models/DatabaseModels/CopilotActionTypePriority";
 import CopilotActionTypePriorityService from "../Services/CopilotActionTypePriorityService";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
+import JSONFunctions from "../../Types/JSONFunctions";
+import CopilotActionType from "../../Types/Copilot/CopilotActionType";
+import { JSONObject } from "../../Types/JSON";
+import OneUptimeDate from "../../Types/Date";
 
 export default class CopilotActionAPI extends BaseAPI<
   CopilotAction,
@@ -142,6 +146,7 @@ export default class CopilotActionAPI extends BaseAPI<
                 serviceCatalogId: true,
                 copilotActionStatus: true,
                 copilotActionType: true,
+                copilotActionProp: true,
                 createdAt: true,
                 copilotPullRequest: {
                   _id: true,
@@ -168,10 +173,96 @@ export default class CopilotActionAPI extends BaseAPI<
       },
     );
 
+    this.router.get(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/get-copilot-action/:secretkey`,
+      CodeRepositoryAuthorization.isAuthorizedRepository,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const secretkey: string = req.params["secretkey"]!;
+
+          if (!secretkey) {
+            throw new BadDataException("Secret key is required");
+          }
+
+          const serviceCatalogId: string = req.body["serviceCatalogId"]!;
+
+          if (!serviceCatalogId) {
+            throw new BadDataException("Service catalog id is required");
+          }
+
+          const codeRepository: CopilotCodeRepository | null =
+            await CopilotCodeRepositoryService.findOneBy({
+              query: {
+                secretToken: new ObjectID(secretkey),
+              },
+              select: {
+                _id: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (!codeRepository) {
+            throw new BadDataException(
+              "Code repository not found. Secret key is invalid.",
+            );
+          }
+
+          const actionType: CopilotActionType = req.body["actionType"]!;
+
+          if (!actionType) {
+            throw new BadDataException("Action type is required");
+          }
+
+          const actionProps: JSONObject = req.body["actionProps"]!;
+
+          const copilotAction: CopilotAction | null =
+            await CopilotActionService.findOneBy({
+              query: {
+                codeRepositoryId: codeRepository.id!,
+                serviceCatalogId: new ObjectID(serviceCatalogId),
+                copilotActionType: actionType,
+                copilotActionProp: actionProps as any,
+              },
+              select: {
+                _id: true,
+                codeRepositoryId: true,
+                serviceCatalogId: true,
+                copilotActionStatus: true,
+                copilotActionType: true,
+                createdAt: true,
+                copilotPullRequest: {
+                  _id: true,
+                  pullRequestId: true,
+                  copilotPullRequestStatus: true,
+                },
+              },
+              sort: {
+                createdAt: SortOrder.Descending,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          return Response.sendJsonObjectResponse(req, res, {
+            copilotAction: copilotAction
+              ? CopilotAction.toJSONObject(copilotAction, CopilotAction)
+              : null,
+          });
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
+
     this.router.post(
       `${new this.entityType()
         .getCrudApiPath()
-        ?.toString()}/queue-copilot-action/:secretkey`,
+        ?.toString()}/create-copilot-action/:secretkey`,
       CodeRepositoryAuthorization.isAuthorizedRepository,
       async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
         try {
@@ -229,5 +320,99 @@ export default class CopilotActionAPI extends BaseAPI<
         }
       },
     );
+
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/update-copilot-action/:secretkey`,
+      CodeRepositoryAuthorization.isAuthorizedRepository,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const secretkey: string = req.params["secretkey"]!;
+
+          if (!secretkey) {
+            throw new BadDataException("Secret key is required");
+          }
+
+          const codeRepository: CopilotCodeRepository | null =
+            await CopilotCodeRepositoryService.findOneBy({
+              query: {
+                secretToken: new ObjectID(secretkey),
+              },
+              select: {
+                _id: true,
+                projectId: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (!codeRepository) {
+            throw new BadDataException(
+              "Code repository not found. Secret key is invalid.",
+            );
+          }
+
+          req.body = JSONFunctions.deserialize(req.body);
+
+          const {
+            actionStatus,
+            pullRequestId,
+            commitHash,
+            statusMessage,
+            logs,
+            actionId,
+          }: {
+            actionStatus: CopilotActionStatus;
+            pullRequestId?: ObjectID | undefined;
+            commitHash?: string | undefined;
+            statusMessage?: string | undefined;
+            logs?: Array<string> | undefined;
+            actionId: ObjectID;
+          } = req.body;
+
+          const exisingAction: CopilotAction | null =
+            await CopilotActionService.findOneBy({
+              query: {
+                _id: actionId,
+                codeRepositoryId: codeRepository.id!,
+              },
+              select: {
+                _id: true,
+              },
+              props: {
+                isRoot: true,
+              },
+            });
+
+          if (!exisingAction) {
+            throw new BadDataException("Action not found");
+          }
+
+          await CopilotActionService.updateOneBy({
+            query: {
+              _id: actionId,
+              codeRepositoryId: codeRepository.id!,
+            },
+            data: {
+              copilotActionStatus: actionStatus!,
+              copilotPullRequestId: pullRequestId!,
+              commitHash: commitHash!,
+              statusMessage: statusMessage!,
+              statusChangedAt: OneUptimeDate.getCurrentDate(),
+              logs: logs?.join("\n") || "",
+            },
+            props: {
+              isRoot: true,
+            },
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (err) {
+          next(err);
+        }
+      },
+    );
   }
 }

package/Server/API/StatusPageAPI.ts

@@ -36,7 +36,7 @@ import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import CommonAPI from "./CommonAPI";
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import ArrayUtil from "Common/Types/ArrayUtil";
+import ArrayUtil from "Common/Utils/Array";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
@@ -840,7 +840,7 @@ export default class StatusPageAPI extends BaseAPI<
               query: {
                 statusPages: objectId as any,
                 showAnnouncementAt: QueryHelper.lessThan(today),
-                endAnnouncementAt: QueryHelper.greaterThan(today),
+                endAnnouncementAt: QueryHelper.greaterThanOrNull(today),
                 projectId: statusPage.projectId!,
               },
               select: {

package/Server/API/TelemetryAPI.ts

@@ -11,7 +11,7 @@ import CommonAPI from "./CommonAPI";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 import TelemetryAttributeService from "../Services/TelemetryAttributeService";
-import ArrayUtil from "Common/Types/ArrayUtil";
+import ArrayUtil from "Common/Utils/Array";
 
 const router: ExpressRouter = Express.getRouter();
 

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

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725551629492 implements MigrationInterface {
+  public name = "MigrationName1725551629492";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" DROP COLUMN "filePath"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" ADD "filePath" character varying NOT NULL`,
+    );
+  }
+}

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725556630384 implements MigrationInterface {
+  public name = "MigrationName1725556630384";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "BillingInvoice" ADD "invoiceDate" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "BillingInvoice" ADD "invoiceNumber" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" ADD "statusChangedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "CopilotAction" DROP COLUMN "statusChangedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "BillingInvoice" DROP COLUMN "invoiceNumber"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "BillingInvoice" DROP COLUMN "invoiceDate"`,
+    );
+  }
+}

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

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1725618842598 implements MigrationInterface {
+  public name = "MigrationName1725618842598";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageAnnouncement" ALTER COLUMN "endAnnouncementAt" DROP NOT NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPageAnnouncement" ALTER COLUMN "endAnnouncementAt" SET NOT NULL`,
+    );
+  }
+}

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

@@ -48,6 +48,9 @@ import { MigrationName1725291476867 } from "./1725291476867-MigrationName";
 import { MigrationName1725357719072 } from "./1725357719072-MigrationName";
 import { MigrationName1725360199561 } from "./1725360199561-MigrationName";
 import { MigrationName1725379949648 } from "./1725379949648-MigrationName";
+import { MigrationName1725551629492 } from "./1725551629492-MigrationName";
+import { MigrationName1725556630384 } from "./1725556630384-MigrationName";
+import { MigrationName1725618842598 } from "./1725618842598-MigrationName";
 
 export default [
   InitialMigration,
@@ -100,4 +103,7 @@ export default [
   MigrationName1725357719072,
   MigrationName1725360199561,
   MigrationName1725379949648,
+  MigrationName1725551629492,
+  MigrationName1725556630384,
+  MigrationName1725618842598,
 ];

package/Server/Services/BillingInvoiceService.ts

@@ -77,6 +77,8 @@ export class Service extends DatabaseService<Model> {
       billingInvoice.status =
         (invoice.status as InvoiceStatus) || InvoiceStatus.Undefined;
       billingInvoice.paymentProviderInvoiceId = invoice.id;
+      billingInvoice.invoiceDate = invoice.invoiceDate;
+      billingInvoice.invoiceNumber = invoice.invoiceNumber || "Unknown";
 
       await this.create({
         data: billingInvoice,

package/Server/Services/BillingService.ts

@@ -35,6 +35,8 @@ export interface Invoice {
   status: string;
   downloadableLink: string;
   customerId: string | undefined;
+  invoiceDate: Date;
+  invoiceNumber: string | undefined;
 }
 
 export class BillingService extends BaseService {
@@ -693,17 +695,30 @@ export class BillingService extends BaseService {
         limit: 100,
       });
 
-    return invoices.data.map((invoice: Stripe.Invoice) => {
-      return {
-        id: invoice.id!,
-        amount: invoice.amount_due,
-        currencyCode: invoice.currency,
-        subscriptionId: invoice.subscription?.toString() || undefined,
-        status: invoice.status?.toString() || "Unknown",
-        downloadableLink: invoice.invoice_pdf?.toString() || "",
-        customerId: invoice.customer?.toString() || "",
-      };
+    let billingInvoices: Array<Invoice> = invoices.data.map(
+      (invoice: Stripe.Invoice) => {
+        return {
+          id: invoice.id!,
+          amount: invoice.amount_due,
+          currencyCode: invoice.currency,
+          subscriptionId: invoice.subscription?.toString() || undefined,
+          status: invoice.status?.toString() || "Unknown",
+          downloadableLink: invoice.invoice_pdf?.toString() || "",
+          customerId: invoice.customer?.toString() || "",
+          invoiceDate: invoice.created
+            ? new Date(invoice.created * 1000)
+            : OneUptimeDate.getCurrentDate(),
+          invoiceNumber: invoice.number || undefined,
+        };
+      },
+    );
+
+    // sort by date in descending order.
+    billingInvoices = billingInvoices.sort((a: Invoice, b: Invoice) => {
+      return a.invoiceDate.getTime() - b.invoiceDate.getTime();
     });
+
+    return billingInvoices;
   }
 
   public async generateInvoiceAndChargeCustomer(
@@ -770,6 +785,10 @@ export class BillingService extends BaseService {
       status: invoice.status?.toString() || "Unknown",
       downloadableLink: invoice.invoice_pdf?.toString() || "",
       customerId: invoice.customer?.toString() || "",
+      invoiceDate: invoice.created
+        ? new Date(invoice.created * 1000)
+        : OneUptimeDate.getCurrentDate(),
+      invoiceNumber: invoice.number || undefined,
     };
   }
 

package/Server/Services/CopilotCodeRepositoryService.ts

@@ -3,6 +3,12 @@ import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import ObjectID from "../../Types/ObjectID";
 import Model from "Common/Models/DatabaseModels/CopilotCodeRepository";
+import {
+  CopilotActionTypeData,
+  CopilotActionTypeUtil,
+} from "../../Types/Copilot/CopilotActionType";
+import CopilotActionTypePriority from "../../Models/DatabaseModels/CopilotActionTypePriority";
+import CopilotActionTypePriorityService from "./CopilotActionTypePriorityService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -19,6 +25,36 @@ export class Service extends DatabaseService<Model> {
       createBy: createBy,
     };
   }
+
+  protected override async onCreateSuccess(
+    _onCreate: OnCreate<Model>,
+    createdItem: Model,
+  ): Promise<Model> {
+    // add all the actions.
+
+    const repo: Model = createdItem;
+
+    const defaultCopilotActionTypes: Array<CopilotActionTypeData> =
+      CopilotActionTypeUtil.getAllCopilotActionTypes();
+
+    for (const defaultAction of defaultCopilotActionTypes) {
+      const copilotActionTypePriority: CopilotActionTypePriority =
+        new CopilotActionTypePriority();
+      copilotActionTypePriority.projectId = repo.projectId!;
+      copilotActionTypePriority.actionType = defaultAction.type;
+      copilotActionTypePriority.priority = defaultAction.defaultPriority;
+      copilotActionTypePriority.codeRepositoryId = repo.id!;
+
+      await CopilotActionTypePriorityService.create({
+        data: copilotActionTypePriority,
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
+    return createdItem;
+  }
 }
 
 export default new Service();

package/Server/Services/ServiceCatalogService.ts

@@ -1,7 +1,7 @@
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import ArrayUtil from "../../Types/ArrayUtil";
+import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
 import Model from "Common/Models/DatabaseModels/ServiceCatalog";
 

package/Server/Services/TelemetryServiceService.ts

@@ -1,7 +1,7 @@
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import ArrayUtil from "../../Types/ArrayUtil";
+import ArrayUtil from "../../Utils/Array";
 import { BrightColors } from "../../Types/BrandColors";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";

package/Server/Types/Database/Permissions/AccessControlPermission.ts

@@ -6,7 +6,7 @@ import AccessControlModel from "Common/Models/DatabaseModels/DatabaseBaseModel/A
 import BaseModel, {
   DatabaseBaseModelType,
 } from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import ArrayUtil from "Common/Types/ArrayUtil";
+import ArrayUtil from "Common/Utils/Array";
 import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import DatabaseCommonInteractionPropsUtil, {

package/Server/Utils/CodeRepository/CodeRepository.ts

@@ -381,6 +381,7 @@ export default class CodeRepositoryUtil {
           filePath: LocalFile.sanitizeFilePath(`${directoryPath}/${fileName}`),
           repoPath,
         }),
+        filePath: filePath,
       };
     }
 

package/Server/Utils/CodeRepository/CodeRepositoryFile.ts

@@ -1,3 +1,4 @@
 export default interface CodeRepositoryFile {
   fileContent: string;
+  filePath: string;
 }

package/Server/Utils/Telemetry.ts

@@ -18,10 +18,8 @@ import { CompressionAlgorithm } from "@opentelemetry/otlp-exporter-base";
 import { Resource } from "@opentelemetry/resources";
 import {
   BatchLogRecordProcessor,
-  ConsoleLogRecordExporter,
   LoggerProvider,
   LogRecordProcessor,
-  SimpleLogRecordProcessor,
 } from "@opentelemetry/sdk-logs";
 import {
   MeterProvider,
@@ -167,9 +165,7 @@ export default class Telemetry {
         }),
       });
 
-      let logRecordProcessor: LogRecordProcessor = new SimpleLogRecordProcessor(
-        new ConsoleLogRecordExporter(),
-      );
+      let logRecordProcessor: LogRecordProcessor | null = null;
 
       if (this.getOltpLogsEndpoint() && hasHeaders) {
         const logExporter: OTLPLogExporter = new OTLPLogExporter({
@@ -181,7 +177,9 @@ export default class Telemetry {
         logRecordProcessor = new BatchLogRecordProcessor(logExporter);
       }
 
-      this.loggerProvider.addLogRecordProcessor(logRecordProcessor);
+      if (logRecordProcessor) {
+        this.loggerProvider.addLogRecordProcessor(logRecordProcessor);
+      }
 
       logs.setGlobalLoggerProvider(this.loggerProvider);