From 72e3f3ef1a5f017f601048eeaed4809b8e5f24d9 Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Wed, 16 Oct 2024 18:54:55 +0100
Subject: [PATCH] fix(api): eslint imports order

---
 api/.eslintrc.js                                |  3 ++-
 .../controllers/bot-stats.controller.spec.ts    |  3 ++-
 .../controllers/bot-stats.controller.ts         |  3 ++-
 .../repositories/bot-stats.repository.spec.ts   |  3 ++-
 .../services/bot-stats.service.spec.ts          |  3 ++-
 .../controllers/attachment.controller.spec.ts   |  3 ++-
 api/src/channel/lib/Handler.ts                  |  3 ++-
 .../chat/controllers/block.controller.spec.ts   |  5 +++--
 .../chat/controllers/category.contoller.spec.ts |  5 +++--
 .../controllers/context-var.controller.spec.ts  |  3 ++-
 .../chat/controllers/label.controller.spec.ts   |  3 ++-
 .../chat/controllers/message.controller.spec.ts |  3 ++-
 .../controllers/subscriber.controller.spec.ts   |  7 ++++---
 .../chat/repositories/block.repository.spec.ts  |  5 +++--
 .../chat/repositories/label.repository.spec.ts  |  5 +++--
 .../repositories/message.repository.spec.ts     |  5 +++--
 .../repositories/subscriber.repository.spec.ts  |  5 +++--
 api/src/chat/schemas/block.schema.ts            |  9 +++++----
 api/src/chat/schemas/types/context.ts           |  3 ++-
 api/src/chat/schemas/types/message.ts           |  3 ++-
 api/src/chat/services/block.service.spec.ts     |  7 ++++---
 api/src/chat/services/bot.service.spec.ts       | 17 +++++++++--------
 api/src/chat/services/bot.service.ts            |  7 ++++---
 api/src/chat/services/chat.service.ts           |  9 +++++----
 api/src/chat/services/conversation.service.ts   |  5 +++--
 api/src/chat/services/label.service.spec.ts     |  7 ++++---
 api/src/chat/services/message.service.spec.ts   |  7 ++++---
 .../chat/services/subscriber.service.spec.ts    |  5 +++--
 api/src/cms/cms.module.ts                       |  3 ++-
 .../controllers/content-type.controller.spec.ts |  3 ++-
 .../cms/controllers/content.controller.spec.ts  |  3 ++-
 api/src/cms/controllers/content.controller.ts   |  5 +++--
 api/src/cms/controllers/menu.controller.spec.ts |  3 ++-
 .../content-type.repository.spec.ts             |  3 ++-
 .../cms/repositories/content.repository.spec.ts |  3 ++-
 .../cms/repositories/menu.reporsitory.spec.ts   |  3 ++-
 .../cms/services/content-type.service.spec.ts   |  5 +++--
 api/src/cms/services/content.service.spec.ts    |  5 +++--
 api/src/cms/services/menu.service.spec.ts       |  3 ++-
 .../channels/live-chat-tester/index.channel.ts  |  3 ++-
 .../channels/offline/__test__/index.spec.ts     |  3 ++-
 .../channels/offline/__test__/wrapper.spec.ts   |  3 ++-
 .../helpers/nlp/default/__test__/index.spec.ts  |  3 ++-
 .../controllers/language.controller.spec.ts     |  3 ++-
 .../controllers/translation.controller.spec.ts  |  3 ++-
 .../controllers/nlp-entity.controller.spec.ts   |  3 ++-
 .../controllers/nlp-sample.controller.spec.ts   |  3 ++-
 .../controllers/nlp-value.controller.spec.ts    |  3 ++-
 api/src/nlp/lib/BaseNlpHelper.ts                |  3 ++-
 .../repositories/nlp-entity.repository.spec.ts  |  7 ++++---
 .../nlp/repositories/nlp-entity.repository.ts   |  5 +++--
 .../nlp-sample-entity.repository.spec.ts        |  7 ++++---
 .../repositories/nlp-sample.repository.spec.ts  |  5 +++--
 .../nlp/repositories/nlp-sample.repository.ts   |  3 ++-
 .../repositories/nlp-value.repository.spec.ts   |  5 +++--
 .../nlp/repositories/nlp-value.repository.ts    |  3 ++-
 api/src/nlp/schemas/nlp-entity.schema.ts        |  3 ++-
 api/src/nlp/services/nlp-entity.service.spec.ts |  5 +++--
 api/src/nlp/services/nlp-entity.service.ts      |  3 ++-
 .../services/nlp-sample-entity.service.spec.ts  |  7 ++++---
 .../nlp/services/nlp-sample-entity.service.ts   |  5 +++--
 api/src/nlp/services/nlp-sample.service.spec.ts |  9 +++++----
 api/src/nlp/services/nlp-value.service.spec.ts  |  5 +++--
 api/src/nlp/services/nlp-value.service.ts       |  3 ++-
 api/src/nlp/services/nlp.service.ts             |  7 ++++---
 .../controllers/setting.controller.spec.ts      |  3 ++-
 .../setting/services/setting.service.spec.ts    |  3 ++-
 .../user/controllers/auth.controller.spec.ts    |  3 ++-
 .../user/controllers/model.controller.spec.ts   |  3 ++-
 .../controllers/permission.controller.spec.ts   |  3 ++-
 .../user/controllers/role.controller.spec.ts    |  3 ++-
 .../user/controllers/user.controller.spec.ts    |  5 +++--
 .../repositories/invitation.repository.spec.ts  |  7 ++++---
 .../user/repositories/model.repository.spec.ts  |  3 ++-
 .../user/repositories/role.repository.spec.ts   |  3 ++-
 api/src/user/schemas/model.schema.ts            |  3 ++-
 api/src/user/schemas/permission.schema.ts       |  3 ++-
 api/src/user/schemas/user.schema.ts             |  3 ++-
 api/src/user/services/auth.service.spec.ts      |  7 ++++---
 .../user/services/invitation.service.spec.ts    |  7 ++++---
 api/src/user/services/model.service.spec.ts     |  3 ++-
 .../user/services/passwordReset.service.spec.ts |  7 ++++---
 api/src/user/services/passwordReset.service.ts  |  3 ++-
 .../user/services/permission.service.spec.ts    |  3 ++-
 api/src/user/services/role.service.spec.ts      |  5 +++--
 api/src/user/services/user.service.spec.ts      |  7 ++++---
 .../services/validate-account.service.spec.ts   |  7 ++++---
 .../user/services/validate-account.service.ts   |  3 ++-
 api/src/utils/generics/base-controller.ts       |  3 ++-
 api/src/utils/generics/base-repository.ts       |  3 ++-
 api/src/utils/generics/base-service.ts          |  3 ++-
 api/src/utils/test/fixtures/content.ts          |  5 +++--
 api/src/utils/test/fixtures/conversation.ts     |  5 +++--
 api/src/utils/test/fixtures/invitation.ts       |  3 ++-
 api/src/utils/test/fixtures/message.ts          |  3 ++-
 api/src/utils/test/fixtures/nlpsample.ts        |  3 ++-
 api/src/utils/test/fixtures/subscriber.ts       |  5 +++--
 api/src/utils/test/fixtures/user.ts             |  3 ++-
 98 files changed, 264 insertions(+), 166 deletions(-)

diff --git a/api/.eslintrc.js b/api/.eslintrc.js
index 29bc8163..76726423 100644
--- a/api/.eslintrc.js
+++ b/api/.eslintrc.js
@@ -57,7 +57,8 @@ module.exports = {
           'builtin', // Built-in imports (come from NodeJS native) go first
           'external', // <- External imports
           'unknown', // <- unknown
-          ['sibling', 'parent'], // <- Relative imports, the sibling and parent types they can be mingled together
+          'parent', // <- Relative imports, the sibling and parent types they can be mingled together
+          'sibling',
           'index', // <- index imports
           'internal', // <- Absolute imports
         ],
diff --git a/api/src/analytics/controllers/bot-stats.controller.spec.ts b/api/src/analytics/controllers/bot-stats.controller.spec.ts
index a0cba2f7..636c3aef 100644
--- a/api/src/analytics/controllers/bot-stats.controller.spec.ts
+++ b/api/src/analytics/controllers/bot-stats.controller.spec.ts
@@ -20,11 +20,12 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { BotStatsController } from './bot-stats.controller';
 import { BotStatsRepository } from '../repositories/bot-stats.repository';
 import { BotStatsModel, BotStatsType } from '../schemas/bot-stats.schema';
 import { BotStatsService } from '../services/bot-stats.service';
 
