fix(queue): update auction message DTO and workers for LFG service compatibility

Author: alexzedim

apps/dma/src/workers/auctions.worker.ts

@@ -80,7 +80,7 @@ export class AuctionsWorker {
     this.stats.total++;
 
     try {
-      const args: AuctionJobQueue = message.payload;
+      const args: AuctionMessageDto = message;
 
       this.BNet = new BlizzAPI({
         region: args.region,
@@ -235,7 +235,7 @@ export class AuctionsWorker {
       }
     } catch (errorOrException) {
       const duration = Date.now() - startTime;
-      const realmId = message.payload?.connectedRealmId || 'unknown';
+      const realmId = message?.connectedRealmId || 'unknown';
       const responseError = isResponseError(errorOrException);
 
       if (responseError) {

apps/wow-progress/src/services/wow-progress.lfg.service.ts

@@ -236,7 +236,7 @@ export class WowProgressLfgService {
       });
 
       const profileMessageDto = RabbitMQMessageDto.create({
-        id: characterQueue.guid,
+        messageId: characterQueue.guid,
         data: {
           guid: characterQueue.guid,
           name: characterQueue.name,

libs/resources/src/dto/queue/auction-message.dto.ts

@@ -1,21 +1,57 @@
-import { AuctionJobQueue } from '@app/resources/types';
 import { TIME_MS } from '@app/resources/constants';
 import {
   IRabbitMQMessageBase,
   RabbitMQMessageDto,
 } from '@app/resources/dto/queue';
+import { RegionIdOrName } from '@alexzedim/blizzapi';
+
+/**
+ * Base interface for creating auction message entries
+ */
+export interface IAuctionMessageBase {
+  connectedRealmId: number;
+  auctionsTimestamp?: number;
+  commoditiesTimestamp?: number;
+  isAssetClassIndex?: boolean;
+  region?: RegionIdOrName;
+  clientId?: string;
+  clientSecret?: string;
+  accessToken?: string;
+}
 
 /**
  * Auction Message DTO for RabbitMQ
  *
  * Wraps AuctionJobQueue with RabbitMQ-specific metadata and routing.
  * Used for auction data synchronization from Blizzard API.
  */
-export class AuctionMessageDto extends RabbitMQMessageDto<AuctionJobQueue> {
-  readonly payload: AuctionJobQueue;
+export class AuctionMessageDto extends RabbitMQMessageDto<IAuctionMessageBase> {
+  readonly connectedRealmId: number;
+  readonly auctionsTimestamp?: number;
+  readonly commoditiesTimestamp?: number;
+  readonly isAssetClassIndex?: boolean;
+  readonly region?: RegionIdOrName;
+  readonly clientId?: string;
+  readonly clientSecret?: string;
+  readonly accessToken?: string;
+
+  private static isRabbitMQMessageBase<T>(
+    params: any,
+  ): params is IRabbitMQMessageBase<T> {
+    return !!params && typeof params === 'object' && 'data' in (params as any);
+  }
+
+  private static isAuctionCreateParams(
+    params: any,
+  ): params is Omit<Partial<AuctionMessageDto>, 'connectedRealmId'> &
+    Pick<IAuctionMessageBase, 'connectedRealmId'> {
+    return (
+      !!params && typeof params === 'object' && 'connectedRealmId' in params
+    );
+  }
 
   constructor(params: any) {
-    const auctionData = params.data || params.payload || params;
+    const auctionData = params.data || params;
 
     super({
       messageId: params.id || `auction-${auctionData.connectedRealmId}`,
@@ -28,44 +64,36 @@ export class AuctionMessageDto extends RabbitMQMessageDto<AuctionJobQueue> {
       metadata: params.metadata,
     });
 
-    this.payload = auctionData;
+    Object.assign(this, auctionData);
   }
 
   /**
    * Create from auction data with RabbitMQ routing
    */
   static create<T>(params: IRabbitMQMessageBase<T>): RabbitMQMessageDto<T>;
-  static create(params: {
-    data: AuctionJobQueue;
-    priority?: number;
-    source?: string;
-    routingKey?: string;
-    expiration?: number;
-  }): AuctionMessageDto;
+  static create(
+    params: Omit<Partial<AuctionMessageDto>, 'connectedRealmId'> &
+      Pick<IAuctionMessageBase, 'connectedRealmId'>,
+  ): AuctionMessageDto;
   static create(
     params:
-      | IRabbitMQMessageBase<AuctionJobQueue>
-      | {
-          data: AuctionJobQueue;
-          priority?: number;
-          source?: string;
-          routingKey?: string;
-          expiration?: number;
-        },
-  ): RabbitMQMessageDto<AuctionJobQueue> | AuctionMessageDto {
-    if (
-      'id' in (params as any) ||
-      'persistent' in (params as any) ||
-      'metadata' in (params as any)
-    ) {
-      return RabbitMQMessageDto.create(
-        params as IRabbitMQMessageBase<AuctionJobQueue>,
+      | IRabbitMQMessageBase<IAuctionMessageBase>
+      | (Omit<Partial<AuctionMessageDto>, 'connectedRealmId'> &
+          Pick<IAuctionMessageBase, 'connectedRealmId'>),
+  ): RabbitMQMessageDto<IAuctionMessageBase> | AuctionMessageDto {
+    if (AuctionMessageDto.isRabbitMQMessageBase(params)) {
+      return RabbitMQMessageDto.create(params);
+    }
+
+    if (!AuctionMessageDto.isAuctionCreateParams(params)) {
+      throw new Error(
+        'AuctionMessageDto.create expected auction params with connectedRealmId.',
       );
     }
 
     return new AuctionMessageDto({
-      id: `auction-${params.data.connectedRealmId}`,
-      data: params.data,
+      id: `auction-${params.connectedRealmId}`,
+      data: params,
       priority: params.priority ?? 5,
       source: params.source ?? 'dma',
       routingKey: params.routingKey ?? 'dma.auctions.normal',