@oneuptime/common 7.0.4597 → 7.0.4646

package/Utils/Schema/ModelSchema.ts

@@ -145,13 +145,14 @@ export class ModelSchema extends BaseSchema {
           .string()
           .openapi({ type: "string", example: "example-slug-value" });
       } else if (column.type === TableColumnType.ShortText) {
-        const openapiConfig: any = { type: "string", example: "Example short text" };
+        const openapiConfig: any = {
+          type: "string",
+          example: "Example short text",
+        };
         if (column.defaultValue !== undefined) {
           openapiConfig.default = column.defaultValue;
         }
-        zodType = z
-          .string()
-          .openapi(openapiConfig);
+        zodType = z.string().openapi(openapiConfig);
       } else if (column.type === TableColumnType.LongText) {
         const openapiConfig: any = {
           type: "string",
@@ -382,8 +383,8 @@ export class ModelSchema extends BaseSchema {
       }
 
       // add title and description to the schema
-      let finalDescription = "";
-      
+      let finalDescription: string = "";
+
       // Add column description first if it exists
       if (column.description) {
         finalDescription = column.description;
@@ -436,6 +437,7 @@ export class ModelSchema extends BaseSchema {
 
   public static getQueryModelSchema(data: {
     modelType: new () => DatabaseBaseModel;
+    disableOpenApiSchema?: boolean;
   }): ModelSchemaType {
     const modelType: new () => DatabaseBaseModel = data.modelType;
     const model: DatabaseBaseModel = new modelType();
@@ -473,6 +475,7 @@ export class ModelSchema extends BaseSchema {
       getExampleValueForColumn: (columnType: TableColumnType) => {
         return this.getExampleValueForColumn(columnType);
       },
+      disableOpenApiSchema: data.disableOpenApiSchema || false,
     });
   }
 
@@ -697,6 +700,7 @@ export class ModelSchema extends BaseSchema {
 
   public static getSortModelSchema(data: {
     modelType: new () => DatabaseBaseModel;
+    disableOpenApiSchema?: boolean;
   }): ModelSchemaType {
     const modelType: new () => DatabaseBaseModel = data.modelType;
     const model: DatabaseBaseModel = new modelType();
@@ -718,6 +722,7 @@ export class ModelSchema extends BaseSchema {
             return col !== null;
           }) as Array<{ key: string; type: any }>;
       },
+      disableOpenApiSchema: data.disableOpenApiSchema || false,
     });
   }
 
