@solidstarters/solid-core 1.2.173 → 1.2.175

package/src/seeders/seed-data/solid-core-metadata.json

@@ -3748,7 +3748,8 @@
             "selectionStaticValues": [
               "audit_insert:audit_insert",
               "audit_update:audit_update",
-              "audit_delete:audit_delete"
+              "audit_delete:audit_delete",
+              "custom:custom"
             ]
           },
           {
@@ -3835,6 +3836,30 @@
             "columnName": null,
             "relationJoinTableName": "",
             "isRelationManyToManyOwner": null
+          },
+          {
+            "name": "modelDisplayName",
+            "displayName": "Model Display Name",
+            "type": "shortText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
+          {
+            "name": "modelUserKey",
+            "displayName": "Model User Key",
+            "type": "shortText",
+            "ormType": "text",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
           }
         ]
       },
@@ -3910,6 +3935,19 @@
             "encrypt": false,
             "isSystem": false
           },
+          {
+            "name": "fieldDisplayName",
+            "displayName": "Field Display Name",
+            "type": "shortText",
+            "ormType": "varchar",
+            "length": 512,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": false
+          },
           {
             "name": "chatterMessage",
             "displayName": "Chatter Message",
@@ -12059,7 +12097,7 @@
           {
             "type": "field",
             "attrs": {
-              "name": "modelUsed"
+              "name": "contentType"
             }
           },
           {
@@ -12067,6 +12105,24 @@
             "attrs": {
               "name": "responseTimeMs"
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "inputTokens"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "outputTokens"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "totalTokens"
+            }
           }
         ]
       }
@@ -12184,6 +12240,24 @@
                                 "attrs": {
                                   "name": "parentInteraction"
                                 }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "inputTokens"
+                                }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "outputTokens"
+                                }
+                              },
+                              {
+                                "type": "field",
+                                "attrs": {
+                                  "name": "totalTokens"
+                                }
                               }
                             ]
                           }
@@ -12249,7 +12323,7 @@
                             "type": "column",
                             "attrs": {
                               "name": "col-meta",
-                              "label": "Metadata",
+                              "label": "",
                               "className": "col-12"
                             },
                             "children": [
@@ -12257,8 +12331,7 @@
                                 "type": "field",
                                 "attrs": {
                                   "name": "metadata",
-                                  "editWidget": "codeEditor",
-                                  "editorLanguage": "json"
+                                  "height": "80vh"
                                 }
                               }
                             ]

package/src/services/ai-interaction.service.ts

@@ -18,6 +18,7 @@ import { RequestContextService } from './request-context.service';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { McpToolResponseHandlerFactory } from './mcp-tool-response-handlers/mcp-tool-response-handler-factory.service';
 import { ERROR_MESSAGES } from 'src/constants/error-messages';
