@oneuptime/common 9.3.7 → 9.3.9

package/Models/DatabaseModels/{ServiceCatalogOwnerUser.ts → ServiceOwnerUser.ts}

@@ -1,5 +1,5 @@
 import Project from "./Project";
-import ServiceCatalog from "./ServiceCatalog";
+import Service from "./Service";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
@@ -21,7 +21,7 @@ import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 
-@CanAccessIfCanReadOn("serviceCatalog")
+@CanAccessIfCanReadOn("service")
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableBillingAccessControl({
@@ -35,23 +35,23 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatalogOwnerUser,
+    Permission.CreateServiceOwnerUser,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.ReadServiceCatalogOwnerUser,
+    Permission.ReadServiceOwnerUser,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
-    Permission.DeleteServiceCatalogOwnerUser,
+    Permission.DeleteServiceOwnerUser,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
-    Permission.EditServiceCatalogOwnerUser,
+    Permission.EditServiceOwnerUser,
   ],
 })
 @EnableWorkflow({
@@ -60,30 +60,30 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog-owner-user"))
+@CrudApiEndpoint(new Route("/service-owner-user"))
 @TableMetadata({
-  tableName: "ServiceCatalogOwnerUser",
-  singularName: "Service Catalog User Owner",
-  pluralName: "Service Catalog User Owners",
+  tableName: "ServiceOwnerUser",
+  singularName: "Service User Owner",
+  pluralName: "Service User Owners",
   icon: IconProp.Signal,
-  tableDescription: "Add users as owners to your Service Catalog.",
+  tableDescription: "Add users as owners to your Service.",
 })
 @Entity({
-  name: "ServiceCatalogOwnerUser",
+  name: "ServiceOwnerUser",
 })
-export default class ServiceCatalogOwnerUser extends BaseModel {
+export default class ServiceOwnerUser extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -114,13 +114,13 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -145,13 +145,13 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -183,13 +183,13 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -214,28 +214,27 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "serviceCatalogId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: ServiceCatalog,
-    title: "Service Catalog",
-    description:
-      "Relation to Service Catalog Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @ManyToOne(
     () => {
-      return ServiceCatalog;
+      return Service;
     },
     {
       eager: false,
@@ -244,21 +243,21 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "serviceCatalogId" })
-  public serviceCatalog?: ServiceCatalog = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -267,9 +266,8 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
     type: TableColumnType.ObjectID,
     required: true,
     canReadOnRelationQuery: true,
-    title: "Service Catalog ID",
-    description:
-      "ID of your OneUptime Service Catalog in which this object belongs",
+    title: "Service ID",
+    description: "ID of your OneUptime Service in which this object belongs",
     example: "f6a7b8c9-d0e1-2345-fa67-bc89de012345",
   })
   @Column({
@@ -277,20 +275,20 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceCatalogId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -322,13 +320,13 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerUser,
+      Permission.CreateServiceOwnerUser,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -352,7 +350,7 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })
@@ -386,7 +384,7 @@ export default class ServiceCatalogOwnerUser extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerUser,
+      Permission.ReadServiceOwnerUser,
     ],
     update: [],
   })

package/Models/DatabaseModels/TelemetryException.ts

@@ -17,7 +17,7 @@ import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 import DatabaseBaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
-import TelemetryService from "./TelemetryService";
+import Service from "./Service";
 
 @EnableDocumentation()
 @TenantColumn("projectId")