@@ -1066,6 +1071,7 @@ export class ModelSchema extends BaseSchema {
     description: string;
     example: SchemaExample;
     makeOptional?: boolean;
+    disableOpenApiSchema?: boolean;
   }): ModelSchemaType {
     const modelType: new () => DatabaseBaseModel = data.modelType;
     const model: DatabaseBaseModel = new modelType();
@@ -1148,14 +1154,18 @@ export class ModelSchema extends BaseSchema {
       let zodType: ZodTypes.ZodTypeAny = this.getZodTypeForColumn(
         column,
         data.schemaType,
+        data.disableOpenApiSchema || false,
       );
 
       // Check if the column is required and make it optional if not
       // Also make columns with default values optional in create schemas
-      if(column.isDefaultValueColumn){
+      if (column.isDefaultValueColumn) {
         // should be optional
         zodType = zodType.optional();
-      } else if (column.title?.toLowerCase() === "project id" && column.type === TableColumnType.ObjectID) {
+      } else if (
+        column.title?.toLowerCase() === "project id" &&
+        column.type === TableColumnType.ObjectID
+      ) {
         // this is optional in the API as well as it's derived from API key
         zodType = zodType.optional();
       } else if (column.required) {
@@ -1170,8 +1180,8 @@ export class ModelSchema extends BaseSchema {
       }
 
       // Add title and description to the schema
-      let finalDescription = "";
-      
+      let finalDescription: string = "";
+
       // Add column description first if it exists
       if (column.description) {
         finalDescription = column.description;
@@ -1211,17 +1221,34 @@ export class ModelSchema extends BaseSchema {
   private static getZodTypeForColumn(
     column: TableColumnMetadata,
     schemaType: "create" | "read" | "update" | "delete",
+    disableOpenApiSchema: boolean = false,
   ): ZodTypes.ZodTypeAny {
     let zodType: ZodTypes.ZodTypeAny;
 
     // Helper function to add default value to openapi schema if it exists
-    const addDefaultToOpenApi = (openApiConfig: any) => {
+    const addDefaultToOpenApi: (openApiConfig: any) => any = (
+      openApiConfig: any,
+    ): any => {
       if (column.defaultValue !== undefined && column.defaultValue !== null) {
         return { ...openApiConfig, default: column.defaultValue };
       }
       return openApiConfig;
     };
 
+    // Helper function to conditionally apply OpenAPI schema
+    const applyOpenApi: (
+      baseType: ZodTypes.ZodTypeAny,
+      openApiConfig: any,
+    ) => ZodTypes.ZodTypeAny = (
+      baseType: ZodTypes.ZodTypeAny,
+      openApiConfig: any,
+    ): ZodTypes.ZodTypeAny => {
+      if (disableOpenApiSchema) {
+        return baseType;
+      }
+      return baseType.openapi(addDefaultToOpenApi(openApiConfig));
+    };
+
     if (column.type === TableColumnType.ObjectID) {
       zodType = ObjectID.getSchema();
     } else if (column.type === TableColumnType.Port) {
@@ -1235,164 +1262,187 @@ export class ModelSchema extends BaseSchema {
     } else if (column.type === TableColumnType.Date) {
       zodType = OneUptimeDate.getSchema();
     } else if (column.type === TableColumnType.VeryLongText) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example:
           "This is an example of very long text content that might be stored in this field. It can contain a lot of information, such as detailed descriptions, comments, or any other lengthy text data that needs to be stored in the database.",
-      }));
+      });
     } else if (
       column.type === TableColumnType.Number ||
       column.type === TableColumnType.PositiveNumber
     ) {
-      zodType = z.number().openapi(addDefaultToOpenApi({ type: "number", example: 42 }));
+      zodType = applyOpenApi(z.number(), { type: "number", example: 42 });
     } else if (column.type === TableColumnType.Email) {
       zodType = Email.getSchema();
     } else if (column.type === TableColumnType.HashedString) {
-      zodType = z
-        .string()
-        .openapi(addDefaultToOpenApi({ type: "string", example: "hashed_string_value" }));
+      zodType = applyOpenApi(z.string(), {
+        type: "string",
+        example: "hashed_string_value",
+      });
     } else if (column.type === TableColumnType.Slug) {
-      zodType = z
-        .string()
-        .openapi(addDefaultToOpenApi({ type: "string", example: "example-slug-value" }));
+      zodType = applyOpenApi(z.string(), {
+        type: "string",
+        example: "example-slug-value",
+      });
     } else if (column.type === TableColumnType.ShortText) {
-      zodType = z
-        .string()
-        .openapi(addDefaultToOpenApi({ type: "string", example: "Example short text" }));
+      zodType = applyOpenApi(z.string(), {
+        type: "string",
+        example: "Example short text",
+      });
     } else if (column.type === TableColumnType.LongText) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example:
           "This is an example of longer text content that might be stored in this field.",
-      }));
+      });
     } else if (column.type === TableColumnType.Phone) {
       zodType = Phone.getSchema();
     } else if (column.type === TableColumnType.Version) {
       zodType = Version.getSchema();
     } else if (column.type === TableColumnType.Password) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         format: "password",
         example: "••••••••",
-      }));
+      });
     } else if (column.type === TableColumnType.Name) {
       zodType = Name.getSchema();
     } else if (column.type === TableColumnType.Description) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "This is a description of the item",
-      }));
+      });
     } else if (column.type === TableColumnType.File) {
-      zodType = z.any().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.any(), {
         type: "string",
         format: "binary",
-      }));
+      });
     } else if (column.type === TableColumnType.Buffer) {
-      zodType = z.any().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.any(), {
         type: "string",
         format: "binary",
-      }));
+      });
     } else if (column.type === TableColumnType.ShortURL) {
-      zodType = z.string().url().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string().url(), {
         type: "string",
         example: "https://short.url/abc123",
-      }));
+      });
     } else if (column.type === TableColumnType.Markdown) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "# Heading\n\nThis is **markdown** content",