+import { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';
 
 @Injectable()
 export class AiInteractionService extends CRUDService<AiInteraction> {
@@ -43,14 +44,14 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
   }
 
-  async triggerMcpClientJob(prompt: string, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {
+  async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {
     // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();
 
     const aiInteraction = await this.create({
       userId: userId,
       threadId: threadId ? threadId : `thread-${userId}`,
       role: 'human',
-      message: prompt,
+      message: dto.prompt,
       contentType: '',
       errorMessage: '',
       modelUsed: '',
@@ -61,6 +62,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
     const m = {
       payload: {
         aiInteractionId: aiInteraction.id,
+        moduleName:dto.moduleName
       },
       parentEntity: 'aiInteraction',
       parentEntityId: aiInteraction.id,
@@ -137,6 +139,25 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
           this.logger.log(`Python script exited with zero exit code: ${stdout}`);
           const raw: McpResponse = JSON.parse(stdout);
 
+          // Sometimes the raw.response might not be a valid json
+          // TODO: examine the content type of the raw response..
+          // if (raw.content_type==='json') {
+          // }
+          let parsedResponse = raw.response;
+          try {
+            parsedResponse = JSON.parse(raw.response);
+          }
+          catch (ex) {
+            this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);
+          }
+          // Parse the response string into an object
+          // const parsedResponse = JSON.parse(raw.response);
+
+          // Replace the string with the parsed object
+          const enrichedRaw = {
+            ...raw,
+            response: parsedResponse,
+          };
           // if (!raw.success) {
           //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));
           // }
@@ -146,7 +167,7 @@ export class AiInteractionService extends CRUDService<AiInteraction> {
           // const parsed = JSON.parse(cleaned);
           // resolve(cleaned);
 
-          resolve(raw);
+          resolve(enrichedRaw);
         } catch (err: any) {
           reject(new Error(`Mcp Invocation Failed: ${err.message}`));
         }

package/src/services/authentication.service.ts

@@ -986,7 +986,7 @@ export class AuthenticationService {
         return accessToken;
     }
 
-    async generateRefreshToken(user: User) {
+    async generateRefreshToken(user: User, previousRefreshToken?: string) {
         const refreshTokenId = randomUUID();
 
         const refreshToken = await this.signToken(user.id, this.jwtConfiguration.refreshTokenTtl, {
@@ -994,7 +994,7 @@ export class AuthenticationService {
         })
 
         // store the refresh token id in the redis storage.
-        await this.refreshTokenIdsStorage.insert(user.id, refreshToken);
+        await this.refreshTokenIdsStorage.insert(user.id, refreshToken, previousRefreshToken);
 
         return refreshToken;
     }
@@ -1164,7 +1164,11 @@ export class AuthenticationService {
                 roles: true
             }
         });
-        const tokens = await this.generateTokens(user);
+
+        // const tokens = await this.generateTokens(user);
+
+        // Get the refresh token for a user from refresh token storage.
+        const refreshTokenState = await this.refreshTokenIdsStorage.getCurrentRefreshTokenState(user.id);
 
         const response = {
             user: {
@@ -1175,7 +1179,8 @@ export class AuthenticationService {
                 id: user.id,
                 roles: user.roles.map((role) => role.name)
             },
-            ...tokens
+            refreshToken: refreshTokenState.currentRefreshToken,
+            // ...tokens
         }
         return response;
     }

package/src/services/chatter-message.service.ts

@@ -19,6 +19,10 @@ import { RequestContextService } from './request-context.service';
 import { ChatterMessageRepository } from 'src/repository/chatter-message.repository';
 import { lowerFirst } from 'src/helpers/string.helper';
 import { ModelMetadataHelperService } from 'src/helpers/model-metadata-helper.service';
+import { ChatterMessageDetailsRepository } from 'src/repository/chatter-message-details.repository';
+import { FieldMetadata } from 'src/entities/field-metadata.entity';
+import { CHATTER_MESSAGE_TYPE, CHATTER_MESSAGE_SUBTYPE } from 'src/constants/chatter-message.constants';
+import { classify } from '@angular-devkit/core/src/utils/strings';
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage> {
     constructor(
@@ -32,8 +36,10 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         readonly entityManager: EntityManager,
         // @InjectRepository(ChatterMessage, 'default')
         readonly repo: ChatterMessageRepository,
-        @InjectRepository(ChatterMessageDetails, 'default')
-        readonly chatterMessageDetailsRepo: Repository<ChatterMessageDetails>,
+        // @InjectRepository(ChatterMessageDetailsRepository, 'default')
+        readonly chatterMessageDetailsRepo: ChatterMessageDetailsRepository,
+        @InjectRepository(FieldMetadata, 'default')
+        readonly fieldMetadataRepo: Repository<FieldMetadata>,
         readonly moduleRef: ModuleRef,
         @InjectRepository(ModelMetadata)
         private readonly modelMetadataRepo: Repository<ModelMetadata>,
@@ -45,8 +51,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
 
     async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
         const chatterMessage = new ChatterMessage();
-        chatterMessage.messageType = 'custom';
-        chatterMessage.messageSubType = postDto.messageSubType || 'post_message';
+        chatterMessage.messageType = CHATTER_MESSAGE_TYPE.CUSTOM;
+        chatterMessage.messageSubType = postDto.messageSubType || CHATTER_MESSAGE_SUBTYPE.CUSTOM;
         chatterMessage.messageBody = postDto.messageBody;
         chatterMessage.coModelEntityId = postDto.coModelEntityId;
         chatterMessage.coModelName = postDto.coModelName;
@@ -97,7 +103,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             },
             relations: {
                 fields: true,
-                module: true
+                module: true,
+                userKeyField: true
             }
         });
 
@@ -114,11 +121,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const activeUser = this.requestContextService.getActiveUser();
 
         const chatterMessage = new ChatterMessage();
-        chatterMessage.messageType = 'audit';
-        chatterMessage.messageSubType = 'insert';
+        chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
+        chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_INSERT;
         chatterMessage.coModelEntityId = entity.id;
-        chatterMessage.coModelName = model.singularName;
-        chatterMessage.messageBody = `New ${model.displayName} created`;
+        chatterMessage.coModelName = model?.singularName;
+        chatterMessage.modelDisplayName = model?.displayName;
+        chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
+        chatterMessage.messageBody = `New ${model?.displayName} created`;
 
         if (activeUser) {
             const userId = activeUser?.sub;
@@ -135,6 +144,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
                 const messageDetail = new ChatterMessageDetails();
                 messageDetail.chatterMessage = savedMessage;
                 messageDetail.fieldName = field.name;
+                messageDetail.fieldDisplayName = field.displayName;
                 messageDetail.oldValue = null;
                 messageDetail.oldValueDisplay = null;
                 messageDetail.newValue = this.formatFieldValue(field, fieldValue);
@@ -154,7 +164,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             },
             relations: {
                 fields: true,
-                module: true
+                module: true,
+                userKeyField: true
             }
         });
 
@@ -228,11 +239,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         const activeUser = this.requestContextService.getActiveUser();
 
         const chatterMessage = new ChatterMessage();
-        chatterMessage.messageType = 'audit';
-        chatterMessage.messageSubType = 'update';
-        chatterMessage.coModelEntityId = entity.id;
-        chatterMessage.coModelName = model.singularName;
-        chatterMessage.messageBody = `${model.displayName} updated`;
+        chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
+        chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_UPDATE;
+        chatterMessage.coModelEntityId = entity?.id;
+        chatterMessage.coModelName = model?.singularName;
+        chatterMessage.modelDisplayName = model.displayName;
+        chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
+        chatterMessage.messageBody = `${model?.displayName} updated`;
 
         if (activeUser) {
             const userId = activeUser?.sub;
@@ -247,6 +260,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             const messageDetail = new ChatterMessageDetails();
             messageDetail.chatterMessage = savedMessage;
             messageDetail.fieldName = field.name;
+            messageDetail.fieldDisplayName = field.displayName;
             messageDetail.oldValue = this.formatFieldValue(field, oldValue);
             messageDetail.newValue = this.formatFieldValue(field, newValue);
             messageDetail.oldValueDisplay = this.formatFieldValueDisplay(field, oldValue);
@@ -262,7 +276,8 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             },
             relations: {
                 fields: true,
-                module: true
+                module: true,
+                userKeyField: true
             }
         });
 
@@ -271,11 +286,13 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
         }
 
         const chatterMessage = new ChatterMessage();
