Merge branch 'master' of github.com:pixfuture-media/prebid-server

.github/workflows/slack-stale-pr.yml

@@ -0,0 +1,27 @@
+name: Post Stale PRs To Slack
+
+on:
+  # run Monday 9am and on-demand
+  workflow_dispatch:
+  schedule:
+    - cron:  '0 9 * * 1'
+
+jobs:
+  fetch-PRs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch pull requests
+        id: local
+        uses: paritytech/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ github.token }}
+          days-stale: 14
+          ignoredLabels: "blocked"
+      - name: Post to a Slack channel
+        id: slack
+        uses: slackapi/[email protected]
+        with:
+          channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack-message: "${{ steps.local.outputs.message }}"
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

adapters/metax/metax.go

@@ -99,8 +99,9 @@ func (a *adapter) MakeBids(bidReq *openrtb2.BidRequest, reqData *adapters.Reques
 				return nil, []error{err}
 			}
 			resp.Bids = append(resp.Bids, &adapters.TypedBid{
-				Bid:     bid,
-				BidType: bidType,
+				Bid:      bid,
+				BidType:  bidType,
+				BidVideo: getBidVideo(bid),
 			})
 		}
 	}
@@ -177,6 +178,17 @@ func getBidType(bid *openrtb2.Bid) (openrtb_ext.BidType, error) {
 	}
 }
 
+func getBidVideo(bid *openrtb2.Bid) *openrtb_ext.ExtBidPrebidVideo {
+	bidVideo := openrtb_ext.ExtBidPrebidVideo{}
+	if len(bid.Cat) > 0 {
+		bidVideo.PrimaryCategory = bid.Cat[0]
+	}
+	if bid.Dur > 0 {
+		bidVideo.Duration = int(bid.Dur)
+	}
+	return &bidVideo
+}
+
 // Builder builds a new instance of the MetaX adapter for the given bidder with the given config.
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) {
 	if config.Endpoint == "" {

adapters/metax/metax_test.go

@@ -148,6 +148,48 @@ func TestGetBidType(t *testing.T) {
 	}
 }
 
+func TestGetBidVideo(t *testing.T) {
+	tests := []struct {
+		description string
+		bid         *openrtb2.Bid
+		bidvideo    openrtb_ext.ExtBidPrebidVideo
+	}{
+		{
+			description: "One category, no duration",
+			bid:         &openrtb2.Bid{Cat: []string{"IAB1-1"}},
+			bidvideo:    openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 0},
+		},
+		{
+			description: "Two categories and use the first, no duration",
+			bid:         &openrtb2.Bid{Cat: []string{"IAB1-1", "IAB1-2"}},
+			bidvideo:    openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 0},
+		},
+		{
+			description: "No category, no duration",
+			bid:         &openrtb2.Bid{Cat: []string{}},
+			bidvideo:    openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "", Duration: 0},
+		},
+		{
+			description: "No category(nil), no duration",
+			bid:         &openrtb2.Bid{Cat: nil},
+			bidvideo:    openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "", Duration: 0},
+		},
+		{
+			description: "Two categories and use the first, duration is 15",
+			bid:         &openrtb2.Bid{Cat: []string{"IAB1-1", "IAB1-2"}, Dur: 15},
+			bidvideo:    openrtb_ext.ExtBidPrebidVideo{PrimaryCategory: "IAB1-1", Duration: 15},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			bidVideo := getBidVideo(test.bid)
+			assert.Equal(t, test.bidvideo.PrimaryCategory, bidVideo.PrimaryCategory)
+			assert.Equal(t, test.bidvideo.Duration, bidVideo.Duration)
+		})
+	}
+}
+
 func TestBuilder(t *testing.T) {
 	serverCfg := config.Server{}
 

adapters/metax/metaxtest/exemplary/simple-app-video.json

@@ -98,7 +98,12 @@
                   "crid": "test-crid",
                   "w": 1024,
                   "h": 576,
-                  "mtype": 2
+                  "mtype": 2,
+                  "dur": 15,
+                  "cat": [
+                    "IAB1-5",
+                    "IAB1-6"
+                  ]
                 }
               ]
             }
@@ -120,9 +125,18 @@
             "crid": "test-crid",
             "w": 1024,
             "h": 576,
-            "mtype": 2
+            "mtype": 2,
+            "dur": 15,
+            "cat": [
+              "IAB1-5",
+              "IAB1-6"
+            ]
           },
