Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue862 - implemented multi media bids #993

Closed
wants to merge 49 commits into from
Closed

Issue862 - implemented multi media bids #993

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
e9fa33d
looking into issue 862
Jul 1, 2019
58e10da
Merge remote-tracking branch 'origin/master' into issue862
Jul 9, 2019
9975473
Improved handling of imps that are looking for both banner and video.…
Jul 9, 2019
3fbe927
Multimedia requests seem to be working. Still testing edge cases.
Jul 11, 2019
9e4b656
removed some logging, updated docs.
Jul 15, 2019
d701b70
buildig out for multiple requests
Jul 26, 2019
de9b3c2
not progress at stacking it.
Jul 30, 2019
92235e9
dumped the idea of multiple appIds for an impresion.
Jul 30, 2019
6ab8f71
Changed the Video property to a slice and now sendig multiple video r…
Jul 31, 2019
ec31df9
cleaning up a bit
Jul 31, 2019
6e0e8c5
Merge remote-tracking branch 'origin/master' into issue862
Jul 31, 2019
4c1d5aa
corrected some access levels
Jul 31, 2019
45b3510
removed redundant counters
Jul 31, 2019
210aed0
updated and expanded on test cases
Aug 1, 2019
b8df0f3
deleted my debug build
Aug 1, 2019
5cc97ea
cleaning up a bit
Aug 1, 2019
eddc960
mior fix to error output
Aug 7, 2019
d2371db
I'll need to update the docs later
Aug 7, 2019
52dc78d
hopefullt this straightens out some weirdness with my Gopkg.lock.
Aug 7, 2019
3766f28
corrected an indexing bug
Aug 8, 2019
14ee1d2
I don't see a way that r.Cur could be set, but covering it anyway
Aug 14, 2019
62e77bb
I'm only adding good Slots to the banner request.
Aug 14, 2019
2b39dcc
removed my test error
Aug 15, 2019
5e405ac
gofmt fixed some indenting on some comments
Aug 15, 2019
53b7aea
This cleans up some in getVideoRequests.
Aug 15, 2019
4d5f42f
removed inaccurate comment
Aug 15, 2019
0ae4ac8
removed test error
Aug 15, 2019
167e18c
gofmted
Aug 15, 2019
914bcaf
as per comments by @mansinahar, cleaned up some comments and looking …
Aug 22, 2019
e093428
@mansinahar pointed out that I dont need to use the addHeaderIfNonEmp…
Aug 22, 2019
96a67d4
Covered a few more very helpfull comments from @mansinahar
Aug 22, 2019
ea6ee2a
fixed possible errs overwrite in preprocess. Also, I'm seeing a bug i…
Aug 22, 2019
fa2ce42
Worked out how to do the site part proper.
Aug 22, 2019
e05e044
Improved readability on video size
Aug 22, 2019
38a0127
Improved the domain stuff a bit
Aug 22, 2019
fef4920
Modified video to not append until the end
Aug 22, 2019
cc8776f
corrected some bugs in test cases
Aug 22, 2019
ecfcc76
Addressed another round of comments and pointers from mansinahar
Aug 23, 2019
1610fef
Found the source of the panic I was seeing when I tried to move the .…
Aug 23, 2019
c31f79d
quick fix in a test case
Aug 23, 2019
5ac6e39
Uhg. Trying to do two things at one leads to dumb mistakes.
Aug 23, 2019
7bb0db2
improved a test case
Aug 23, 2019
69790a3
added slightly improved error reporting. I was running into errors wi…
Aug 27, 2019
3174bdb
eliminated a redundant else
Aug 27, 2019
bcc3734
A version bump
Aug 28, 2019
6b32fd8
fixed all the references in test cases for version bump
Aug 28, 2019
d63ecfa
found the source of the panic on multi - mix test. Some flawed logic …
Aug 28, 2019
53915ce
I needed a status in my mock response for multi-video test case.
Sep 5, 2019
60f2c73
this gets the unmarshal-error-video.json test case working. The probl…
Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
587 changes: 306 additions & 281 deletions adapters/beachfront/beachfront.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion adapters/beachfront/beachfronttest/exemplary/minimal-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dnt": 0,
"ua": "",
"adapterName": "BF_PREBID_S2S",
"adapterVersion": "0.3.0",
"adapterVersion": "0.6.0",
"user": {
}
}
Expand Down
2 changes: 1 addition & 1 deletion adapters/beachfront/beachfronttest/supplemental/minimal-banner-empty_array-200.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dnt": 0,
"ua": "",
"adapterName": "BF_PREBID_S2S",
"adapterVersion": "0.3.0",
"adapterVersion": "0.6.0",
"user": {
}
}
Expand Down
131 changes: 83 additions & 48 deletions adapters/beachfront/beachfronttest/supplemental/minimal-mobile-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,98 @@
{
"mockBidRequest": {
"id": "some_test_ad",
"app": {
"domain": "yourmomshouse.com",
"id": "some-mobile-app"
"id":"763e3312-19d5-4b07-a61d-890147e863a1",
"source":{
"tid":"763e3312-19d5-4b07-a61d-890147e863a1"
},
"imp": [
"tmax":1000,
"imp":[
{
"bidfloor": 0.02,
"banner": {
"format": [
"id":"div-gpt-ad-1460505748561-0",
"ext":{
"bidder":{
"appId":"3b16770b-17af-4d22-daff-9606bdf2c9c3",
"bidfloor":0.01
}
},
"banner":{
"format":[
{
"w": 300,
"h": 250
"w":300,
"h":250
},
{
"w":300,
"h":600
}
]
},
"ext": {
"bidder": {
"bidfloor": 0.02,
"appId": "3b16770b-17af-4d22-daff-9606bdf2c9c3"
}
}
}
]
],
"device":{
"make":"Huawei",
"model":"Android SDK built for x86",
"ua":"Mozilla\/5.0 (Linux; Android 5.1.1; Android SDK built for x86 Build\/LMY48X) AppleWebKit\/537.36 (KHTML, like Gecko) Version\/4.0 Chrome\/39.0.0.0 Mobile Safari\/537.36",
"w":360,
"h":567,
"pxratio":2,
"mccmnc":"310-260",
"carrier":"Android",
"connectiontype":2,
"lmt":0,
"ifa":"bb956625-df13-4568-b60b-eb5cbf76e986",
"os":"android",
"osv":"22",
"language":"en"
},
"app":{
"id":"bfa84af2-bd16-4d35-96ad-31c6bb888df0",
"name":"Demo app",
"bundle":"_org.prebid.mobile.demoapp",
"domain":"beachfront.com"
}
},

"httpCalls": [
{
"expectedRequest": {
"uri": "https://display.bfmio.com/prebid_display",
"body": {
"slots": [
"uri" : "https://display.bfmio.com/prebid_display",
"body" : {
"slots":[
{
"slot": "",
"id": "3b16770b-17af-4d22-daff-9606bdf2c9c3",
"bidfloor": 0.02,
"sizes": [
"slot":"div-gpt-ad-1460505748561-0",
"id":"3b16770b-17af-4d22-daff-9606bdf2c9c3",
"bidfloor":0.01,
"sizes":[
{
"w": 300,
"h": 250
"w":300,
"h":250
},
{
"w":300,
"h":600
}
]
}
],
"domain": "yourmomshouse.com",
"page": "some-mobile-app",
"referrer": "",
"search": "",
"requestId": "some_test_ad",
"secure": 0,
"isMobile": 0,
"ip": "",
"deviceModel": "",
"deviceOs": "",
"dnt": 0,
"ua": "",
"adapterName": "BF_PREBID_S2S",
"adapterVersion": "0.3.0",
"user": {
}
"domain":"beachfront.com",
"page":"_org.prebid.mobile.demoapp",
"referrer":"",
"search":"",
"secure":0,
"deviceOs":"android",
"deviceModel":"Android SDK built for x86",
"isMobile":1,
"ua":"Mozilla/5.0 (Linux; Android 5.1.1; Android SDK built for x86 Build/LMY48X) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36",
"dnt":0,
"user":{

},
"adapterName":"BF_PREBID_S2S",
"adapterVersion":"0.6.0",
"ip":"",
"requestId":"763e3312-19d5-4b07-a61d-890147e863a1"
}
},
}
,
"mockResponse": {
"status": 200,
"body": [
Expand All @@ -81,15 +112,19 @@
"expectedBids": [
{
"Bid": {
"id": "12345678",
"impid": "test-slot",
"price": 2,
"id": "763e3312-19d5-4b07-a61d-890147e863a1",
"impid": "div-gpt-ad-1460505748561-0",
"price": 2.942808,
"adm": "\u003cdiv id=\"12345678\" style=\"width:300;height:250;background-color:black;color:white;\"\u003e300x250\u003c\\div\u003e",
"crid": "crid_1",
"w": 300,
"h": 250
},
"type": "banner"
"ext": {
"prebid": {
"type": "banner"
}
}
}
]
}
2 changes: 1 addition & 1 deletion adapters/beachfront/beachfronttest/supplemental/minimal-mobile-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"isPrebid": true,
"site": {
"domain": "some.app.com",
"page": "some-mobile-app"
"mobile" : 1
},
"user": {
}
Expand Down
2 changes: 1 addition & 1 deletion adapters/beachfront/beachfronttest/supplemental/minimal-site-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"dnt": 0,
"ua": "",
"adapterName": "BF_PREBID_S2S",
"adapterVersion": "0.3.0",
"adapterVersion": "0.6.0",
"user": {
}
}
Expand Down
2 changes: 1 addition & 1 deletion adapters/beachfront/beachfronttest/supplemental/multi-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"dnt": 1,
"ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16",
"adapterName": "BF_PREBID_S2S",
"adapterVersion": "0.3.0",
"adapterVersion": "0.6.0",
"user": {
"buyeruid": "some-buyer",
"id": "some-user"
Expand Down
Loading