DAConsortium
diff --git a/‎modules/equativBidAdapter.js
+54-37 b/‎modules/equativBidAdapter.js
+54-37
@@ -1,9 +1,10 @@
-import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { getBidFloor } from '../libraries/equativUtils/equativUtils.js'
+import { getStorageManager } from '../src/storageManager.js';
 import { ortbConverter } from '../libraries/ortbConverter/converter.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
-import { deepAccess, deepSetValue, mergeDeep } from '../src/utils.js';
+import { deepAccess, deepSetValue, logError, logWarn, mergeDeep } from '../src/utils.js';
 
 /**
  * @typedef {import('../src/adapters/bidderFactory.js').Bid} Bid
@@ -13,26 +14,50 @@ import { deepAccess, deepSetValue, mergeDeep } from '../src/utils.js';
 const BIDDER_CODE = 'equativ';
 const COOKIE_SYNC_ORIGIN = 'https://apps.smartadserver.com';
 const COOKIE_SYNC_URL = `${COOKIE_SYNC_ORIGIN}/diff/templates/asset/csync.html`;
+const LOG_PREFIX = 'Equativ:';
 const PID_COOKIE_NAME = 'eqt_pid';
 
+/**
+ * Evaluates a bid request for validity. Returns false if the
+ * request contains a video media type with no properties, true
+ * otherwise.
+ * @param {*} bidReq A bid request object to evaluate
+ * @returns boolean
+ */
+function isValid(bidReq) {
+  return !(bidReq.mediaTypes.video && JSON.stringify(bidReq.mediaTypes.video) === '{}');
+}
+
 export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 45,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /**
    * @param bidRequests
    * @param bidderRequest
    * @returns {ServerRequest[]}
    */
   buildRequests: (bidRequests, bidderRequest) => {
-    return {
-      data: converter.toORTB({ bidderRequest, bidRequests }),
-      method: 'POST',
-      url: 'https://ssb-global.smartadserver.com/api/bid?callerId=169'
-    };
+    if (bidRequests.filter(isValid).length === 0) {
+      logError(`${LOG_PREFIX} No useful bid requests to process. No request will be sent.`, bidRequests);
+      return undefined;
+    }
+
+    const requests = [];
+
+    bidRequests.forEach(bid => {
+      const data = converter.toORTB({bidRequests: [bid], bidderRequest});
+      requests.push({
+        data,
+        method: 'POST',
+        url: 'https://ssb-global.smartadserver.com/api/bid?callerId=169',
+      })
+    });
+
+    return requests;
   },
 
   /**
@@ -89,32 +114,23 @@ export const converter = ortbConverter({
 
   imp(buildImp, bidRequest, context) {
     const imp = buildImp(bidRequest, context);
+    const mediaType = deepAccess(bidRequest, 'mediaTypes.video') ? VIDEO : BANNER;
     const { siteId, pageId, formatId } = bidRequest.params;
 
     delete imp.dt;
 
-    imp.bidfloor = imp.bidfloor || getBidFloor(bidRequest);
-    imp.secure = bidRequest.ortb2Imp?.secure ?? 1;
-    imp.tagid = bidRequest.adUnitCode;
-
-    if (siteId || pageId || formatId) {
-      const bidder = {};
-
-      if (siteId) {
-        bidder.siteId = siteId;
-      }
+    imp.bidfloor = imp.bidfloor || getBidFloor(bidRequest, config.getConfig('currency.adServerCurrency'), mediaType);
+    imp.secure = 1;
 
-      if (pageId) {
-        bidder.pageId = pageId;
-      }
+    imp.tagid = bidRequest.adUnitCode;
 
-      if (formatId) {
-        bidder.formatId = formatId;
-      }
+    if (!deepAccess(bidRequest, 'ortb2Imp.rwdd') && deepAccess(bidRequest, 'mediaTypes.video.ext.rewarded')) {
+      mergeDeep(imp, { rwdd: bidRequest.mediaTypes.video.ext.rewarded });
+    }
 
-      mergeDeep(imp, {
-        ext: { bidder },
-      });
+    const bidder = { ...(siteId && { siteId }), ...(pageId && { pageId }), ...(formatId && { formatId }) };
+    if (Object.keys(bidder).length) {
+      mergeDeep(imp.ext, { bidder });
     }
 
     return imp;
@@ -124,14 +140,15 @@ export const converter = ortbConverter({
     const bid = context.bidRequests[0];
     const req = buildRequest(imps, bidderRequest, context);
 
-    if (deepAccess(bid, 'ortb2.site.publisher')) {
-      deepSetValue(req, 'site.publisher.id', bid.ortb2.site.publisher.id || bid.params.networkId);
-    } else if (deepAccess(bid, 'ortb2.app.publisher')) {
-      deepSetValue(req, 'app.publisher.id', bid.ortb2.app.publisher.id || bid.params.networkId);
-    } else if (deepAccess(bid, 'ortb2.dooh.publisher')) {
-      deepSetValue(req, 'dooh.publisher.id', bid.ortb2.dooh.publisher.id || bid.params.networkId);
-    } else {
-      deepSetValue(req, 'site.publisher.id', bid.params.networkId);
+    let env = ['ortb2.site.publisher', 'ortb2.app.publisher', 'ortb2.dooh.publisher'].find(propPath => deepAccess(bid, propPath)) || 'ortb2.site.publisher';
+    deepSetValue(req, env.replace('ortb2.', '') + '.id', deepAccess(bid, env + '.id') || bid.params.networkId);
+
+    if (deepAccess(bid, 'mediaTypes.video')) {
+      ['mimes', 'placement'].forEach(prop => {
+        if (!bid.mediaTypes.video[prop]) {
+          logWarn(`${LOG_PREFIX} Property "${prop}" is missing from request`, bid);
+        }
+      });
     }
 
     const pid = storage.getCookie(PID_COOKIE_NAME);
@@ -140,7 +157,7 @@ export const converter = ortbConverter({
     }
 
     return req;
-  },
+  }
 });
 
 registerBidder(spec);