diff --git a/api/src/chat/dto/block.dto.ts b/api/src/chat/dto/block.dto.ts index 02ec4f30..3b2da43e 100644 --- a/api/src/chat/dto/block.dto.ts +++ b/api/src/chat/dto/block.dto.ts @@ -148,6 +148,6 @@ export class BlockUpdateDto extends PartialType( trigger_channels?: string[]; } -export type BlockDTOMapActions = DtoConfig<{ +export type BlockDto = DtoConfig<{ create: BlockCreateDto; }>; diff --git a/api/src/chat/dto/category.dto.ts b/api/src/chat/dto/category.dto.ts index 0a857d6d..487483a4 100644 --- a/api/src/chat/dto/category.dto.ts +++ b/api/src/chat/dto/category.dto.ts @@ -42,6 +42,6 @@ export class CategoryCreateDto { export class CategoryUpdateDto extends PartialType(CategoryCreateDto) {} -export type CategoryDTOMapActions = DtoConfig<{ +export type CategoryDto = DtoConfig<{ create: CategoryCreateDto; }>; diff --git a/api/src/chat/dto/context-var.dto.ts b/api/src/chat/dto/context-var.dto.ts index fcef8d64..37ec6440 100644 --- a/api/src/chat/dto/context-var.dto.ts +++ b/api/src/chat/dto/context-var.dto.ts @@ -30,6 +30,6 @@ export class ContextVarCreateDto { export class ContextVarUpdateDto extends PartialType(ContextVarCreateDto) {} -export type ContextVarDTOMapActions = DtoConfig<{ +export type ContextVarDto = DtoConfig<{ create: ContextVarCreateDto; }>; diff --git a/api/src/chat/dto/conversation.dto.ts b/api/src/chat/dto/conversation.dto.ts index 19b5fdd2..3567c593 100644 --- a/api/src/chat/dto/conversation.dto.ts +++ b/api/src/chat/dto/conversation.dto.ts @@ -58,6 +58,6 @@ export class ConversationCreateDto { next?: string[]; } -export type ConversationDtoMapActions = DtoConfig<{ +export type ConversationDto = DtoConfig<{ create: ConversationCreateDto; }>; diff --git a/api/src/chat/dto/label.dto.ts b/api/src/chat/dto/label.dto.ts index 8db0938b..b6c5d3c4 100644 --- a/api/src/chat/dto/label.dto.ts +++ b/api/src/chat/dto/label.dto.ts @@ -42,6 +42,6 @@ export class LabelCreateDto { export class LabelUpdateDto extends PartialType(LabelCreateDto) {} -export type LabelDtoMapActions = DtoConfig<{ +export type LabelDto = DtoConfig<{ create: LabelCreateDto; }>; diff --git a/api/src/chat/dto/subscriber.dto.ts b/api/src/chat/dto/subscriber.dto.ts index 7b8a5bd2..c23222d9 100644 --- a/api/src/chat/dto/subscriber.dto.ts +++ b/api/src/chat/dto/subscriber.dto.ts @@ -116,6 +116,6 @@ export class SubscriberCreateDto { export class SubscriberUpdateDto extends PartialType(SubscriberCreateDto) {} -export type UserDtoMapActions = DtoConfig<{ +export type UserDto = DtoConfig<{ create: SubscriberCreateDto; }>; diff --git a/api/src/chat/repositories/block.repository.ts b/api/src/chat/repositories/block.repository.ts index 2b33e5b9..14cf333f 100644 --- a/api/src/chat/repositories/block.repository.ts +++ b/api/src/chat/repositories/block.repository.ts @@ -22,11 +22,7 @@ import { LoggerService } from '@/logger/logger.service'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { - BlockCreateDto, - BlockDTOMapActions, - BlockUpdateDto, -} from '../dto/block.dto'; +import { BlockCreateDto, BlockDto, BlockUpdateDto } from '../dto/block.dto'; import { Block, BLOCK_POPULATE, @@ -39,7 +35,7 @@ export class BlockRepository extends BaseRepository< Block, BlockPopulate, BlockFull, - BlockDTOMapActions + BlockDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/chat/repositories/category.repository.ts b/api/src/chat/repositories/category.repository.ts index f27f05ac..3188352d 100644 --- a/api/src/chat/repositories/category.repository.ts +++ b/api/src/chat/repositories/category.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { CategoryDTOMapActions } from '../dto/category.dto'; +import { CategoryDto } from '../dto/category.dto'; import { Category } from '../schemas/category.schema'; import { BlockService } from '../services/block.service'; @@ -23,7 +23,7 @@ export class CategoryRepository extends BaseRepository< Category, never, never, - CategoryDTOMapActions + CategoryDto > { private readonly blockService: BlockService; diff --git a/api/src/chat/repositories/context-var.repository.ts b/api/src/chat/repositories/context-var.repository.ts index 3b7e397e..20ea8640 100644 --- a/api/src/chat/repositories/context-var.repository.ts +++ b/api/src/chat/repositories/context-var.repository.ts @@ -19,7 +19,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { ContextVarDTOMapActions } from '../dto/context-var.dto'; +import { ContextVarDto } from '../dto/context-var.dto'; import { ContextVar } from '../schemas/context-var.schema'; import { BlockService } from '../services/block.service'; @@ -28,7 +28,7 @@ export class ContextVarRepository extends BaseRepository< ContextVar, never, never, - ContextVarDTOMapActions + ContextVarDto > { private readonly blockService: BlockService; diff --git a/api/src/chat/repositories/conversation.repository.ts b/api/src/chat/repositories/conversation.repository.ts index fcf216cd..52995fb7 100644 --- a/api/src/chat/repositories/conversation.repository.ts +++ b/api/src/chat/repositories/conversation.repository.ts @@ -13,7 +13,7 @@ import { Model } from 'mongoose'; import { BaseRepository } from '@/utils/generics/base-repository'; -import { ConversationDtoMapActions } from '../dto/conversation.dto'; +import { ConversationDto } from '../dto/conversation.dto'; import { Conversation, CONVERSATION_POPULATE, @@ -26,7 +26,7 @@ export class ConversationRepository extends BaseRepository< Conversation, ConversationPopulate, ConversationFull, - ConversationDtoMapActions + ConversationDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/chat/repositories/label.repository.ts b/api/src/chat/repositories/label.repository.ts index 13d67ce1..655ec6d0 100644 --- a/api/src/chat/repositories/label.repository.ts +++ b/api/src/chat/repositories/label.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { LabelDtoMapActions } from '../dto/label.dto'; +import { LabelDto } from '../dto/label.dto'; import { Label, LABEL_POPULATE, @@ -28,7 +28,7 @@ export class LabelRepository extends BaseRepository< Label, LabelPopulate, LabelFull, - LabelDtoMapActions + LabelDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/chat/repositories/subscriber.repository.ts b/api/src/chat/repositories/subscriber.repository.ts index 34bd5d71..367f873b 100644 --- a/api/src/chat/repositories/subscriber.repository.ts +++ b/api/src/chat/repositories/subscriber.repository.ts @@ -20,7 +20,7 @@ import { import { BaseRepository } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { SubscriberUpdateDto, UserDtoMapActions } from '../dto/subscriber.dto'; +import { SubscriberUpdateDto, UserDto } from '../dto/subscriber.dto'; import { Subscriber, SUBSCRIBER_POPULATE, @@ -34,7 +34,7 @@ export class SubscriberRepository extends BaseRepository< Subscriber, SubscriberPopulate, SubscriberFull, - UserDtoMapActions + UserDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/chat/seeds/category.seed.ts b/api/src/chat/seeds/category.seed.ts index 034f9623..5134fc4c 100644 --- a/api/src/chat/seeds/category.seed.ts +++ b/api/src/chat/seeds/category.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { CategoryDTOMapActions } from '../dto/category.dto'; +import { CategoryDto } from '../dto/category.dto'; import { CategoryRepository } from '../repositories/category.repository'; import { Category } from '../schemas/category.schema'; @@ -19,7 +19,7 @@ export class CategorySeeder extends BaseSeeder< Category, never, never, - CategoryDTOMapActions + CategoryDto > { constructor(private readonly categoryRepository: CategoryRepository) { super(categoryRepository); diff --git a/api/src/chat/seeds/context-var.seed.ts b/api/src/chat/seeds/context-var.seed.ts index b654f89d..813581ef 100644 --- a/api/src/chat/seeds/context-var.seed.ts +++ b/api/src/chat/seeds/context-var.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { ContextVarDTOMapActions } from '../dto/context-var.dto'; +import { ContextVarDto } from '../dto/context-var.dto'; import { ContextVarRepository } from '../repositories/context-var.repository'; import { ContextVar } from '../schemas/context-var.schema'; @@ -19,7 +19,7 @@ export class ContextVarSeeder extends BaseSeeder< ContextVar, never, never, - ContextVarDTOMapActions + ContextVarDto > { constructor(private readonly contextVarRepository: ContextVarRepository) { super(contextVarRepository); diff --git a/api/src/chat/services/block.service.ts b/api/src/chat/services/block.service.ts index 42db00a2..44ebb732 100644 --- a/api/src/chat/services/block.service.ts +++ b/api/src/chat/services/block.service.ts @@ -22,7 +22,7 @@ import { SettingService } from '@/setting/services/setting.service'; import { BaseService } from '@/utils/generics/base-service'; import { getRandom } from '@/utils/helpers/safeRandom'; -import { BlockDTOMapActions } from '../dto/block.dto'; +import { BlockDto } from '../dto/block.dto'; import { BlockRepository } from '../repositories/block.repository'; import { Block, BlockFull, BlockPopulate } from '../schemas/block.schema'; import { Context } from '../schemas/types/context'; @@ -40,7 +40,7 @@ export class BlockService extends BaseService< Block, BlockPopulate, BlockFull, - BlockDTOMapActions + BlockDto > { constructor( readonly repository: BlockRepository, diff --git a/api/src/chat/services/category.service.ts b/api/src/chat/services/category.service.ts index 8bb4472e..85ceca21 100644 --- a/api/src/chat/services/category.service.ts +++ b/api/src/chat/services/category.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { CategoryDTOMapActions } from '../dto/category.dto'; +import { CategoryDto } from '../dto/category.dto'; import { CategoryRepository } from '../repositories/category.repository'; import { Category } from '../schemas/category.schema'; @@ -19,7 +19,7 @@ export class CategoryService extends BaseService< Category, never, never, - CategoryDTOMapActions + CategoryDto > { constructor(readonly repository: CategoryRepository) { super(repository); diff --git a/api/src/chat/services/context-var.service.ts b/api/src/chat/services/context-var.service.ts index 03baf9f5..d93f96d5 100644 --- a/api/src/chat/services/context-var.service.ts +++ b/api/src/chat/services/context-var.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { ContextVarDTOMapActions } from '../dto/context-var.dto'; +import { ContextVarDto } from '../dto/context-var.dto'; import { ContextVarRepository } from '../repositories/context-var.repository'; import { Block, BlockFull } from '../schemas/block.schema'; import { ContextVar } from '../schemas/context-var.schema'; @@ -20,7 +20,7 @@ export class ContextVarService extends BaseService< ContextVar, never, never, - ContextVarDTOMapActions + ContextVarDto > { constructor(readonly repository: ContextVarRepository) { super(repository); diff --git a/api/src/chat/services/conversation.service.ts b/api/src/chat/services/conversation.service.ts index f0d36f6a..035c54fc 100644 --- a/api/src/chat/services/conversation.service.ts +++ b/api/src/chat/services/conversation.service.ts @@ -12,7 +12,7 @@ import EventWrapper from '@/channel/lib/EventWrapper'; import { LoggerService } from '@/logger/logger.service'; import { BaseService } from '@/utils/generics/base-service'; -import { ConversationDtoMapActions } from '../dto/conversation.dto'; +import { ConversationDto } from '../dto/conversation.dto'; import { VIEW_MORE_PAYLOAD } from '../helpers/constants'; import { ConversationRepository } from '../repositories/conversation.repository'; import { Block, BlockFull } from '../schemas/block.schema'; @@ -32,7 +32,7 @@ export class ConversationService extends BaseService< Conversation, ConversationPopulate, ConversationFull, - ConversationDtoMapActions + ConversationDto > { constructor( readonly repository: ConversationRepository, diff --git a/api/src/chat/services/label.service.ts b/api/src/chat/services/label.service.ts index b4833ee2..976f273c 100644 --- a/api/src/chat/services/label.service.ts +++ b/api/src/chat/services/label.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { LabelDtoMapActions } from '../dto/label.dto'; +import { LabelDto } from '../dto/label.dto'; import { LabelRepository } from '../repositories/label.repository'; import { Label, LabelFull, LabelPopulate } from '../schemas/label.schema'; @@ -19,7 +19,7 @@ export class LabelService extends BaseService< Label, LabelPopulate, LabelFull, - LabelDtoMapActions + LabelDto > { constructor(readonly repository: LabelRepository) { super(repository); diff --git a/api/src/chat/services/subscriber.service.ts b/api/src/chat/services/subscriber.service.ts index b822fa61..e1552265 100644 --- a/api/src/chat/services/subscriber.service.ts +++ b/api/src/chat/services/subscriber.service.ts @@ -28,7 +28,7 @@ import { SocketRequest } from '@/websocket/utils/socket-request'; import { SocketResponse } from '@/websocket/utils/socket-response'; import { WebsocketGateway } from '@/websocket/websocket.gateway'; -import { SubscriberUpdateDto, UserDtoMapActions } from '../dto/subscriber.dto'; +import { SubscriberUpdateDto, UserDto } from '../dto/subscriber.dto'; import { SubscriberRepository } from '../repositories/subscriber.repository'; import { Subscriber, @@ -41,7 +41,7 @@ export class SubscriberService extends BaseService< Subscriber, SubscriberPopulate, SubscriberFull, - UserDtoMapActions + UserDto > { private readonly gateway: WebsocketGateway; diff --git a/api/src/cms/dto/content.dto.ts b/api/src/cms/dto/content.dto.ts index de49ccd4..4eb4dae4 100644 --- a/api/src/cms/dto/content.dto.ts +++ b/api/src/cms/dto/content.dto.ts @@ -36,6 +36,6 @@ export class ContentCreateDto { export class ContentUpdateDto extends PartialType(ContentCreateDto) {} -export type ContentDTOMapActions = DtoConfig<{ +export type ContentDto = DtoConfig<{ create: ContentCreateDto; }>; diff --git a/api/src/cms/dto/contentType.dto.ts b/api/src/cms/dto/contentType.dto.ts index 81f09c98..f4f2ae25 100644 --- a/api/src/cms/dto/contentType.dto.ts +++ b/api/src/cms/dto/contentType.dto.ts @@ -58,6 +58,6 @@ export class ContentTypeCreateDto { export class ContentTypeUpdateDto extends PartialType(ContentTypeCreateDto) {} -export type ContentTypeDtoMapActions = DtoConfig<{ +export type ContentTypeDto = DtoConfig<{ create: ContentTypeCreateDto; }>; diff --git a/api/src/cms/dto/menu.dto.ts b/api/src/cms/dto/menu.dto.ts index 7eaeafb0..892acb18 100644 --- a/api/src/cms/dto/menu.dto.ts +++ b/api/src/cms/dto/menu.dto.ts @@ -55,6 +55,6 @@ export class MenuCreateDto { export class MenuQueryDto extends PartialType(MenuCreateDto) {} -export type MenuDTOMapActions = DtoConfig<{ +export type MenuDto = DtoConfig<{ create: MenuCreateDto; }>; diff --git a/api/src/cms/repositories/content-type.repository.ts b/api/src/cms/repositories/content-type.repository.ts index 6681c3e8..9ee6d510 100644 --- a/api/src/cms/repositories/content-type.repository.ts +++ b/api/src/cms/repositories/content-type.repository.ts @@ -15,7 +15,7 @@ import { BlockService } from '@/chat/services/block.service'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { ContentTypeDtoMapActions } from '../dto/contentType.dto'; +import { ContentTypeDto } from '../dto/contentType.dto'; import { ContentType } from '../schemas/content-type.schema'; import { Content } from '../schemas/content.schema'; @@ -24,7 +24,7 @@ export class ContentTypeRepository extends BaseRepository< ContentType, never, never, - ContentTypeDtoMapActions + ContentTypeDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/cms/repositories/content.repository.ts b/api/src/cms/repositories/content.repository.ts index b6f7e954..5fd38905 100644 --- a/api/src/cms/repositories/content.repository.ts +++ b/api/src/cms/repositories/content.repository.ts @@ -21,7 +21,7 @@ import { import { BaseRepository } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { ContentDTOMapActions } from '../dto/content.dto'; +import { ContentDto } from '../dto/content.dto'; import { Content, CONTENT_POPULATE, @@ -34,7 +34,7 @@ export class ContentRepository extends BaseRepository< Content, ContentPopulate, ContentFull, - ContentDTOMapActions + ContentDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/cms/repositories/menu.repository.ts b/api/src/cms/repositories/menu.repository.ts index d9fef68b..65408f50 100644 --- a/api/src/cms/repositories/menu.repository.ts +++ b/api/src/cms/repositories/menu.repository.ts @@ -13,7 +13,7 @@ import { Model } from 'mongoose'; import { BaseRepository } from '@/utils/generics/base-repository'; -import { MenuDTOMapActions } from '../dto/menu.dto'; +import { MenuDto } from '../dto/menu.dto'; import { Menu, MENU_POPULATE, @@ -28,7 +28,7 @@ export class MenuRepository extends BaseRepository< Menu, MenuPopulate, MenuFull, - MenuDTOMapActions + MenuDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/cms/services/content-type.service.ts b/api/src/cms/services/content-type.service.ts index d654d875..2c98d988 100644 --- a/api/src/cms/services/content-type.service.ts +++ b/api/src/cms/services/content-type.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { ContentTypeDtoMapActions } from '../dto/contentType.dto'; +import { ContentTypeDto } from '../dto/contentType.dto'; import { ContentTypeRepository } from '../repositories/content-type.repository'; import { ContentType } from '../schemas/content-type.schema'; @@ -19,7 +19,7 @@ export class ContentTypeService extends BaseService< ContentType, never, never, - ContentTypeDtoMapActions + ContentTypeDto > { constructor(readonly repository: ContentTypeRepository) { super(repository); diff --git a/api/src/cms/services/content.service.ts b/api/src/cms/services/content.service.ts index 4a0f5fee..7b78bbe5 100644 --- a/api/src/cms/services/content.service.ts +++ b/api/src/cms/services/content.service.ts @@ -19,7 +19,7 @@ import { LoggerService } from '@/logger/logger.service'; import { BaseService } from '@/utils/generics/base-service'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { ContentDTOMapActions } from '../dto/content.dto'; +import { ContentDto } from '../dto/content.dto'; import { ContentRepository } from '../repositories/content.repository'; import { Content, @@ -32,7 +32,7 @@ export class ContentService extends BaseService< Content, ContentPopulate, ContentFull, - ContentDTOMapActions + ContentDto > { constructor( readonly repository: ContentRepository, diff --git a/api/src/cms/services/menu.service.ts b/api/src/cms/services/menu.service.ts index ccb7b234..794ae22d 100644 --- a/api/src/cms/services/menu.service.ts +++ b/api/src/cms/services/menu.service.ts @@ -20,7 +20,7 @@ import { MENU_CACHE_KEY } from '@/utils/constants/cache'; import { Cacheable } from '@/utils/decorators/cacheable.decorator'; import { BaseService } from '@/utils/generics/base-service'; -import { MenuCreateDto, MenuDTOMapActions } from '../dto/menu.dto'; +import { MenuCreateDto, MenuDto } from '../dto/menu.dto'; import { MenuRepository } from '../repositories/menu.repository'; import { Menu, MenuFull, MenuPopulate } from '../schemas/menu.schema'; import { AnyMenu, MenuTree, MenuType } from '../schemas/types/menu'; @@ -30,7 +30,7 @@ export class MenuService extends BaseService< Menu, MenuPopulate, MenuFull, - MenuDTOMapActions + MenuDto > { private RootSymbol: symbol = Symbol('RootMenu'); diff --git a/api/src/i18n/dto/language.dto.ts b/api/src/i18n/dto/language.dto.ts index 868068f7..7f3f6325 100644 --- a/api/src/i18n/dto/language.dto.ts +++ b/api/src/i18n/dto/language.dto.ts @@ -35,6 +35,6 @@ export class LanguageCreateDto { export class LanguageUpdateDto extends PartialType(LanguageCreateDto) {} -export type LanguageDTOMapActions = DtoConfig<{ +export type LanguageDto = DtoConfig<{ create: LanguageCreateDto; }>; diff --git a/api/src/i18n/repositories/language.repository.ts b/api/src/i18n/repositories/language.repository.ts index 6d42d22e..a3d5cfd4 100644 --- a/api/src/i18n/repositories/language.repository.ts +++ b/api/src/i18n/repositories/language.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { LanguageDTOMapActions } from '../dto/language.dto'; +import { LanguageDto } from '../dto/language.dto'; import { Language } from '../schemas/language.schema'; @Injectable() @@ -22,7 +22,7 @@ export class LanguageRepository extends BaseRepository< Language, never, never, - LanguageDTOMapActions + LanguageDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/i18n/seeds/language.seed.ts b/api/src/i18n/seeds/language.seed.ts index da5fc2f0..b7ca63e3 100644 --- a/api/src/i18n/seeds/language.seed.ts +++ b/api/src/i18n/seeds/language.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { LanguageDTOMapActions } from '../dto/language.dto'; +import { LanguageDto } from '../dto/language.dto'; import { LanguageRepository } from '../repositories/language.repository'; import { Language } from '../schemas/language.schema'; @@ -19,7 +19,7 @@ export class LanguageSeeder extends BaseSeeder< Language, never, never, - LanguageDTOMapActions + LanguageDto > { constructor(private readonly languageRepository: LanguageRepository) { super(languageRepository); diff --git a/api/src/i18n/services/language.service.ts b/api/src/i18n/services/language.service.ts index 542a62a8..de312cf6 100644 --- a/api/src/i18n/services/language.service.ts +++ b/api/src/i18n/services/language.service.ts @@ -21,7 +21,7 @@ import { import { Cacheable } from '@/utils/decorators/cacheable.decorator'; import { BaseService } from '@/utils/generics/base-service'; -import { LanguageDTOMapActions } from '../dto/language.dto'; +import { LanguageDto } from '../dto/language.dto'; import { LanguageRepository } from '../repositories/language.repository'; import { Language } from '../schemas/language.schema'; @@ -30,7 +30,7 @@ export class LanguageService extends BaseService< Language, never, never, - LanguageDTOMapActions + LanguageDto > { constructor( readonly repository: LanguageRepository, diff --git a/api/src/nlp/dto/nlp-entity.dto.ts b/api/src/nlp/dto/nlp-entity.dto.ts index 4390b4f1..009b1841 100644 --- a/api/src/nlp/dto/nlp-entity.dto.ts +++ b/api/src/nlp/dto/nlp-entity.dto.ts @@ -49,6 +49,6 @@ export class NlpEntityCreateDto { builtin?: boolean; } -export type NlpEntityDTOMapActions = DtoConfig<{ +export type NlpEntityDto = DtoConfig<{ create: NlpEntityCreateDto; }>; diff --git a/api/src/nlp/dto/nlp-sample.dto.ts b/api/src/nlp/dto/nlp-sample.dto.ts index ea24cc75..2f88ed68 100644 --- a/api/src/nlp/dto/nlp-sample.dto.ts +++ b/api/src/nlp/dto/nlp-sample.dto.ts @@ -65,6 +65,6 @@ export class NlpSampleDto extends NlpSampleCreateDto { export class NlpSampleUpdateDto extends PartialType(NlpSampleCreateDto) {} -export type NlpSampleDTOMapActions = DtoConfig<{ +export type TNlpSampleDto = DtoConfig<{ create: NlpSampleCreateDto; }>; diff --git a/api/src/nlp/dto/nlp-value.dto.ts b/api/src/nlp/dto/nlp-value.dto.ts index 46d2deca..3848718c 100644 --- a/api/src/nlp/dto/nlp-value.dto.ts +++ b/api/src/nlp/dto/nlp-value.dto.ts @@ -54,6 +54,6 @@ export class NlpValueCreateDto { export class NlpValueUpdateDto extends PartialType(NlpValueCreateDto) {} -export type NlpValueDTOMapActions = DtoConfig<{ +export type NlpValueDto = DtoConfig<{ create: NlpValueCreateDto; }>; diff --git a/api/src/nlp/repositories/nlp-entity.repository.ts b/api/src/nlp/repositories/nlp-entity.repository.ts index b9a0c10a..36b57bef 100644 --- a/api/src/nlp/repositories/nlp-entity.repository.ts +++ b/api/src/nlp/repositories/nlp-entity.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { NlpEntityDTOMapActions } from '../dto/nlp-entity.dto'; +import { NlpEntityDto } from '../dto/nlp-entity.dto'; import { NLP_ENTITY_POPULATE, NlpEntity, @@ -31,7 +31,7 @@ export class NlpEntityRepository extends BaseRepository< NlpEntity, NlpEntityPopulate, NlpEntityFull, - NlpEntityDTOMapActions + NlpEntityDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/nlp/repositories/nlp-sample.repository.ts b/api/src/nlp/repositories/nlp-sample.repository.ts index 3d300966..0536bde6 100644 --- a/api/src/nlp/repositories/nlp-sample.repository.ts +++ b/api/src/nlp/repositories/nlp-sample.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { NlpSampleDTOMapActions } from '../dto/nlp-sample.dto'; +import { TNlpSampleDto } from '../dto/nlp-sample.dto'; import { NLP_SAMPLE_POPULATE, NlpSample, @@ -29,7 +29,7 @@ export class NlpSampleRepository extends BaseRepository< NlpSample, NlpSamplePopulate, NlpSampleFull, - NlpSampleDTOMapActions + TNlpSampleDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/nlp/repositories/nlp-value.repository.ts b/api/src/nlp/repositories/nlp-value.repository.ts index a99f5d22..e7839bf1 100644 --- a/api/src/nlp/repositories/nlp-value.repository.ts +++ b/api/src/nlp/repositories/nlp-value.repository.ts @@ -14,7 +14,7 @@ import { Document, Model, Query } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { NlpValueDTOMapActions } from '../dto/nlp-value.dto'; +import { NlpValueDto } from '../dto/nlp-value.dto'; import { NLP_VALUE_POPULATE, NlpValue, @@ -30,7 +30,7 @@ export class NlpValueRepository extends BaseRepository< NlpValue, NlpValuePopulate, NlpValueFull, - NlpValueDTOMapActions + NlpValueDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/nlp/seeds/nlp-entity.seed.ts b/api/src/nlp/seeds/nlp-entity.seed.ts index 4e4e008d..f9be033f 100644 --- a/api/src/nlp/seeds/nlp-entity.seed.ts +++ b/api/src/nlp/seeds/nlp-entity.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { NlpEntityDTOMapActions } from '../dto/nlp-entity.dto'; +import { NlpEntityDto } from '../dto/nlp-entity.dto'; import { NlpEntityRepository } from '../repositories/nlp-entity.repository'; import { NlpEntity, @@ -23,7 +23,7 @@ export class NlpEntitySeeder extends BaseSeeder< NlpEntity, NlpEntityPopulate, NlpEntityFull, - NlpEntityDTOMapActions + NlpEntityDto > { constructor(nlpEntityRepository: NlpEntityRepository) { super(nlpEntityRepository); diff --git a/api/src/nlp/seeds/nlp-value.seed.ts b/api/src/nlp/seeds/nlp-value.seed.ts index 3caba199..d8fd5f7a 100644 --- a/api/src/nlp/seeds/nlp-value.seed.ts +++ b/api/src/nlp/seeds/nlp-value.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { NlpValueCreateDto, NlpValueDTOMapActions } from '../dto/nlp-value.dto'; +import { NlpValueCreateDto, NlpValueDto } from '../dto/nlp-value.dto'; import { NlpEntityRepository } from '../repositories/nlp-entity.repository'; import { NlpValueRepository } from '../repositories/nlp-value.repository'; import { @@ -24,7 +24,7 @@ export class NlpValueSeeder extends BaseSeeder< NlpValue, NlpValuePopulate, NlpValueFull, - NlpValueDTOMapActions + NlpValueDto > { constructor( nlpValueRepository: NlpValueRepository, diff --git a/api/src/nlp/services/nlp-entity.service.ts b/api/src/nlp/services/nlp-entity.service.ts index 766b5791..e8531e95 100644 --- a/api/src/nlp/services/nlp-entity.service.ts +++ b/api/src/nlp/services/nlp-entity.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { Lookup, NlpEntityDTOMapActions } from '../dto/nlp-entity.dto'; +import { Lookup, NlpEntityDto } from '../dto/nlp-entity.dto'; import { NlpEntityRepository } from '../repositories/nlp-entity.repository'; import { NlpEntity, @@ -26,7 +26,7 @@ export class NlpEntityService extends BaseService< NlpEntity, NlpEntityPopulate, NlpEntityFull, - NlpEntityDTOMapActions + NlpEntityDto > { constructor( readonly repository: NlpEntityRepository, diff --git a/api/src/nlp/services/nlp-sample.service.ts b/api/src/nlp/services/nlp-sample.service.ts index b66e1cf3..5392e934 100644 --- a/api/src/nlp/services/nlp-sample.service.ts +++ b/api/src/nlp/services/nlp-sample.service.ts @@ -21,10 +21,7 @@ import { LoggerService } from '@/logger/logger.service'; import { BaseService } from '@/utils/generics/base-service'; import { THydratedDocument } from '@/utils/types/filter.types'; -import { - NlpSampleCreateDto, - NlpSampleDTOMapActions, -} from '../dto/nlp-sample.dto'; +import { NlpSampleCreateDto, TNlpSampleDto } from '../dto/nlp-sample.dto'; import { NlpSampleRepository } from '../repositories/nlp-sample.repository'; import { NlpSample, @@ -41,7 +38,7 @@ export class NlpSampleService extends BaseService< NlpSample, NlpSamplePopulate, NlpSampleFull, - NlpSampleDTOMapActions + TNlpSampleDto > { constructor( readonly repository: NlpSampleRepository, diff --git a/api/src/nlp/services/nlp-value.service.ts b/api/src/nlp/services/nlp-value.service.ts index 13423967..d6a51b6d 100644 --- a/api/src/nlp/services/nlp-value.service.ts +++ b/api/src/nlp/services/nlp-value.service.ts @@ -13,7 +13,7 @@ import { BaseService } from '@/utils/generics/base-service'; import { NlpValueCreateDto, - NlpValueDTOMapActions, + NlpValueDto, NlpValueUpdateDto, } from '../dto/nlp-value.dto'; import { NlpValueRepository } from '../repositories/nlp-value.repository'; @@ -32,7 +32,7 @@ export class NlpValueService extends BaseService< NlpValue, NlpValuePopulate, NlpValueFull, - NlpValueDTOMapActions + NlpValueDto > { constructor( readonly repository: NlpValueRepository, diff --git a/api/src/user/dto/permission.dto.ts b/api/src/user/dto/permission.dto.ts index 93b33ded..41966e99 100644 --- a/api/src/user/dto/permission.dto.ts +++ b/api/src/user/dto/permission.dto.ts @@ -42,6 +42,6 @@ export class PermissionCreateDto { relation?: TRelation; } -export type PermissionDTOMapActions = DtoConfig<{ +export type PermissionDto = DtoConfig<{ create: PermissionCreateDto; }>; diff --git a/api/src/user/dto/role.dto.ts b/api/src/user/dto/role.dto.ts index 6363ae30..a830dac7 100644 --- a/api/src/user/dto/role.dto.ts +++ b/api/src/user/dto/role.dto.ts @@ -29,6 +29,6 @@ export class RoleCreateDto { export class RoleUpdateDto extends PartialType(RoleCreateDto) {} -export type RoleDTOMapActions = DtoConfig<{ +export type RoleDto = DtoConfig<{ create: RoleCreateDto; }>; diff --git a/api/src/user/dto/user.dto.ts b/api/src/user/dto/user.dto.ts index 053414ab..8ac4dada 100644 --- a/api/src/user/dto/user.dto.ts +++ b/api/src/user/dto/user.dto.ts @@ -109,6 +109,6 @@ export class UserResetPasswordDto extends PickType(UserCreateDto, [ export class UserRequestResetDto extends PickType(UserCreateDto, ['email']) {} -export type UserDtoMapActions = DtoConfig<{ +export type UserDto = DtoConfig<{ create: UserCreateDto; }>; diff --git a/api/src/user/repositories/permission.repository.ts b/api/src/user/repositories/permission.repository.ts index b7e60f17..dff4f5d0 100644 --- a/api/src/user/repositories/permission.repository.ts +++ b/api/src/user/repositories/permission.repository.ts @@ -13,7 +13,7 @@ import { Model } from 'mongoose'; import { BaseRepository } from '@/utils/generics/base-repository'; -import { PermissionDTOMapActions } from '../dto/permission.dto'; +import { PermissionDto } from '../dto/permission.dto'; import { Permission, PERMISSION_POPULATE, @@ -26,7 +26,7 @@ export class PermissionRepository extends BaseRepository< Permission, PermissionPopulate, PermissionFull, - PermissionDTOMapActions + PermissionDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/user/repositories/role.repository.ts b/api/src/user/repositories/role.repository.ts index b954da24..3d6c3668 100644 --- a/api/src/user/repositories/role.repository.ts +++ b/api/src/user/repositories/role.repository.ts @@ -13,7 +13,7 @@ import { Model } from 'mongoose'; import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository'; -import { RoleDTOMapActions } from '../dto/role.dto'; +import { RoleDto } from '../dto/role.dto'; import { Permission } from '../schemas/permission.schema'; import { Role, @@ -27,7 +27,7 @@ export class RoleRepository extends BaseRepository< Role, RolePopulate, RoleFull, - RoleDTOMapActions + RoleDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/user/repositories/user.repository.ts b/api/src/user/repositories/user.repository.ts index 0bd64de9..4a361ee5 100644 --- a/api/src/user/repositories/user.repository.ts +++ b/api/src/user/repositories/user.repository.ts @@ -20,7 +20,7 @@ import { import { BaseRepository } from '@/utils/generics/base-repository'; import { TFilterQuery } from '@/utils/types/filter.types'; -import { UserDtoMapActions, UserEditProfileDto } from '../dto/user.dto'; +import { UserDto, UserEditProfileDto } from '../dto/user.dto'; import { User, USER_POPULATE, @@ -35,7 +35,7 @@ export class UserRepository extends BaseRepository< User, UserPopulate, UserFull, - UserDtoMapActions + UserDto > { constructor( readonly eventEmitter: EventEmitter2, diff --git a/api/src/user/seeds/permission.seed.ts b/api/src/user/seeds/permission.seed.ts index 98f179f8..f95da026 100644 --- a/api/src/user/seeds/permission.seed.ts +++ b/api/src/user/seeds/permission.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { PermissionDTOMapActions } from '../dto/permission.dto'; +import { PermissionDto } from '../dto/permission.dto'; import { PermissionRepository } from '../repositories/permission.repository'; import { Permission, @@ -23,7 +23,7 @@ export class PermissionSeeder extends BaseSeeder< Permission, PermissionPopulate, PermissionFull, - PermissionDTOMapActions + PermissionDto > { constructor(private readonly permissionRepository: PermissionRepository) { super(permissionRepository); diff --git a/api/src/user/seeds/role.seed.ts b/api/src/user/seeds/role.seed.ts index 364f8c01..4dd392c6 100644 --- a/api/src/user/seeds/role.seed.ts +++ b/api/src/user/seeds/role.seed.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseSeeder } from '@/utils/generics/base-seeder'; -import { RoleDTOMapActions } from '../dto/role.dto'; +import { RoleDto } from '../dto/role.dto'; import { RoleRepository } from '../repositories/role.repository'; import { Role, RoleFull, RolePopulate } from '../schemas/role.schema'; @@ -19,7 +19,7 @@ export class RoleSeeder extends BaseSeeder< Role, RolePopulate, RoleFull, - RoleDTOMapActions + RoleDto > { constructor(private readonly roleRepository: RoleRepository) { super(roleRepository); diff --git a/api/src/user/services/permission.service.ts b/api/src/user/services/permission.service.ts index e867b01a..f8b68349 100644 --- a/api/src/user/services/permission.service.ts +++ b/api/src/user/services/permission.service.ts @@ -15,7 +15,7 @@ import { PERMISSION_CACHE_KEY } from '@/utils/constants/cache'; import { Cacheable } from '@/utils/decorators/cacheable.decorator'; import { BaseService } from '@/utils/generics/base-service'; -import { PermissionDTOMapActions } from '../dto/permission.dto'; +import { PermissionDto } from '../dto/permission.dto'; import { PermissionRepository } from '../repositories/permission.repository'; import { Permission, @@ -29,7 +29,7 @@ export class PermissionService extends BaseService< Permission, PermissionPopulate, PermissionFull, - PermissionDTOMapActions + PermissionDto > { constructor( readonly repository: PermissionRepository, diff --git a/api/src/user/services/role.service.ts b/api/src/user/services/role.service.ts index cafa7999..e6b16f79 100644 --- a/api/src/user/services/role.service.ts +++ b/api/src/user/services/role.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { RoleDTOMapActions } from '../dto/role.dto'; +import { RoleDto } from '../dto/role.dto'; import { RoleRepository } from '../repositories/role.repository'; import { Role, RoleFull, RolePopulate } from '../schemas/role.schema'; @@ -19,7 +19,7 @@ export class RoleService extends BaseService< Role, RolePopulate, RoleFull, - RoleDTOMapActions + RoleDto > { constructor(readonly repository: RoleRepository) { super(repository); diff --git a/api/src/user/services/user.service.ts b/api/src/user/services/user.service.ts index 06cc641a..325479b4 100644 --- a/api/src/user/services/user.service.ts +++ b/api/src/user/services/user.service.ts @@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common'; import { BaseService } from '@/utils/generics/base-service'; -import { UserDtoMapActions } from '../dto/user.dto'; +import { UserDto } from '../dto/user.dto'; import { UserRepository } from '../repositories/user.repository'; import { User, UserFull, UserPopulate } from '../schemas/user.schema'; @@ -19,7 +19,7 @@ export class UserService extends BaseService< User, UserPopulate, UserFull, - UserDtoMapActions + UserDto > { constructor(readonly repository: UserRepository) { super(repository); diff --git a/api/src/utils/generics/base-repository.ts b/api/src/utils/generics/base-repository.ts index ce96100f..033bb48a 100644 --- a/api/src/utils/generics/base-repository.ts +++ b/api/src/utils/generics/base-repository.ts @@ -30,7 +30,7 @@ import { import { TFilterQuery } from '@/utils/types/filter.types'; import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto'; -import { DtoActions, DtoInfer, DtoProps } from '../types/dto.types'; +import { DtoAction, DtoInfer, DtoProps } from '../types/dto.types'; import { BaseSchema } from './base-schema'; import { LifecycleHookManager } from './lifecycle-hook-manager'; @@ -456,7 +456,7 @@ export abstract class BaseRepository< return await this.model.countDocuments(criteria).exec(); } - async create(dto: DtoInfer): Promise { + async create(dto: DtoInfer): Promise { const doc = await this.model.create(dto); return plainToClass( @@ -467,7 +467,7 @@ export abstract class BaseRepository< } async createMany( - dtoArray: DtoInfer[], + dtoArray: DtoInfer[], ): Promise { const docs = await this.model.create(dtoArray); diff --git a/api/src/utils/generics/base-seeder.ts b/api/src/utils/generics/base-seeder.ts index c1e160ac..2553bf6a 100644 --- a/api/src/utils/generics/base-seeder.ts +++ b/api/src/utils/generics/base-seeder.ts @@ -8,7 +8,7 @@ import { FlattenMaps } from 'mongoose'; -import { DtoActions, DtoInfer, DtoProps } from '../types/dto.types'; +import { DtoAction, DtoInfer, DtoProps } from '../types/dto.types'; import { BaseRepository } from './base-repository'; import { BaseSchema } from './base-schema'; @@ -33,7 +33,7 @@ export abstract class BaseSeeder< } async seed>( - models: DtoInfer[], + models: DtoInfer[], ): Promise { if (await this.isEmpty()) { await this.repository.createMany(models); diff --git a/api/src/utils/generics/base-service.ts b/api/src/utils/generics/base-service.ts index bcf3045c..7cf29d1a 100644 --- a/api/src/utils/generics/base-service.ts +++ b/api/src/utils/generics/base-service.ts @@ -14,7 +14,7 @@ import { ProjectionType, QueryOptions } from 'mongoose'; import { TFilterQuery } from '@/utils/types/filter.types'; import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto'; -import { DtoActions, DtoInfer, DtoProps } from '../types/dto.types'; +import { DtoAction, DtoInfer, DtoProps } from '../types/dto.types'; import { BaseRepository } from './base-repository'; import { BaseSchema } from './base-schema'; @@ -145,7 +145,7 @@ export abstract class BaseService< } async create>( - dto: DtoInfer, + dto: DtoInfer, ): Promise { try { return await this.repository.create(dto); @@ -161,7 +161,7 @@ export abstract class BaseService< async findOneOrCreate>( criteria: string | TFilterQuery, - dto: DtoInfer, + dto: DtoInfer, ): Promise { const result = await this.findOne(criteria); if (!result) { @@ -171,7 +171,7 @@ export abstract class BaseService< } async createMany>( - dtoArray: DtoInfer[], + dtoArray: DtoInfer[], ): Promise { return await this.repository.createMany(dtoArray); } diff --git a/api/src/utils/types/dto.types.ts b/api/src/utils/types/dto.types.ts index 34bfe0d5..1052b3df 100644 --- a/api/src/utils/types/dto.types.ts +++ b/api/src/utils/types/dto.types.ts @@ -6,17 +6,17 @@ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file). */ -export enum DtoActions { +export enum DtoAction { Create = 'create', Read = 'read', Update = 'update', Delete = 'delete', } -export type DtoConfig>> = T; +export type DtoConfig>> = T; export type DtoProps> = { - [K in DtoActions]?: T[K]; + [K in DtoAction]?: T[K]; }; export type DtoInfer = DTO[K] extends object