@oneuptime/common 9.3.7 → 9.3.8

package/Models/DatabaseModels/{ServiceCatalogTelemetryService.ts → ServiceTelemetryService.ts}

@@ -20,10 +20,10 @@ import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
-import ServiceCatalog from "./ServiceCatalog";
+import Service from "./Service";
 import TelemetryService from "./TelemetryService";
 
-@CanAccessIfCanReadOn("serviceCatalogId")
+@CanAccessIfCanReadOn("serviceId")
 @EnableDocumentation()
 @TenantColumn("projectId")
 @TableBillingAccessControl({
@@ -37,26 +37,26 @@ import TelemetryService from "./TelemetryService";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatalogTelemetryService,
+    Permission.CreateServiceTelemetryService,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
     Permission.ProjectMember,
-    Permission.ReadServiceCatalogTelemetryService,
+    Permission.ReadServiceTelemetryService,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.DeleteServiceCatalogTelemetryService,
+    Permission.DeleteServiceTelemetryService,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.EditServiceCatalogTelemetryService,
+    Permission.EditServiceTelemetryService,
   ],
 })
 @EnableWorkflow({
@@ -65,32 +65,32 @@ import TelemetryService from "./TelemetryService";
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog-telemetry-service"))
+@CrudApiEndpoint(new Route("/service-telemetry-service"))
 @SlugifyColumn("name", "slug")
 @TableMetadata({
-  tableName: "ServiceCatalogTelemetryService",
-  singularName: "Service Catalog Telemetry Service",
-  pluralName: "Service Catalog Telemertry Services",
+  tableName: "ServiceTelemetryService",
+  singularName: "Service Telemetry Service",
+  pluralName: "Service Telemetry Services",
   icon: IconProp.SquareStack,
-  tableDescription: "List of telemetry service - service catalog relationship.",
+  tableDescription: "List of telemetry service - service relationship.",
 })
 @Entity({
-  name: "ServiceCatalogTelemetryService",
+  name: "ServiceTelemetryService",
 })
-export default class ServiceCatalogTelemetryService extends BaseModel {
+export default class ServiceTelemetryService extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -121,14 +121,14 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -153,29 +153,28 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     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,
@@ -184,22 +183,22 @@ export default class ServiceCatalogTelemetryService 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.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -208,9 +207,8 @@ export default class ServiceCatalogTelemetryService 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({
@@ -218,21 +216,21 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceCatalogId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -263,14 +261,14 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -295,14 +293,14 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -334,14 +332,14 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogTelemetryService,
+      Permission.CreateServiceTelemetryService,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -366,7 +364,7 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })
@@ -401,7 +399,7 @@ export default class ServiceCatalogTelemetryService extends BaseModel {
       Permission.ProjectAdmin,
       Permission.ProjectMember,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogTelemetryService,
+      Permission.ReadServiceTelemetryService,
     ],
     update: [],
   })

package/Models/DatabaseModels/TelemetryService.ts

@@ -412,7 +412,7 @@ export default class TelemetryService extends BaseModel {
     { eager: false },
   )
   @JoinTable({
-    name: "ServiceLabel",
+    name: "TelemetryServiceLabel",
     inverseJoinColumn: {
       name: "labelId",
       referencedColumnName: "_id",

package/Server/API/AIAgentDataAPI.ts

@@ -1,8 +1,8 @@
 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 ServiceTelemetryServiceService from "../Services/ServiceTelemetryServiceService";
+import ServiceCodeRepositoryService from "../Services/ServiceCodeRepositoryService";
 import CodeRepositoryService from "../Services/CodeRepositoryService";
 import AIAgentTaskPullRequestService from "../Services/AIAgentTaskPullRequestService";
 import AIAgentTaskService from "../Services/AIAgentTaskService";
@@ -16,8 +16,8 @@ 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 ServiceTelemetryService from "../../Models/DatabaseModels/ServiceTelemetryService";
+import ServiceCodeRepository from "../../Models/DatabaseModels/ServiceCodeRepository";
 import CodeRepository from "../../Models/DatabaseModels/CodeRepository";
 import AIAgentTaskPullRequest from "../../Models/DatabaseModels/AIAgentTaskPullRequest";
 import AIAgentTask from "../../Models/DatabaseModels/AIAgentTask";
@@ -220,7 +220,7 @@ export default class AIAgentDataAPI {
       },
     );
 
-    // Get code repositories linked to a telemetry service via ServiceCatalog
+    // Get code repositories linked to a telemetry service via Service
     this.router.post(
       "/ai-agent-data/get-code-repositories",
       async (
@@ -255,14 +255,14 @@ export default class AIAgentDataAPI {
             data["telemetryServiceId"] as string,
           );
 
-          // Step 1: Find ServiceCatalogs linked to this TelemetryService
-          const serviceCatalogTelemetryServices: Array<ServiceCatalogTelemetryService> =
-            await ServiceCatalogTelemetryServiceService.findBy({
+          // Step 1: Find Services linked to this TelemetryService
+          const serviceTelemetryServices: Array<ServiceTelemetryService> =
+            await ServiceTelemetryServiceService.findBy({
               query: {
                 telemetryServiceId: telemetryServiceId,
               },
               select: {
-                serviceCatalogId: true,
+                serviceId: true,
               },
               skip: 0,
               limit: LIMIT_MAX,
@@ -271,26 +271,25 @@ export default class AIAgentDataAPI {
               },
             });
 
-          if (serviceCatalogTelemetryServices.length === 0) {
+          if (serviceTelemetryServices.length === 0) {
             logger.debug(
-              `No service catalogs found for telemetry service ${telemetryServiceId.toString()}`,
+              `No services found for telemetry service ${telemetryServiceId.toString()}`,
             );
             return Response.sendJsonObjectResponse(req, res, {
               repositories: [],
             });
           }
 
-          // Extract service catalog IDs
-          const serviceCatalogIds: Array<ObjectID> =
-            serviceCatalogTelemetryServices
-              .filter((s: ServiceCatalogTelemetryService) => {
-                return s.serviceCatalogId;
-              })
-              .map((s: ServiceCatalogTelemetryService) => {
-                return s.serviceCatalogId as ObjectID;
-              });
+          // Extract service IDs
+          const serviceIds: Array<ObjectID> = serviceTelemetryServices
+            .filter((s: ServiceTelemetryService) => {
+              return s.serviceId;
+            })
+            .map((s: ServiceTelemetryService) => {
+              return s.serviceId as ObjectID;
+            });
 
-          // Step 2: Find CodeRepositories linked to these ServiceCatalogs
+          // Step 2: Find CodeRepositories linked to these Services
           const repositories: Array<{
             id: string;
             name: string;
@@ -302,11 +301,11 @@ export default class AIAgentDataAPI {
             gitHubAppInstallationId: string | null;
           }> = [];
 
-          for (const serviceCatalogId of serviceCatalogIds) {
-            const serviceCatalogCodeRepositories: Array<ServiceCatalogCodeRepository> =
-              await ServiceCatalogCodeRepositoryService.findBy({
+          for (const serviceId of serviceIds) {
+            const serviceCodeRepositories: Array<ServiceCodeRepository> =
+              await ServiceCodeRepositoryService.findBy({
                 query: {
-                  serviceCatalogId: serviceCatalogId,
+                  serviceId: serviceId,
                 },
                 select: {
                   codeRepositoryId: true,
@@ -328,7 +327,7 @@ export default class AIAgentDataAPI {
                 },
               });
 
-            for (const scr of serviceCatalogCodeRepositories) {
+            for (const scr of serviceCodeRepositories) {
               if (scr.codeRepository) {
                 // Check if we already have this repository
                 const existingRepo: boolean = repositories.some(

package/Server/Infrastructure/Postgres/SchemaMigrations/1767966850199-RenameServiceCatalogToService.ts

@@ -0,0 +1,171 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RenameServiceCatalogToService1767966850199
+  implements MigrationInterface
+{
+  public name = "RenameServiceCatalogToService1767966850199";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    /*
+     * Step 0: Rename existing ServiceLabel (TelemetryService ↔ Label) to TelemetryServiceLabel
+     * This frees up the "ServiceLabel" name for use by Service (formerly ServiceCatalog)
+     */
+    await queryRunner.query(
+      `ALTER TABLE "ServiceLabel" RENAME TO "TelemetryServiceLabel"`,
+    );
+
+    /*
+     * Step 1: Rename columns in dependent tables first (before renaming the main table)
+     */
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogMonitor
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogMonitor" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogTelemetryService
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogTelemetryService" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    // Rename columns in ServiceCatlogDependency (note the typo in original table name)
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatlogDependency" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatlogDependency" RENAME COLUMN "dependencyServiceCatalogId" TO "dependencyServiceId"`,
+    );
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogCodeRepository
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogCodeRepository" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogOwnerTeam
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerTeam" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogOwnerUser
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerUser" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    // Rename serviceCatalogId to serviceId in ServiceCatalogLabel join table
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogLabel" RENAME COLUMN "serviceCatalogId" TO "serviceId"`,
+    );
+
+    /*
+     * Step 2: Rename tables
+     */
+
+    // Rename main ServiceCatalog table to Service
+    await queryRunner.query(`ALTER TABLE "ServiceCatalog" RENAME TO "Service"`);
+
+    // Rename ServiceCatalogMonitor to ServiceMonitor
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogMonitor" RENAME TO "ServiceMonitor"`,
+    );
+
+    // Rename ServiceCatalogTelemetryService to ServiceTelemetryService
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogTelemetryService" RENAME TO "ServiceTelemetryService"`,
+    );
+
+    // Rename ServiceCatlogDependency to ServiceDependency (fixing the typo too)
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatlogDependency" RENAME TO "ServiceDependency"`,
+    );
+
+    // Rename ServiceCatalogCodeRepository to ServiceCodeRepository
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogCodeRepository" RENAME TO "ServiceCodeRepository"`,
+    );
+
+    // Rename ServiceCatalogOwnerTeam to ServiceOwnerTeam
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerTeam" RENAME TO "ServiceOwnerTeam"`,
+    );
+
+    // Rename ServiceCatalogOwnerUser to ServiceOwnerUser
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerUser" RENAME TO "ServiceOwnerUser"`,
+    );
+
+    // Rename ServiceCatalogLabel to ServiceLabel
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogLabel" RENAME TO "ServiceLabel"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Step 1: Rename tables back to original names
+    await queryRunner.query(
+      `ALTER TABLE "ServiceLabel" RENAME TO "ServiceCatalogLabel"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceOwnerUser" RENAME TO "ServiceCatalogOwnerUser"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceOwnerTeam" RENAME TO "ServiceCatalogOwnerTeam"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCodeRepository" RENAME TO "ServiceCatalogCodeRepository"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceDependency" RENAME TO "ServiceCatlogDependency"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceTelemetryService" RENAME TO "ServiceCatalogTelemetryService"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceMonitor" RENAME TO "ServiceCatalogMonitor"`,
+    );
+
+    await queryRunner.query(`ALTER TABLE "Service" RENAME TO "ServiceCatalog"`);
+
+    // Step 2: Rename columns back to original names
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogLabel" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerUser" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogOwnerTeam" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogCodeRepository" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatlogDependency" RENAME COLUMN "dependencyServiceId" TO "dependencyServiceCatalogId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatlogDependency" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogTelemetryService" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    await queryRunner.query(
+      `ALTER TABLE "ServiceCatalogMonitor" RENAME COLUMN "serviceId" TO "serviceCatalogId"`,
+    );
+
+    // Step 3: Rename TelemetryServiceLabel back to ServiceLabel
+    await queryRunner.query(
+      `ALTER TABLE "TelemetryServiceLabel" RENAME TO "ServiceLabel"`,
+    );
+  }
+}

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

@@ -213,6 +213,7 @@ import { AddAIAgentIsDefault1766918848434 } from "./1766918848434-AddAIAgentIsDe
 import { MigrationName1766923324521 } from "./1766923324521-MigrationName";
 import { AddGitHubAppInstallationIdToProject1766958924188 } from "./1766958924188-AddGitHubAppInstallationIdToProject";
 import { MigrationName1767009661768 } from "./1767009661768-MigrationName";
+import { RenameServiceCatalogToService1767966850199 } from "./1767966850199-RenameServiceCatalogToService";
 
 export default [
   InitialMigration,
@@ -430,4 +431,5 @@ export default [
   MigrationName1766923324521,
   AddGitHubAppInstallationIdToProject1766958924188,
   MigrationName1767009661768,
+  RenameServiceCatalogToService1767966850199,
 ];

package/Server/Services/Index.ts

@@ -87,12 +87,12 @@ import ScheduledMaintenancePublicNoteService from "./ScheduledMaintenancePublicN
 import ScheduledMaintenanceService from "./ScheduledMaintenanceService";
 import ScheduledMaintenanceStateService from "./ScheduledMaintenanceStateService";
 import ScheduledMaintenanceStateTimelineService from "./ScheduledMaintenanceStateTimelineService";
-import ServiceCatalogOwnerTeamService from "./ServiceCatalogOwnerTeamService";
-import ServiceCatalogOwnerUserService from "./ServiceCatalogOwnerUserService";
-import ServiceCatalogService from "./ServiceCatalogService";
-import ServiceCatalogMonitorService from "./ServiceCatalogMonitorService";
-import ServiceCatalogTelemetryServiceService from "./ServiceCatalogTelemetryServiceService";
-import ServiceCatalogCodeRepositoryService from "./ServiceCatalogCodeRepositoryService";
+import ServiceOwnerTeamService from "./ServiceOwnerTeamService";
+import ServiceOwnerUserService from "./ServiceOwnerUserService";
+import ServiceService from "./ServiceService";
+import ServiceMonitorService from "./ServiceMonitorService";
+import ServiceTelemetryServiceService from "./ServiceTelemetryServiceService";
+import ServiceCodeRepositoryService from "./ServiceCodeRepositoryService";
 import ShortLinkService from "./ShortLinkService";
 // SMS Log Service
 import SmsLogService from "./SmsLogService";
@@ -142,7 +142,7 @@ import WorkflowLogService from "./WorkflowLogService";
 import WorkflowService from "./WorkflowService";
 import WorkflowVariablesService from "./WorkflowVariableService";
 import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import ServiceCatalogDependencyService from "./ServiceCatalogDependencyService";
+import ServiceDependencyService from "./ServiceDependencyService";
 import TelemetryExceptionService from "./TelemetryExceptionService";
 import ExceptionInstanceService from "./ExceptionInstanceService";
 import ScheduledMaintenanceTemplateService from "./ScheduledMaintenanceTemplateService";
@@ -326,13 +326,13 @@ const services: Array<BaseService> = [
   UsageBillingService,
   ProjectCallSMSConfigService,
 
-  ServiceCatalogService,
-  ServiceCatalogOwnerTeamService,
-  ServiceCatalogOwnerUserService,
-  ServiceCatalogDependencyService,
-  ServiceCatalogMonitorService,
-  ServiceCatalogTelemetryServiceService,
-  ServiceCatalogCodeRepositoryService,
+  ServiceService,
+  ServiceOwnerTeamService,
+  ServiceOwnerUserService,
+  ServiceDependencyService,
+  ServiceMonitorService,
+  ServiceTelemetryServiceService,
+  ServiceCodeRepositoryService,
 
   TelemetryExceptionService,
 

package/Server/Services/{ServiceCatalogCodeRepositoryService.ts → ServiceCodeRepositoryService.ts}

@@ -2,7 +2,7 @@ import BadDataException from "../../Types/Exception/BadDataException";
 import CreateBy from "../Types/Database/CreateBy";
 import { OnCreate } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
-import Model from "../../Models/DatabaseModels/ServiceCatalogCodeRepository";
+import Model from "../../Models/DatabaseModels/ServiceCodeRepository";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -15,23 +15,23 @@ export class Service extends DatabaseService<Model> {
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
   ): Promise<OnCreate<Model>> {
-    if (!createBy.data.serviceCatalogId && !createBy.data.serviceCatalog) {
-      throw new BadDataException("serviceCatalog is required");
+    if (!createBy.data.serviceId && !createBy.data.service) {
+      throw new BadDataException("service is required");
     }
 
     if (!createBy.data.codeRepository && !createBy.data.codeRepositoryId) {
       throw new BadDataException("codeRepository is required");
     }
 
-    const serviceCatalogId: string | ObjectID | undefined =
-      createBy.data.serviceCatalogId || createBy.data.serviceCatalog?._id;
+    const serviceId: string | ObjectID | undefined =
+      createBy.data.serviceId || createBy.data.service?._id;
     const codeRepositoryId: string | ObjectID | undefined =
       createBy.data.codeRepositoryId || createBy.data.codeRepository?._id;
 
-    // check if this code repository is already added to the service catalog for this service.
+    // check if this code repository is already added to the service for this service.
     const existingCodeRepository: Model | null = await this.findOneBy({
       query: {
-        serviceCatalogId: serviceCatalogId as ObjectID,
+        serviceId: serviceId as ObjectID,
         codeRepositoryId: codeRepositoryId as ObjectID,
       },
       props: {