@@ -142,17 +142,16 @@ export default class TelemetryException extends DatabaseBaseModel {
     ],
   })
   @TableColumn({
-    manyToOneRelationColumn: "telemetryServiceId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: TelemetryService,
-    title: "Telemetry Service",
-    description:
-      "Relation to Telemetry Service Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @ManyToOne(
     () => {
-      return TelemetryService;
+      return Service;
     },
     {
       eager: false,
@@ -161,8 +160,8 @@ export default class TelemetryException extends DatabaseBaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "telemetryServiceId" })
-  public telemetryService?: TelemetryService = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [
@@ -186,9 +185,8 @@ export default class TelemetryException extends DatabaseBaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
-    title: "Telemetry Service ID",
-    description:
-      "ID of your Telemetry Service resource where this object belongs",
+    title: "Service ID",
+    description: "ID of your Service resource where this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @Column({
@@ -196,7 +194,7 @@ export default class TelemetryException extends DatabaseBaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public telemetryServiceId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [

package/Models/DatabaseModels/TelemetryUsageBilling.ts

@@ -1,5 +1,5 @@
 import Project from "./Project";
-import TelemetryService from "./TelemetryService";
+import Service from "./Service";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
@@ -256,17 +256,16 @@ export default class TelemetryUsageBilling extends BaseModel {
     update: [],
   })
   @TableColumn({
-    manyToOneRelationColumn: "telemetryServiceId",
+    manyToOneRelationColumn: "serviceId",
     type: TableColumnType.Entity,
-    modelType: TelemetryService,
-    title: "Telemetry Service",
-    description:
-      "Relation to Telemetry Service Resource in which this object belongs",
+    modelType: Service,
+    title: "Service",
+    description: "Relation to Service Resource in which this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @ManyToOne(
     () => {
-      return TelemetryService;
+      return Service;
     },
     {
       eager: false,
@@ -275,8 +274,8 @@ export default class TelemetryUsageBilling extends BaseModel {
       orphanedRowAction: "nullify",
     },
   )
-  @JoinColumn({ name: "telemetryServiceId" })
-  public telemetryService?: TelemetryService = undefined;
+  @JoinColumn({ name: "serviceId" })
+  public service?: Service = undefined;
 
   @ColumnAccessControl({
     create: [],
@@ -291,9 +290,8 @@ export default class TelemetryUsageBilling extends BaseModel {
   @TableColumn({
     type: TableColumnType.ObjectID,
     required: true,
-    title: "Telemetry Service ID",
-    description:
-      "ID of your Telemetry Service resource where this object belongs",
+    title: "Service ID",
+    description: "ID of your Service resource where this object belongs",
     example: "d4e5f6a7-b8c9-0123-def1-234567890123",
   })
   @Column({
@@ -301,7 +299,7 @@ export default class TelemetryUsageBilling extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public telemetryServiceId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [],

package/Server/API/AIAgentDataAPI.ts

@@ -1,8 +1,7 @@
 import AIAgentService from "../Services/AIAgentService";
 import LlmProviderService from "../Services/LlmProviderService";
 import TelemetryExceptionService from "../Services/TelemetryExceptionService";
-import ServiceCatalogTelemetryServiceService from "../Services/ServiceCatalogTelemetryServiceService";
-import ServiceCatalogCodeRepositoryService from "../Services/ServiceCatalogCodeRepositoryService";
+import ServiceCodeRepositoryService from "../Services/ServiceCodeRepositoryService";
 import CodeRepositoryService from "../Services/CodeRepositoryService";
 import AIAgentTaskPullRequestService from "../Services/AIAgentTaskPullRequestService";
 import AIAgentTaskService from "../Services/AIAgentTaskService";
@@ -16,8 +15,7 @@ import Response from "../Utils/Response";
 import AIAgent from "../../Models/DatabaseModels/AIAgent";
 import LlmProvider from "../../Models/DatabaseModels/LlmProvider";
 import TelemetryException from "../../Models/DatabaseModels/TelemetryException";
-import ServiceCatalogTelemetryService from "../../Models/DatabaseModels/ServiceCatalogTelemetryService";
-import ServiceCatalogCodeRepository from "../../Models/DatabaseModels/ServiceCatalogCodeRepository";
+import ServiceCodeRepository from "../../Models/DatabaseModels/ServiceCodeRepository";
 import CodeRepository from "../../Models/DatabaseModels/CodeRepository";
 import AIAgentTaskPullRequest from "../../Models/DatabaseModels/AIAgentTaskPullRequest";
 import AIAgentTask from "../../Models/DatabaseModels/AIAgentTask";
@@ -164,7 +162,7 @@ export default class AIAgentDataAPI {
             data["exceptionId"] as string,
           );
 
-          // Get exception with telemetry service
+          // Get exception with service
           const exception: TelemetryException | null =
             await TelemetryExceptionService.findOneById({
               id: exceptionId,
@@ -174,8 +172,8 @@ export default class AIAgentDataAPI {
                 stackTrace: true,
                 exceptionType: true,
                 fingerprint: true,
-                telemetryServiceId: true,
-                telemetryService: {
+                serviceId: true,
+                service: {
                   _id: true,
                   name: true,
                   description: true,
@@ -206,11 +204,11 @@ export default class AIAgentDataAPI {
               exceptionType: exception.exceptionType,
               fingerprint: exception.fingerprint,
             },
-            telemetryService: exception.telemetryServiceId
+            service: exception.serviceId
               ? {
-                  id: exception.telemetryServiceId.toString(),
-                  name: exception.telemetryService?.name,
-                  description: exception.telemetryService?.description,
+                  id: exception.serviceId.toString(),
+                  name: exception.service?.name,
+                  description: exception.service?.description,
                 }
               : null,
           });
@@ -220,7 +218,7 @@ export default class AIAgentDataAPI {
       },
     );
 
-    // Get code repositories linked to a telemetry service via ServiceCatalog
+    // Get code repositories linked to a service
     this.router.post(
       "/ai-agent-data/get-code-repositories",
       async (
@@ -242,55 +240,22 @@ export default class AIAgentDataAPI {
             );
           }
 
-          // Get telemetry service ID
-          if (!data["telemetryServiceId"]) {
+          // Get service ID (supports both serviceId and legacy telemetryServiceId)
+          const serviceIdParam: string | undefined =
+            (data["serviceId"] as string) ||
+            (data["telemetryServiceId"] as string);
+
+          if (!serviceIdParam) {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("telemetryServiceId is required"),
+              new BadDataException("serviceId is required"),
             );
           }
 
-          const telemetryServiceId: ObjectID = new ObjectID(
-            data["telemetryServiceId"] as string,
-          );
-
-          // Step 1: Find ServiceCatalogs linked to this TelemetryService
-          const serviceCatalogTelemetryServices: Array<ServiceCatalogTelemetryService> =
-            await ServiceCatalogTelemetryServiceService.findBy({
-              query: {
-                telemetryServiceId: telemetryServiceId,
-              },
-              select: {
-                serviceCatalogId: true,
-              },
-              skip: 0,
-              limit: LIMIT_MAX,
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (serviceCatalogTelemetryServices.length === 0) {
-            logger.debug(
-              `No service catalogs found for telemetry service ${telemetryServiceId.toString()}`,
-            );
-            return Response.sendJsonObjectResponse(req, res, {
-              repositories: [],
-            });
-          }
+          const serviceId: ObjectID = new ObjectID(serviceIdParam);
 
-          // Extract service catalog IDs
-          const serviceCatalogIds: Array<ObjectID> =
-            serviceCatalogTelemetryServices
-              .filter((s: ServiceCatalogTelemetryService) => {
-                return s.serviceCatalogId;
-              })
-              .map((s: ServiceCatalogTelemetryService) => {
-                return s.serviceCatalogId as ObjectID;
-              });
-
-          // Step 2: Find CodeRepositories linked to these ServiceCatalogs
+          // Find CodeRepositories linked to this Service
           const repositories: Array<{
             id: string;
             name: string;
@@ -302,70 +267,67 @@ export default class AIAgentDataAPI {
             gitHubAppInstallationId: string | null;
           }> = [];
 
-          for (const serviceCatalogId of serviceCatalogIds) {
-            const serviceCatalogCodeRepositories: Array<ServiceCatalogCodeRepository> =
-              await ServiceCatalogCodeRepositoryService.findBy({
-                query: {
-                  serviceCatalogId: serviceCatalogId,
-                },
-                select: {
-                  codeRepositoryId: true,
-                  servicePathInRepository: true,
-                  codeRepository: {
-                    _id: true,
-                    name: true,
-                    repositoryHostedAt: true,
-                    organizationName: true,
-                    repositoryName: true,
-                    mainBranchName: true,
-                    gitHubAppInstallationId: true,
-                  },
+          const serviceCodeRepositories: Array<ServiceCodeRepository> =
+            await ServiceCodeRepositoryService.findBy({
+              query: {
+                serviceId: serviceId,
+              },
+              select: {
+                codeRepositoryId: true,
+                servicePathInRepository: true,
+                codeRepository: {
+                  _id: true,
+                  name: true,
+                  repositoryHostedAt: true,
+                  organizationName: true,
+                  repositoryName: true,
+                  mainBranchName: true,
+                  gitHubAppInstallationId: true,
                 },
-                skip: 0,
-                limit: LIMIT_MAX,
-                props: {
-                  isRoot: true,
+              },
+              skip: 0,
+              limit: LIMIT_MAX,
+              props: {
+                isRoot: true,
+              },
+            });
+
+          for (const scr of serviceCodeRepositories) {
+            if (scr.codeRepository) {
+              // Check if we already have this repository
+              const existingRepo: boolean = repositories.some(
+                (r: {
+                  id: string;
+                  name: string;
+                  repositoryHostedAt: string;
+                  organizationName: string;
+                  repositoryName: string;
+                  mainBranchName: string;
+                  servicePathInRepository: string | null;
+                  gitHubAppInstallationId: string | null;
+                }) => {
+                  return r.id === scr.codeRepository?._id?.toString();
                 },
-              });
-
-            for (const scr of serviceCatalogCodeRepositories) {
-              if (scr.codeRepository) {
-                // Check if we already have this repository
-                const existingRepo: boolean = repositories.some(
-                  (r: {
-                    id: string;
-                    name: string;
-                    repositoryHostedAt: string;
-                    organizationName: string;
-                    repositoryName: string;
-                    mainBranchName: string;
-                    servicePathInRepository: string | null;
-                    gitHubAppInstallationId: string | null;
-                  }) => {
-                    return r.id === scr.codeRepository?._id?.toString();
-                  },
-                );
-                if (!existingRepo) {
-                  repositories.push({
-                    id: scr.codeRepository._id?.toString() || "",
-                    name: scr.codeRepository.name || "",
-                    repositoryHostedAt:
-                      scr.codeRepository.repositoryHostedAt || "",
-                    organizationName: scr.codeRepository.organizationName || "",
-                    repositoryName: scr.codeRepository.repositoryName || "",
-                    mainBranchName: scr.codeRepository.mainBranchName || "main",
-                    servicePathInRepository:
-                      scr.servicePathInRepository || null,
-                    gitHubAppInstallationId:
-                      scr.codeRepository.gitHubAppInstallationId || null,
-                  });
-                }
+              );
+              if (!existingRepo) {
+                repositories.push({
+                  id: scr.codeRepository._id?.toString() || "",
+                  name: scr.codeRepository.name || "",
+                  repositoryHostedAt:
+                    scr.codeRepository.repositoryHostedAt || "",
+                  organizationName: scr.codeRepository.organizationName || "",
+                  repositoryName: scr.codeRepository.repositoryName || "",
+                  mainBranchName: scr.codeRepository.mainBranchName || "main",
+                  servicePathInRepository: scr.servicePathInRepository || null,
+                  gitHubAppInstallationId:
+                    scr.codeRepository.gitHubAppInstallationId || null,
+                });
               }
             }
           }
 
           logger.debug(
-            `Found ${repositories.length} code repositories for telemetry service ${telemetryServiceId.toString()}`,
+            `Found ${repositories.length} code repositories for service ${serviceId.toString()}`,
           );
 
           return Response.sendJsonObjectResponse(req, res, {