-          "type": "video"
+          "type": "video",
+          "video": {
+            "duration": 15,
+            "primary_category": "IAB1-5"
+          }
         }
       ]
     }

adapters/pubmatic/pubmatic.go

@@ -65,7 +65,6 @@ type extRequestAdServer struct {
 	Wrapper     *pubmaticWrapperExt `json:"wrapper,omitempty"`
 	Acat        []string            `json:"acat,omitempty"`
 	Marketplace *marketplaceReqExt  `json:"marketplace,omitempty"`
-	openrtb_ext.ExtRequest
 }
 
 type respExt struct {
@@ -362,7 +361,6 @@ func extractPubmaticExtFromRequest(request *openrtb2.BidRequest) (extRequestAdSe
 	if err != nil {
 		return pmReqExt, fmt.Errorf("error decoding Request.ext : %s", err.Error())
 	}
-	pmReqExt.ExtRequest = *reqExt
 
 	reqExtBidderParams := make(map[string]json.RawMessage)
 	if reqExt.Prebid.BidderParams != nil {

adapters/pubmatic/pubmatic_test.go

@@ -268,14 +268,8 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) {
 					Ext: json.RawMessage(`{"prebid":{"bidderparams":{}}}`),
 				},
 			},
-			expectedReqExt: extRequestAdServer{
-				ExtRequest: openrtb_ext.ExtRequest{
-					Prebid: openrtb_ext.ExtRequestPrebid{
-						BidderParams: json.RawMessage("{}"),
-					},
-				},
-			},
-			wantErr: false,
+			expectedReqExt: extRequestAdServer{},
+			wantErr:        false,
 		},
 		{
 			name: "Only_Pubmatic_wrapper_ext_present",
@@ -286,11 +280,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) {
 			},
 			expectedReqExt: extRequestAdServer{
 				Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456},
-				ExtRequest: openrtb_ext.ExtRequest{
-					Prebid: openrtb_ext.ExtRequestPrebid{
-						BidderParams: json.RawMessage(`{"wrapper":{"profile":123,"version":456}}`),
-					},
-				},
 			},
 			wantErr: false,
 		},
@@ -313,11 +302,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) {
 			expectedReqExt: extRequestAdServer{
 				Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456},
 				Acat:    []string{"drg", "dlu", "ssr"},
-				ExtRequest: openrtb_ext.ExtRequest{
-					Prebid: openrtb_ext.ExtRequestPrebid{
-						BidderParams: json.RawMessage(`{"acat":[" drg \t","dlu","ssr"],"wrapper":{"profile":123,"version":456}}`),
-					},
-				},
 			},
 			wantErr: false,
 		},
@@ -330,11 +314,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) {
 			},
 			expectedReqExt: extRequestAdServer{
 				Wrapper: &pubmaticWrapperExt{ProfileID: 123, VersionID: 456},
-				ExtRequest: openrtb_ext.ExtRequest{
-					Prebid: openrtb_ext.ExtRequestPrebid{
-						BidderParams: json.RawMessage(`{"acat":[1,3,4],"wrapper":{"profile":123,"version":456}}`),
-					},
-				},
 			},
 			wantErr: true,
 		},
@@ -348,12 +327,6 @@ func TestExtractPubmaticExtFromRequest(t *testing.T) {
 			expectedReqExt: extRequestAdServer{
 				Marketplace: &marketplaceReqExt{AllowedBidders: []string{"pubmatic", "groupm"}},
 				Wrapper:     &pubmaticWrapperExt{ProfileID: 123, VersionID: 456},
-				ExtRequest: openrtb_ext.ExtRequest{
-					Prebid: openrtb_ext.ExtRequestPrebid{
-						BidderParams:         json.RawMessage(`{"wrapper":{"profile":123,"version":456}}`),
-						AlternateBidderCodes: &openrtb_ext.ExtAlternateBidderCodes{Enabled: true, Bidders: map[string]openrtb_ext.ExtAdapterAlternateBidderCodes{"pubmatic": {Enabled: true, AllowedBidderCodes: []string{"groupm"}}}},
-					},
-				},
 			},
 			wantErr: false,
 		},

adapters/pubmatic/pubmatictest/exemplary/banner.json

@@ -46,8 +46,7 @@
 			        	"id": "1234"
 		      	}
 		      }
