@nextad/auction 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextad/auction",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "keywords": [],
   "author": "Kai Miyamoto",

package/src/Auction.ts

@@ -1,10 +1,13 @@
 import { BidComparator } from "./BidComparator";
-import { BidFactory } from "./BidFactory";
 import {
   AlreadyEndedAuctionException,
   BidNotFoundException,
 } from "./exceptions";
-import type { BaseBidResponseV26, BidV26, CurrencyConversionData } from "./types";
+import type {
+  BidResponse as BaseBidResponseV26,
+  Bid as BidV26,
+} from "iab-openrtb/v26";
+import type { BidInformation, CurrencyConversionData } from "./types";
 
 type AuctionType = "open" | "closed";
 
@@ -22,9 +25,9 @@ export class Auction {
   };
 
   private itemIds: string[] = [];
-  private currencyConversionData?: CurrencyConversionData;
   private status: AuctionType;
   private options: AuctionOptions;
+  private bidInformation: WeakMap<BidV26, BidInformation>;
 
   public constructor(
     itemOrImpressionIds: string | string[],
@@ -41,8 +44,8 @@ export class Auction {
     this.losingBids = {
       v26: [],
     };
-    this.currencyConversionData = options.currencyConversionData;
     this.status = "open";
+    this.bidInformation = new WeakMap();
 
     if (typeof itemOrImpressionIds === "string") {
       this.itemIds.push(itemOrImpressionIds);
@@ -61,9 +64,18 @@ export class Auction {
 
   public placeBidResponseV26(bidResponse: BaseBidResponseV26): this {
     if (bidResponse.seatbid) {
-      this.bids.v26.push(
-        ...BidFactory.createV26Bids(bidResponse, this.itemIds)
-      );
+      const bids: BidV26[] = bidResponse.seatbid.flatMap((seatbid) => {
+        return seatbid.bid.map((bid) => {
+          this.bidInformation.set(bid, {
+            currency: bidResponse.cur,
+            version: "2.6",
+            seat: seatbid.seat,
+          });
+          return bid;
+        });
+      });
+
+      this.bids.v26.push(...bids);
     }
 
     return this;
@@ -78,7 +90,11 @@ export class Auction {
       throw new BidNotFoundException();
     }
 
-    const highestBid = BidComparator.getHighestBidV26(this.bids.v26, this.options.currencyConversionData);
+    const highestBid = BidComparator.getHighestBidV26(
+      this.bids.v26,
+      this.bidInformation,
+      this.options.currencyConversionData
+    );
 
     this.setLosingBids(highestBid);
     this.handleLossBids();

package/src/BidComparator.ts

@@ -1,8 +1,10 @@
-import type { BidV26, CurrencyConversionData } from "./types";
+import type { BidInformation, CurrencyConversionData } from "./types";
+import type { Bid as BidV26 } from "iab-openrtb/v26";
 
 export class BidComparator {
   public static getHighestBidV26(
     bids: BidV26[],
+    bidInformation: WeakMap<BidV26, BidInformation>,
     currencyConversionData?: CurrencyConversionData
   ): BidV26 {
     if (!currencyConversionData) {
@@ -14,19 +16,29 @@ export class BidComparator {
     }
 
     return bids.reduce((highest, current) => {
-      const highestPrice = this.convertPrice(highest, currencyConversionData);
-      const currentPrice = this.convertPrice(current, currencyConversionData);
+      const highestPrice = this.convertPrice(
+        highest,
+        bidInformation,
+        currencyConversionData
+      );
+      const currentPrice = this.convertPrice(
+        current,
+        bidInformation,
+        currencyConversionData
+      );
       return currentPrice > highestPrice ? current : highest;
     });
   }
 
   private static convertPrice(
-    bid: BidV26, 
+    bid: BidV26,
+    bidInformation: WeakMap<BidV26, BidInformation>,
     conversionData: CurrencyConversionData
   ): number {
     const price = bid.price;
-    const rates = conversionData.conversions[bid.ext.nextadjs.currency];
-    
+    const rates =
+      conversionData.conversions[bidInformation.get(bid)?.currency || "USD"];
+
     if (!rates) {
       return price * 100;
     }
@@ -35,4 +47,4 @@ export class BidComparator {
     const rate = rates[targetCurrency];
     return price * (rate || 1) * 100;
   }
-}
+}

package/src/types/index.ts

@@ -1,29 +1,8 @@
-import type {
-  Bid as BaseBidV26,
-  BidResponse as BaseBidResponseV26,
-  SeatBid as BaseSeatBidV26,
-} from "iab-openrtb/v26";
-export type {
-  BidResponse as BaseBidResponseV26,
-  Bid as BaseBidV26,
-} from "iab-openrtb/v26";
-
-export interface BidResponseV26 extends BaseBidResponseV26 {
-  seatbid?: SeatBidV26[];
-}
-export interface SeatBidV26 extends BaseSeatBidV26 {
-  bid: BidV26[];
-}
-
-export interface BidV26 extends BaseBidV26 {
-  ext: {
-    nextadjs: {
-      openrtbVersion: "2.6";
-      seat?: string;
-      currency: string;
-    };
-  };
-}
+export type BidInformation = {
+  currency?: string;
+  seat?: string;
+  version: string;
+};
 
 
 export interface CurrencyRates {

package/src/BidFactory.ts

@@ -1,32 +0,0 @@
-import type { BaseBidResponseV26, BidV26 } from "./types";
-
-export class BidFactory {
-  public static createV26Bids(
-    bidResponse: BaseBidResponseV26,
-    itemIds: string[]
-  ): BidV26[] {
-    let bids: BidV26[] = [];
-
-    if (bidResponse.seatbid) {
-      bidResponse.seatbid.forEach((seatBid) => {
-        seatBid.bid.forEach((bid) => {
-          if (itemIds.some((itemId) => bid.impid === itemId)) {
-            bids.push({
-              ...bid,
-              ext: {
-                ...bid.ext,
-                nextadjs: {
-                  openrtbVersion: "2.6",
-                  currency: bidResponse.cur || "USD",
-                  seat: seatBid.seat,
-                },
-              },
-            });
-          }
-        });
-      });
-    }
-
-    return bids;
-  }
-}