@solidxai/core 0.1.10-beta.23 → 0.1.10-beta.25

package/src/services/crud.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, InternalServerErrorException, NotFoundException } from "@nestjs/common";
+import { BadRequestException, ConflictException, HttpException, InternalServerErrorException, NotFoundException } from "@nestjs/common";
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { isArray } from "class-validator";
 import { CommonEntity } from "../entities/common.entity";
@@ -911,7 +911,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             });
 
             if (!softDeletedRows) {
-                throw new Error(ERROR_MESSAGES.NO_SOFT_DELETED_RECORD_FOUND);
+                throw new NotFoundException(ERROR_MESSAGES.NO_SOFT_DELETED_RECORD_FOUND);
             }
 
             await this.repo.update(id, {
@@ -921,13 +921,13 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
 
             return { message: SUCCESS_MESSAGES.RECORD_RECOVERED, data: softDeletedRows };
         } catch (error: any) {
-            if (error instanceof QueryFailedError) {
-                if ((error as any).code === '23505') {
-                    throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
-                }
+            if (error instanceof QueryFailedError && (error as any).code === '23505') {
+                throw new ConflictException(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
             }
-
-            throw new Error(error);
+            if (error instanceof HttpException) {
+                throw error;
+            }
+            throw new InternalServerErrorException(error?.message ?? String(error));
         }
     }
 
@@ -956,7 +956,7 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
             });
 
             if (softDeletedRows.length === 0) {
-                throw new Error(ERROR_MESSAGES.NO_SOFT_DELETED_RECORDS_FOUND);
+                throw new NotFoundException(ERROR_MESSAGES.NO_SOFT_DELETED_RECORDS_FOUND);
             }
 
             // Recover the specific records by setting deletedAt to null
