Merge pull request #579 from Hexastack/576-issue---refactor-updateone-logic-to-centralize-logs

update(api): centralize updateOne error handling logic

api/src/analytics/services/bot-stats.service.ts

@@ -111,7 +111,7 @@ export class BotStatsService extends BaseService<BotStats> {
    * @param name - The name or identifier of the statistics entry (e.g., a specific feature or component being tracked).
    */
   @OnEvent('hook:stats:entry')
-  async handleStatEntry(type: BotStatsType, name: string) {
+  async handleStatEntry(type: BotStatsType, name: string): Promise<void> {
     const day = new Date();
     day.setMilliseconds(0);
     day.setSeconds(0);

api/src/chat/controllers/block.controller.spec.ts

@@ -35,6 +35,7 @@ import { PermissionService } from '@/user/services/permission.service';
 import { RoleService } from '@/user/services/role.service';
 import { UserService } from '@/user/services/user.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   blockFixtures,
   installBlockFixtures,
@@ -327,9 +328,7 @@ describe('BlockController', () => {
 
       await expect(
         blockController.updateOne(blockToDelete.id, updateBlock),
-      ).rejects.toThrow(
+      ).rejects.toThrow(getUpdateOneError(Block.name, blockToDelete.id));
-        new NotFoundException(`Block with ID ${blockToDelete.id} not found`),
-      );
     });
   });
 });

api/src/chat/controllers/block.controller.ts

@@ -296,12 +296,7 @@ export class BlockController extends BaseController<
     @Param('id') id: string,
     @Body() blockUpdate: BlockUpdateDto,
   ): Promise<Block> {
-    const result = await this.blockService.updateOne(id, blockUpdate);
+    return await this.blockService.updateOne(id, blockUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Block by id ${id}`);
-      throw new NotFoundException(`Block with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/chat/controllers/category.controller.ts

@@ -114,12 +114,7 @@ export class CategoryController extends BaseController<Category> {
     @Param('id') id: string,
     @Body() categoryUpdate: CategoryUpdateDto,
   ): Promise<Category> {
-    const result = await this.categoryService.updateOne(id, categoryUpdate);
+    return await this.categoryService.updateOne(id, categoryUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Category by id ${id}`);
-      throw new NotFoundException(`Category with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/chat/controllers/context-var.controller.spec.ts

@@ -12,6 +12,7 @@ import { MongooseModule } from '@nestjs/mongoose';
 import { Test } from '@nestjs/testing';
 
 import { LoggerService } from '@/logger/logger.service';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   contextVarFixtures,
   installContextVarFixtures,
@@ -211,9 +212,7 @@ describe('ContextVarController', () => {
           contextVarUpdatedDto,
         ),
       ).rejects.toThrow(
-        new NotFoundException(
+        getUpdateOneError(ContextVar.name, contextVarToDelete.id),
-          `ContextVar with ID ${contextVarToDelete.id} not found`,
-        ),
       );
     });
   });

api/src/chat/controllers/context-var.controller.ts

@@ -120,12 +120,7 @@ export class ContextVarController extends BaseController<ContextVar> {
     @Param('id') id: string,
     @Body() contextVarUpdate: ContextVarUpdateDto,
   ): Promise<ContextVar> {
-    const result = await this.contextVarService.updateOne(id, contextVarUpdate);
+    return await this.contextVarService.updateOne(id, contextVarUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update ContextVar by id ${id}`);
-      throw new NotFoundException(`ContextVar with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/chat/controllers/label.controller.spec.ts

@@ -23,6 +23,7 @@ import { UserModel } from '@/user/schemas/user.schema';
 import { RoleService } from '@/user/services/role.service';
 import { UserService } from '@/user/services/user.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import { labelFixtures } from '@/utils/test/fixtures/label';
 import { installSubscriberFixtures } from '@/utils/test/fixtures/subscriber';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -223,12 +224,10 @@ describe('LabelController', () => {
       );
     });
 
-    it('should throw  a NotFoundException when attempting to update a non existing label by id', async () => {
+    it('should throw a NotFoundException when attempting to update a non existing label by id', async () => {
       await expect(
         labelController.updateOne(labelToDelete.id, labelUpdateDto),
-      ).rejects.toThrow(
+      ).rejects.toThrow(getUpdateOneError(Label.name, labelToDelete.id));
-        new NotFoundException(`Label with ID ${labelToDelete.id} not found`),
-      );
     });
   });
 });

