@oneuptime/common 9.3.6 → 9.3.8

package/Models/DatabaseModels/{ServiceCatalogOwnerTeam.ts → ServiceOwnerTeam.ts}

@@ -1,5 +1,5 @@
 import Project from "./Project";
-import ServiceCatalog from "./ServiceCatalog";
+import Service from "./Service";
 import Team from "./Team";
 import User from "./User";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
@@ -22,7 +22,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({
@@ -36,23 +36,23 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.CreateServiceCatalogOwnerTeam,
+    Permission.CreateServiceOwnerTeam,
   ],
   read: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
     Permission.ProjectMember,
-    Permission.ReadServiceCatalogOwnerTeam,
+    Permission.ReadServiceOwnerTeam,
   ],
   delete: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
-    Permission.DeleteServiceCatalogOwnerTeam,
+    Permission.DeleteServiceOwnerTeam,
   ],
   update: [
     Permission.ProjectOwner,
     Permission.ProjectAdmin,
-    Permission.EditServiceCatalogOwnerTeam,
+    Permission.EditServiceOwnerTeam,
   ],
 })
 @EnableWorkflow({
@@ -61,30 +61,30 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
   update: true,
   read: true,
 })
-@CrudApiEndpoint(new Route("/service-catalog-owner-team"))
+@CrudApiEndpoint(new Route("/service-owner-team"))
 @TableMetadata({
-  tableName: "ServiceCatalogOwnerTeam",
-  singularName: "Service Catalog Team Owner",
-  pluralName: "Service Catalog Team Owners",
+  tableName: "ServiceOwnerTeam",
+  singularName: "Service Team Owner",
+  pluralName: "Service Team Owners",
   icon: IconProp.Signal,
-  tableDescription: "Add teams as owners to your Service Catalog.",
+  tableDescription: "Add teams as owners to your Service.",
 })
 @Entity({
-  name: "ServiceCatalogOwnerTeam",
+  name: "ServiceOwnerTeam",
 })
-export default class ServiceCatalogOwnerTeam extends BaseModel {
+export default class ServiceOwnerTeam extends BaseModel {
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -115,13 +115,13 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -146,13 +146,13 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -184,13 +184,13 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -215,28 +215,27 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     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,
@@ -245,21 +244,21 @@ export default class ServiceCatalogOwnerTeam 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.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -268,9 +267,8 @@ export default class ServiceCatalogOwnerTeam 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({
@@ -278,20 +276,20 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
     nullable: false,
     transformer: ObjectID.getDatabaseTransformer(),
   })
-  public serviceCatalogId?: ObjectID = undefined;
+  public serviceId?: ObjectID = undefined;
 
   @ColumnAccessControl({
     create: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -323,13 +321,13 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.CreateServiceCatalogOwnerTeam,
+      Permission.CreateServiceOwnerTeam,
     ],
     read: [
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -353,7 +351,7 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })
@@ -387,7 +385,7 @@ export default class ServiceCatalogOwnerTeam extends BaseModel {
       Permission.ProjectOwner,
       Permission.ProjectAdmin,
       Permission.ProjectMember,
-      Permission.ReadServiceCatalogOwnerTeam,
+      Permission.ReadServiceOwnerTeam,
     ],
     update: [],
   })

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: [],
   })