@hexabot-ai/api 3.1.4-alpha.0 → 3.2.1-alpha.0

package/src/chat/services/subscriber.service.ts

@@ -4,6 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
+import { Subscriber } from '@hexabot-ai/types';
 import { Inject, Injectable, Optional, forwardRef } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 import mime from 'mime';
@@ -22,7 +23,7 @@ import { UserService } from '@/user/services/user.service';
 import { BaseOrmService } from '@/utils/generics/base-orm.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
-import { Subscriber, SubscriberUpdateDto } from '../dto/subscriber.dto';
+import { SubscriberUpdateDto } from '../dto/subscriber.dto';
 import { SubscriberOrmEntity } from '../entities/subscriber.entity';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
 
@@ -65,11 +66,12 @@ export class SubscriberService extends BaseOrmService<SubscriberOrmEntity> {
    * Finds and returns a single subscriber based on a foreign ID.
    *
    * @param id - The foreign ID used to find the subscriber.
+   * @param sourceId - Optional source ID to scope the lookup.
    *
    * @returns The subscriber matching the foreign ID.
    */
-  async findOneByForeignId(id: string) {
-    return await this.repository.findOneByForeignId(id);
+  async findOneByForeignId(id: string, sourceId?: string) {
+    return await this.repository.findOneByForeignId(id, sourceId);
   }
 
   /**
@@ -77,11 +79,12 @@ export class SubscriberService extends BaseOrmService<SubscriberOrmEntity> {
    * and populates the result with related data.
    *
    * @param id - The foreign ID used to find the subscriber.
+   * @param sourceId - Optional source ID to scope the lookup.
    *
    * @returns The subscriber with populated related data.
    */
-  async findOneByForeignIdAndPopulate(id: string) {
-    return await this.repository.findOneByForeignIdAndPopulate(id);
+  async findOneByForeignIdAndPopulate(id: string, sourceId?: string) {
+    return await this.repository.findOneByForeignIdAndPopulate(id, sourceId);
   }
 
   /**
@@ -92,8 +95,16 @@ export class SubscriberService extends BaseOrmService<SubscriberOrmEntity> {
    *
    * @returns The updated subscriber data.
    */
-  async updateOneByForeignId(id: string, updates: SubscriberUpdateDto) {
-    return await this.repository.updateOneByForeignIdQuery(id, updates);
+  async updateOneByForeignId(
+    id: string,
+    updates: SubscriberUpdateDto,
+    sourceId?: string,
+  ) {
+    return await this.repository.updateOneByForeignIdQuery(
+      id,
+      updates,
+      sourceId,
+    );
   }
 
   /**
@@ -103,8 +114,8 @@ export class SubscriberService extends BaseOrmService<SubscriberOrmEntity> {
    *
    * @returns The result of the hand-back operation.
    */
-  async handBackByForeignId(foreignId: string) {
-    return await this.repository.handBackByForeignIdQuery(foreignId);
+  async handBackByForeignId(foreignId: string, sourceId?: string) {
+    return await this.repository.handBackByForeignIdQuery(foreignId, sourceId);
   }
 
   /**
@@ -116,8 +127,16 @@ export class SubscriberService extends BaseOrmService<SubscriberOrmEntity> {
    *
    * @returns The result of the hand-over operation.
    */
-  async handOverByForeignId(foreignId: string, userId: string) {
-    return await this.repository.handOverByForeignIdQuery(foreignId, userId);
+  async handOverByForeignId(
+    foreignId: string,
+    userId: string,
+    sourceId?: string,
+  ) {
+    return await this.repository.handOverByForeignIdQuery(
+      foreignId,
+      userId,
+      sourceId,
+    );
   }
 
   /**

package/src/chat/services/thread.service.ts

@@ -4,24 +4,89 @@
  * Full terms: see LICENSE.md.
  */
 
-import { Injectable } from '@nestjs/common';
+import { Thread } from '@hexabot-ai/types';
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { FindOneOptions } from 'typeorm';
 
+import { UpdateOneOptions } from '@/utils/generics/base-orm.repository';
 import { BaseOrmService } from '@/utils/generics/base-orm.service';
 
-import { Thread } from '../dto/thread.dto';
+import { ThreadCreateDto, ThreadUpdateDto } from '../dto/thread.dto';
 import { ThreadOrmEntity } from '../entities/thread.entity';
 import { ThreadRepository } from '../repositories/thread.repository';
 
+import { SubscriberService } from './subscriber.service';
+
 @Injectable()
 export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
   public static readonly THREAD_TITLE_MAX_LENGTH = 96;
 
   public static readonly THREAD_TITLE_ELLIPSIS = '...';
 
-  constructor(readonly repository: ThreadRepository) {
+  private extractSourceId(source: unknown): string | null {
+    if (typeof source === 'string' && source.length > 0) {
+      return source;
+    }
+    if (
+      source &&
+      typeof source === 'object' &&
+      'id' in source &&
+      typeof (source as { id?: unknown }).id === 'string'
+    ) {
+      return (source as { id: string }).id;
+    }
+
+    return null;
+  }
+
+  constructor(
+    readonly repository: ThreadRepository,
+    private readonly subscriberService: SubscriberService,
+  ) {
     super(repository);
   }
 
+  private async resolveThreadSourceId({
+    subscriberId,
+    sourceId,
+  }: {
+    subscriberId: string;
+    sourceId?: string;
+  }): Promise<string> {
+    // Incoming event context is authoritative when present.
+    if (sourceId) {
+      return sourceId;
+    }
+
+    const subscriber = await this.subscriberService.findOne(subscriberId);
+    if (!subscriber) {
+      throw new Error(
+        `Unable to resolve source for subscriber ${subscriberId}`,
+      );
+    }
+
+    const subscriberSourceId = this.extractSourceId(subscriber.source);
+    if (subscriberSourceId) {
+      return subscriberSourceId;
+    }
+
+    throw new Error(`Unable to resolve source for subscriber ${subscriberId}`);
+  }
+
+  override async create(
+    payload: ThreadCreateDto & { source?: string },
+  ): Promise<Thread> {
+    const sourceId = await this.resolveThreadSourceId({
+      subscriberId: payload.subscriber,
+      sourceId: payload.source,
+    });
+
+    return await super.create({
+      ...payload,
+      source: sourceId,
+    } as ThreadCreateDto);
+  }
+
   getDefaultInactivityHours(): number {
     return 24;
   }
@@ -41,9 +106,14 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
     return await this.repository.findOneForSubscriber(threadId, subscriberId);
   }
 
-  async createThread(subscriberId: string, title?: string | null) {
+  async createThread(
+    subscriberId: string,
+    title?: string | null,
+    sourceId?: string,
+  ) {
     return await this.create({
       subscriber: subscriberId,
+      source: sourceId,
       title: title ?? null,
       status: 'open',
       lastMessageAt: new Date(),
@@ -52,6 +122,20 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
     });
   }
 
+  override async updateOne(
+    idOrOptions: string | FindOneOptions<ThreadOrmEntity>,
+    payload: ThreadUpdateDto,
+    options?: UpdateOneOptions,
+  ): Promise<Thread> {
+    if ('subscriber' in (payload ?? {}) || 'source' in (payload ?? {})) {
+      throw new BadRequestException(
+        'Thread subscriber and source cannot be updated',
+      );
+    }
+
+    return await super.updateOne(idOrOptions, payload, options);
+  }
+
   buildThreadTitleFromIncomingText(input?: string | null): string | null {
     if (typeof input !== 'string') {
       return null;
@@ -111,10 +195,12 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
     subscriberId,
     explicitThreadId,
     inactivityHours,
+    sourceId,
   }: {
     subscriberId: string;
     explicitThreadId?: string;
     inactivityHours?: number;
+    sourceId?: string;
   }): Promise<Thread> {
     const now = new Date();
 
@@ -144,7 +230,7 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
       await this.repository.findLatestOpenThreadForSubscriber(subscriberId);
 
     if (!latestOpen) {
-      return await this.createThread(subscriberId);
+      return await this.createThread(subscriberId, null, sourceId);
     }
 
     const anchor = latestOpen.lastMessageAt ?? latestOpen.createdAt;
@@ -154,7 +240,7 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
     if (hasExpired) {
       await this.closeThread(latestOpen.id, 'inactivity', now);
 
-      return await this.createThread(subscriberId);
+      return await this.createThread(subscriberId, null, sourceId);
     }
 
     await this.touchThread(latestOpen.id, now);
@@ -165,9 +251,11 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
   async resolveOrCreateThread({
     subscriberId,
     explicitThreadId,
+    sourceId,
   }: {
     subscriberId: string;
     explicitThreadId?: string;
+    sourceId?: string;
   }): Promise<Thread> {
     const resolved = await this.resolveThread({
       subscriberId,
@@ -177,7 +265,7 @@ export class ThreadService extends BaseOrmService<ThreadOrmEntity> {
       return resolved;
     }
 
-    return await this.createThread(subscriberId);
+    return await this.createThread(subscriberId, null, sourceId);
   }
 
   async resolveThread({

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

@@ -4,6 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
+import { ContentType } from '@hexabot-ai/types';
 import {
   Body,
   Controller,
@@ -22,7 +23,6 @@ import { BaseOrmController } from '@/utils/generics/base-orm.controller';
 import { TypeOrmSearchFilterPipe } from '@/utils/pipes/typeorm-search-filter.pipe';
 
 import {
-  ContentType,
   ContentTypeCreateDto,
   ContentTypeUpdateDto,
 } from '../dto/contentType.dto';

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

@@ -4,6 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
+import { Content } from '@hexabot-ai/types';
 import {
   Body,
   Controller,
@@ -25,11 +26,7 @@ import { BaseOrmController } from '@/utils/generics/base-orm.controller';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { TypeOrmSearchFilterPipe } from '@/utils/pipes/typeorm-search-filter.pipe';
 
-import {
-  Content,
-  ContentCreateDto,
-  ContentUpdateDto,
-} from '../dto/content.dto';
+import { ContentCreateDto, ContentUpdateDto } from '../dto/content.dto';
 import { ContentOrmEntity } from '../entities/content.entity';
 import { RagService } from '../services/rag.service';
 import { RagHit, RagMode, RagQueryOptions } from '../types/rag';

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

@@ -4,6 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
+import { Menu } from '@hexabot-ai/types';
 import {
   Body,
   Controller,
@@ -21,7 +22,7 @@ import { BaseOrmController } from '@/utils/generics/base-orm.controller';
 import { FindAllOptions } from '@/utils/generics/base-orm.repository';
 import { TypeOrmSearchFilterPipe } from '@/utils/pipes/typeorm-search-filter.pipe';
 
-import { Menu, MenuCreateDto, MenuUpdateDto } from '../dto/menu.dto';
+import { MenuCreateDto, MenuUpdateDto } from '../dto/menu.dto';
 import { MenuOrmEntity } from '../entities/menu.entity';
 import { MenuService } from '../services/menu.service';
 

package/src/cms/dto/content.dto.ts

@@ -4,42 +4,12 @@
  * Full terms: see LICENSE.md.
  */
 
+import { contentFullSchema, contentSchema } from '@hexabot-ai/types';
 import { ApiProperty, ApiPropertyOptional, PartialType } from '@nestjs/swagger';
-import { Exclude, Expose, Type } from 'class-transformer';
 import { IsBoolean, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
 import { IsUUIDv4 } from '@/utils/decorators/is-uuid.decorator';
-import { BaseStub, TDto } from '@/utils/types/dto.types';
-
-import { ContentType } from './contentType.dto';
-
-@Exclude()
-export class ContentStub extends BaseStub {
-  @Expose()
-  title!: string;
-
-  @Expose()
-  status!: boolean;
-
-  @Expose()
-  properties!: Record<string, any> | null;
-
-  @Expose()
-  searchText: string;
-}
-
-@Exclude()
-export class Content extends ContentStub {
-  @Expose({ name: 'contentTypeId' })
-  contentType!: string;
-}
-
-@Exclude()
-export class ContentFull extends ContentStub {
-  @Expose()
-  @Type(() => ContentType)
-  contentType!: ContentType;
-}
+import { TDto } from '@/utils/types/dto.types';
 
 export class ContentCreateDto {
   @ApiProperty({ description: 'Content entity', type: String })
@@ -67,8 +37,8 @@ export class ContentUpdateDto extends PartialType(ContentCreateDto) {}
 
 export type ContentDto = TDto<
   {
-    plain: typeof Content;
-    full: typeof ContentFull;
+    plain: typeof contentSchema;
+    full: typeof contentFullSchema;
   },
   {
     create: ContentCreateDto;

package/src/cms/dto/contentType.dto.ts

@@ -4,30 +4,15 @@
  * Full terms: see LICENSE.md.
  */
 
+import { contentTypeFullSchema, contentTypeSchema } from '@hexabot-ai/types';
 import { ApiProperty, PartialType } from '@nestjs/swagger';
-import { Exclude, Expose } from 'class-transformer';
 import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
 import { JSONSchema7 as JsonSchema } from 'json-schema';
 import { z } from 'zod';
 
 import { FieldType } from '@/setting/types';
 import { Validate } from '@/utils/decorators/validate.decorator';
-import { BaseStub, TDto } from '@/utils/types/dto.types';
-
-@Exclude()
-export class ContentTypeStub extends BaseStub {
-  @Expose()
-  name!: string;
-
-  @Expose()
-  schema!: JsonSchema;
-}
-
-@Exclude()
-export class ContentType extends ContentTypeStub {}
-
-@Exclude()
-export class ContentTypeFull extends ContentType {}
+import { TDto } from '@/utils/types/dto.types';
 
 export class ContentField {
   @IsString()
@@ -65,8 +50,8 @@ export class ContentTypeUpdateDto extends PartialType(ContentTypeCreateDto) {}
 
 export type ContentTypeDto = TDto<
   {
-    plain: typeof ContentType;
-    full: typeof ContentTypeFull;
+    plain: typeof contentTypeSchema;
+    full: typeof contentTypeFullSchema;
   },
   {
     create: ContentTypeCreateDto;

package/src/cms/dto/menu.dto.ts

@@ -4,8 +4,8 @@
  * Full terms: see LICENSE.md.
  */
 
+import { menuFullSchema, menuSchema } from '@hexabot-ai/types';
 import { ApiProperty, ApiPropertyOptional, PartialType } from '@nestjs/swagger';
-import { Exclude, Expose, Type } from 'class-transformer';
 import {
   IsEnum,
   IsNotEmpty,
@@ -16,42 +16,10 @@ import {
 } from 'class-validator';
 
 import { IsUUIDv4 } from '@/utils/decorators/is-uuid.decorator';
-import { BaseStub, TDto } from '@/utils/types/dto.types';
+import { TDto } from '@/utils/types/dto.types';
 
 import { MenuType } from '../enums/menu-type.enum';
 
-@Exclude()
-export class MenuStub extends BaseStub {
-  @Expose()
-  title!: string;
-
-  @Expose()
-  type!: MenuType;
-
-  @Expose()
-  payload?: string | null;
-
-  @Expose()
-  url?: string | null;
-}
-
-@Exclude()
-export class Menu extends MenuStub {
-  @Expose({ name: 'parentId' })
-  parent?: string | null;
-}
-
-@Exclude()
-export class MenuFull extends MenuStub {
-  @Expose()
-  @Type(() => Menu)
-  parent?: Menu | null;
-
-  @Expose()
-  @Type(() => Menu)
-  children?: Menu[];
-}
-
 export class MenuCreateDto {
   @ApiProperty({ description: 'Menu title', type: String })
   @IsString()
@@ -95,8 +63,8 @@ export class MenuQueryDto extends PartialType(MenuCreateDto) {}
 
 export type MenuDto = TDto<
   {
-    plain: typeof Menu;
-    full: typeof MenuFull;
+    plain: typeof menuSchema;
+    full: typeof menuFullSchema;
   },
   {
     create: MenuCreateDto;

package/src/cms/entities/content-type.entity.ts

@@ -4,27 +4,26 @@
  * Full terms: see LICENSE.md.
  */
 
+import { contentTypeSchema, contentTypeFullSchema } from '@hexabot-ai/types';
 import { JSONSchema7 as JsonSchema } from 'json-schema';
 import { Column, Entity, Index, OneToMany } from 'typeorm';
 
+import { AuditLabel } from '@/audit/decorators/audit-label.decorator';
 import { JsonColumn } from '@/database/decorators/json-column.decorator';
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 
-import {
-  ContentType,
-  ContentTypeDto,
-  ContentTypeFull,
-} from '../dto/contentType.dto';
+import { ContentTypeDto } from '../dto/contentType.dto';
 
 import { ContentOrmEntity } from './content.entity';
 
 @Entity({ name: 'content_types' })
 @Index(['name'], { unique: true })
 export class ContentTypeOrmEntity extends BaseOrmEntity<ContentTypeDto> {
-  plainCls = ContentType;
+  plainCls = contentTypeSchema;
 
-  fullCls = ContentTypeFull;
+  fullCls = contentTypeFullSchema;
 
+  @AuditLabel()
   @Column({ unique: true })
   name!: string;
 

package/src/cms/entities/content.entity.ts

@@ -4,6 +4,12 @@
  * Full terms: see LICENSE.md.
  */
 
+import {
+  contentSchema,
+  contentFullSchema,
+  Content,
+  ContentElement,
+} from '@hexabot-ai/types';
 import {
   Column,
   Entity,
@@ -13,7 +19,7 @@ import {
   RelationId,
 } from 'typeorm';
 
-import { ContentElement } from '@/chat/types/message';
+import { AuditLabel } from '@/audit/decorators/audit-label.decorator';
 import { config } from '@/config';
 import { JsonColumn } from '@/database/decorators/json-column.decorator';
 import {
@@ -23,7 +29,7 @@ import {
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
 
-import { Content, ContentDto, ContentFull } from '../dto/content.dto';
+import { ContentDto } from '../dto/content.dto';
 
 import { ContentTypeOrmEntity } from './content-type.entity';
 
@@ -31,9 +37,9 @@ import { ContentTypeOrmEntity } from './content-type.entity';
 @Index(['title'])
 @Index(['searchText'])
 export class ContentOrmEntity extends BaseOrmEntity<ContentDto> {
-  plainCls = Content;
+  plainCls = contentSchema;
 
-  fullCls = ContentFull;
+  fullCls = contentFullSchema;
 
   /**
    * The content type of this content.
@@ -52,6 +58,7 @@ export class ContentOrmEntity extends BaseOrmEntity<ContentDto> {
   /**
    * The title of the content.
    */
+  @AuditLabel()
   @Column()
   title!: string;
 

package/src/cms/entities/menu.entity.ts

@@ -4,6 +4,7 @@
  * Full terms: see LICENSE.md.
  */
 
+import { menuSchema, menuFullSchema } from '@hexabot-ai/types';
 import {
   Check,
   Column,
@@ -17,6 +18,7 @@ import {
   UpdateEvent,
 } from 'typeorm';
 
+import { AuditLabel } from '@/audit/decorators/audit-label.decorator';
 import { EnumColumn } from '@/database/decorators/enum-column.decorator';
 import {
   OnBeforeInsert,
@@ -25,7 +27,7 @@ import {
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
 
-import { Menu, MenuDto, MenuFull } from '../dto/menu.dto';
+import { MenuDto } from '../dto/menu.dto';
 import { MenuType } from '../enums/menu-type.enum';
 
 export { MenuType };
@@ -43,13 +45,14 @@ export { MenuType };
 `,
 )
 export class MenuOrmEntity extends BaseOrmEntity<MenuDto> {
-  plainCls = Menu;
+  plainCls = menuSchema;
 
-  fullCls = MenuFull;
+  fullCls = menuFullSchema;
 
   /**
    * The displayed title of the menu.
    */
+  @AuditLabel()
   @Column()
   title!: string;
 

package/src/cms/enums/menu-type.enum.ts

@@ -4,8 +4,4 @@
  * Full terms: see LICENSE.md.
  */
 
-export enum MenuType {
-  web_url = 'web_url',
-  postback = 'postback',
-  nested = 'nested',
-}
+export { MenuType } from '@hexabot-ai/types';

package/src/cms/repositories/content.repository.ts

@@ -4,13 +4,13 @@
  * Full terms: see LICENSE.md.
  */
 
+import { ContentFull } from '@hexabot-ai/types';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
 import { BaseOrmRepository } from '@/utils/generics/base-orm.repository';
 
-import { ContentFull } from '../dto/content.dto';
 import { ContentOrmEntity } from '../entities/content.entity';
 
 @Injectable()

package/src/cms/services/content-type.service.ts

@@ -4,13 +4,13 @@
  * Full terms: see LICENSE.md.
  */
 
+import { ContentType } from '@hexabot-ai/types';
 import { Injectable } from '@nestjs/common';
 import { JSONSchema7 } from 'json-schema';
 
 import { InferCreateDto } from '@/utils';
 import { BaseOrmService } from '@/utils/generics/base-orm.service';
 
-import { ContentType } from '../dto/contentType.dto';
 import { ContentTypeOrmEntity } from '../entities/content-type.entity';
 import { ContentTypeRepository } from '../repositories/content-type.repository';