api/src/chat/controllers/label.controller.ts

@@ -111,12 +111,7 @@ export class LabelController extends BaseController<
     @Param('id') id: string,
     @Body() labelUpdate: LabelUpdateDto,
   ) {
-    const result = await this.labelService.updateOne(id, labelUpdate);
+    return await this.labelService.updateOne(id, labelUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Label by id ${id}`);
-      throw new NotFoundException(`Label with ID ${id} not found`);
-    }
-    return result;
   }
 
   @CsrfCheck(true)

api/src/chat/controllers/subscriber.controller.ts

@@ -174,11 +174,6 @@ export class SubscriberController extends BaseController<
     @Param('id') id: string,
     @Body() subscriberUpdate: SubscriberUpdateDto,
   ) {
-    const result = await this.subscriberService.updateOne(id, subscriberUpdate);
+    return await this.subscriberService.updateOne(id, subscriberUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Subscriber by id ${id}`);
-      throw new NotFoundException(`Subscriber with ID ${id} not found`);
-    }
-    return result;
   }
 }

api/src/chat/repositories/block.repository.spec.ts

@@ -36,6 +36,7 @@ describe('BlockRepository', () => {
   let hasNextBlocks: Block;
   let validIds: string[];
   let validCategory: string;
+  let blockValidIds: string[];
 
   beforeAll(async () => {
     const module = await Test.createTestingModule({
@@ -58,6 +59,7 @@ describe('BlockRepository', () => {
     hasNextBlocks = (await blockRepository.findOne({
       name: 'hasNextBlocks',
     }))!;
+    blockValidIds = (await blockRepository.findAll()).map(({ id }) => id);
   });
 
   afterEach(jest.clearAllMocks);
@@ -169,22 +171,22 @@ describe('BlockRepository', () => {
   describe('prepareBlocksInCategoryUpdateScope', () => {
     it('should update blocks within the scope based on category and ids', async () => {
       jest.spyOn(blockRepository, 'findOne').mockResolvedValue({
-        id: validIds[0],
+        id: blockValidIds[0],
         category: 'oldCategory',
-        nextBlocks: [validIds[1]],
+        nextBlocks: [blockValidIds[1]],
-        attachedBlock: validIds[1],
+        attachedBlock: blockValidIds[1],
       } as Block);
 
       const mockUpdateOne = jest.spyOn(blockRepository, 'updateOne');
 
       await blockRepository.prepareBlocksInCategoryUpdateScope(
         validCategory,
-        validIds,
+        blockValidIds,
       );
 
-      expect(mockUpdateOne).toHaveBeenCalledWith(validIds[0], {
+      expect(mockUpdateOne).toHaveBeenCalledWith(blockValidIds[0], {
-        nextBlocks: [validIds[1]],
+        nextBlocks: [blockValidIds[1]],
-        attachedBlock: validIds[1],
+        attachedBlock: blockValidIds[1],
       });
     });
 
@@ -211,9 +213,9 @@ describe('BlockRepository', () => {
     it('should update blocks outside the scope by removing references from attachedBlock', async () => {
       const otherBlocks = [
         {
-          id: '64abc1234def567890fedcab',
+          id: blockValidIds[1],
-          attachedBlock: validIds[0],
+          attachedBlock: blockValidIds[0],
-          nextBlocks: [validIds[0]],
+          nextBlocks: [blockValidIds[0]],
         },
       ] as Block[];
 
@@ -221,10 +223,10 @@ describe('BlockRepository', () => {
 
       await blockRepository.prepareBlocksOutOfCategoryUpdateScope(
         otherBlocks,
-        validIds,
+        blockValidIds,
       );
 
-      expect(mockUpdateOne).toHaveBeenCalledWith('64abc1234def567890fedcab', {
+      expect(mockUpdateOne).toHaveBeenCalledWith(blockValidIds[1], {
         attachedBlock: null,
       });
     });
@@ -232,20 +234,20 @@ describe('BlockRepository', () => {
     it('should update blocks outside the scope by removing references from nextBlocks', async () => {
       const otherBlocks = [
         {
-          id: '64abc1234def567890fedcab',
+          id: blockValidIds[1],
           attachedBlock: null,
-          nextBlocks: [validIds[0], validIds[1]],
+          nextBlocks: [blockValidIds[0], blockValidIds[1]],
         },
       ] as unknown as Block[];
 
       const mockUpdateOne = jest.spyOn(blockRepository, 'updateOne');
 
       await blockRepository.prepareBlocksOutOfCategoryUpdateScope(otherBlocks, [
-        validIds[0],
+        blockValidIds[0],
       ]);
 
-      expect(mockUpdateOne).toHaveBeenCalledWith('64abc1234def567890fedcab', {
+      expect(mockUpdateOne).toHaveBeenCalledWith(blockValidIds[1], {
-        nextBlocks: [validIds[1]],
+        nextBlocks: [blockValidIds[1]],
       });
     });
   });
@@ -254,7 +256,7 @@ describe('BlockRepository', () => {
     it('should update blocks in and out of the scope', async () => {
       const mockFind = jest.spyOn(blockRepository, 'find').mockResolvedValue([
         {
-          id: '64abc1234def567890fedcab',
+          id: blockValidIds[1],
           attachedBlock: validIds[0],
           nextBlocks: [validIds[0]],
         },
@@ -278,17 +280,17 @@ describe('BlockRepository', () => {
       expect(mockFind).toHaveBeenCalled();
       expect(prepareBlocksInCategoryUpdateScope).toHaveBeenCalledWith(
         validCategory,
-        ['64abc1234def567890fedcab'],
+        [blockValidIds[1]],
       );
       expect(prepareBlocksOutOfCategoryUpdateScope).toHaveBeenCalledWith(
         [
           {
-            id: '64abc1234def567890fedcab',
+            id: blockValidIds[1],
             attachedBlock: validIds[0],
             nextBlocks: [validIds[0]],
           },
         ],
-        ['64abc1234def567890fedcab'],
+        [blockValidIds[1]],
       );
     });
 

api/src/chat/repositories/conversation.repository.ts

@@ -48,7 +48,7 @@ export class ConversationRepository extends BaseRepository<
    *
    * @returns A promise resolving to the result of the update operation.
    */
-  async end(convo: Conversation | ConversationFull) {
+  async end(convo: Conversation | ConversationFull): Promise<Conversation> {
     return await this.updateOne(convo.id, { active: false });
   }
 }

api/src/chat/repositories/subscriber.repository.ts

@@ -151,7 +151,7 @@ export class SubscriberRepository extends BaseRepository<
   async updateOneByForeignIdQuery(
     id: string,
     updates: SubscriberUpdateDto,
-  ): Promise<Subscriber | null> {
+  ): Promise<Subscriber> {
     return await this.updateOne({ foreign_id: id }, updates);
   }
 
@@ -162,9 +162,7 @@ export class SubscriberRepository extends BaseRepository<
    *
    * @returns The updated subscriber entity.
    */
-  async handBackByForeignIdQuery(
+  async handBackByForeignIdQuery(foreignId: string): Promise<Subscriber> {
-    foreignId: string,
-  ): Promise<Subscriber | null> {
     return await this.updateOne(
       {
         foreign_id: foreignId,
@@ -187,7 +185,7 @@ export class SubscriberRepository extends BaseRepository<
   async handOverByForeignIdQuery(
     foreignId: string,
     userId: string,
-  ): Promise<Subscriber | null> {
+  ): Promise<Subscriber> {
     return await this.updateOne(
       {
         foreign_id: foreignId,

api/src/chat/services/conversation.service.ts

@@ -173,11 +173,6 @@ export class ConversationService extends BaseService<
       const updatedConversation = await this.updateOne(convo.id, {
         context: convo.context,
       });
-      if (!updatedConversation) {
-        throw new Error(
-          'Conversation Model : No conversation has been updated',
-        );
-      }
 
       //TODO: add check if nothing changed don't update
       const criteria =

api/src/cms/controllers/content-type.controller.spec.ts

@@ -17,6 +17,7 @@ import { AttachmentService } from '@/attachment/services/attachment.service';
 import { BlockService } from '@/chat/services/block.service';
 import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import { installContentFixtures } from '@/utils/test/fixtures/content';
 import { contentTypeFixtures } from '@/utils/test/fixtures/contenttype';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -174,7 +175,7 @@ describe('ContentTypeController', () => {
       jest.spyOn(contentTypeService, 'updateOne');
       await expect(
         contentTypeController.updateOne(updatedContent, NOT_FOUND_ID),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(ContentType.name, NOT_FOUND_ID));
       expect(contentTypeService.updateOne).toHaveBeenCalledWith(
         NOT_FOUND_ID,
         updatedContent,

api/src/cms/controllers/content-type.controller.ts

@@ -148,17 +148,6 @@ export class ContentTypeController extends BaseController<ContentType> {
     @Body() contentTypeDto: ContentTypeUpdateDto,
     @Param('id') id: string,
   ) {
-    const updatedContentType = await this.contentTypeService.updateOne(
+    return await this.contentTypeService.updateOne(id, contentTypeDto);
-      id,
-      contentTypeDto,
-    );
-
-    if (!updatedContentType) {
-      this.logger.warn(
-        `Failed to update content type with id ${id}. Content type not found.`,
-      );
-      throw new NotFoundException(`Content type with id ${id} not found`);
-    }
-    return updatedContentType;
   }
 }

api/src/cms/controllers/content.controller.spec.ts

@@ -23,6 +23,7 @@ import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   contentFixtures,
   installContentFixtures,
@@ -194,7 +195,7 @@ describe('ContentController', () => {
     it('should throw NotFoundException if the content is not found', async () => {
       await expect(
         contentController.updateOne(updatedContent, NOT_FOUND_ID),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(Content.name, NOT_FOUND_ID));
     });
   });
 

api/src/cms/controllers/content.controller.ts

@@ -300,13 +300,6 @@ export class ContentController extends BaseController<
     @Body() contentDto: ContentUpdateDto,
     @Param('id') id: string,
   ): Promise<Content> {
-    const updatedContent = await this.contentService.updateOne(id, contentDto);
+    return await this.contentService.updateOne(id, contentDto);
-    if (!updatedContent) {
-      this.logger.warn(
-        `Failed to update content with id ${id}. Content not found.`,
-      );
-      throw new NotFoundException(`Content of id ${id} not found`);
-    }
-    return updatedContent;
   }
 }

api/src/cms/controllers/menu.controller.ts

@@ -165,7 +165,10 @@ export class MenuController extends BaseController<
    */
   @CsrfCheck(true)
   @Patch(':id')
-  async updateOne(@Body() body: MenuCreateDto, @Param('id') id: string) {
+  async updateOne(
+    @Body() body: MenuCreateDto,
+    @Param('id') id: string,
+  ): Promise<Menu> {
     if (!id) return await this.create(body);
     return await this.menuService.updateOne(id, body);
   }

api/src/i18n/controllers/language.controller.spec.ts

@@ -7,7 +7,7 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { BadRequestException, NotFoundException } from '@nestjs/common';
+import { BadRequestException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Test } from '@nestjs/testing';
@@ -15,6 +15,7 @@ import { Test } from '@nestjs/testing';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   installLanguageFixtures,
   languageFixtures,
@@ -169,7 +170,7 @@ describe('LanguageController', () => {
       jest.spyOn(languageService, 'updateOne');
       await expect(
         languageController.updateOne(NOT_FOUND_ID, translationUpdateDto),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(Language.name, NOT_FOUND_ID));
     });
   });
 

api/src/i18n/controllers/language.controller.ts

@@ -123,12 +123,7 @@ export class LanguageController extends BaseController<Language> {
       }
     }
 
-    const result = await this.languageService.updateOne(id, languageUpdate);
+    return await this.languageService.updateOne(id, languageUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Language by id ${id}`);
-      throw new NotFoundException(`Language with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/i18n/controllers/translation.controller.spec.ts

@@ -7,7 +7,6 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { NotFoundException } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Test } from '@nestjs/testing';
@@ -38,6 +37,7 @@ import { NlpService } from '@/nlp/services/nlp.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   installTranslationFixtures,
   translationFixtures,
@@ -209,7 +209,7 @@ describe('TranslationController', () => {
       jest.spyOn(translationService, 'updateOne');
       await expect(
         translationController.updateOne(NOT_FOUND_ID, translationUpdateDto),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(Translation.name, NOT_FOUND_ID));
     });
   });
 });

api/src/i18n/controllers/translation.controller.ts

@@ -90,15 +90,7 @@ export class TranslationController extends BaseController<Translation> {
     @Param('id') id: string,
     @Body() translationUpdate: TranslationUpdateDto,
   ) {
-    const result = await this.translationService.updateOne(
+    return await this.translationService.updateOne(id, translationUpdate);
-      id,
-      translationUpdate,
-    );
-    if (!result) {
-      this.logger.warn(`Unable to update Translation by id ${id}`);
-      throw new NotFoundException(`Translation with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/migration/migration.service.ts

@@ -522,7 +522,7 @@ module.exports = {
     version,
     action,
     migrationDocument,
-  }: MigrationSuccessCallback) {
+  }: MigrationSuccessCallback): Promise<void> {
     await this.updateStatus({ version, action, migrationDocument });
     const migrationDisplayName = `${version} [${action}]`;
     this.logger.log(`"${migrationDisplayName}" migration done`);

api/src/nlp/controllers/nlp-entity.controller.ts

@@ -167,17 +167,7 @@ export class NlpEntityController extends BaseController<
       );
     }
 
-    const result = await this.nlpEntityService.updateOne(
+    return await this.nlpEntityService.updateOne(id, updateNlpEntityDto);
-      id,
-      updateNlpEntityDto,
-    );
-    if (!result) {
-      this.logger.warn(`Failed to update NLP Entity by id ${id}`);
-      throw new InternalServerErrorException(
-        `Failed to update NLP Entity with ID ${id}`,
-      );
-    }
-    return result;
   }
 
   /**

api/src/nlp/controllers/nlp-sample.controller.spec.ts

@@ -22,6 +22,7 @@ import { SettingRepository } from '@/setting/repositories/setting.repository';
 import { SettingModel } from '@/setting/schemas/setting.schema';
 import { SettingSeeder } from '@/setting/seeds/setting.seed';
 import { SettingService } from '@/setting/services/setting.service';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import { installAttachmentFixtures } from '@/utils/test/fixtures/attachment';
 import { nlpSampleFixtures } from '@/utils/test/fixtures/nlpsample';
 import { installNlpSampleEntityFixtures } from '@/utils/test/fixtures/nlpsampleentity';
@@ -310,7 +311,7 @@ describe('NlpSampleController', () => {
           type: NlpSampleState.test,
           language: 'fr',
         }),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(NlpSample.name, byeJhonSampleId!));
     });
   });
 

api/src/nlp/controllers/nlp-sample.controller.ts

@@ -305,11 +305,6 @@ export class NlpSampleController extends BaseController<
       trained: false,
     });
 
-    if (!sample) {
-      this.logger.warn(`Unable to update NLP Sample by id ${id}`);
-      throw new NotFoundException(`NLP Sample with ID ${id} not found`);
-    }
-
     await this.nlpSampleEntityService.deleteMany({ sample: id });
 
     const updatedSampleEntities =

api/src/nlp/controllers/nlp-value.controller.spec.ts

@@ -12,6 +12,7 @@ import { MongooseModule } from '@nestjs/mongoose';
 import { Test, TestingModule } from '@nestjs/testing';
 
 import { LoggerService } from '@/logger/logger.service';
+import { getUpdateOneError } from '@/utils/test/errors/messages';
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import {
   installNlpValueFixtures,
@@ -241,7 +242,7 @@ describe('NlpValueController', () => {
           expressions: [],
           builtin: true,
         }),
-      ).rejects.toThrow(NotFoundException);
+      ).rejects.toThrow(getUpdateOneError(NlpValue.name, jhonNlpValue!.id));
     });
   });
   describe('deleteMany', () => {

api/src/nlp/controllers/nlp-value.controller.ts

@@ -168,12 +168,7 @@ export class NlpValueController extends BaseController<
     @Param('id') id: string,
     @Body() updateNlpValueDto: NlpValueUpdateDto,
   ): Promise<NlpValue> {
-    const result = await this.nlpValueService.updateOne(id, updateNlpValueDto);
+    return await this.nlpValueService.updateOne(id, updateNlpValueDto);
-    if (!result) {
-      this.logger.warn(`Unable to update NLP Value by id ${id}`);
-      throw new NotFoundException(`NLP Value with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/nlp/services/nlp-value.service.ts

@@ -63,7 +63,7 @@ export class NlpValueService extends BaseService<
     sampleText: string,
     sampleEntities: NlpSampleEntityValue[],
     storedEntities: NlpEntity[],
-  ) {
+  ): Promise<NlpSampleEntityValue[]> {
     const eMap: Record<string, NlpEntity> = storedEntities.reduce(
       (acc, curr) => {
         if (curr.name) acc[curr?.name] = curr;

api/src/setting/controllers/setting.controller.ts

@@ -10,7 +10,6 @@ import {
   Body,
   Controller,
   Get,
-  NotFoundException,
   Param,
   Patch,
   Query,
@@ -71,11 +70,6 @@ export class SettingController {
     @Param('id') id: string,
     @Body() settingUpdateDto: { value: any },
   ): Promise<Setting> {
-    const result = await this.settingService.updateOne(id, settingUpdateDto);
+    return await this.settingService.updateOne(id, settingUpdateDto);
-    if (!result) {
-      this.logger.warn(`Unable to update setting by id ${id}`);
-      throw new NotFoundException(`Setting with ID ${id} not found`);
-    }
-    return result;
   }
 }

api/src/user/controllers/role.controller.ts

@@ -134,12 +134,7 @@ export class RoleController extends BaseController<
   @CsrfCheck(true)
   @Patch(':id')
   async updateOne(@Param('id') id: string, @Body() roleUpdate: RoleUpdateDto) {
-    const result = await this.roleService.updateOne(id, roleUpdate);
+    return await this.roleService.updateOne(id, roleUpdate);
-    if (!result) {
-      this.logger.warn(`Unable to update Role by id ${id}`);
-      throw new NotFoundException(`Role with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/user/controllers/user.controller.ts

@@ -306,7 +306,7 @@ export class ReadWriteUserController extends ReadOnlyUserController {
         })
       : undefined;
 
-    const result = await this.userService.updateOne(
+    return await this.userService.updateOne(
       req.user.id,
       avatar
         ? {
@@ -315,12 +315,6 @@ export class ReadWriteUserController extends ReadOnlyUserController {
           }
         : userUpdate,
     );
-
-    if (!result) {
-      this.logger.warn(`Unable to update User by id ${id}`);
-      throw new NotFoundException(`User with ID ${id} not found`);
-    }
-    return result;
   }
 
   /**

api/src/utils/generics/base-repository.ts

@@ -482,7 +482,7 @@ export abstract class BaseRepository<
     options: QueryOptions<D> | null = {
       new: true,
     },
-  ): Promise<T | null> {
+  ): Promise<T> {
     const query = this.model.findOneAndUpdate<T>(
       {
         ...(typeof criteria === 'string' ? { _id: criteria } : criteria),
@@ -512,7 +512,14 @@ export abstract class BaseRepository<
       filterCriteria,
       queryUpdates,
     );
-    return await this.executeOne(query, this.cls);
+    const result = await this.executeOne(query, this.cls);
+
+    if (!result) {
+      const errorMessage = `Unable to update ${this.cls.name} with ${typeof criteria === 'string' ? 'ID' : 'criteria'} ${JSON.stringify(criteria)}`;
+      throw new Error(errorMessage);
+    }
+
+    return result;
   }
 
   async updateMany<D extends Partial<U>>(

api/src/utils/generics/base-service.ts

@@ -179,7 +179,7 @@ export abstract class BaseService<
     criteria: string | TFilterQuery<T>,
     dto: DtoInfer<DtoAction.Update, Dto, Partial<U>>,
     options?: QueryOptions<Partial<U>> | null,
-  ): Promise<T | null> {
+  ): Promise<T> {
     return await this.repository.updateOne(criteria, dto, options);
   }
 

api/src/utils/test/errors/messages.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+export const getUpdateOneError = (entity: string, id?: string) =>
+  new Error(`Unable to update ${entity}${id ? ` with ID \"${id}\"` : ''}`);