@@ -967,13 +967,13 @@ export class CRUDService<T extends CommonEntity> { // Add two generic value i.e
 
             return { message: SUCCESS_MESSAGES.SELECTED_RECORDS_RECOVERED, recoveredIds: ids };
         } catch (error: any) {
-            if (error instanceof QueryFailedError) {
-                if ((error as any).code === "23505") {
-                    throw new Error(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
-                }
+            if (error instanceof QueryFailedError && (error as any).code === "23505") {
+                throw new ConflictException(ERROR_MESSAGES.CONFLICTING_RECORD_ON_UNARCHIVE);
             }
-
-            throw new Error(error);
+            if (error instanceof HttpException) {
+                throw error;
+            }
+            throw new InternalServerErrorException(error?.message ?? String(error));
         }
     }
 

package/src/services/mediaStorageProviders/file-s3-storage-provider.ts

@@ -2,8 +2,8 @@ import { Injectable, Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { CommonEntity } from "src/entities/common.entity";
 import { FieldMetadata } from "src/entities/field-metadata.entity";
-import { LegacyCommonEntity } from "src/entities/legacy-common.entity";
-import { LegacyCommonWithIdEntity } from "src/entities/legacy-common-with-id.entity";
+import { LegacyCommonEntityWithExistingId } from "src/entities/legacy-common.entity";
+import { LegacyCommonEntityWithGeneratedId } from "src/entities/legacy-common-with-id.entity";
 import { Media } from "src/entities/media.entity";
 import { MediaStorageProvider } from "src/interfaces";
 import { DiskFileService, S3FileService } from "src/services/file";
@@ -27,10 +27,10 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
 
     async retrieve(entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
         const isSupportedEntity = entity instanceof CommonEntity
-            || entity instanceof LegacyCommonEntity
-            || entity instanceof LegacyCommonWithIdEntity;
+            || entity instanceof LegacyCommonEntityWithExistingId
+            || entity instanceof LegacyCommonEntityWithGeneratedId;
         if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         // @ts-ignore
         const media = await this.mediaRepository.findByEntityIdAndFieldIdAndModelMetadataId(entity.id, mediaFieldMetadata.id, mediaFieldMetadata.model.id, ['mediaStorageProviderMetadata']);
@@ -60,10 +60,10 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
 
     async store(files: Express.Multer.File[], entity: T, mediaFieldMetadata: FieldMetadata): Promise<Media[]> {
         const isSupportedEntity = entity instanceof CommonEntity
-            || entity instanceof LegacyCommonEntity
-            || entity instanceof LegacyCommonWithIdEntity;
+            || entity instanceof LegacyCommonEntityWithExistingId
+            || entity instanceof LegacyCommonEntityWithGeneratedId;
         if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const result: Media[] = [];
         const storageProvider = mediaFieldMetadata.mediaStorageProvider;
@@ -102,10 +102,10 @@ export class FileS3StorageProvider<T> implements MediaStorageProvider<T> {
 
     async delete(entity: T, mediaFieldMetadata: FieldMetadata): Promise<void> {
         const isSupportedEntity = entity instanceof CommonEntity
-            || entity instanceof LegacyCommonEntity
-            || entity instanceof LegacyCommonWithIdEntity;
+            || entity instanceof LegacyCommonEntityWithExistingId
+            || entity instanceof LegacyCommonEntityWithGeneratedId;
         if (!isSupportedEntity) {
-            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntity or LegacyCommonWithIdEntity"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
+            throw new Error("Entity must be an instance of CommonEntity, LegacyCommonEntityWithExistingId or LegacyCommonEntityWithGeneratedId"); // FIXME This needs to be handled through generics. e.g T extends CommonEntity
         }
         const storageProvider = mediaFieldMetadata.mediaStorageProvider;
         const region = this.getEffectiveRegion(storageProvider.region);

package/src/services/model-metadata.service.ts

@@ -2,17 +2,16 @@ import { BadRequestException, forwardRef, Inject, Injectable, Logger, NotFoundEx
 import { InjectDataSource } from '@nestjs/typeorm';
 import * as fs from 'fs/promises'; // Use the Promise-based version of fs for async/await
 import * as path from 'path';
-import { DataSource, EntityManager, In, Repository, SelectQueryBuilder } from 'typeorm';
+import { DataSource, EntityManager, Repository, SelectQueryBuilder } from 'typeorm';
 import { CreateModelMetadataDto } from '../dtos/create-model-metadata.dto';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { ModuleMetadata } from '../entities/module-metadata.entity';
 
 import { kebabCase } from 'lodash';
-import { classify } from '../helpers/string.helper';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { DisallowInProduction } from 'src/decorators/disallow-in-production.decorator';
 import { SolidFieldType } from 'src/dtos/create-field-metadata.dto';
-import { PermissionMetadata } from 'src/entities/permission-metadata.entity';
+import { NavigationDto } from 'src/dtos/navigation.dto';
 import { ModuleMetadataHelperService } from 'src/helpers/module-metadata-helper.service';
 import { FieldMetadataRepository } from 'src/repository/field-metadata.repository';
 import { ModelMetadataRepository } from 'src/repository/model-metadata.repository';
@@ -22,20 +21,20 @@ import { ActionMetadata } from '../entities/action-metadata.entity';
 import { FieldMetadata } from '../entities/field-metadata.entity';
 import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
 import { ViewMetadata } from '../entities/view-metadata.entity';
+import { CommandService } from '../helpers/command.service';
 import {
   REFRESH_MODEL_COMMAND,
   REMOVE_FIELDS_COMMAND,
   SchematicService
 } from '../helpers/schematic.service';
-import { CommandService } from '../helpers/command.service';
+import { classify } from '../helpers/string.helper';
 import { CodeGenerationOptions } from '../interfaces';
 import { CrudHelperService } from './crud-helper.service';
+import { CRUDService } from './crud.service';
 import { FieldMetadataService } from './field-metadata.service';
 import { MediaStorageProviderMetadataService } from './media-storage-provider-metadata.service';
 import { RoleMetadataService } from './role-metadata.service';
-import { NavigationDto } from 'src/dtos/navigation.dto';
 import { SolidIntrospectService } from './solid-introspect.service';
-import { CRUDService } from './crud.service';
 import { SolidTsMorphService } from './solid-ts-morph.service';
 
 @Injectable()
@@ -288,8 +287,7 @@ export class ModelMetadataService {
         tableName: model.tableName,
         userKeyFieldUserKey: model.fields.find(field => field.isUserKey)?.name,
         isChild: model?.isChild,
-        isLegacyTable: model?.isLegacyTable,
-        isLegacyTableWithId: model?.isLegacyTableWithId,
+        legacyTableType: model?.legacyTableType,
         parentModelUserKey: model?.parentModel?.singularName,
         enableAuditTracking: model?.enableAuditTracking,
         enableSoftDelete: model?.enableSoftDelete,

package/src/services/settings/default-settings-provider.service.ts

@@ -363,6 +363,16 @@ const getSolidCoreSettings = (isProd: boolean) =>
       group: "system-settings",
       sortOrder: 30,
       controlType: "shortText",
+    }, 
+    {
+      moduleName: "solid-core",
+      key: "frontendAdminBaseUrl",
+      value: process.env.FRONTEND_BASE_URL,
+      level: SettingLevel.SystemAdminReadonly,
+      label: "Frontend Admin Base URL",
+      group: "system-settings",
+      sortOrder: 35,
+      controlType: "shortText",
     },
     {
       moduleName: "solid-core",

package/src/subscribers/model-metadata.subscriber.ts

@@ -35,9 +35,7 @@ export class ModelMetadataSubscriber implements EntitySubscriberInterface<ModelM
 
 
   private systemFieldMetadataToBeAdded(event: InsertEvent<ModelMetadata>) {
-    const isLegacyTable = event.entity.isLegacyTable;
-    const isLegacyTableWithId = event.entity.isLegacyTableWithId;
-    const systemFieldsDefaultMetadata = this.modelHelperService.getSystemFieldsMetadata(isLegacyTable, isLegacyTableWithId);
+    const systemFieldsDefaultMetadata = this.modelHelperService.getSystemFieldsMetadata(event.entity.legacyTableType);
     // map and add the model as event.entity for the above metadata
     const systemFieldsMetadata = systemFieldsDefaultMetadata.map(field => ({
       ...field,

package/CURRENT_PROMPT

@@ -1,6 +0,0 @@
-Have a look at the generate command in the control plane project. It generates code i.e boilerplate for modules and models. For the generation of api code is delegate to the solid cli in the api project. 
-
-The modelMetadataService generateCode and moduleMetadataService generateCode are what are called eventually. These are called from both the refresh-model and refresh-module commands and the controllers for module-metadata and model-metadata. 
-
-Change the code in schematic service to use the solidctl generate command instead of using the schematic command directly. This will ensure that the code generation is consistent and follows the same patterns as the rest of the project.
-