Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"nest-commander": "^3.20.1",
"nestjs-dynamic-providers": "^0.3.7",
"nestjs-i18n": "^10.5.1",
"nodemailer": "^7.0.9",
"papaparse": "^5.5.3",
"passport": "^0.7.0",
"passport-anonymous": "^1.0.1",
Expand Down Expand Up @@ -124,7 +123,6 @@
"@types/multer": "^2.0.0",
"@types/node": "^20.3.1",
"@types/node-fetch": "^2.6.13",
"@types/nodemailer": "^6.4.14",
"@types/papaparse": "^5.3.16",
"@types/passport-anonymous": "^1.0.5",
"@types/passport-jwt": "^4.0.1",
Expand Down
9 changes: 2 additions & 7 deletions packages/api/src/chat/controllers/block.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ import { SubscriberOrmEntity } from '@/chat/entities/subscriber.entity';
import { ContentTypeOrmEntity } from '@/cms/entities/content-type.entity';
import { ContentOrmEntity } from '@/cms/entities/content.entity';
import { ContentService } from '@/cms/services/content.service';
import { I18nService } from '@/i18n/services/i18n.service';
import { LanguageService } from '@/i18n/services/language.service';
import { NlpEntityOrmEntity } from '@/nlp/entities/nlp-entity.entity';
import { NlpSampleEntityOrmEntity } from '@/nlp/entities/nlp-sample-entity.entity';
import { NlpSampleOrmEntity } from '@/nlp/entities/nlp-sample.entity';
import { NlpValueOrmEntity } from '@/nlp/entities/nlp-value.entity';
import { NlpService } from '@/nlp/services/nlp.service';
import { PluginService } from '@/plugins/plugins.service';
import { SettingService } from '@/setting/services/setting.service';
import { ModelOrmEntity } from '@/user/entities/model.entity';
import { PermissionOrmEntity } from '@/user/entities/permission.entity';
import { RoleOrmEntity } from '@/user/entities/role.entity';
Expand All @@ -38,6 +36,7 @@ import {
import { installCategoryFixturesTypeOrm } from '@/utils/test/fixtures/category';
import { installLabelFixturesTypeOrm } from '@/utils/test/fixtures/label';
import { installNlpSampleEntityFixturesTypeOrm } from '@/utils/test/fixtures/nlpsampleentity';
import { I18nServiceProvider } from '@/utils/test/providers/i18n-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';

Expand Down Expand Up @@ -77,9 +76,6 @@ const userServiceMock = {
const contentServiceMock = {};
const languageServiceMock = {};
const nlpServiceMock = {};
const i18nServiceMock = {
t: jest.fn().mockImplementation((translationKey: string) => translationKey),
};
const FIELDS_TO_POPULATE = [
'trigger_labels',
'assign_labels',
Expand Down Expand Up @@ -153,8 +149,7 @@ describe('BlockController (TypeORM)', () => {
{ provide: ContentService, useValue: contentServiceMock },
{ provide: LanguageService, useValue: languageServiceMock },
{ provide: NlpService, useValue: nlpServiceMock },
{ provide: SettingService, useValue: settingServiceMock },
{ provide: I18nService, useValue: i18nServiceMock },
I18nServiceProvider,
],
typeorm: {
entities: [
Expand Down
14 changes: 1 addition & 13 deletions packages/api/src/chat/repositories/block.repository.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { LabelGroupOrmEntity } from '@/chat/entities/label-group.entity';
import { LabelOrmEntity } from '@/chat/entities/label.entity';
import { SubscriberOrmEntity } from '@/chat/entities/subscriber.entity';
import { SettingOrmEntity } from '@/setting/entities/setting.entity';
import { SettingService } from '@/setting/services/setting.service';
import { SettingType } from '@/setting/types';
import { ModelOrmEntity } from '@/user/entities/model.entity';
import { PermissionOrmEntity } from '@/user/entities/permission.entity';
Expand Down Expand Up @@ -57,20 +56,9 @@ describe('BlockRepository (TypeORM)', () => {
const createdSettingIds: string[] = [];

beforeAll(async () => {
const settingServiceMock = {
getSettings: jest.fn().mockResolvedValue({
chatbot_settings: {},
}),
};
const testing = await buildTestingMocks({
autoInjectFrom: ['providers'],
providers: [
BlockRepository,
{
provide: SettingService,
useValue: settingServiceMock,
},
],
providers: [BlockRepository],
typeorm: {
entities: [
BlockOrmEntity,
Expand Down
9 changes: 2 additions & 7 deletions packages/api/src/chat/services/bot.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import WebChannelHandler from '@/extensions/channels/web/index.channel';
import { WEB_CHANNEL_NAME } from '@/extensions/channels/web/settings';
import WebEventWrapper from '@/extensions/channels/web/wrapper';
import { HelperService } from '@/helper/helper.service';
import { I18nService } from '@/i18n/services/i18n.service';
import { NlpEntityOrmEntity } from '@/nlp/entities/nlp-entity.entity';
import { NlpSampleEntityOrmEntity } from '@/nlp/entities/nlp-sample-entity.entity';
import { NlpSampleOrmEntity } from '@/nlp/entities/nlp-sample.entity';
Expand All @@ -45,6 +44,7 @@ import {
textBlock,
} from '@/utils/test/mocks/block';
import { conversationGetStarted } from '@/utils/test/mocks/conversation';
import { I18nServiceProvider } from '@/utils/test/providers/i18n-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';

Expand Down Expand Up @@ -88,12 +88,7 @@ describe('BotService', () => {
autoInjectFrom: ['providers'],
providers: [
BotService,
{
provide: I18nService,
useValue: {
t: jest.fn().mockImplementation((t) => t),
},
},
I18nServiceProvider,
{
provide: HelperService,
useValue: helperServiceMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import { SubscriberService } from '@/chat/services/subscriber.service';
import { OutgoingMessageFormat } from '@/chat/types/message';
import { MenuOrmEntity } from '@/cms/entities/menu.entity';
import { MenuService } from '@/cms/services/menu.service';
import { I18nService } from '@/i18n/services/i18n.service';
import { ModelOrmEntity } from '@/user/entities/model.entity';
import { PermissionOrmEntity } from '@/user/entities/permission.entity';
import { RoleOrmEntity } from '@/user/entities/role.entity';
import { UserOrmEntity } from '@/user/entities/user.entity';
import { installLabelGroupFixturesTypeOrm } from '@/utils/test/fixtures/label-group';
import { installMessageFixturesTypeOrm } from '@/utils/test/fixtures/message';
import { I18nServiceProvider } from '@/utils/test/providers/i18n-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';
import { SocketRequest } from '@/websocket/utils/socket-request';
Expand Down Expand Up @@ -77,12 +77,7 @@ describe('WebChannelHandler', () => {
providers: [
JwtService,
WebChannelHandler,
{
provide: I18nService,
useValue: {
t: jest.fn().mockImplementation((t) => t),
},
},
I18nServiceProvider,
{
provide: MenuService,
useValue: menuServiceMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import { MessageService } from '@/chat/services/message.service';
import { IncomingMessageType, StdEventType } from '@/chat/types/message';
import { MenuOrmEntity } from '@/cms/entities/menu.entity';
import { MenuService } from '@/cms/services/menu.service';
import { I18nService } from '@/i18n/services/i18n.service';
import { ModelOrmEntity } from '@/user/entities/model.entity';
import { PermissionOrmEntity } from '@/user/entities/permission.entity';
import { RoleOrmEntity } from '@/user/entities/role.entity';
import { UserOrmEntity } from '@/user/entities/user.entity';
import { installSubscriberFixturesTypeOrm } from '@/utils/test/fixtures/subscriber';
import { I18nServiceProvider } from '@/utils/test/providers/i18n-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';
import { WebsocketGateway } from '@/websocket/websocket.gateway';
Expand Down Expand Up @@ -71,12 +71,7 @@ describe(`Web event wrapper`, () => {
providers: [
JwtService,
WebChannelHandler,
{
provide: I18nService,
useValue: {
t: jest.fn().mockImplementation((t) => t),
},
},
I18nServiceProvider,
{
provide: MenuService,
useValue: menuServiceMock,
Expand Down
16 changes: 0 additions & 16 deletions packages/api/src/i18n/controllers/translation.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { BlockRepository } from '@/chat/repositories/block.repository';
import { ConversationRepository } from '@/chat/repositories/conversation.repository';
import { BlockService } from '@/chat/services/block.service';
import { PluginService } from '@/plugins/plugins.service';
import { SettingService } from '@/setting/services/setting.service';
import { NOT_FOUND_ID } from '@/utils/constants/mock';
import { installLanguageFixturesTypeOrm } from '@/utils/test/fixtures/language';
import {
Expand All @@ -26,7 +25,6 @@ import { LanguageOrmEntity } from '../entities/language.entity';
import { TranslationOrmEntity } from '../entities/translation.entity';
import { LanguageRepository } from '../repositories/language.repository';
import { TranslationRepository } from '../repositories/translation.repository';
import { I18nService } from '../services/i18n.service';
import { LanguageService } from '../services/language.service';
import { TranslationService } from '../services/translation.service';

Expand All @@ -45,13 +43,6 @@ describe('TranslationController', () => {
TranslationRepository,
LanguageService,
LanguageRepository,
{
provide: I18nService,
useValue: {
t: jest.fn().mockImplementation((t) => t),
refreshDynamicTranslations: jest.fn(),
},
},
{
provide: BlockService,
useValue: {
Expand All @@ -71,13 +62,6 @@ describe('TranslationController', () => {
find: jest.fn(),
},
},
{
provide: SettingService,
useValue: {
find: jest.fn().mockResolvedValue([]),
getSettings: jest.fn().mockResolvedValue({}),
},
},
{
provide: PluginService,
useValue: {
Expand Down
37 changes: 2 additions & 35 deletions packages/api/src/i18n/services/translation.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { I18nService } from '@/i18n/services/i18n.service';
import { BasePlugin } from '@/plugins/base-plugin.service';
import { PluginService } from '@/plugins/plugins.service';
import { PluginBlockTemplate } from '@/plugins/types';
import { SettingService } from '@/setting/services/setting.service';
import { SettingType } from '@/setting/types';
import { SettingServiceProvider } from '@/utils/test/providers/setting-service.provider';
import { buildTestingMocks } from '@/utils/test/utils';

import { Block } from '../../chat/dto/block.dto';
Expand Down Expand Up @@ -63,40 +63,7 @@ describe('TranslationService', () => {
]),
},
},
{
provide: SettingService,
useValue: {
getSettings: jest.fn().mockResolvedValue({
chatbot_settings: {
global_fallback: true,
fallback_message: ['Global fallback message'],
},
}),
find: jest
.fn()
.mockImplementation((criteria: { translatable?: boolean }) =>
[
{
translatable: true,
group: 'default',
value: 'Global fallback message',
label: 'fallback_message',
type: SettingType.text,
},
].filter((s) =>
criteria && 'translatable' in criteria
? s.translatable === criteria.translatable
: true,
),
),
},
},
{
provide: I18nService,
useValue: {
refreshDynamicTranslations: jest.fn(),
},
},
SettingServiceProvider,
],
});
[service, i18nService, pluginService] = await getMocks([
Expand Down
17 changes: 2 additions & 15 deletions packages/api/src/nlp/repositories/nlp-entity.repository.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { In } from 'typeorm';

import LlmNluHelper from '@/extensions/helpers/llm-nlu/index.helper';
import { HelperService } from '@/helper/helper.service';
import { SettingService } from '@/setting/services/setting.service';
import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
import { installNlpValueFixturesTypeOrm } from '@/utils/test/fixtures/nlpvalue';
import { SettingServiceProvider } from '@/utils/test/providers/setting-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';

Expand Down Expand Up @@ -41,20 +41,7 @@ describe('NlpEntityRepository (TypeORM)', () => {
beforeAll(async () => {
const testing = await buildTestingMocks({
autoInjectFrom: ['providers'],
providers: [
NlpService,
LlmNluHelper,
{
provide: SettingService,
useValue: {
getSettings: jest.fn(() => ({
chatbot_settings: {
default_nlu_helper: 'llm-nlu-helper',
},
})),
},
},
],
providers: [NlpService, LlmNluHelper, SettingServiceProvider],
typeorm: {
entities: [
NlpEntityOrmEntity,
Expand Down
13 changes: 2 additions & 11 deletions packages/api/src/nlp/repositories/nlp-value.repository.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { TestingModule } from '@nestjs/testing';
import LlmNluHelper from '@/extensions/helpers/llm-nlu/index.helper';
import { HelperService } from '@/helper/helper.service';
import { LanguageOrmEntity } from '@/i18n/entities/language.entity';
import { SettingService } from '@/setting/services/setting.service';
import { installNlpSampleEntityFixturesTypeOrm } from '@/utils/test/fixtures/nlpsampleentity';
import { SettingServiceProvider } from '@/utils/test/providers/setting-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';
import { Format } from '@/utils/types/format.types';
Expand Down Expand Up @@ -49,16 +49,7 @@ describe('NlpValueRepository (TypeORM)', () => {
NlpService,
NlpValueService,
LlmNluHelper,
{
provide: SettingService,
useValue: {
getSettings: jest.fn(() => ({
chatbot_settings: {
default_nlu_helper: 'llm-nlu-helper',
},
})),
},
},
SettingServiceProvider,
],
typeorm: {
entities: [
Expand Down
11 changes: 0 additions & 11 deletions packages/api/src/nlp/services/nlp.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { TestingModule } from '@nestjs/testing';

import LlmNluHelper from '@/extensions/helpers/llm-nlu/index.helper';
import { HelperService } from '@/helper/helper.service';
import { SettingService } from '@/setting/services/setting.service';
import { installNlpSampleEntityFixturesTypeOrm } from '@/utils/test/fixtures/nlpsampleentity';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';
Expand Down Expand Up @@ -38,16 +37,6 @@ describe('NlpService (TypeORM)', () => {
NlpValueService,
NlpSampleEntityService,
LlmNluHelper,
{
provide: SettingService,
useValue: {
getSettings: jest.fn(() => ({
chatbot_settings: {
default_nlu_helper: 'llm-nlu-helper',
},
})),
},
},
],
typeorm: {
entities: [
Expand Down
11 changes: 2 additions & 9 deletions packages/api/src/setting/controllers/setting.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

import { TestingModule } from '@nestjs/testing';

import { I18nService } from '@/i18n/services/i18n.service';
import {
installSettingFixturesTypeOrm,
settingFixtures,
} from '@/utils/test/fixtures/setting';
import { I18nServiceProvider } from '@/utils/test/providers/i18n-service.provider';
import { closeTypeOrmConnections } from '@/utils/test/test';
import { buildTestingMocks } from '@/utils/test/utils';

Expand All @@ -34,14 +34,7 @@ describe('SettingController', () => {
const { module: testingModule, getMocks } = await buildTestingMocks({
autoInjectFrom: ['controllers'],
controllers: [SettingController],
providers: [
{
provide: I18nService,
useValue: {
t: jest.fn().mockImplementation((t) => t),
},
},
],
providers: [I18nServiceProvider],
typeorm: {
fixtures: installSettingFixturesTypeOrm,
},
Expand Down
Loading
Loading