-      }));
+      });
     } else if (column.type === TableColumnType.Domain) {
       zodType = Domain.getSchema();
     } else if (column.type === TableColumnType.LongURL) {
-      zodType = z.string().url().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string().url(), {
         type: "string",
         example: "https://www.example.com/path/to/resource?param=value",
-      }));
+      });
     } else if (column.type === TableColumnType.OTP) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "123456",
-      }));
+      });
     } else if (column.type === TableColumnType.HTML) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "<div><h1>Title</h1><p>Content</p></div>",
-      }));
+      });
     } else if (column.type === TableColumnType.JavaScript) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "function example() { return true; }",
-      }));
+      });
     } else if (column.type === TableColumnType.CSS) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "body { color: #333; margin: 0; }",
-      }));
+      });
     } else if (column.type === TableColumnType.Array) {
-      zodType = z.array(z.any()).openapi(addDefaultToOpenApi({
-        type: "array",
-        items: {
-          type: "string",
-        },
-        example: ["item1", "item2", "item3"],
-      }));
+      zodType = z.array(z.any()).openapi(
+        addDefaultToOpenApi({
+          type: "array",
+          items: {
+            type: "string",
+          },
+          example: ["item1", "item2", "item3"],
+        }),
+      );
     } else if (column.type === TableColumnType.SmallPositiveNumber) {
-      zodType = z.number().int().nonnegative().openapi(addDefaultToOpenApi({
-        type: "integer",
-        example: 5,
-      }));
+      zodType = z
+        .number()
+        .int()
+        .nonnegative()
+        .openapi(
+          addDefaultToOpenApi({
+            type: "integer",
+            example: 5,
+          }),
+        );
     } else if (column.type === TableColumnType.BigPositiveNumber) {
-      zodType = z.number().nonnegative().openapi(addDefaultToOpenApi({
-        type: "number",
-        example: 1000000,
-      }));
+      zodType = z
+        .number()
+        .nonnegative()
+        .openapi(
+          addDefaultToOpenApi({
+            type: "number",
+            example: 1000000,
+          }),
+        );
     } else if (column.type === TableColumnType.SmallNumber) {
-      zodType = z.number().int().openapi(addDefaultToOpenApi({
-        type: "integer",
-        example: 10,
-      }));
+      zodType = z
+        .number()
+        .int()
+        .openapi(
+          addDefaultToOpenApi({
+            type: "integer",
+            example: 10,
+          }),
+        );
     } else if (column.type === TableColumnType.BigNumber) {
-      zodType = z.number().openapi(addDefaultToOpenApi({
-        type: "number",
-        example: 1000000,
-      }));
+      zodType = z.number().openapi(
+        addDefaultToOpenApi({
+          type: "number",
+          example: 1000000,
+        }),
+      );
     } else if (column.type === TableColumnType.Permission) {
-      zodType = z.any().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.any(), {
         type: "object",
         example: { read: true, write: false, delete: false },
-      }));
+      });
     } else if (column.type === TableColumnType.CustomFieldType) {
-      zodType = z.any().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.any(), {
         type: "object",
         example: { type: "text", required: true },
-      }));
+      });
     } else if (column.type === TableColumnType.MonitorType) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "HTTP",