+import { BotStatsController } from './bot-stats.controller';
+
 describe('BotStatsController', () => {
   let botStatsController: BotStatsController;
 
diff --git a/api/src/analytics/controllers/bot-stats.controller.ts b/api/src/analytics/controllers/bot-stats.controller.ts
index ec8c12be..09d3183b 100644
--- a/api/src/analytics/controllers/bot-stats.controller.ts
+++ b/api/src/analytics/controllers/bot-stats.controller.ts
@@ -8,12 +8,13 @@
 
 import { Controller, Get, Query } from '@nestjs/common';
 
-import { ToLinesType } from './../schemas/bot-stats.schema';
 import { BotStatsFindDatumDto, BotStatsFindDto } from '../dto/bot-stats.dto';
 import { BotStats, BotStatsType } from '../schemas/bot-stats.schema';
 import { BotStatsService } from '../services/bot-stats.service';
 import { aMonthAgo } from '../utilities';
 
+import { ToLinesType } from './../schemas/bot-stats.schema';
+
 @Controller('botstats')
 export class BotStatsController {
   constructor(private readonly botStatsService: BotStatsService) {}
diff --git a/api/src/analytics/repositories/bot-stats.repository.spec.ts b/api/src/analytics/repositories/bot-stats.repository.spec.ts
index 74ff01b6..76f1606a 100644
--- a/api/src/analytics/repositories/bot-stats.repository.spec.ts
+++ b/api/src/analytics/repositories/bot-stats.repository.spec.ts
@@ -21,13 +21,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { BotStatsRepository } from './bot-stats.repository';
 import {
   BotStats,
   BotStatsModel,
   BotStatsType,
 } from '../schemas/bot-stats.schema';
 
+import { BotStatsRepository } from './bot-stats.repository';
+
 describe('BotStatsRepository', () => {
   let botStatsRepository: BotStatsRepository;
   let botStatsModel: Model<BotStats>;
diff --git a/api/src/analytics/services/bot-stats.service.spec.ts b/api/src/analytics/services/bot-stats.service.spec.ts
index 979e4aa1..1d320848 100644
--- a/api/src/analytics/services/bot-stats.service.spec.ts
+++ b/api/src/analytics/services/bot-stats.service.spec.ts
@@ -20,10 +20,11 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { BotStatsService } from './bot-stats.service';
 import { BotStatsRepository } from '../repositories/bot-stats.repository';
 import { BotStatsModel, BotStatsType } from '../schemas/bot-stats.schema';
 
+import { BotStatsService } from './bot-stats.service';
+
 describe('BotStatsService', () => {
   let botStatsService: BotStatsService;
 
diff --git a/api/src/attachment/controllers/attachment.controller.spec.ts b/api/src/attachment/controllers/attachment.controller.spec.ts
index 9f36ae3e..a0cf19e8 100644
--- a/api/src/attachment/controllers/attachment.controller.spec.ts
+++ b/api/src/attachment/controllers/attachment.controller.spec.ts
@@ -25,12 +25,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { AttachmentController } from './attachment.controller';
 import { attachment, attachmentFile } from '../mocks/attachment.mock';
 import { AttachmentRepository } from '../repositories/attachment.repository';
 import { AttachmentModel, Attachment } from '../schemas/attachment.schema';
 import { AttachmentService } from '../services/attachment.service';
 
+import { AttachmentController } from './attachment.controller';
+
 describe('AttachmentController', () => {
   let attachmentController: AttachmentController;
   let attachmentService: AttachmentService;
diff --git a/api/src/channel/lib/Handler.ts b/api/src/channel/lib/Handler.ts
index c26da799..0f3767a3 100644
--- a/api/src/channel/lib/Handler.ts
+++ b/api/src/channel/lib/Handler.ts
@@ -23,9 +23,10 @@ import { SettingService } from '@/setting/services/setting.service';
 import { SocketRequest } from '@/websocket/utils/socket-request';
 import { SocketResponse } from '@/websocket/utils/socket-response';
 
-import EventWrapper from './EventWrapper';
 import { ChannelService } from '../channel.service';
 
+import EventWrapper from './EventWrapper';
+
 @Injectable()
 export default abstract class ChannelHandler {
   protected settings: SettingCreateDto[] = [];
diff --git a/api/src/chat/controllers/block.controller.spec.ts b/api/src/chat/controllers/block.controller.spec.ts
index e9aa3625..e56d1861 100644
--- a/api/src/chat/controllers/block.controller.spec.ts
+++ b/api/src/chat/controllers/block.controller.spec.ts
@@ -44,8 +44,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { CategoryModel, Category } from './../schemas/category.schema';
-import { BlockController } from './block.controller';
 import { BlockCreateDto, BlockUpdateDto } from '../dto/block.dto';
 import { BlockRepository } from '../repositories/block.repository';
 import { CategoryRepository } from '../repositories/category.repository';
@@ -56,6 +54,9 @@ import { BlockService } from '../services/block.service';
 import { CategoryService } from '../services/category.service';
 import { LabelService } from '../services/label.service';
 
+import { CategoryModel, Category } from './../schemas/category.schema';
+import { BlockController } from './block.controller';
+
 describe('BlockController', () => {
   let blockController: BlockController;
   let blockService: BlockService;
diff --git a/api/src/chat/controllers/category.contoller.spec.ts b/api/src/chat/controllers/category.contoller.spec.ts
index e4f1b1f8..663cd02c 100644
--- a/api/src/chat/controllers/category.contoller.spec.ts
+++ b/api/src/chat/controllers/category.contoller.spec.ts
@@ -32,8 +32,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { Category, CategoryModel } from './../schemas/category.schema';
-import { CategoryController } from './category.controller';
 import { CategoryCreateDto, CategoryUpdateDto } from '../dto/category.dto';
 import { BlockRepository } from '../repositories/block.repository';
 import { CategoryRepository } from '../repositories/category.repository';
@@ -42,6 +40,9 @@ import { LabelModel } from '../schemas/label.schema';
 import { BlockService } from '../services/block.service';
 import { CategoryService } from '../services/category.service';
 
+import { Category, CategoryModel } from './../schemas/category.schema';
+import { CategoryController } from './category.controller';
+
 describe('CategoryController', () => {
   let categoryController: CategoryController;
   let categoryService: CategoryService;
diff --git a/api/src/chat/controllers/context-var.controller.spec.ts b/api/src/chat/controllers/context-var.controller.spec.ts
index c38f4f63..a42ef037 100644
--- a/api/src/chat/controllers/context-var.controller.spec.ts
+++ b/api/src/chat/controllers/context-var.controller.spec.ts
@@ -23,7 +23,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ContextVarController } from './context-var.controller';
 import {
   ContextVarCreateDto,
   ContextVarUpdateDto,
@@ -32,6 +31,8 @@ import { ContextVarRepository } from '../repositories/context-var.repository';
 import { ContextVarModel, ContextVar } from '../schemas/context-var.schema';
 import { ContextVarService } from '../services/context-var.service';
 
+import { ContextVarController } from './context-var.controller';
+
 describe('ContextVarController', () => {
   let contextVarController: ContextVarController;
   let contextVarService: ContextVarService;
diff --git a/api/src/chat/controllers/label.controller.spec.ts b/api/src/chat/controllers/label.controller.spec.ts
index 316103bc..f09ca847 100644
--- a/api/src/chat/controllers/label.controller.spec.ts
+++ b/api/src/chat/controllers/label.controller.spec.ts
@@ -32,7 +32,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { LabelController } from './label.controller';
 import { LabelCreateDto, LabelUpdateDto } from '../dto/label.dto';
 import { LabelRepository } from '../repositories/label.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
@@ -41,6 +40,8 @@ import { SubscriberModel } from '../schemas/subscriber.schema';
 import { LabelService } from '../services/label.service';
 import { SubscriberService } from '../services/subscriber.service';
 
+import { LabelController } from './label.controller';
+
 describe('LabelController', () => {
   let labelController: LabelController;
   let labelService: LabelService;
diff --git a/api/src/chat/controllers/message.controller.spec.ts b/api/src/chat/controllers/message.controller.spec.ts
index d97a1b56..168bcd3f 100644
--- a/api/src/chat/controllers/message.controller.spec.ts
+++ b/api/src/chat/controllers/message.controller.spec.ts
@@ -39,7 +39,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { MessageController } from './message.controller';
 import { MessageRepository } from '../repositories/message.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
 import { Message, MessageModel } from '../schemas/message.schema';
@@ -47,6 +46,8 @@ import { Subscriber, SubscriberModel } from '../schemas/subscriber.schema';
 import { MessageService } from '../services/message.service';
 import { SubscriberService } from '../services/subscriber.service';
 
+import { MessageController } from './message.controller';
+
 describe('MessageController', () => {
   let messageController: MessageController;
   let messageService: MessageService;
diff --git a/api/src/chat/controllers/subscriber.controller.spec.ts b/api/src/chat/controllers/subscriber.controller.spec.ts
index f550b91c..913300ee 100644
--- a/api/src/chat/controllers/subscriber.controller.spec.ts
+++ b/api/src/chat/controllers/subscriber.controller.spec.ts
@@ -33,15 +33,16 @@ import {
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { UserService } from './../../user/services/user.service';
-import { LabelService } from './../services/label.service';
-import { SubscriberController } from './subscriber.controller';
 import { LabelRepository } from '../repositories/label.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
 import { LabelModel, Label } from '../schemas/label.schema';
 import { SubscriberModel, Subscriber } from '../schemas/subscriber.schema';
 import { SubscriberService } from '../services/subscriber.service';
 
+import { UserService } from './../../user/services/user.service';
+import { LabelService } from './../services/label.service';
+import { SubscriberController } from './subscriber.controller';
+
 describe('SubscriberController', () => {
   let subscriberController: SubscriberController;
   let subscriberService: SubscriberService;
diff --git a/api/src/chat/repositories/block.repository.spec.ts b/api/src/chat/repositories/block.repository.spec.ts
index dfa917eb..1558facf 100644
--- a/api/src/chat/repositories/block.repository.spec.ts
+++ b/api/src/chat/repositories/block.repository.spec.ts
@@ -20,12 +20,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { BlockRepository } from './block.repository';
-import { CategoryRepository } from './category.repository';
 import { BlockModel, Block } from '../schemas/block.schema';
 import { CategoryModel, Category } from '../schemas/category.schema';
 import { LabelModel } from '../schemas/label.schema';
 
+import { BlockRepository } from './block.repository';
+import { CategoryRepository } from './category.repository';
+
 describe('BlockRepository', () => {
   let blockRepository: BlockRepository;
   let categoryRepository: CategoryRepository;
diff --git a/api/src/chat/repositories/label.repository.spec.ts b/api/src/chat/repositories/label.repository.spec.ts
index 958c0460..96132e30 100644
--- a/api/src/chat/repositories/label.repository.spec.ts
+++ b/api/src/chat/repositories/label.repository.spec.ts
@@ -21,11 +21,12 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { LabelRepository } from './label.repository';
-import { SubscriberRepository } from './subscriber.repository';
 import { LabelModel, Label } from '../schemas/label.schema';
 import { SubscriberModel, Subscriber } from '../schemas/subscriber.schema';
 
+import { LabelRepository } from './label.repository';
+import { SubscriberRepository } from './subscriber.repository';
+
 describe('LabelRepository', () => {
   let labelRepository: LabelRepository;
   let labelModel: Model<Label>;
diff --git a/api/src/chat/repositories/message.repository.spec.ts b/api/src/chat/repositories/message.repository.spec.ts
index 896c3d5e..97afffc8 100644
--- a/api/src/chat/repositories/message.repository.spec.ts
+++ b/api/src/chat/repositories/message.repository.spec.ts
@@ -23,12 +23,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { MessageRepository } from './message.repository';
-import { SubscriberRepository } from './subscriber.repository';
 import { MessageModel, Message } from '../schemas/message.schema';
 import { SubscriberModel } from '../schemas/subscriber.schema';
 import { AnyMessage } from '../schemas/types/message';
 
+import { MessageRepository } from './message.repository';
+import { SubscriberRepository } from './subscriber.repository';
+
 describe('MessageRepository', () => {
   let messageRepository: MessageRepository;
   let userRepository: UserRepository;
diff --git a/api/src/chat/repositories/subscriber.repository.spec.ts b/api/src/chat/repositories/subscriber.repository.spec.ts
index 2cc9f125..4e05dd52 100644
--- a/api/src/chat/repositories/subscriber.repository.spec.ts
+++ b/api/src/chat/repositories/subscriber.repository.spec.ts
@@ -31,8 +31,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { LabelRepository } from './label.repository';
-import { SubscriberRepository } from './subscriber.repository';
 import { LabelModel, Label } from '../schemas/label.schema';
 import {
   SubscriberModel,
@@ -40,6 +38,9 @@ import {
   SubscriberFull,
 } from '../schemas/subscriber.schema';
 
+import { LabelRepository } from './label.repository';
+import { SubscriberRepository } from './subscriber.repository';
+
 describe('SubscriberRepository', () => {
   let subscriberRepository: SubscriberRepository;
   let subscriberModel: Model<Subscriber>;
diff --git a/api/src/chat/schemas/block.schema.ts b/api/src/chat/schemas/block.schema.ts
index 8d5205d4..e1135993 100644
--- a/api/src/chat/schemas/block.schema.ts
+++ b/api/src/chat/schemas/block.schema.ts
@@ -14,6 +14,11 @@ import { BaseSchema } from '@/utils/generics/base-schema';
 import { LifecycleHookManager } from '@/utils/generics/lifecycle-hook-manager';
 import { TFilterPopulateFields } from '@/utils/types/filter.types';
 
+import { isValidMessage } from '../validation-rules/is-message';
+import { isPatternList } from '../validation-rules/is-pattern-list';
+import { isPosition } from '../validation-rules/is-position';
+import { isValidVarCapture } from '../validation-rules/is-valid-capture';
+
 import { Category } from './category.schema';
 import { Label } from './label.schema';
 import { CaptureVar } from './types/capture-var';
@@ -21,10 +26,6 @@ import { BlockMessage } from './types/message';
 import { BlockOptions } from './types/options';
 import { Pattern } from './types/pattern';
 import { Position } from './types/position';
-import { isValidMessage } from '../validation-rules/is-message';
-import { isPatternList } from '../validation-rules/is-pattern-list';
-import { isPosition } from '../validation-rules/is-position';
-import { isValidVarCapture } from '../validation-rules/is-valid-capture';
 
 @Schema({ timestamps: true })
 export class BlockStub extends BaseSchema {
diff --git a/api/src/chat/schemas/types/context.ts b/api/src/chat/schemas/types/context.ts
index 38e72378..8d2fc30d 100644
--- a/api/src/chat/schemas/types/context.ts
+++ b/api/src/chat/schemas/types/context.ts
@@ -8,9 +8,10 @@
 
 import { Nlp } from '@/nlp/lib/types';
 
-import { Payload } from './quick-reply';
 import { Subscriber } from '../subscriber.schema';
 
+import { Payload } from './quick-reply';
+
 export interface Context {
   channel?: string;
   text?: string;
diff --git a/api/src/chat/schemas/types/message.ts b/api/src/chat/schemas/types/message.ts
index 4f4effc6..8d1edbcd 100644
--- a/api/src/chat/schemas/types/message.ts
+++ b/api/src/chat/schemas/types/message.ts
@@ -9,6 +9,8 @@
 import { Attachment } from '@/attachment/schemas/attachment.schema';
 import { Content } from '@/cms/schemas/content.schema';
 
+import { Message } from '../message.schema';
+
 import {
   AttachmentForeignKey,
   AttachmentPayload,
@@ -18,7 +20,6 @@ import {
 import { Button } from './button';
 import { ContentOptions } from './options';
 import { StdQuickReply } from './quick-reply';
-import { Message } from '../message.schema';
 
 /**
  * StdEventType enum is declared, and currently not used
diff --git a/api/src/chat/services/block.service.spec.ts b/api/src/chat/services/block.service.spec.ts
index 29d1f918..36fdc5df 100644
--- a/api/src/chat/services/block.service.spec.ts
+++ b/api/src/chat/services/block.service.spec.ts
@@ -59,9 +59,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { CategoryRepository } from './../repositories/category.repository';
-import { BlockService } from './block.service';
-import { CategoryService } from './category.service';
 import { BlockRepository } from '../repositories/block.repository';
 import { Block, BlockModel } from '../schemas/block.schema';
 import { Category, CategoryModel } from '../schemas/category.schema';
@@ -71,6 +68,10 @@ import { Context } from '../schemas/types/context';
 import { PayloadType, StdOutgoingListMessage } from '../schemas/types/message';
 import { SubscriberContext } from '../schemas/types/subscriberContext';
 
+import { CategoryRepository } from './../repositories/category.repository';
+import { BlockService } from './block.service';
+import { CategoryService } from './category.service';
+
 describe('BlockService', () => {
   let blockRepository: BlockRepository;
   let categoryRepository: CategoryRepository;
diff --git a/api/src/chat/services/bot.service.spec.ts b/api/src/chat/services/bot.service.spec.ts
index 67441f73..be816bce 100644
--- a/api/src/chat/services/bot.service.spec.ts
+++ b/api/src/chat/services/bot.service.spec.ts
@@ -57,14 +57,6 @@ import {
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { CategoryRepository } from './../repositories/category.repository';
-import { BlockService } from './block.service';
-import { BotService } from './bot.service';
-import { CategoryService } from './category.service';
-import { ContextVarService } from './context-var.service';
-import { ConversationService } from './conversation.service';
-import { MessageService } from './message.service';
-import { SubscriberService } from './subscriber.service';
 import { BlockRepository } from '../repositories/block.repository';
 import { ContextVarRepository } from '../repositories/context-var.repository';
 import { ConversationRepository } from '../repositories/conversation.repository';
@@ -82,6 +74,15 @@ import { LabelModel } from '../schemas/label.schema';
 import { MessageModel } from '../schemas/message.schema';
 import { SubscriberModel } from '../schemas/subscriber.schema';
 
+import { CategoryRepository } from './../repositories/category.repository';
+import { BlockService } from './block.service';
+import { BotService } from './bot.service';
+import { CategoryService } from './category.service';
+import { ContextVarService } from './context-var.service';
+import { ConversationService } from './conversation.service';
+import { MessageService } from './message.service';
+import { SubscriberService } from './subscriber.service';
+
 describe('BlockService', () => {
   let blockService: BlockService;
   let subscriberService: SubscriberService;
diff --git a/api/src/chat/services/bot.service.ts b/api/src/chat/services/bot.service.ts
index ac11ac24..9ff1937a 100644
--- a/api/src/chat/services/bot.service.ts
+++ b/api/src/chat/services/bot.service.ts
@@ -14,9 +14,6 @@ import { LoggerService } from '@/logger/logger.service';
 import { Settings } from '@/setting/schemas/types';
 import { SettingService } from '@/setting/services/setting.service';
 
-import { BlockService } from './block.service';
-import { ConversationService } from './conversation.service';
-import { SubscriberService } from './subscriber.service';
 import { MessageCreateDto } from '../dto/message.dto';
 import { BlockFull } from '../schemas/block.schema';
 import {
@@ -30,6 +27,10 @@ import {
   StdOutgoingEnvelope,
 } from '../schemas/types/message';
 
+import { BlockService } from './block.service';
+import { ConversationService } from './conversation.service';
+import { SubscriberService } from './subscriber.service';
+
 @Injectable()
 export class BotService {
   constructor(
diff --git a/api/src/chat/services/chat.service.ts b/api/src/chat/services/chat.service.ts
index 48eaec9d..e7229ec1 100644
--- a/api/src/chat/services/chat.service.ts
+++ b/api/src/chat/services/chat.service.ts
@@ -15,15 +15,16 @@ import { LoggerService } from '@/logger/logger.service';
 import { NlpService } from '@/nlp/services/nlp.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { BotService } from './bot.service';
-import { ConversationService } from './conversation.service';
-import { MessageService } from './message.service';
-import { SubscriberService } from './subscriber.service';
 import { MessageCreateDto } from '../dto/message.dto';
 import { Conversation } from '../schemas/conversation.schema';
 import { Subscriber } from '../schemas/subscriber.schema';
 import { OutgoingMessage } from '../schemas/types/message';
 
+import { BotService } from './bot.service';
+import { ConversationService } from './conversation.service';
+import { MessageService } from './message.service';
+import { SubscriberService } from './subscriber.service';
+
 @Injectable()
 export class ChatService {
   constructor(
diff --git a/api/src/chat/services/conversation.service.ts b/api/src/chat/services/conversation.service.ts
index 010e9812..b6ebb14e 100644
--- a/api/src/chat/services/conversation.service.ts
+++ b/api/src/chat/services/conversation.service.ts
@@ -12,8 +12,6 @@ import EventWrapper from '@/channel/lib/EventWrapper';
 import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 
-import { ContextVarService } from './context-var.service';
-import { SubscriberService } from './subscriber.service';
 import { VIEW_MORE_PAYLOAD } from '../helpers/constants';
 import { ConversationRepository } from '../repositories/conversation.repository';
 import { Block, BlockFull } from '../schemas/block.schema';
@@ -25,6 +23,9 @@ import {
 import { OutgoingMessageFormat } from '../schemas/types/message';
 import { Payload } from '../schemas/types/quick-reply';
 
+import { ContextVarService } from './context-var.service';
+import { SubscriberService } from './subscriber.service';
+
 @Injectable()
 export class ConversationService extends BaseService<
   Conversation,
diff --git a/api/src/chat/services/label.service.spec.ts b/api/src/chat/services/label.service.spec.ts
index 931408e3..56c3df75 100644
--- a/api/src/chat/services/label.service.spec.ts
+++ b/api/src/chat/services/label.service.spec.ts
@@ -25,13 +25,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { SubscriberRepository } from './../repositories/subscriber.repository';
-import { LabelService } from './label.service';
-import { SubscriberService } from './subscriber.service';
 import { LabelRepository } from '../repositories/label.repository';
 import { LabelModel, Label, LabelFull } from '../schemas/label.schema';
 import { SubscriberModel, Subscriber } from '../schemas/subscriber.schema';
 
+import { SubscriberRepository } from './../repositories/subscriber.repository';
+import { LabelService } from './label.service';
+import { SubscriberService } from './subscriber.service';
+
 describe('LabelService', () => {
   let labelRepository: LabelRepository;
   let labelService: LabelService;
diff --git a/api/src/chat/services/message.service.spec.ts b/api/src/chat/services/message.service.spec.ts
index 39852633..cf67c066 100644
--- a/api/src/chat/services/message.service.spec.ts
+++ b/api/src/chat/services/message.service.spec.ts
@@ -32,13 +32,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { SubscriberRepository } from './../repositories/subscriber.repository';
-import { MessageService } from './message.service';
-import { SubscriberService } from './subscriber.service';
 import { MessageRepository } from '../repositories/message.repository';
 import { Message, MessageModel } from '../schemas/message.schema';
 import { Subscriber, SubscriberModel } from '../schemas/subscriber.schema';
 
+import { SubscriberRepository } from './../repositories/subscriber.repository';
+import { MessageService } from './message.service';
+import { SubscriberService } from './subscriber.service';
+
 describe('MessageService', () => {
   let messageRepository: MessageRepository;
   let messageService: MessageService;
diff --git a/api/src/chat/services/subscriber.service.spec.ts b/api/src/chat/services/subscriber.service.spec.ts
index ee393855..bae61da4 100644
--- a/api/src/chat/services/subscriber.service.spec.ts
+++ b/api/src/chat/services/subscriber.service.spec.ts
@@ -29,13 +29,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { LabelService } from './label.service';
-import { SubscriberService } from './subscriber.service';
 import { LabelRepository } from '../repositories/label.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
 import { Label, LabelModel } from '../schemas/label.schema';
 import { Subscriber, SubscriberModel } from '../schemas/subscriber.schema';
 
+import { LabelService } from './label.service';
+import { SubscriberService } from './subscriber.service';
+
 describe('SubscriberService', () => {
   let subscriberRepository: SubscriberRepository;
   let labelRepository: LabelRepository;
diff --git a/api/src/cms/cms.module.ts b/api/src/cms/cms.module.ts
index 8cc23d5d..660b0430 100644
--- a/api/src/cms/cms.module.ts
+++ b/api/src/cms/cms.module.ts
@@ -12,6 +12,8 @@ import { MongooseModule } from '@nestjs/mongoose';
 import { AttachmentModule } from '@/attachment/attachment.module';
 import { ChatModule } from '@/chat/chat.module';
 
+import { AttachmentModel } from '../attachment/schemas/attachment.schema';
+
 import { ContentTypeController } from './controllers/content-type.controller';
 import { ContentController } from './controllers/content.controller';
 import { MenuController } from './controllers/menu.controller';
@@ -24,7 +26,6 @@ import { MenuModel } from './schemas/menu.schema';
 import { ContentTypeService } from './services/content-type.service';
 import { ContentService } from './services/content.service';
 import { MenuService } from './services/menu.service';
-import { AttachmentModel } from '../attachment/schemas/attachment.schema';
 
 @Module({
   imports: [
diff --git a/api/src/cms/controllers/content-type.controller.spec.ts b/api/src/cms/controllers/content-type.controller.spec.ts
index e5399b32..ae4deab1 100644
--- a/api/src/cms/controllers/content-type.controller.spec.ts
+++ b/api/src/cms/controllers/content-type.controller.spec.ts
@@ -25,7 +25,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ContentTypeController } from './content-type.controller';
 import { ContentTypeCreateDto } from '../dto/contentType.dto';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
@@ -34,6 +33,8 @@ import { ContentModel } from '../schemas/content.schema';
 import { ContentTypeService } from '../services/content-type.service';
 import { ContentService } from '../services/content.service';
 
+import { ContentTypeController } from './content-type.controller';
+
 describe('ContentTypeController', () => {
   let contentTypeController: ContentTypeController;
   let contentTypeService: ContentTypeService;
diff --git a/api/src/cms/controllers/content.controller.spec.ts b/api/src/cms/controllers/content.controller.spec.ts
index e084843a..53bb39cd 100644
--- a/api/src/cms/controllers/content.controller.spec.ts
+++ b/api/src/cms/controllers/content.controller.spec.ts
@@ -33,7 +33,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ContentController } from './content.controller';
 import { ContentCreateDto } from '../dto/content.dto';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
@@ -42,6 +41,8 @@ import { Content, ContentModel } from '../schemas/content.schema';
 import { ContentTypeService } from '../services/content-type.service';
 import { ContentService } from '../services/content.service';
 
+import { ContentController } from './content.controller';
+
 describe('ContentController', () => {
   let contentController: ContentController;
   let contentService: ContentService;
diff --git a/api/src/cms/controllers/content.controller.ts b/api/src/cms/controllers/content.controller.ts
index 10b45de3..f8b79d46 100644
--- a/api/src/cms/controllers/content.controller.ts
+++ b/api/src/cms/controllers/content.controller.ts
@@ -37,8 +37,6 @@ import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
 
-import { ContentTypeService } from './../services/content-type.service';
-import { ContentService } from './../services/content.service';
 import { ContentCreateDto, ContentUpdateDto } from '../dto/content.dto';
 import {
   Content,
@@ -47,6 +45,9 @@ import {
   ContentStub,
 } from '../schemas/content.schema';
 
+import { ContentTypeService } from './../services/content-type.service';
+import { ContentService } from './../services/content.service';
+
 @UseInterceptors(CsrfInterceptor)
 @Controller('content')
 export class ContentController extends BaseController<
diff --git a/api/src/cms/controllers/menu.controller.spec.ts b/api/src/cms/controllers/menu.controller.spec.ts
index 757e4984..5c2cf0a3 100644
--- a/api/src/cms/controllers/menu.controller.spec.ts
+++ b/api/src/cms/controllers/menu.controller.spec.ts
@@ -23,13 +23,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { MenuController } from './menu.controller';
 import { MenuRepository } from '../repositories/menu.repository';
 import { MenuModel } from '../schemas/menu.schema';
 import { MenuType } from '../schemas/types/menu';
 import { MenuService } from '../services/menu.service';
 import { verifyTree } from '../utilities/verifyTree';
 
+import { MenuController } from './menu.controller';
+
 describe('MenuController', () => {
   let menuController: MenuController;
   let menuService: MenuService;
diff --git a/api/src/cms/repositories/content-type.repository.spec.ts b/api/src/cms/repositories/content-type.repository.spec.ts
index e6a76deb..95b7ab8d 100644
--- a/api/src/cms/repositories/content-type.repository.spec.ts
+++ b/api/src/cms/repositories/content-type.repository.spec.ts
@@ -24,10 +24,11 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
+import { Content, ContentModel } from '../schemas/content.schema';
+
 import { installContentFixtures } from './../../utils/test/fixtures/content';
 import { ContentTypeRepository } from './content-type.repository';
 import { ContentRepository } from './content.repository';
-import { Content, ContentModel } from '../schemas/content.schema';
 
 describe('ContentTypeRepository', () => {
   let contentTypeRepository: ContentTypeRepository;
diff --git a/api/src/cms/repositories/content.repository.spec.ts b/api/src/cms/repositories/content.repository.spec.ts
index 7dfbe710..520d15cd 100644
--- a/api/src/cms/repositories/content.repository.spec.ts
+++ b/api/src/cms/repositories/content.repository.spec.ts
@@ -23,12 +23,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
+import { Content, ContentModel } from '../schemas/content.schema';
+
 import {
   installContentFixtures,
   contentFixtures,
 } from './../../utils/test/fixtures/content';
 import { ContentRepository } from './content.repository';
-import { Content, ContentModel } from '../schemas/content.schema';
 
 describe('ContentRepository', () => {
   let contentRepository: ContentRepository;
diff --git a/api/src/cms/repositories/menu.reporsitory.spec.ts b/api/src/cms/repositories/menu.reporsitory.spec.ts
index 0e282e8a..688d81c3 100644
--- a/api/src/cms/repositories/menu.reporsitory.spec.ts
+++ b/api/src/cms/repositories/menu.reporsitory.spec.ts
@@ -19,10 +19,11 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { MenuRepository } from './menu.repository';
 import { MenuModel } from '../schemas/menu.schema';
 import { MenuType } from '../schemas/types/menu';
 
+import { MenuRepository } from './menu.repository';
+
 describe('MenuRepository', () => {
   let menuRepository: MenuRepository;
   beforeAll(async () => {
diff --git a/api/src/cms/services/content-type.service.spec.ts b/api/src/cms/services/content-type.service.spec.ts
index 88bea8e5..a2f157bf 100644
--- a/api/src/cms/services/content-type.service.spec.ts
+++ b/api/src/cms/services/content-type.service.spec.ts
@@ -21,13 +21,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ContentTypeService } from './content-type.service';
-import { ContentService } from './content.service';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
 import { ContentTypeModel } from '../schemas/content-type.schema';
 import { ContentModel } from '../schemas/content.schema';
 
+import { ContentTypeService } from './content-type.service';
+import { ContentService } from './content.service';
+
 describe('ContentTypeService', () => {
   let contentTypeService: ContentTypeService;
   let contentService: ContentService;
diff --git a/api/src/cms/services/content.service.spec.ts b/api/src/cms/services/content.service.spec.ts
index c9d0a144..3844bedd 100644
--- a/api/src/cms/services/content.service.spec.ts
+++ b/api/src/cms/services/content.service.spec.ts
@@ -28,13 +28,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ContentTypeService } from './content-type.service';
-import { ContentService } from './content.service';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
 import { ContentTypeModel } from '../schemas/content-type.schema';
 import { Content, ContentModel } from '../schemas/content.schema';
 
+import { ContentTypeService } from './content-type.service';
+import { ContentService } from './content.service';
+
 describe('ContentService', () => {
   let contentService: ContentService;
   let contentTypeService: ContentTypeService;
diff --git a/api/src/cms/services/menu.service.spec.ts b/api/src/cms/services/menu.service.spec.ts
index 689b20ac..40cc2503 100644
--- a/api/src/cms/services/menu.service.spec.ts
+++ b/api/src/cms/services/menu.service.spec.ts
@@ -22,12 +22,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { MenuService } from './menu.service';
 import { MenuRepository } from '../repositories/menu.repository';
 import { MenuModel } from '../schemas/menu.schema';
 import { MenuType } from '../schemas/types/menu';
 import { verifyTree } from '../utilities/verifyTree';
 
+import { MenuService } from './menu.service';
+
 describe('MenuService', () => {
   let menuService: MenuService;
   let menuRepository: MenuRepository;
diff --git a/api/src/extensions/channels/live-chat-tester/index.channel.ts b/api/src/extensions/channels/live-chat-tester/index.channel.ts
index a889a126..33dc1d1f 100644
--- a/api/src/extensions/channels/live-chat-tester/index.channel.ts
+++ b/api/src/extensions/channels/live-chat-tester/index.channel.ts
@@ -21,11 +21,12 @@ import { SettingCreateDto } from '@/setting/dto/setting.dto';
 import { SettingService } from '@/setting/services/setting.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
+import OfflineHandler from '../offline/index.channel';
+
 import {
   DEFAULT_LIVE_CHAT_TEST_SETTINGS,
   LIVE_CHAT_TEST_CHANNEL_NAME,
 } from './settings';
-import OfflineHandler from '../offline/index.channel';
 
 @Injectable()
 export default class LiveChatTesterHandler extends OfflineHandler {
diff --git a/api/src/extensions/channels/offline/__test__/index.spec.ts b/api/src/extensions/channels/offline/__test__/index.spec.ts
index 0fc62ecb..78f8df7e 100644
--- a/api/src/extensions/channels/offline/__test__/index.spec.ts
+++ b/api/src/extensions/channels/offline/__test__/index.spec.ts
@@ -49,6 +49,8 @@ import { SocketRequest } from '@/websocket/utils/socket-request';
 import { SocketResponse } from '@/websocket/utils/socket-response';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
+import OfflineHandler from '../index.channel';
+
 import {
   offlineAttachment,
   offlineButtons,
@@ -57,7 +59,6 @@ import {
   offlineQuickReplies,
   offlineText,
 } from './data.mock';
-import OfflineHandler from '../index.channel';
 
 describe('Offline Handler', () => {
   let subscriberService: SubscriberService;
diff --git a/api/src/extensions/channels/offline/__test__/wrapper.spec.ts b/api/src/extensions/channels/offline/__test__/wrapper.spec.ts
index a4358343..4abfc6b2 100644
--- a/api/src/extensions/channels/offline/__test__/wrapper.spec.ts
+++ b/api/src/extensions/channels/offline/__test__/wrapper.spec.ts
@@ -36,10 +36,11 @@ import {
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { offlineEvents } from './events.mock';
 import OfflineHandler from '../index.channel';
 import OfflineEventWrapper from '../wrapper';
 
+import { offlineEvents } from './events.mock';
+
 describe(`Offline event wrapper`, () => {
   let handler: OfflineHandler;
   const offlineSettings = {};
diff --git a/api/src/extensions/helpers/nlp/default/__test__/index.spec.ts b/api/src/extensions/helpers/nlp/default/__test__/index.spec.ts
index c3a77044..1d829f03 100644
--- a/api/src/extensions/helpers/nlp/default/__test__/index.spec.ts
+++ b/api/src/extensions/helpers/nlp/default/__test__/index.spec.ts
@@ -36,6 +36,8 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
+import DefaultNlpHelper from '../index.nlp.helper';
+
 import { entitiesMock, samplesMock } from './__mock__/base.mock';
 import {
   nlpBestGuess,
@@ -43,7 +45,6 @@ import {
   nlpFormatted,
   nlpParseResult,
 } from './index.mock';
-import DefaultNlpHelper from '../index.nlp.helper';
 
 describe('NLP Default Helper', () => {
   let settingService: SettingService;
diff --git a/api/src/i18n/controllers/language.controller.spec.ts b/api/src/i18n/controllers/language.controller.spec.ts
index a67090b6..8709d57d 100644
--- a/api/src/i18n/controllers/language.controller.spec.ts
+++ b/api/src/i18n/controllers/language.controller.spec.ts
@@ -25,12 +25,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { LanguageController } from './language.controller';
 import { LanguageUpdateDto } from '../dto/language.dto';
 import { LanguageRepository } from '../repositories/language.repository';
 import { Language, LanguageModel } from '../schemas/language.schema';
 import { LanguageService } from '../services/language.service';
 
+import { LanguageController } from './language.controller';
+
 describe('LanguageController', () => {
   let languageController: LanguageController;
   let languageService: LanguageService;
diff --git a/api/src/i18n/controllers/translation.controller.spec.ts b/api/src/i18n/controllers/translation.controller.spec.ts
index a6ddeb6d..63623ee3 100644
--- a/api/src/i18n/controllers/translation.controller.spec.ts
+++ b/api/src/i18n/controllers/translation.controller.spec.ts
@@ -48,7 +48,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { TranslationController } from './translation.controller';
 import { TranslationUpdateDto } from '../dto/translation.dto';
 import { LanguageRepository } from '../repositories/language.repository';
 import { TranslationRepository } from '../repositories/translation.repository';
@@ -57,6 +56,8 @@ import { Translation, TranslationModel } from '../schemas/translation.schema';
 import { LanguageService } from '../services/language.service';
 import { TranslationService } from '../services/translation.service';
 
+import { TranslationController } from './translation.controller';
+
 describe('TranslationController', () => {
   let translationController: TranslationController;
   let translationService: TranslationService;
diff --git a/api/src/nlp/controllers/nlp-entity.controller.spec.ts b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
index 5e68e4a7..22d9dfd8 100644
--- a/api/src/nlp/controllers/nlp-entity.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
@@ -28,7 +28,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityController } from './nlp-entity.controller';
 import { NlpEntityCreateDto } from '../dto/nlp-entity.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
@@ -43,6 +42,8 @@ import { NlpValueModel } from '../schemas/nlp-value.schema';
 import { NlpEntityService } from '../services/nlp-entity.service';
 import { NlpValueService } from '../services/nlp-value.service';
 
+import { NlpEntityController } from './nlp-entity.controller';
+
 describe('NlpEntityController', () => {
   let nlpEntityController: NlpEntityController;
   let nlpValueService: NlpValueService;
diff --git a/api/src/nlp/controllers/nlp-sample.controller.spec.ts b/api/src/nlp/controllers/nlp-sample.controller.spec.ts
index 8a401a70..fd3c30fd 100644
--- a/api/src/nlp/controllers/nlp-sample.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-sample.controller.spec.ts
@@ -35,7 +35,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpSampleController } from './nlp-sample.controller';
 import { NlpSampleDto } from '../dto/nlp-sample.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
@@ -52,6 +51,8 @@ import { NlpSampleService } from '../services/nlp-sample.service';
 import { NlpValueService } from '../services/nlp-value.service';
 import { NlpService } from '../services/nlp.service';
 
+import { NlpSampleController } from './nlp-sample.controller';
+
 describe('NlpSampleController', () => {
   let nlpSampleController: NlpSampleController;
   let nlpSampleEntityService: NlpSampleEntityService;
diff --git a/api/src/nlp/controllers/nlp-value.controller.spec.ts b/api/src/nlp/controllers/nlp-value.controller.spec.ts
index 609cff89..bb4a56f4 100644
--- a/api/src/nlp/controllers/nlp-value.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-value.controller.spec.ts
@@ -23,7 +23,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpValueController } from './nlp-value.controller';
 import { NlpValueCreateDto } from '../dto/nlp-value.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
@@ -34,6 +33,8 @@ import { NlpValueModel, NlpValue } from '../schemas/nlp-value.schema';
 import { NlpEntityService } from '../services/nlp-entity.service';
 import { NlpValueService } from '../services/nlp-value.service';
 
+import { NlpValueController } from './nlp-value.controller';
+
 describe('NlpValueController', () => {
   let nlpValueController: NlpValueController;
   let nlpValueService: NlpValueService;
diff --git a/api/src/nlp/lib/BaseNlpHelper.ts b/api/src/nlp/lib/BaseNlpHelper.ts
index e6c2a855..b710bd56 100644
--- a/api/src/nlp/lib/BaseNlpHelper.ts
+++ b/api/src/nlp/lib/BaseNlpHelper.ts
@@ -33,11 +33,12 @@ import {
 } from '@/nlp/schemas/nlp-value.schema';
 import { Settings } from '@/setting/schemas/types';
 
-import { Nlp } from './types';
 import { NlpEntityService } from '../services/nlp-entity.service';
 import { NlpSampleService } from '../services/nlp-sample.service';
 import { NlpService } from '../services/nlp.service';
 
+import { Nlp } from './types';
+
 export default abstract class BaseNlpHelper {
   protected settings: Settings['nlp_settings'];
 
diff --git a/api/src/nlp/repositories/nlp-entity.repository.spec.ts b/api/src/nlp/repositories/nlp-entity.repository.spec.ts
index a11fc6b1..4ed70ca9 100644
--- a/api/src/nlp/repositories/nlp-entity.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-entity.repository.spec.ts
@@ -18,13 +18,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityRepository } from './nlp-entity.repository';
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
-import { NlpValueRepository } from './nlp-value.repository';
 import { NlpEntityModel, NlpEntity } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
 import { NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityRepository } from './nlp-entity.repository';
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+import { NlpValueRepository } from './nlp-value.repository';
+
 describe('NlpEntityRepository', () => {
   let nlpEntityRepository: NlpEntityRepository;
   let nlpValueRepository: NlpValueRepository;
diff --git a/api/src/nlp/repositories/nlp-entity.repository.ts b/api/src/nlp/repositories/nlp-entity.repository.ts
index bcd75fbe..692896cc 100644
--- a/api/src/nlp/repositories/nlp-entity.repository.ts
+++ b/api/src/nlp/repositories/nlp-entity.repository.ts
@@ -13,8 +13,6 @@ import { Document, Model, Query, TFilterQuery } from 'mongoose';
 
 import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository';
 
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
-import { NlpValueRepository } from './nlp-value.repository';
 import {
   NLP_ENTITY_POPULATE,
   NlpEntity,
@@ -23,6 +21,9 @@ import {
   NlpEntityPopulate,
 } from '../schemas/nlp-entity.schema';
 
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+import { NlpValueRepository } from './nlp-value.repository';
+
 @Injectable()
 export class NlpEntityRepository extends BaseRepository<
   NlpEntity,
diff --git a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
index 973731f3..801f5e5b 100644
--- a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
@@ -24,9 +24,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityRepository } from './nlp-entity.repository';
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
-import { NlpValueRepository } from './nlp-value.repository';
 import { NlpEntityModel, NlpEntity } from '../schemas/nlp-entity.schema';
 import {
   NlpSampleEntityModel,
@@ -35,6 +32,10 @@ import {
 import { NlpSampleModel } from '../schemas/nlp-sample.schema';
 import { NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityRepository } from './nlp-entity.repository';
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+import { NlpValueRepository } from './nlp-value.repository';
+
 describe('NlpSampleEntityRepository', () => {
   let nlpSampleEntityRepository: NlpSampleEntityRepository;
   let nlpEntityRepository: NlpEntityRepository;
diff --git a/api/src/nlp/repositories/nlp-sample.repository.spec.ts b/api/src/nlp/repositories/nlp-sample.repository.spec.ts
index 21d2dca1..b5dd9e0b 100644
--- a/api/src/nlp/repositories/nlp-sample.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-sample.repository.spec.ts
@@ -20,14 +20,15 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
-import { NlpSampleRepository } from './nlp-sample.repository';
 import {
   NlpSampleEntityModel,
   NlpSampleEntity,
 } from '../schemas/nlp-sample-entity.schema';
 import { NlpSampleModel, NlpSample } from '../schemas/nlp-sample.schema';
 
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+import { NlpSampleRepository } from './nlp-sample.repository';
+
 describe('NlpSampleRepository', () => {
   let nlpSampleRepository: NlpSampleRepository;
   let nlpSampleEntityRepository: NlpSampleEntityRepository;
diff --git a/api/src/nlp/repositories/nlp-sample.repository.ts b/api/src/nlp/repositories/nlp-sample.repository.ts
index 7eb5d6ee..e653d880 100644
--- a/api/src/nlp/repositories/nlp-sample.repository.ts
+++ b/api/src/nlp/repositories/nlp-sample.repository.ts
@@ -13,7 +13,6 @@ import { Document, Model, Query, TFilterQuery } from 'mongoose';
 
 import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository';
 
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
 import {
   NLP_SAMPLE_POPULATE,
   NlpSample,
@@ -21,6 +20,8 @@ import {
   NlpSamplePopulate,
 } from '../schemas/nlp-sample.schema';
 
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+
 @Injectable()
 export class NlpSampleRepository extends BaseRepository<
   NlpSample,
diff --git a/api/src/nlp/repositories/nlp-value.repository.spec.ts b/api/src/nlp/repositories/nlp-value.repository.spec.ts
index c54321b7..ffef47f9 100644
--- a/api/src/nlp/repositories/nlp-value.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-value.repository.spec.ts
@@ -19,12 +19,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
-import { NlpValueRepository } from './nlp-value.repository';
 import { NlpEntityModel } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
 import { NlpValue, NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+import { NlpValueRepository } from './nlp-value.repository';
+
 describe('NlpValueRepository', () => {
   let nlpValueRepository: NlpValueRepository;
   let nlpSampleEntityRepository: NlpSampleEntityRepository;
diff --git a/api/src/nlp/repositories/nlp-value.repository.ts b/api/src/nlp/repositories/nlp-value.repository.ts
index 983b7ef2..90d7aa3c 100644
--- a/api/src/nlp/repositories/nlp-value.repository.ts
+++ b/api/src/nlp/repositories/nlp-value.repository.ts
@@ -13,7 +13,6 @@ import { Document, Model, Query, TFilterQuery } from 'mongoose';
 
 import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository';
 
-import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
 import {
   NLP_VALUE_POPULATE,
   NlpValue,
@@ -22,6 +21,8 @@ import {
   NlpValuePopulate,
 } from '../schemas/nlp-value.schema';
 
+import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
+
 @Injectable()
 export class NlpValueRepository extends BaseRepository<
   NlpValue,
diff --git a/api/src/nlp/schemas/nlp-entity.schema.ts b/api/src/nlp/schemas/nlp-entity.schema.ts
index 8a0ead16..f729cb68 100644
--- a/api/src/nlp/schemas/nlp-entity.schema.ts
+++ b/api/src/nlp/schemas/nlp-entity.schema.ts
@@ -14,9 +14,10 @@ import { BaseSchema } from '@/utils/generics/base-schema';
 import { LifecycleHookManager } from '@/utils/generics/lifecycle-hook-manager';
 import { TFilterPopulateFields } from '@/utils/types/filter.types';
 
+import { Lookup } from '../dto/nlp-entity.dto';
+
 import { NlpValue } from './nlp-value.schema';
 import { NlpEntityMap } from './types';
-import { Lookup } from '../dto/nlp-entity.dto';
 
 @Schema({ timestamps: true })
 export class NlpEntityStub extends BaseSchema {
diff --git a/api/src/nlp/services/nlp-entity.service.spec.ts b/api/src/nlp/services/nlp-entity.service.spec.ts
index 54c4973a..ffb53216 100644
--- a/api/src/nlp/services/nlp-entity.service.spec.ts
+++ b/api/src/nlp/services/nlp-entity.service.spec.ts
@@ -18,8 +18,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpValueService } from './nlp-value.service';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
@@ -27,6 +25,9 @@ import { NlpEntityModel, NlpEntity } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
 import { NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpValueService } from './nlp-value.service';
+
 describe('nlpEntityService', () => {
   let nlpEntityService: NlpEntityService;
   let nlpEntityRepository: NlpEntityRepository;
diff --git a/api/src/nlp/services/nlp-entity.service.ts b/api/src/nlp/services/nlp-entity.service.ts
index b443ed1e..e119bf87 100644
--- a/api/src/nlp/services/nlp-entity.service.ts
+++ b/api/src/nlp/services/nlp-entity.service.ts
@@ -10,7 +10,6 @@ import { Injectable } from '@nestjs/common';
 
 import { BaseService } from '@/utils/generics/base-service';
 
-import { NlpValueService } from './nlp-value.service';
 import { Lookup } from '../dto/nlp-entity.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import {
@@ -20,6 +19,8 @@ import {
 } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityValue } from '../schemas/types';
 
+import { NlpValueService } from './nlp-value.service';
+
 @Injectable()
 export class NlpEntityService extends BaseService<
   NlpEntity,
diff --git a/api/src/nlp/services/nlp-sample-entity.service.spec.ts b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
index 53ed56f1..72a42011 100644
--- a/api/src/nlp/services/nlp-sample-entity.service.spec.ts
+++ b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
@@ -24,9 +24,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpSampleEntityService } from './nlp-sample-entity.service';
-import { NlpValueService } from './nlp-value.service';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
@@ -38,6 +35,10 @@ import {
 import { NlpSample, NlpSampleModel } from '../schemas/nlp-sample.schema';
 import { NlpValue, NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpSampleEntityService } from './nlp-sample-entity.service';
+import { NlpValueService } from './nlp-value.service';
+
 describe('NlpSampleEntityService', () => {
   let nlpSampleEntityService: NlpSampleEntityService;
   let nlpSampleEntityRepository: NlpSampleEntityRepository;
diff --git a/api/src/nlp/services/nlp-sample-entity.service.ts b/api/src/nlp/services/nlp-sample-entity.service.ts
index 0bb00c97..3ebb8df2 100644
--- a/api/src/nlp/services/nlp-sample-entity.service.ts
+++ b/api/src/nlp/services/nlp-sample-entity.service.ts
@@ -10,8 +10,6 @@ import { Injectable } from '@nestjs/common';
 
 import { BaseService } from '@/utils/generics/base-service';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpValueService } from './nlp-value.service';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
 import {
   NlpSampleEntity,
@@ -21,6 +19,9 @@ import {
 import { NlpSample } from '../schemas/nlp-sample.schema';
 import { NlpSampleEntityValue } from '../schemas/types';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpValueService } from './nlp-value.service';
+
 @Injectable()
 export class NlpSampleEntityService extends BaseService<
   NlpSampleEntity,
diff --git a/api/src/nlp/services/nlp-sample.service.spec.ts b/api/src/nlp/services/nlp-sample.service.spec.ts
index 03c9c93f..97cf5dd9 100644
--- a/api/src/nlp/services/nlp-sample.service.spec.ts
+++ b/api/src/nlp/services/nlp-sample.service.spec.ts
@@ -22,10 +22,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpSampleEntityService } from './nlp-sample-entity.service';
-import { NlpSampleService } from './nlp-sample.service';
-import { NlpValueService } from './nlp-value.service';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
 import { NlpSampleRepository } from '../repositories/nlp-sample.repository';
@@ -38,6 +34,11 @@ import {
 import { NlpSampleModel, NlpSample } from '../schemas/nlp-sample.schema';
 import { NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpSampleEntityService } from './nlp-sample-entity.service';
+import { NlpSampleService } from './nlp-sample.service';
+import { NlpValueService } from './nlp-value.service';
+
 describe('NlpSampleService', () => {
   let nlpSampleService: NlpSampleService;
   let nlpSampleEntityRepository: NlpSampleEntityRepository;
diff --git a/api/src/nlp/services/nlp-value.service.spec.ts b/api/src/nlp/services/nlp-value.service.spec.ts
index 1bb667b4..c5aeb79a 100644
--- a/api/src/nlp/services/nlp-value.service.spec.ts
+++ b/api/src/nlp/services/nlp-value.service.spec.ts
@@ -21,8 +21,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpValueService } from './nlp-value.service';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
@@ -30,6 +28,9 @@ import { NlpEntity, NlpEntityModel } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
 import { NlpValue, NlpValueModel } from '../schemas/nlp-value.schema';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpValueService } from './nlp-value.service';
+
 describe('NlpValueService', () => {
   let nlpEntityService: NlpEntityService;
   let nlpValueService: NlpValueService;
diff --git a/api/src/nlp/services/nlp-value.service.ts b/api/src/nlp/services/nlp-value.service.ts
index 4942b0c1..7e8465cd 100644
--- a/api/src/nlp/services/nlp-value.service.ts
+++ b/api/src/nlp/services/nlp-value.service.ts
@@ -10,7 +10,6 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common';
 
 import { BaseService } from '@/utils/generics/base-service';
 
-import { NlpEntityService } from './nlp-entity.service';
 import { NlpValueCreateDto, NlpValueUpdateDto } from '../dto/nlp-value.dto';
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
 import { NlpEntity } from '../schemas/nlp-entity.schema';
@@ -21,6 +20,8 @@ import {
 } from '../schemas/nlp-value.schema';
 import { NlpSampleEntityValue } from '../schemas/types';
 
+import { NlpEntityService } from './nlp-entity.service';
+
 @Injectable()
 export class NlpValueService extends BaseService<
   NlpValue,
diff --git a/api/src/nlp/services/nlp.service.ts b/api/src/nlp/services/nlp.service.ts
index 9c9cf0ae..12f9f06c 100644
--- a/api/src/nlp/services/nlp.service.ts
+++ b/api/src/nlp/services/nlp.service.ts
@@ -12,13 +12,14 @@ import { OnEvent } from '@nestjs/event-emitter';
 import { LoggerService } from '@/logger/logger.service';
 import { SettingService } from '@/setting/services/setting.service';
 
-import { NlpEntityService } from './nlp-entity.service';
-import { NlpSampleService } from './nlp-sample.service';
-import { NlpValueService } from './nlp-value.service';
 import BaseNlpHelper from '../lib/BaseNlpHelper';
 import { NlpEntity, NlpEntityDocument } from '../schemas/nlp-entity.schema';
 import { NlpValue, NlpValueDocument } from '../schemas/nlp-value.schema';
 
+import { NlpEntityService } from './nlp-entity.service';
+import { NlpSampleService } from './nlp-sample.service';
+import { NlpValueService } from './nlp-value.service';
+
 @Injectable()
 export class NlpService implements OnApplicationBootstrap {
   private registry: Map<string, BaseNlpHelper> = new Map();
diff --git a/api/src/setting/controllers/setting.controller.spec.ts b/api/src/setting/controllers/setting.controller.spec.ts
index c1f1b827..aacf0193 100644
--- a/api/src/setting/controllers/setting.controller.spec.ts
+++ b/api/src/setting/controllers/setting.controller.spec.ts
@@ -22,12 +22,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { SettingController } from './setting.controller';
 import { SettingRepository } from '../repositories/setting.repository';
 import { SettingModel } from '../schemas/setting.schema';
 import { SettingSeeder } from '../seeds/setting.seed';
 import { SettingService } from '../services/setting.service';
 
+import { SettingController } from './setting.controller';
+
 describe('SettingController', () => {
   let settingController: SettingController;
   let settingService: SettingService;
diff --git a/api/src/setting/services/setting.service.spec.ts b/api/src/setting/services/setting.service.spec.ts
index dd06cc01..fee81ebf 100644
--- a/api/src/setting/services/setting.service.spec.ts
+++ b/api/src/setting/services/setting.service.spec.ts
@@ -22,12 +22,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { SettingService } from './setting.service';
 import { SettingRepository } from '../repositories/setting.repository';
 import { Setting, SettingModel } from '../schemas/setting.schema';
 import { SettingType } from '../schemas/types';
 import { SettingSeeder } from '../seeds/setting.seed';
 
+import { SettingService } from './setting.service';
+
 describe('SettingService', () => {
   let settingService: SettingService;
   let settingRepository: SettingRepository;
diff --git a/api/src/user/controllers/auth.controller.spec.ts b/api/src/user/controllers/auth.controller.spec.ts
index bc85e2cb..706de31f 100644
--- a/api/src/user/controllers/auth.controller.spec.ts
+++ b/api/src/user/controllers/auth.controller.spec.ts
@@ -36,7 +36,6 @@ import {
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { LocalAuthController } from './auth.controller';
 import { UserCreateDto } from '../dto/user.dto';
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -52,6 +51,8 @@ import { RoleService } from '../services/role.service';
 import { UserService } from '../services/user.service';
 import { ValidateAccountService } from '../services/validate-account.service';
 
+import { LocalAuthController } from './auth.controller';
+
 describe('AuthController', () => {
   let authController: LocalAuthController;
   let userService: UserService;
diff --git a/api/src/user/controllers/model.controller.spec.ts b/api/src/user/controllers/model.controller.spec.ts
index 276b4956..549a87fb 100644
--- a/api/src/user/controllers/model.controller.spec.ts
+++ b/api/src/user/controllers/model.controller.spec.ts
@@ -24,7 +24,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ModelController } from './model.controller';
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -38,6 +37,8 @@ import { PermissionService } from '../services/permission.service';
 import { RoleService } from '../services/role.service';
 import { UserService } from '../services/user.service';
 
+import { ModelController } from './model.controller';
+
 describe('ModelController', () => {
   let modelController: ModelController;
   let modelService: ModelService;
diff --git a/api/src/user/controllers/permission.controller.spec.ts b/api/src/user/controllers/permission.controller.spec.ts
index 52bc5471..ead8f22b 100644
--- a/api/src/user/controllers/permission.controller.spec.ts
+++ b/api/src/user/controllers/permission.controller.spec.ts
@@ -19,7 +19,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { PermissionController } from './permission.controller';
 import { PermissionCreateDto } from '../dto/permission.dto';
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -32,6 +31,8 @@ import { PermissionService } from '../services/permission.service';
 import { RoleService } from '../services/role.service';
 import { Action } from '../types/action.type';
 
+import { PermissionController } from './permission.controller';
+
 describe('PermissionController', () => {
   let permissionController: PermissionController;
   let permissionService: PermissionService;
diff --git a/api/src/user/controllers/role.controller.spec.ts b/api/src/user/controllers/role.controller.spec.ts
index 17c3bf67..0f4a7192 100644
--- a/api/src/user/controllers/role.controller.spec.ts
+++ b/api/src/user/controllers/role.controller.spec.ts
@@ -25,7 +25,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { RoleController } from './role.controller';
 import { RoleCreateDto, RoleUpdateDto } from '../dto/role.dto';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -37,6 +36,8 @@ import { PermissionService } from '../services/permission.service';
 import { RoleService } from '../services/role.service';
 import { UserService } from '../services/user.service';
 
+import { RoleController } from './role.controller';
+
 describe('RoleController', () => {
   let roleController: RoleController;
   let roleService: RoleService;
diff --git a/api/src/user/controllers/user.controller.spec.ts b/api/src/user/controllers/user.controller.spec.ts
index 97b254df..d7b6504f 100644
--- a/api/src/user/controllers/user.controller.spec.ts
+++ b/api/src/user/controllers/user.controller.spec.ts
@@ -33,8 +33,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { InvitationService } from './../services/invitation.service';
-import { ReadWriteUserController } from './user.controller';
 import { InvitationCreateDto } from '../dto/invitation.dto';
 import {
   UserCreateDto,
@@ -55,6 +53,9 @@ import { RoleService } from '../services/role.service';
 import { UserService } from '../services/user.service';
 import { ValidateAccountService } from '../services/validate-account.service';
 
+import { InvitationService } from './../services/invitation.service';
+import { ReadWriteUserController } from './user.controller';
+
 describe('UserController', () => {
   let userController: ReadWriteUserController;
   let userService: UserService;
diff --git a/api/src/user/repositories/invitation.repository.spec.ts b/api/src/user/repositories/invitation.repository.spec.ts
index 75b32734..6ecdccdb 100644
--- a/api/src/user/repositories/invitation.repository.spec.ts
+++ b/api/src/user/repositories/invitation.repository.spec.ts
@@ -23,13 +23,14 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { InvitationRepository } from './invitation.repository';
-import { PermissionRepository } from './permission.repository';
-import { RoleRepository } from './role.repository';
 import { InvitationModel, Invitation } from '../schemas/invitation.schema';
 import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel } from '../schemas/role.schema';
 
+import { InvitationRepository } from './invitation.repository';
+import { PermissionRepository } from './permission.repository';
+import { RoleRepository } from './role.repository';
+
 describe('InvitationRepository', () => {
   let roleRepository: RoleRepository;
   let invitationRepository: InvitationRepository;
diff --git a/api/src/user/repositories/model.repository.spec.ts b/api/src/user/repositories/model.repository.spec.ts
index 71ee0e0e..9db52d2d 100644
--- a/api/src/user/repositories/model.repository.spec.ts
+++ b/api/src/user/repositories/model.repository.spec.ts
@@ -18,12 +18,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { Model as ModelType } from './../schemas/model.schema';
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { ModelModel } from '../schemas/model.schema';
 import { Permission, PermissionModel } from '../schemas/permission.schema';
 
+import { Model as ModelType } from './../schemas/model.schema';
+
 describe('ModelRepository', () => {
   let modelRepository: ModelRepository;
   let permissionRepository: PermissionRepository;
diff --git a/api/src/user/repositories/role.repository.spec.ts b/api/src/user/repositories/role.repository.spec.ts
index 14abeefb..6f391aa2 100644
--- a/api/src/user/repositories/role.repository.spec.ts
+++ b/api/src/user/repositories/role.repository.spec.ts
@@ -18,7 +18,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { roleFixtures } from './../../utils/test/fixtures/role';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
@@ -26,6 +25,8 @@ import { PermissionModel } from '../schemas/permission.schema';
 import { Role, RoleModel } from '../schemas/role.schema';
 import { User, UserModel } from '../schemas/user.schema';
 
+import { roleFixtures } from './../../utils/test/fixtures/role';
+
 describe('RoleRepository', () => {
   let roleRepository: RoleRepository;
   let permissionRepository: PermissionRepository;
diff --git a/api/src/user/schemas/model.schema.ts b/api/src/user/schemas/model.schema.ts
index e2b57c8c..18d6f513 100644
--- a/api/src/user/schemas/model.schema.ts
+++ b/api/src/user/schemas/model.schema.ts
@@ -14,9 +14,10 @@ import { BaseSchema } from '@/utils/generics/base-schema';
 import { LifecycleHookManager } from '@/utils/generics/lifecycle-hook-manager';
 import { TFilterPopulateFields } from '@/utils/types/filter.types';
 
-import { Permission } from './permission.schema';
 import { TRelation } from '../types/index.type';
 
+import { Permission } from './permission.schema';
+
 @Schema({ timestamps: true })
 export class ModelStub extends BaseSchema {
   @Prop({
diff --git a/api/src/user/schemas/permission.schema.ts b/api/src/user/schemas/permission.schema.ts
index 01b6d163..5212194e 100644
--- a/api/src/user/schemas/permission.schema.ts
+++ b/api/src/user/schemas/permission.schema.ts
@@ -14,9 +14,10 @@ import { BaseSchema } from '@/utils/generics/base-schema';
 import { LifecycleHookManager } from '@/utils/generics/lifecycle-hook-manager';
 import { TFilterPopulateFields } from '@/utils/types/filter.types';
 
+import { Action } from '../types/action.type';
+
 import { Model } from './model.schema';
 import { Role } from './role.schema';
-import { Action } from '../types/action.type';
 
 @Schema({ timestamps: true })
 export class PermissionStub extends BaseSchema {
diff --git a/api/src/user/schemas/user.schema.ts b/api/src/user/schemas/user.schema.ts
index a6c69703..ec03de92 100644
--- a/api/src/user/schemas/user.schema.ts
+++ b/api/src/user/schemas/user.schema.ts
@@ -15,9 +15,10 @@ import { BaseSchema } from '@/utils/generics/base-schema';
 import { LifecycleHookManager } from '@/utils/generics/lifecycle-hook-manager';
 import { TFilterPopulateFields } from '@/utils/types/filter.types';
 
-import { Role } from './role.schema';
 import { UserProvider } from '../types/user-provider.type';
 
+import { Role } from './role.schema';
+
 @Schema({ timestamps: true })
 export class UserStub extends BaseSchema {
   @Prop({
diff --git a/api/src/user/services/auth.service.spec.ts b/api/src/user/services/auth.service.spec.ts
index 07c17a54..5422454b 100644
--- a/api/src/user/services/auth.service.spec.ts
+++ b/api/src/user/services/auth.service.spec.ts
@@ -21,15 +21,16 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { AuthService } from './auth.service';
-import { RoleService } from './role.service';
-import { UserService } from './user.service';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
 import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel } from '../schemas/role.schema';
 import { UserModel } from '../schemas/user.schema';
 
+import { AuthService } from './auth.service';
+import { RoleService } from './role.service';
+import { UserService } from './user.service';
+
 describe('AuthService', () => {
   let authService: AuthService;
   let userRepository: UserRepository;
diff --git a/api/src/user/services/invitation.service.spec.ts b/api/src/user/services/invitation.service.spec.ts
index 3df1c334..e15a2c11 100644
--- a/api/src/user/services/invitation.service.spec.ts
+++ b/api/src/user/services/invitation.service.spec.ts
@@ -30,9 +30,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { InvitationService } from './invitation.service';
-import { PermissionService } from './permission.service';
-import { RoleService } from './role.service';
 import { InvitationCreateDto } from '../dto/invitation.dto';
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -41,6 +38,10 @@ import { InvitationModel } from '../schemas/invitation.schema';
 import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel } from '../schemas/role.schema';
 
+import { InvitationService } from './invitation.service';
+import { PermissionService } from './permission.service';
+import { RoleService } from './role.service';
+
 describe('InvitationService', () => {
   let invitationService: InvitationService;
   let roleRepository: RoleRepository;
diff --git a/api/src/user/services/model.service.spec.ts b/api/src/user/services/model.service.spec.ts
index 7cdfaeae..21179a37 100644
--- a/api/src/user/services/model.service.spec.ts
+++ b/api/src/user/services/model.service.spec.ts
@@ -17,12 +17,13 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { ModelService } from './model.service';
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { ModelModel, Model } from '../schemas/model.schema';
 import { PermissionModel, Permission } from '../schemas/permission.schema';
 
+import { ModelService } from './model.service';
+
 describe('ModelService', () => {
   let modelService: ModelService;
   let modelRepository: ModelRepository;
diff --git a/api/src/user/services/passwordReset.service.spec.ts b/api/src/user/services/passwordReset.service.spec.ts
index 4e4b1206..0ab45ca3 100644
--- a/api/src/user/services/passwordReset.service.spec.ts
+++ b/api/src/user/services/passwordReset.service.spec.ts
@@ -31,15 +31,16 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { PasswordResetService } from './passwordReset.service';
-import { RoleService } from './role.service';
-import { UserService } from './user.service';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
 import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel } from '../schemas/role.schema';
 import { User, UserModel } from '../schemas/user.schema';
 
+import { PasswordResetService } from './passwordReset.service';
+import { RoleService } from './role.service';
+import { UserService } from './user.service';
+
 describe('PasswordResetService', () => {
   let passwordResetService: PasswordResetService;
   let mailerService: MailerService;
diff --git a/api/src/user/services/passwordReset.service.ts b/api/src/user/services/passwordReset.service.ts
index 74780eaf..845ddf52 100644
--- a/api/src/user/services/passwordReset.service.ts
+++ b/api/src/user/services/passwordReset.service.ts
@@ -24,9 +24,10 @@ import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
 import { LoggerService } from '@/logger/logger.service';
 
-import { UserService } from './user.service';
 import { UserRequestResetDto, UserResetPasswordDto } from '../dto/user.dto';
 
+import { UserService } from './user.service';
+
 @Injectable()
 export class PasswordResetService {
   constructor(
diff --git a/api/src/user/services/permission.service.spec.ts b/api/src/user/services/permission.service.spec.ts
index add45edd..e9edb7bc 100644
--- a/api/src/user/services/permission.service.spec.ts
+++ b/api/src/user/services/permission.service.spec.ts
@@ -21,7 +21,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { PermissionService } from './permission.service';
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -34,6 +33,8 @@ import {
 import { RoleModel } from '../schemas/role.schema';
 import { Action } from '../types/action.type';
 
+import { PermissionService } from './permission.service';
+
 describe('PermissionService', () => {
   let permissionService: PermissionService;
   let modelRepository: ModelRepository;
diff --git a/api/src/user/services/role.service.spec.ts b/api/src/user/services/role.service.spec.ts
index 3989e02c..3631d3a2 100644
--- a/api/src/user/services/role.service.spec.ts
+++ b/api/src/user/services/role.service.spec.ts
@@ -17,8 +17,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { roleFixtures } from './../../utils/test/fixtures/role';
-import { RoleService } from './role.service';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
@@ -26,6 +24,9 @@ import { PermissionModel, Permission } from '../schemas/permission.schema';
 import { RoleModel, Role } from '../schemas/role.schema';
 import { UserModel, User } from '../schemas/user.schema';
 
+import { roleFixtures } from './../../utils/test/fixtures/role';
+import { RoleService } from './role.service';
+
 describe('RoleService', () => {
   let roleService: RoleService;
   let roleRepository: RoleRepository;
diff --git a/api/src/user/services/user.service.spec.ts b/api/src/user/services/user.service.spec.ts
index cd93f1f1..6a209eff 100644
--- a/api/src/user/services/user.service.spec.ts
+++ b/api/src/user/services/user.service.spec.ts
@@ -24,9 +24,6 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { PermissionService } from './permission.service';
-import { RoleService } from './role.service';
-import { UserService } from './user.service';
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
@@ -34,6 +31,10 @@ import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel, Role } from '../schemas/role.schema';
 import { UserModel, User } from '../schemas/user.schema';
 
+import { PermissionService } from './permission.service';
+import { RoleService } from './role.service';
+import { UserService } from './user.service';
+
 describe('UserService', () => {
   let userService: UserService;
   let roleRepository: RoleRepository;
diff --git a/api/src/user/services/validate-account.service.spec.ts b/api/src/user/services/validate-account.service.spec.ts
index d04adc62..b3ca7753 100644
--- a/api/src/user/services/validate-account.service.spec.ts
+++ b/api/src/user/services/validate-account.service.spec.ts
@@ -28,15 +28,16 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 
-import { RoleService } from './role.service';
-import { UserService } from './user.service';
-import { ValidateAccountService } from './validate-account.service';
 import { RoleRepository } from '../repositories/role.repository';
 import { UserRepository } from '../repositories/user.repository';
 import { PermissionModel } from '../schemas/permission.schema';
 import { RoleModel } from '../schemas/role.schema';
 import { UserModel } from '../schemas/user.schema';
 
+import { RoleService } from './role.service';
+import { UserService } from './user.service';
+import { ValidateAccountService } from './validate-account.service';
+
 describe('ValidateAccountService', () => {
   let validateAccountService: ValidateAccountService;
   let mailerService: MailerService;
diff --git a/api/src/user/services/validate-account.service.ts b/api/src/user/services/validate-account.service.ts
index 85fb3bbf..3516e827 100644
--- a/api/src/user/services/validate-account.service.ts
+++ b/api/src/user/services/validate-account.service.ts
@@ -21,9 +21,10 @@ import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
 import { LoggerService } from '@/logger/logger.service';
 
-import { UserService } from './user.service';
 import { UserCreateDto } from '../dto/user.dto';
 
+import { UserService } from './user.service';
+
 @Injectable()
 export class ValidateAccountService {
   public readonly jwtSignOptions: JwtSignOptions = {
diff --git a/api/src/utils/generics/base-controller.ts b/api/src/utils/generics/base-controller.ts
index 494369e7..b544c6e4 100644
--- a/api/src/utils/generics/base-controller.ts
+++ b/api/src/utils/generics/base-controller.ts
@@ -9,9 +9,10 @@
 import { NotFoundException } from '@nestjs/common';
 import { TFilterQuery } from 'mongoose';
 
+import { TValidateProps } from '../types/filter.types';
+
 import { BaseSchema } from './base-schema';
 import { BaseService } from './base-service';
-import { TValidateProps } from '../types/filter.types';
 
 export abstract class BaseController<
   T extends BaseSchema,
diff --git a/api/src/utils/generics/base-repository.ts b/api/src/utils/generics/base-repository.ts
index 213ed014..5f1b0256 100644
--- a/api/src/utils/generics/base-repository.ts
+++ b/api/src/utils/generics/base-repository.ts
@@ -20,9 +20,10 @@ import {
   UpdateWithAggregationPipeline,
 } from 'mongoose';
 
+import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
+
 import { BaseSchema } from './base-schema';
 import { LifecycleHookManager } from './lifecycle-hook-manager';
-import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
 
 export type DeleteResult = {
   acknowledged: boolean;
diff --git a/api/src/utils/generics/base-service.ts b/api/src/utils/generics/base-service.ts
index 47b002b6..7cc9efda 100644
--- a/api/src/utils/generics/base-service.ts
+++ b/api/src/utils/generics/base-service.ts
@@ -11,9 +11,10 @@ import { ClassTransformOptions } from 'class-transformer';
 import { MongoError } from 'mongodb';
 import { TFilterQuery } from 'mongoose';
 
+import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
+
 import { BaseRepository } from './base-repository';
 import { BaseSchema } from './base-schema';
-import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
 
 export abstract class BaseService<
   T extends BaseSchema,
diff --git a/api/src/utils/test/fixtures/content.ts b/api/src/utils/test/fixtures/content.ts
index 7ed3524e..33c3d379 100644
--- a/api/src/utils/test/fixtures/content.ts
+++ b/api/src/utils/test/fixtures/content.ts
@@ -11,11 +11,12 @@ import mongoose from 'mongoose';
 import { ContentCreateDto } from '@/cms/dto/content.dto';
 import { Content, ContentModel } from '@/cms/schemas/content.schema';
 
-import { installAttachmentFixtures } from './attachment';
-import { installContentTypeFixtures } from './contenttype';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installAttachmentFixtures } from './attachment';
+import { installContentTypeFixtures } from './contenttype';
+
 const contents: ContentCreateDto[] = [
   {
     title: 'Jean',
diff --git a/api/src/utils/test/fixtures/conversation.ts b/api/src/utils/test/fixtures/conversation.ts
index 73c64e76..23b76341 100644
--- a/api/src/utils/test/fixtures/conversation.ts
+++ b/api/src/utils/test/fixtures/conversation.ts
@@ -14,11 +14,12 @@ import {
   Conversation,
 } from '@/chat/schemas/conversation.schema';
 
-import { installBlockFixtures } from './block';
-import { installSubscriberFixtures } from './subscriber';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installBlockFixtures } from './block';
+import { installSubscriberFixtures } from './subscriber';
+
 const conversations: ConversationCreateDto[] = [
   {
     sender: '0',
diff --git a/api/src/utils/test/fixtures/invitation.ts b/api/src/utils/test/fixtures/invitation.ts
index eb2cc290..8a0560b5 100644
--- a/api/src/utils/test/fixtures/invitation.ts
+++ b/api/src/utils/test/fixtures/invitation.ts
@@ -11,10 +11,11 @@ import mongoose from 'mongoose';
 import { InvitationModel, Invitation } from '@/user/schemas/invitation.schema';
 import { hash } from '@/user/utilities/hash';
 
-import { installRoleFixtures } from './role';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixtures } from '../types';
 
+import { installRoleFixtures } from './role';
+
 const invitations: TFixtures<Invitation>[] = [
   {
     email: 'email@test.com',
diff --git a/api/src/utils/test/fixtures/message.ts b/api/src/utils/test/fixtures/message.ts
index f8fc69d3..5f70796a 100644
--- a/api/src/utils/test/fixtures/message.ts
+++ b/api/src/utils/test/fixtures/message.ts
@@ -11,10 +11,11 @@ import mongoose from 'mongoose';
 import { MessageCreateDto } from '@/chat/dto/message.dto';
 import { MessageModel, Message } from '@/chat/schemas/message.schema';
 
-import { installSubscriberFixtures } from './subscriber';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installSubscriberFixtures } from './subscriber';
+
 const messages: MessageCreateDto[] = [
   {
     mid: 'mid-1',
diff --git a/api/src/utils/test/fixtures/nlpsample.ts b/api/src/utils/test/fixtures/nlpsample.ts
index 85efb75c..9be261a1 100644
--- a/api/src/utils/test/fixtures/nlpsample.ts
+++ b/api/src/utils/test/fixtures/nlpsample.ts
@@ -12,10 +12,11 @@ import { NlpSampleCreateDto } from '@/nlp/dto/nlp-sample.dto';
 import { NlpSampleModel, NlpSample } from '@/nlp/schemas/nlp-sample.schema';
 import { NlpSampleState } from '@/nlp/schemas/types';
 
-import { installLanguageFixtures } from './language';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installLanguageFixtures } from './language';
+
 const nlpSamples: NlpSampleCreateDto[] = [
   {
     text: 'yess',
diff --git a/api/src/utils/test/fixtures/subscriber.ts b/api/src/utils/test/fixtures/subscriber.ts
index 6d83d33e..0df2eba1 100644
--- a/api/src/utils/test/fixtures/subscriber.ts
+++ b/api/src/utils/test/fixtures/subscriber.ts
@@ -11,11 +11,12 @@ import mongoose from 'mongoose';
 import { SubscriberCreateDto } from '@/chat/dto/subscriber.dto';
 import { Subscriber, SubscriberModel } from '@/chat/schemas/subscriber.schema';
 
-import { installLabelFixtures } from './label';
-import { installUserFixtures } from './user';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installLabelFixtures } from './label';
+import { installUserFixtures } from './user';
+
 const subscribers: SubscriberCreateDto[] = [
   {
     foreign_id: 'foreign-id-messenger',
diff --git a/api/src/utils/test/fixtures/user.ts b/api/src/utils/test/fixtures/user.ts
index 795be362..c5f9d5d9 100644
--- a/api/src/utils/test/fixtures/user.ts
+++ b/api/src/utils/test/fixtures/user.ts
@@ -12,10 +12,11 @@ import { UserCreateDto } from '@/user/dto/user.dto';
 import { UserModel, User } from '@/user/schemas/user.schema';
 import { hash } from '@/user/utilities/bcryptjs';
 
-import { installRoleFixtures } from './role';
 import { getFixturesWithDefaultValues } from '../defaultValues';
 import { TFixturesDefaultValues } from '../types';
 
+import { installRoleFixtures } from './role';
+
 export const users: UserCreateDto[] = [
   {
     username: 'admin',