@flusys/nestjs-form-builder 6.4.0 → 6.4.1

package/cjs/services/form-result.service.js

@@ -189,6 +189,7 @@ let FormResultService = class FormResultService extends _classes.ApiService {
         const form = await this.getActiveForm(dto.formId);
         await this.validateSubmissionAccess(form, user, isPublic);
         const isDraft = dto.isDraft ?? false;
+        const staleResults = [];
         // Handle existing draft for authenticated users
         if (user?.id) {
             const existingDraft = await this.repository.findOne({
@@ -203,9 +204,13 @@ let FormResultService = class FormResultService extends _classes.ApiService {
                         submittedAt: new Date()
                     });
                     const saved = await this.repository.save(existingDraft);
+                    await this.invalidateResultCache([
+                        saved
+                    ]);
                     return this.convertEntityToResponseDto(saved, false);
                 }
                 await this.repository.softRemove(existingDraft);
+                staleResults.push(existingDraft);
             }
         }
         const saved = await this.repository.save({
@@ -217,6 +222,10 @@ let FormResultService = class FormResultService extends _classes.ApiService {
             submittedAt: new Date(),
             isDraft
         });
+        await this.invalidateResultCache([
+            ...staleResults,
+            saved
+        ]);
         return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
@@ -254,8 +263,17 @@ let FormResultService = class FormResultService extends _classes.ApiService {
             isDraft
         });
         const saved = await this.repository.save(draft);
+        await this.invalidateResultCache([
+            saved
+        ]);
         return this.convertEntityToResponseDto(saved, false);
     }