-      }));
+      });
     } else if (column.type === TableColumnType.WorkflowStatus) {
-      zodType = z.string().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.string(), {
         type: "string",
         example: "In Progress",
-      }));
+      });
     } else if (column.type === TableColumnType.Boolean) {
-      zodType = z.boolean().openapi(addDefaultToOpenApi({ type: "boolean", example: true }));
+      zodType = applyOpenApi(z.boolean(), { type: "boolean", example: true });
     } else if (column.type === TableColumnType.JSON) {
-      zodType = z.any().openapi(addDefaultToOpenApi({
+      zodType = applyOpenApi(z.any(), {
         type: "object",
         example: { key: "value", nested: { data: 123 } },
-      }));
+      });
     } else if (column.type === TableColumnType.EntityArray) {
       const entityArrayType: (new () => DatabaseBaseModel) | undefined =
         column.modelType;
       if (!entityArrayType) {
-        return z.any().openapi(addDefaultToOpenApi({
+        return applyOpenApi(z.any(), {
           type: "array",
           items: { type: "object" },
           example: [],
-        }));
+        });
       }
 
       // Use the appropriate schema method based on the operation type
@@ -1412,34 +1462,40 @@ export class ModelSchema extends BaseSchema {
           break;
       }
 
-      zodType = z
-        .array(
-          z.lazy(() => {
-            return schemaMethod({
-              modelType: entityArrayType as new () => DatabaseBaseModel,
-            });
-          }),
-        )
-        .openapi(addDefaultToOpenApi({
-          type: "array",
-          items: {
-            type: "object",
-            properties: {
-              id: { type: "string" },
-            },
-          },
-          example: [{ id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" }],
-        }));
+      const arrayType: ZodTypes.ZodArray<
+        ZodTypes.ZodLazy<ZodTypes.ZodTypeAny>
+      > = z.array(
+        z.lazy(() => {
+          return schemaMethod({
+            modelType: entityArrayType as new () => DatabaseBaseModel,
+          });
+        }),
+      );
+
+      zodType = disableOpenApiSchema
+        ? arrayType
+        : arrayType.openapi(
+            addDefaultToOpenApi({
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  id: { type: "string" },
+                },
+              },
+              example: [{ id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" }],
+            }),
+          );
     } else if (column.type === TableColumnType.Entity) {
       const entityType: (new () => DatabaseBaseModel) | undefined =
         column.modelType;
 
       if (!entityType) {
-        return z.any().openapi(addDefaultToOpenApi({
+        return applyOpenApi(z.any(), {
           type: "object",
           description: "Entity reference",
           example: { _id: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" },
-        }));
+        });
       }
 
       // Use the appropriate schema method based on the operation type
@@ -1459,16 +1515,20 @@ export class ModelSchema extends BaseSchema {
           break;
       }
 
-      zodType = z
-        .lazy(() => {
-          return schema;
-        })
-        .openapi(addDefaultToOpenApi({
-          type: "object",
-          example: { id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" },
-        }));
+      const lazyType: ZodTypes.ZodLazy<ZodTypes.ZodTypeAny> = z.lazy(() => {
+        return schema;
+      });
+
+      zodType = disableOpenApiSchema
+        ? lazyType
+        : lazyType.openapi(
+            addDefaultToOpenApi({
+              type: "object",
+              example: { id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" },
+            }),
+          );
     } else {
-      zodType = z.any().openapi(addDefaultToOpenApi({ type: "null", example: null }));
+      zodType = applyOpenApi(z.any(), { type: "null", example: null });
     }
 
     // Apply default value if it exists in the column metadata
@@ -1477,7 +1537,7 @@ export class ModelSchema extends BaseSchema {
     }
 
     // Mark computed fields as readOnly in OpenAPI spec
-    if (column.computed) {
+    if (column.computed && !disableOpenApiSchema) {
       zodType = zodType.openapi({ readOnly: true });
     }
 
@@ -1486,6 +1546,7 @@ export class ModelSchema extends BaseSchema {
 
   public static getCreateModelSchema(data: {
     modelType: new () => DatabaseBaseModel;
+    disableOpenApiSchema?: boolean;
   }): ModelSchemaType {
     // Auto-generated fields to exclude from create schema
     const excludedFields: Array<string> = [
@@ -1506,6 +1567,7 @@ export class ModelSchema extends BaseSchema {
         schemaType: "create",
         excludedFields,
       }),
+      disableOpenApiSchema: data.disableOpenApiSchema || false,
     });
   }
 
@@ -1526,6 +1588,7 @@ export class ModelSchema extends BaseSchema {
 
   public static getUpdateModelSchema(data: {
     modelType: new () => DatabaseBaseModel;
+    disableOpenApiSchema?: boolean;
   }): ModelSchemaType {
     // Auto-generated fields to exclude from update schema (but allow _id for identification)
     const excludedFields: Array<string> = [
@@ -1546,6 +1609,7 @@ export class ModelSchema extends BaseSchema {
         excludedFields,
       }),
       makeOptional: true, // All fields are optional for updates
+      disableOpenApiSchema: data.disableOpenApiSchema || false,
     });
   }
 

package/build/dist/Models/DatabaseModels/AcmeCertificate.js

@@ -113,6 +113,7 @@ __decorate([
         manyToOneRelationColumn: "deletedByUserId",
         type: TableColumnType.Entity,
         title: "Deleted by User",
+        modelType: User,
         description: "Relation to User who deleted this object (if this object was deleted by a User)",
     }),
     ManyToOne(() => {

package/build/dist/Models/DatabaseModels/AcmeCertificate.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcmeCertificate.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/AcmeCertificate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcmeCertificate.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/AcmeCertificate.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAkBxD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS;IAAvC;;QAcN,WAAM,GAAY,SAAS,CAAC;QAa5B,gBAAW,GAAY,SAAS,CAAC;QAajC,mBAAc,GAAY,SAAS,CAAC;QAapC,aAAQ,GAAU,SAAS,CAAC;QAa5B,cAAS,GAAU,SAAS,CAAC;QA4B7B,kBAAa,GAAU,SAAS,CAAC;QAkBjC,oBAAe,GAAc,SAAS,CAAC;IAChD,CAAC;CAAA,CAAA;AAnGQ;IAbN,KAAK,EAAE;IACP,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC;IAC/C,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,SAAS;QAC1B,MAAM,EAAE,YAAY,CAAC,SAAS;QAC9B,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;KACd,CAAC;;+CACiC;AAa5B;IAXN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,YAAY,EAAE,CAAC;IACnD,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,YAAY;QAC7B,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;KACd,CAAC;;oDACsC;AAajC;IAXN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,YAAY,EAAE,CAAC;IACnD,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,YAAY;QAC7B,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;KACd,CAAC;;uDACyC;AAapC;IAXN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC;IAC3C,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;KACd,CAAC;8BACgB,IAAI;iDAAa;AAa5B;IAXN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC;IAC3C,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;KACd,CAAC;8BACiB,IAAI;kDAAa;AA4B7B;IA1BN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC;QACX,uBAAuB,EAAE,iBAAiB;QAC1C,IAAI,EAAE,eAAe,CAAC,MAAM;QAC5B,KAAK,EAAE,iBAAiB;QACxB,SAAS,EAAE,IAAI;QACf,WAAW,EACT,iFAAiF;KACpF,CAAC;IACD,SAAS,CACR,GAAG,EAAE;QACH,OAAO,IAAI,CAAC;IACd,CAAC,EACD;QACE,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,UAAU;QACpB,iBAAiB,EAAE,SAAS;KAC7B,CACF;IACA,UAAU,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;8BACjB,IAAI;sDAAa;AAkBjC;IAhBN,mBAAmB,CAAC;QACnB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;IACD,WAAW,CAAC;QACX,IAAI,EAAE,eAAe,CAAC,QAAQ;QAC9B,KAAK,EAAE,oBAAoB;QAC3B,WAAW,EACT,wEAAwE;KAC3E,CAAC;IACD,MAAM,CAAC;QACN,IAAI,EAAE,UAAU,CAAC,QAAQ;QACzB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,sBAAsB,EAAE;KAC/C,CAAC;8BACuB,QAAQ;wDAAa;AAhH3B,eAAe;IAhBnC,kBAAkB,CAAC;QAClB,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,EAAE;KACX,CAAC;IACD,aAAa,CAAC;QACb,SAAS,EAAE,iBAAiB;QAC5B,YAAY,EAAE,kBAAkB;QAChC,UAAU,EAAE,kBAAkB;QAC9B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,gBAAgB,EAAE,2BAA2B;KAC9C,CAAC;IACD,MAAM,CAAC;QACN,IAAI,EAAE,iBAAiB;KACxB,CAAC;GACmB,eAAe,CAiHnC;eAjHoB,eAAe"}

package/build/dist/Models/DatabaseModels/AcmeChallenge.js

@@ -85,6 +85,7 @@ __decorate([
         manyToOneRelationColumn: "deletedByUserId",
         type: TableColumnType.Entity,
         title: "Deleted by User",
+        modelType: User,
         description: "Relation to User who deleted this object (if this object was deleted by a User)",
     }),
     ManyToOne(() => {

package/build/dist/Models/DatabaseModels/AcmeChallenge.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcmeChallenge.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/AcmeChallenge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcmeChallenge.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/AcmeChallenge.ts"],"names":[],"mappings":"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"}

package/build/dist/Models/DatabaseModels/Alert.js

@@ -277,6 +277,7 @@ __decorate([
         manyToOneRelationColumn: "deletedByUserId",
         type: TableColumnType.Entity,
         title: "Deleted by User",
+        modelType: User,
         description: "Relation to User who deleted this object (if this object was deleted by a User)",
     }),
     ManyToOne(() => {