-        chatterMessage.messageType = 'audit';
-        chatterMessage.messageSubType = 'delete';
-        chatterMessage.coModelEntityId = databaseEntity.id;
-        chatterMessage.coModelName = model.singularName;
-        chatterMessage.messageBody = `${model.displayName} deleted`;
+        chatterMessage.messageType = CHATTER_MESSAGE_TYPE.AUDIT;
+        chatterMessage.messageSubType = CHATTER_MESSAGE_SUBTYPE.AUDIT_DELETE;
+        chatterMessage.coModelEntityId = databaseEntity?.id;
+        chatterMessage.coModelName = model?.singularName;
+        chatterMessage.modelDisplayName = model?.displayName;
+        chatterMessage.modelUserKey = entity[model?.userKeyField?.name];
+        chatterMessage.messageBody = `${model?.displayName} deleted`;
 
         const activeUser = this.requestContextService.getActiveUser();
 
@@ -302,7 +319,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             if (field.relationType === "many-to-one") {
                 return value.id;
             }
-            if (field.relationType === 'manyToMany') {
+            if (field.relationType === 'many-to-many') {
                 return value.map(item => item.id).join(', ');
             }
         }
@@ -324,7 +341,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             if (field.relationType === "many-to-one") {
                 return value.name;
             }
-            if (field.relationType === 'many-toMany') {
+            if (field.relationType === 'many-to-many') {
                 return value.map(item => item.name).join(', ');
             }
         }
@@ -383,7 +400,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
             return newId !== oldId;
         }
 
