Revert "Revert "fix bidcaching for 1x1""

src/marfeelTools.js

@@ -42,7 +42,15 @@ export const setLastLocationFromLastAdUnit = (adUnitArr) => {
   }
 }
 
-export const getCurrentAuctionSizes = () => {
+const normalizeSizes = sizesArray => sizesArray.join('x');
+
+function is1x1Allowed(auctionSizes) {
+  const LARGE_SIZE_NORMALIZED = '300x250';
+
+  return (auctionSizes.map(normalizeSizes).includes(LARGE_SIZE_NORMALIZED));
+}
+
+const getCurrentAuctionSizes = () => {
   const lastAdUnitUsed = [...auctionManager.getAdUnits()].pop();
 
   if (lastAdUnitUsed &&
@@ -56,11 +64,19 @@ export const getCurrentAuctionSizes = () => {
   return [];
 }
 
-const normalizeSizes = sizesArray => sizesArray.join('x');
-
 export const isBidSizeAllowed = (bid, allowedSizes) => {
   const allowedSizesNormalized = allowedSizes.map(normalizeSizes);
   const bidSize = normalizeSizes([bid.width, bid.height]);
 
   return allowedSizesNormalized.includes(bidSize);
 }
+
+function add1x1IfAllowed(auctionSizes) {
+  const SIZE_1_X_1 = [1, 1];
+
+  return is1x1Allowed(auctionSizes) ? [...auctionSizes, SIZE_1_X_1] : auctionSizes;
+}
+
+export function getAllowedSizes() {
+  return add1x1IfAllowed(getCurrentAuctionSizes())
+}

src/targeting.js

@@ -5,7 +5,7 @@ import { auctionManager } from './auctionManager';
 import { sizeSupported } from './sizeMapping';
 import { ADPOD } from './mediaTypes';
 import includes from 'core-js/library/fn/array/includes';
-import { getLastLocation, getCurrentAuctionSizes, isBidSizeAllowed } from './marfeelTools';
+import { getLastLocation, getAllowedSizes, isBidSizeAllowed } from './marfeelTools';
 
 const utils = require('./utils.js');
 var CONSTANTS = require('./constants.json');
@@ -372,7 +372,7 @@ export function newTargeting(auctionManager) {
         }));
 
       const bidsToFilter = bidsByReferrer[lastLocation] || filterBidsByAdUnit(bidsReceived);
-      const allowedSizes = getCurrentAuctionSizes();
+      const allowedSizes = getAllowedSizes();
 
       bidsToProcess = bidsToFilter.filter(bid => isBidSizeAllowed(bid, allowedSizes));
     }

test/spec/marfeelTools_spec.js

@@ -12,7 +12,8 @@
  * from Marfeel Solutions SL.
  */
 
-import { filterBidsBySizes } from './marfeelTools';
+import { isBidSizeAllowed, getAllowedSizes } from './marfeelTools';
+import { auctionManager } from './auctionManager';
 
 describe('marfeelTools', function () {
   describe('isBidSizeAllowed', function() {
@@ -42,4 +43,35 @@ describe('marfeelTools', function () {
       }])
     });
   });
+  describe('getAllowedSizes', function() {
+    it('adds 1x1 to allowed sizes if 300x250 is present', function() {
+      const currentSizes = [[100, 100], [300, 150], [300, 250]];
+      const fakeGetAdUnits = () => [{
+        mediaTypes: {
+          banner: {
+            sizes: currentSizes
+          }
+        }
+      }];
+      sinon.replace(auctionManager, 'getAdUnits', fakeGetAdUnits);
+      const expectedSizes = [[100, 100], [300, 150], [300, 250], [1, 1]];
+
+      assert.deepEqual(getAllowedSizes(), expectedSizes);
+    });
+
+    it('does not add 1x1 to allowed sizes if 300x250 is not present', function() {
+      const currentSizes = [[100, 100], [300, 150]];
+      const fakeGetAdUnits = () => [{
+        mediaTypes: {
+          banner: {
+            sizes: currentSizes
+          }
+        }
+      }];
+      sinon.replace(auctionManager, 'getAdUnits', fakeGetAdUnits);
+      const expectedSizes = [[100, 100], [300, 150]];
+
+      assert.deepEqual(getAllowedSizes(), expectedSizes);
+    });
+  });
 });