From eedcb055d0b592c738db0015782b11fc0b128fa4 Mon Sep 17 00:00:00 2001
From: ElgarsG <65354776+eldzis@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:42:01 +0300
Subject: [PATCH] Setupad adapter: param change and minor fixes (#11770)

* Fix analytics params and set account_id param mandatory

* Remove unused param

* Remove unneeded function logic and refactor
---
 modules/setupadBidAdapter.js                | 45 ++++++++++++---------
 modules/setupadBidAdapter.md                |  2 +-
 test/spec/modules/setupadBidAdapter_spec.js | 15 +++++++
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/modules/setupadBidAdapter.js b/modules/setupadBidAdapter.js
index 55677d51c56..c6fb9097122 100644
--- a/modules/setupadBidAdapter.js
+++ b/modules/setupadBidAdapter.js
@@ -13,7 +13,7 @@ import { BANNER } from '../src/mediaTypes.js';
 const BIDDER_CODE = 'setupad';
 const ENDPOINT = 'https://prebid.setupad.io/openrtb2/auction';
 const SYNC_ENDPOINT = 'https://cookie.stpd.cloud/sync?';
-const REPORT_ENDPOINT = 'https://adapter-analytics.setupad.io/api/adapter-analytics';
+const REPORT_ENDPOINT = 'https://adapter-analytics.setupad.io/api/adapter-analytics?';
 const GVLID = 1241;
 const TIME_TO_LIVE = 360;
 const biddersCreativeIds = {};
@@ -28,7 +28,12 @@ export const spec = {
   gvlid: GVLID,
 
   isBidRequestValid: function (bid) {
-    return !!(bid.params.placement_id && isStr(bid.params.placement_id));
+    return !!(
+      bid.params.placement_id &&
+      isStr(bid.params.placement_id) &&
+      bid.params.account_id &&
+      isStr(bid.params.account_id)
+    );
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
@@ -225,17 +230,23 @@ export const spec = {
 
     if (!placementIds) return;
 
-    let extraBidParams = '';
-
     // find the winning bidder by using creativeId as identification
     if (biddersCreativeIds.hasOwnProperty(bid.creativeId) && biddersCreativeIds[bid.creativeId]) {
       bidder = biddersCreativeIds[bid.creativeId];
     }
 
-    // Add extra parameters
-    extraBidParams = `&cpm=${bid.originalCpm}&currency=${bid.originalCurrency}`;
+    const queryParams = [];
+    queryParams.push(`event=bidWon`);
+    queryParams.push('bidder=' + bidder);
+    queryParams.push('placementIds=' + placementIds);
+    queryParams.push('auctionId=' + auctionId);
+    queryParams.push('cpm=' + bid.originalCpm);
+    queryParams.push('currency=' + bid.originalCurrency);
+    queryParams.push('timestamp=' + Date.now());
+
+    const strQueryParams = queryParams.join('&');
 
-    const url = `${REPORT_ENDPOINT}?event=bidWon&bidder=${bidder}&placementIds=${placementIds}&auctionId=${auctionId}${extraBidParams}&timestamp=${Date.now()}`;
+    const url = REPORT_ENDPOINT + strQueryParams;
     triggerPixel(url);
   },
 };
@@ -251,21 +262,15 @@ function getBidders(serverResponse) {
 }
 
 function getAd(bid) {
-  let ad, adUrl;
-
-  switch (deepAccess(bid, 'ext.prebid.type')) {
-    default:
-      if (bid.adm && bid.nurl) {
-        ad = bid.adm;
-        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
-      } else if (bid.adm) {
-        ad = bid.adm;
-      } else if (bid.nurl) {
-        adUrl = bid.nurl;
-      }
+  const { adm, nurl } = bid;
+  let ad = adm;
+
+  if (nurl) {
+    const trackingPixel = createTrackPixelHtml(decodeURIComponent(nurl));
+    ad += trackingPixel;
   }
 
-  return { ad, adUrl };
+  return { ad };
 }
 
 registerBidder(spec);
diff --git a/modules/setupadBidAdapter.md b/modules/setupadBidAdapter.md
index 0d4f0ef392e..c11e8eb4bae 100644
--- a/modules/setupadBidAdapter.md
+++ b/modules/setupadBidAdapter.md
@@ -26,7 +26,7 @@ const adUnits = [
         bidder: 'setupad',
         params: {
           placement_id: '123', //required
-          account_id: '123', //optional
+          account_id: '123', //required
         },
       },
     ],
diff --git a/test/spec/modules/setupadBidAdapter_spec.js b/test/spec/modules/setupadBidAdapter_spec.js
index d4ff73d005f..bc1527df603 100644
--- a/test/spec/modules/setupadBidAdapter_spec.js
+++ b/test/spec/modules/setupadBidAdapter_spec.js
@@ -92,11 +92,26 @@ describe('SetupadAdapter', function () {
       bidder: 'setupad',
       params: {
         placement_id: '123',
+        account_id: '123',
       },
     };
+
     it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
+
+    it('should return false when placement_id is missing', function () {
+      const bidWithoutPlacementId = { ...bid };
+      delete bidWithoutPlacementId.params.placement_id;
+      expect(spec.isBidRequestValid(bidWithoutPlacementId)).to.equal(false);
+    });
+
+    it('should return false when account_id is missing', function () {
+      const bidWithoutAccountId = { ...bid };
+      delete bidWithoutAccountId.params.account_id;
+      expect(spec.isBidRequestValid(bidWithoutAccountId)).to.equal(false);
+    });
+
     it('should return false when required params are not passed', function () {
       delete bid.params.placement_id;
       expect(spec.isBidRequestValid(bid)).to.equal(false);