UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-04-06 22:14:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: update the DTOs types naming

Browse Source
This commit is contained in:
yassinedorbozgithub 2025-01-10 08:32:40 +01:00
parent 13e94e5079
commit 5c4d9af9cf
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/chat/dto/conversation.dto.ts
View File

@ -58,6 +58,6 @@ export class ConversationCreateDto {
next?: string[]; next?: string[];
} }
export type ConversationCrudsDto = DtoConfig<{ export type ConversationDTOCruds = DtoConfig<{
create: ConversationCreateDto; create: ConversationCreateDto;
}>; }>;

4
api/src/chat/repositories/conversation.repository.ts
View File

@ -13,7 +13,7 @@ import { Model } from 'mongoose';
import { BaseRepository } from '@/utils/generics/base-repository'; import { BaseRepository } from '@/utils/generics/base-repository';
import { ConversationCrudsDto } from '../dto/conversation.dto'; import { ConversationDTOCruds } from '../dto/conversation.dto';
import { import {
Conversation, Conversation,
CONVERSATION_POPULATE, CONVERSATION_POPULATE,
@ -26,7 +26,7 @@ export class ConversationRepository extends BaseRepository<
Conversation, Conversation,
ConversationPopulate, ConversationPopulate,
ConversationFull, ConversationFull,
ConversationCrudsDto ConversationDTOCruds
> { > {
constructor( constructor(
readonly eventEmitter: EventEmitter2, readonly eventEmitter: EventEmitter2,

4
api/src/chat/services/conversation.service.ts
View File

@ -12,7 +12,7 @@ import EventWrapper from '@/channel/lib/EventWrapper';
import { LoggerService } from '@/logger/logger.service'; import { LoggerService } from '@/logger/logger.service';
import { BaseService } from '@/utils/generics/base-service'; import { BaseService } from '@/utils/generics/base-service';
import { ConversationCrudsDto } from '../dto/conversation.dto'; import { ConversationDTOCruds } from '../dto/conversation.dto';
import { VIEW_MORE_PAYLOAD } from '../helpers/constants'; import { VIEW_MORE_PAYLOAD } from '../helpers/constants';
import { ConversationRepository } from '../repositories/conversation.repository'; import { ConversationRepository } from '../repositories/conversation.repository';
import { Block, BlockFull } from '../schemas/block.schema'; import { Block, BlockFull } from '../schemas/block.schema';
@ -32,7 +32,7 @@ export class ConversationService extends BaseService<
Conversation, Conversation,
ConversationPopulate, ConversationPopulate,
ConversationFull, ConversationFull,
ConversationCrudsDto ConversationDTOCruds
> { > {
constructor( constructor(
readonly repository: ConversationRepository, readonly repository: ConversationRepository,

2
api/src/user/dto/user.dto.ts
View File

@ -100,6 +100,6 @@ export class UserResetPasswordDto extends PickType(UserCreateDto, [
export class UserRequestResetDto extends PickType(UserCreateDto, ['email']) {} export class UserRequestResetDto extends PickType(UserCreateDto, ['email']) {}
export type UserCrudsDto = DtoConfig<{ export type UserDTOCruds = DtoConfig<{
create: UserCreateDto; create: UserCreateDto;
}>; }>;

4
api/src/user/repositories/user.repository.ts
View File

@ -20,7 +20,7 @@ import {
import { BaseRepository } from '@/utils/generics/base-repository'; import { BaseRepository } from '@/utils/generics/base-repository';
import { TFilterQuery } from '@/utils/types/filter.types'; import { TFilterQuery } from '@/utils/types/filter.types';
import { UserCrudsDto, UserEditProfileDto } from '../dto/user.dto'; import { UserDTOCruds, UserEditProfileDto } from '../dto/user.dto';
import { import {
User, User,
USER_POPULATE, USER_POPULATE,
@ -35,7 +35,7 @@ export class UserRepository extends BaseRepository<
User, User,
UserPopulate, UserPopulate,
UserFull, UserFull,
UserCrudsDto UserDTOCruds
> { > {
constructor( constructor(
readonly eventEmitter: EventEmitter2, readonly eventEmitter: EventEmitter2,

4
api/src/user/services/user.service.ts
View File

@ -10,7 +10,7 @@ import { Injectable } from '@nestjs/common';
import { BaseService } from '@/utils/generics/base-service'; import { BaseService } from '@/utils/generics/base-service';
import { UserCrudsDto } from '../dto/user.dto'; import { UserDTOCruds } from '../dto/user.dto';
import { UserRepository } from '../repositories/user.repository'; import { UserRepository } from '../repositories/user.repository';
import { User, UserFull, UserPopulate } from '../schemas/user.schema'; import { User, UserFull, UserPopulate } from '../schemas/user.schema';
@ -19,7 +19,7 @@ export class UserService extends BaseService<
User, User,
UserPopulate, UserPopulate,
UserFull, UserFull,
UserCrudsDto UserDTOCruds
> { > {
constructor(readonly repository: UserRepository) { constructor(readonly repository: UserRepository) {
super(repository); super(repository);

4
api/src/utils/generics/base-repository.ts
View File

@ -71,7 +71,7 @@ export abstract class BaseRepository<
T extends FlattenMaps<unknown>, T extends FlattenMaps<unknown>,
P extends string = never, P extends string = never,
TFull extends Omit<T, P> = never, TFull extends Omit<T, P> = never,
DTO extends DtoProps<T> = unknown, DTOCruds extends DtoProps<T> = unknown,
U = Omit<T, keyof BaseSchema>, U = Omit<T, keyof BaseSchema>,
D = Document<T>, D = Document<T>,
> { > {
@ -456,7 +456,7 @@ export abstract class BaseRepository<
return await this.model.countDocuments(criteria).exec(); return await this.model.countDocuments(criteria).exec();
} }
async create(dto: DtoInfer<DtoOperations.Create, DTO, U>): Promise<T> { async create(dto: DtoInfer<DtoOperations.Create, DTOCruds, U>): Promise<T> {
const doc = await this.model.create(dto); const doc = await this.model.create(dto);
return plainToClass( return plainToClass(

16
api/src/utils/generics/base-service.ts
View File

@ -23,10 +23,10 @@ export abstract class BaseService<
T extends BaseSchema, T extends BaseSchema,
P extends string = never, P extends string = never,
TFull extends Omit<T, P> = never, TFull extends Omit<T, P> = never,
DTO extends DtoProps<any> = unknown, DTOCruds extends DtoProps<any> = unknown,
> { > {
constructor( constructor(
protected readonly repository: BaseRepository<T, P, TFull, DTO>, protected readonly repository: BaseRepository<T, P, TFull, DTOCruds>,
) {} ) {}
getRepository() { getRepository() {
@ -145,7 +145,11 @@ export abstract class BaseService<
} }
async create< async create<
D extends DtoInfer<DtoOperations.Create, DTO, Omit<T, keyof BaseSchema>>, D extends DtoInfer<
DtoOperations.Create,
DTOCruds,
Omit<T, keyof BaseSchema>
>,
>(dto: D): Promise<T> { >(dto: D): Promise<T> {
try { try {
return await this.repository.create(dto); return await this.repository.create(dto);
@ -160,7 +164,11 @@ export abstract class BaseService<
} }
async findOneOrCreate< async findOneOrCreate<
D extends DtoInfer<DtoOperations.Create, DTO, Omit<T, keyof BaseSchema>>, D extends DtoInfer<
DtoOperations.Create,
DTOCruds,
Omit<T, keyof BaseSchema>
>,
>(criteria: string | TFilterQuery<T>, dto: D): Promise<T> { >(criteria: string | TFilterQuery<T>, dto: D): Promise<T> {
const result = await this.findOne(criteria); const result = await this.findOne(criteria);
if (!result) { if (!result) {