-     },
-
+     }, 
     "httpCalls": [
       {
         "expectedRequest": {
@@ -89,12 +88,7 @@
                     "profile": 5123,
                     "version":1
                 },
-                "acat": ["drg","dlu","ssr"],
-                "prebid": {
-                  "bidderparams": {
-                    "acat": ["drg","dlu","ssr"]
-                  }
-                }
+                "acat": ["drg","dlu","ssr"]
             }
           },
           "impIDs":["test-imp-id"]

adapters/pubmatic/pubmatictest/exemplary/fledge.json

@@ -47,7 +47,7 @@
               }
             }
           ],
-          "ext": {"prebid":{}}
+          "ext": {}
         },
         "impIDs":["test-imp-id"]
       },

adapters/pubmatic/pubmatictest/exemplary/native.json

@@ -56,8 +56,7 @@
                       "wrapper": {
                           "profile": 5123,
                           "version": 1
-                      },
-                      "prebid": {}
+                      }
                   }
               },
               "impIDs":["test-native-imp"]

adapters/pubmatic/pubmatictest/exemplary/video.json

@@ -53,7 +53,6 @@
         }
       }
     },
-
     "httpCalls": [
       {
         "expectedRequest": {
@@ -100,12 +99,7 @@
                     "profile": 5123,
                     "version":1
                 },
-                "acat": ["drg","dlu","ssr"],
-                "prebid": {
-                  "bidderparams": {
-                    "acat": ["drg","dlu","ssr"]
-                  }
-                }
+                "acat": ["drg","dlu","ssr"]
             }
           },
           "impIDs":["test-video-imp"]

adapters/pubmatic/pubmatictest/supplemental/app.json

@@ -41,7 +41,6 @@
           "ext":{}
 		    }
     },
-
     "httpCalls": [
       {
         "expectedRequest": {
@@ -83,8 +82,7 @@
                 "wrapper": {
                     "profile": 5123,
                     "version":1
-                },
-                "prebid": {}
+                }
             }
           },
           "impIDs":["app-imp"]

adapters/pubmatic/pubmatictest/supplemental/dctrAndPmZoneID.json

@@ -92,8 +92,7 @@
             "wrapper": {
               "profile": 5123,
               "version": 1
-            },
-            "prebid": {}
+            }
           }
         },
         "impIDs":["test-imp-id"]

adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExt.json

@@ -102,8 +102,7 @@
                         "wrapper": {
                             "profile": 5123,
                             "version": 1
-                        },
-                        "prebid": {}
+                        }
                     }
                 },
                 "impIDs": [

adapters/pubmatic/pubmatictest/supplemental/displayManagerInAppExtPrebid.json

@@ -110,8 +110,7 @@
                         "wrapper": {
                             "profile": 5123,
                             "version": 1
-                        },
-                        "prebid": {}
+                        }
                     }
                 },
                 "impIDs": [

adapters/pubmatic/pubmatictest/supplemental/extra-bid.json

@@ -58,7 +58,6 @@
             }
           }
      },
-
      "httpCalls": [
       {
         "expectedRequest": {
@@ -103,22 +102,6 @@
                 "acat": ["drg","dlu","ssr"],
                 "marketplace": {
                   "allowedbidders": ["pubmatic", "groupm"]
-                },
-                "prebid": {
-                  "bidderparams": {
-                    "acat": ["drg","dlu","ssr"]
-                  },
-                  "alternatebiddercodes": {
-                    "enabled": true,
-                    "bidders": {
-                      "pubmatic": {
-                        "enabled": true,
-                        "allowedbiddercodes": [
-                          "groupm"
-                        ]
-                      }
-                    }
-                  }
                 }
             }
           },

adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json

@@ -97,8 +97,7 @@
             "wrapper": {
               "profile": 5123,
               "version": 1
-            },
-            "prebid": {}
+            }
           }
         },
         "impIDs":["test-imp-id"]

adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExtPbAdslot.json

@@ -93,8 +93,7 @@
             "wrapper": {
               "profile": 5123,
               "version": 1
-            },
-            "prebid": {}
+            }
           }
         },
         "impIDs":["test-imp-id"]

adapters/pubmatic/pubmatictest/supplemental/impExt.json

@@ -84,7 +84,6 @@
                         }
                     },
                     "ext": {
-                        "prebid": {},
                         "wrapper": {
                             "profile": 5123,
                             "version": 1