+    async invalidateResultCache(results) {
+        await Promise.all([
+            this.clearCacheForAll(),
+            this.clearCacheForId(results)
+        ]);
+    }
     async getByFormId(formId, user, pagination) {
         await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {

package/cjs/services/form-result.service.spec.js

@@ -108,6 +108,15 @@ describe('FormResultService', ()=>{
     let mockResultRepo;
     let mockFormRepo;
     let mockFormBuilderConfig;
+    const mockUtilsService = {
+        clearCache: jest.fn(),
+        getCacheKey: jest.fn().mockReturnValue('cache-key'),
+        trackCacheKey: jest.fn()
+    };
+    // Call history is shared across tests in this file; reset it so each cache assertion is exact.
+    beforeEach(()=>{
+        mockUtilsService.clearCache.mockClear();
+    });
     async function buildService(companyFeatureEnabled = false) {
         mockResultRepo = (0, _repositorymock.createMockRepository)();
         mockFormRepo = (0, _repositorymock.createMockRepository)();
@@ -138,7 +147,7 @@ describe('FormResultService', ()=>{
                 },
                 {
                     provide: _modules.UtilsService,
-                    useValue: {}
+                    useValue: mockUtilsService
                 },
                 {
                     provide: _formbuilderconfigservice.FormBuilderConfigService,
@@ -417,6 +426,43 @@ describe('FormResultService', ()=>{
                 isDraft: false
             }));
         });
+        it('invalidates the result list cache and the new entry after a submission', async ()=>{
+            await buildService(false);
+            mockFormRepo.findOne.mockResolvedValue(buildForm());
+            mockResultRepo.findOne.mockResolvedValue(null);
+            mockResultRepo.save.mockResolvedValue(buildFormResult({
+                id: 'result-1'
+            }));
+            await service.submitForm({
+                formId: 'form-uuid-1',
+                data: {
+                    field1: 'x'
+                }
+            }, (0, _loggedusermock.buildMockUser)(), false);
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything());
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'result-1');
+        });
+        it('invalidates the soft-removed draft as well when a draft is finalized into a new record', async ()=>{
+            await buildService(false);
+            mockFormRepo.findOne.mockResolvedValue(buildForm());
+            mockResultRepo.findOne.mockResolvedValue(buildFormResult({
+                id: 'draft-1',
+                isDraft: true
+            }));
+            mockResultRepo.save.mockResolvedValue(buildFormResult({
+                id: 'result-2'
+            }));
+            await service.submitForm({
+                formId: 'form-uuid-1',
+                data: {
+                    field1: 'x'
+                },
+                isDraft: false
+            }, (0, _loggedusermock.buildMockUser)(), false);
+            expect(mockResultRepo.softRemove).toHaveBeenCalled();
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'draft-1');
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'result-2');
+        });
         it('does not compute fields when saving as a draft', async ()=>{
             await buildService(false);
             const form = buildForm({

package/fesm/services/form-result.service.js

@@ -179,6 +179,7 @@ export class FormResultService extends ApiService {
         const form = await this.getActiveForm(dto.formId);
         await this.validateSubmissionAccess(form, user, isPublic);
         const isDraft = dto.isDraft ?? false;
+        const staleResults = [];
         // Handle existing draft for authenticated users
         if (user?.id) {
             const existingDraft = await this.repository.findOne({
@@ -193,9 +194,13 @@ export class FormResultService extends ApiService {
                         submittedAt: new Date()
                     });
                     const saved = await this.repository.save(existingDraft);
+                    await this.invalidateResultCache([
+                        saved
+                    ]);
                     return this.convertEntityToResponseDto(saved, false);
                 }
                 await this.repository.softRemove(existingDraft);
+                staleResults.push(existingDraft);
             }
         }
         const saved = await this.repository.save({
@@ -207,6 +212,10 @@ export class FormResultService extends ApiService {
             submittedAt: new Date(),
             isDraft
         });
+        await this.invalidateResultCache([
+            ...staleResults,
+            saved
+        ]);
         return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
@@ -244,8 +253,17 @@ export class FormResultService extends ApiService {
             isDraft
         });
         const saved = await this.repository.save(draft);
+        await this.invalidateResultCache([
+            saved
+        ]);
         return this.convertEntityToResponseDto(saved, false);
     }
+    async invalidateResultCache(results) {
+        await Promise.all([
+            this.clearCacheForAll(),
+            this.clearCacheForId(results)
+        ]);
+    }
     async getByFormId(formId, user, pagination) {
         await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {

package/fesm/services/form-result.service.spec.js

@@ -63,6 +63,15 @@ describe('FormResultService', ()=>{
     let mockResultRepo;
     let mockFormRepo;
     let mockFormBuilderConfig;
+    const mockUtilsService = {
+        clearCache: jest.fn(),
+        getCacheKey: jest.fn().mockReturnValue('cache-key'),
+        trackCacheKey: jest.fn()
+    };
+    // Call history is shared across tests in this file; reset it so each cache assertion is exact.
+    beforeEach(()=>{
+        mockUtilsService.clearCache.mockClear();
+    });
     async function buildService(companyFeatureEnabled = false) {
         mockResultRepo = createMockRepository();
         mockFormRepo = createMockRepository();
@@ -93,7 +102,7 @@ describe('FormResultService', ()=>{
                 },
                 {
                     provide: UtilsService,
-                    useValue: {}
+                    useValue: mockUtilsService
                 },
                 {
                     provide: FormBuilderConfigService,
@@ -372,6 +381,43 @@ describe('FormResultService', ()=>{
                 isDraft: false
             }));
         });
+        it('invalidates the result list cache and the new entry after a submission', async ()=>{
+            await buildService(false);
+            mockFormRepo.findOne.mockResolvedValue(buildForm());
+            mockResultRepo.findOne.mockResolvedValue(null);
+            mockResultRepo.save.mockResolvedValue(buildFormResult({
+                id: 'result-1'
+            }));
+            await service.submitForm({
+                formId: 'form-uuid-1',
+                data: {
+                    field1: 'x'
+                }
+            }, buildMockUser(), false);
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything());
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'result-1');
+        });
+        it('invalidates the soft-removed draft as well when a draft is finalized into a new record', async ()=>{
+            await buildService(false);
+            mockFormRepo.findOne.mockResolvedValue(buildForm());
+            mockResultRepo.findOne.mockResolvedValue(buildFormResult({
+                id: 'draft-1',
+                isDraft: true
+            }));
+            mockResultRepo.save.mockResolvedValue(buildFormResult({
+                id: 'result-2'
+            }));
+            await service.submitForm({
+                formId: 'form-uuid-1',
+                data: {
+                    field1: 'x'
+                },
+                isDraft: false
+            }, buildMockUser(), false);
+            expect(mockResultRepo.softRemove).toHaveBeenCalled();
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'draft-1');
+            expect(mockUtilsService.clearCache).toHaveBeenCalledWith('form_result', expect.anything(), 'result-2');
+        });
         it('does not compute fields when saving as a draft', async ()=>{
             await buildService(false);
             const form = buildForm({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "Dynamic form builder module with schema versioning and access control",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -84,7 +84,7 @@
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "6.4.0",
-    "@flusys/nestjs-shared": "6.4.0"
+    "@flusys/nestjs-core": "6.4.1",
+    "@flusys/nestjs-shared": "6.4.1"
   }
 }

package/services/form-result.service.d.ts

@@ -33,6 +33,7 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     submitForm(dto: SubmitFormDto, user: ILoggedUserInfo | null, isPublic?: boolean): Promise<IFormResult>;
     getMyDraft(formId: string, user: ILoggedUserInfo): Promise<IFormResult | null>;
     updateDraft(draftId: string, dto: SubmitFormDto, user: ILoggedUserInfo): Promise<IFormResult>;
+    private invalidateResultCache;
     getByFormId(formId: string, user: ILoggedUserInfo | null, pagination?: {
         page?: number;
         pageSize?: number;