-        if (field.relationType === 'many-to-many' || field.relationType === 'manyToMany') {
+        if (field.relationType === 'many-to-many') {
             const newIds = this.extractRelationIds(newValue);
             const oldIds = this.extractRelationIds(oldValue);
 
@@ -469,4 +486,106 @@ export class ChatterMessageService extends CRUDService<ChatterMessage> {
 
         return populatedEntity;
     }
+
+    async getChatterMessages(
+        entityId: number,
+        entityName: string,
+        query: any
+    ) {
+        const { limit = 25, offset = 0, sort, populate = [] } = query;
+
+        const model = await this.modelMetadataRepo.findOne({
+            where: {
+                singularName: entityName
+            },
+        });
+        const oneToManyFields = await this.fieldMetadataRepo.find({
+            where: {
+                model: { id: model.id },
+                type: 'relation',
+                relationType: 'one-to-many'
+            }
+        });
+
+        const relatedEntitiesMap = new Map<string, number[]>();
+
+        for (const field of oneToManyFields) {
+            const coModelName = field.relationCoModelSingularName;
+            const coModelFieldName = field.relationCoModelFieldName;
+
+            const coModel = await this.modelMetadataRepo.findOne({
+                where: { singularName: coModelName }
+            });
+
+            if (coModel) {
+                const relatedEntityRepository = this.entityManager.getRepository(classify(coModelName));
+
+                const relatedEntities = await relatedEntityRepository.find({
+                    where: { [coModelFieldName]: { id: entityId } }
+                });
+
+                const relatedIds = relatedEntities.map((entity: any) => entity.id);
+                relatedEntitiesMap.set(field.name, relatedIds);
+            }
+        }
+
+        const qb = this.repo.createQueryBuilder('entity');
+
+        const orConditions: string[] = [];
+        const parameters: any = {};
+
+        orConditions.push('(entity.coModelName = :entityName AND entity.coModelEntityId = :entityId)');
+        parameters.entityName = entityName;
+        parameters.entityId = entityId;
+
+        let paramIndex = 0;
+        for (const [fieldName, relatedIds] of relatedEntitiesMap.entries()) {
+            if (relatedIds.length > 0) {
+                const field = oneToManyFields.find(f => f.name === fieldName);
+                if (field) {
+                    const coModelName = field.relationCoModelSingularName;
+                    const idsParamName = `relatedIds${paramIndex}`;
+                    orConditions.push(`(entity.coModelName = :coModelName${paramIndex} AND entity.coModelEntityId IN (:...${idsParamName}))`);
+                    parameters[`coModelName${paramIndex}`] = coModelName;
+                    parameters[idsParamName] = relatedIds;
+                    paramIndex++;
+                }
+            }
+        }
+
+        qb.where(orConditions.join(' OR '), parameters);
+
+        const relations = ['chatterMessageDetails', 'user'];
+        if (populate && populate.length > 0) {
+            const normalizedPopulate = this.crudHelperService.normalize(populate);
+            relations.push(...normalizedPopulate.filter(rel => !relations.includes(rel)));
+        }
+
+        relations.forEach(relation => {
+            qb.leftJoinAndSelect(`entity.${relation}`, relation);
+        });
+
+        qb.orderBy('entity.createdAt', 'DESC');
+
+        qb.skip(offset).take(limit);
+
+        const [entities, count] = await qb.getManyAndCount();
+
+        const currentPage = Math.floor(offset / limit) + 1;
+        const totalPages = Math.ceil(count / limit);
+        const nextPage = currentPage < totalPages ? currentPage + 1 : null;
+        const prevPage = currentPage > 1 ? currentPage - 1 : null;
+
+        return {
+            meta: {
+                totalRecords: count,
+                currentPage: currentPage,
+                nextPage: nextPage,
+                prevPage: prevPage,
+                totalPages: totalPages,
+                perPage: +limit,
+            },
+            records: entities
+        };
+    }
 }

package/src/services/refresh-token-ids-storage.service.ts

@@ -28,13 +28,13 @@ export class RefreshTokenIdsStorageService {
         private readonly authenticationService: AuthenticationService
     ) { }
 
-    async insert(userId: number, refreshToken: string): Promise<void> {
+    async insert(userId: number, refreshToken: string, previousRefreshToken?: string): Promise<void> {
         // TODO: save a refresh token object with this shape {"currentRefreshToken": "", "previousRefreshToken": ""}
         // Save a refresh token object with the shape: { currentRefreshToken: string, previousRefreshToken: string }
         const existing = (await this.cacheManager.get(this.getKey(userId))) as { currentRefreshToken?: string, previousRefreshToken?: string } | undefined;
         const refreshTokenState = {
             currentRefreshToken: refreshToken,
-            previousRefreshToken: "",
+            previousRefreshToken: previousRefreshToken ?? "",
         };
         await this.cacheManager.set(this.getKey(userId), refreshTokenState);
     }
@@ -84,14 +84,14 @@ export class RefreshTokenIdsStorageService {
                 // Scenario 1: Token matches currentRefreshToken
                 valid = true;
                 // Rotate tokens: move current to previous, set new current (simulate generation)
-                newRefreshToken = await this.authenticationService.generateRefreshToken(user); // Replace with real token generation logic
+                newRefreshToken = await this.authenticationService.generateRefreshToken(user, refreshTokenState.currentRefreshToken); // Replace with real token generation logic
 
 
                 //   updated cache state
-                await this.cacheManager.set(this.getKey(user.id), {
-                    currentRefreshToken: newRefreshToken,
-                    previousRefreshToken: refreshTokenState.currentRefreshToken,
-                });
+                // await this.cacheManager.set(this.getKey(user.id), {
+                //     currentRefreshToken: newRefreshToken,
+                //     previousRefreshToken: refreshTokenState.currentRefreshToken,
+                // });
 
                 // Optionally, set a timeout to clear previousRefreshToken after X minutes
                 setTimeout(async () => {
@@ -125,4 +125,8 @@ export class RefreshTokenIdsStorageService {
     private getKey(userId: number): string {
         return `user-${userId}`;
     }
+
+    getCurrentRefreshTokenState(userId: number): Promise<any> {
+        return this.cacheManager.get(this.getKey(userId));
+    }
 }