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.

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

ZetaGlobalSsp adapter: merge ortb2.site and params.site #11773

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
da0b4a5
Merge pull request #1 from prebid/master
asurovenko-zeta Mar 24, 2021
f4ec68e
Merge branch 'master' of git://github.com/prebid/Prebid.js
surovenko Apr 21, 2021
01990a9
Merge remote-tracking branch 'upstream/master'
surovenko May 18, 2021
62f969f
Merge remote-tracking branch 'upstream/master'
surovenko May 18, 2021
ec7c8f0
Merge remote-tracking branch 'upstream/master'
surovenko May 19, 2021
89fe5b1
Merge remote-tracking branch 'upstream/master'
surovenko May 24, 2021
6dc0255
Merge remote-tracking branch 'upstream/master'
surovenko Jun 1, 2021
8dc9ac2
Merge remote-tracking branch 'upstream/master'
surovenko Jun 3, 2021
35353f0
Merge remote-tracking branch 'upstream/master'
surovenko Jun 3, 2021
e6f982a
Merge remote-tracking branch 'upstream/master'
surovenko Jun 4, 2021
70e546c
Merge remote-tracking branch 'upstream/master'
surovenko Jun 7, 2021
cc56875
Merge remote-tracking branch 'upstream/master'
surovenko Jun 15, 2021
f4f2a1e
Merge remote-tracking branch 'upstream/master'
surovenko Jun 16, 2021
3f96c6a
Merge remote-tracking branch 'upstream/master'
surovenko Jul 8, 2021
8e503cd
Merge remote-tracking branch 'upstream/master'
surovenko Aug 3, 2021
1781bfd
Merge remote-tracking branch 'upstream/master'
surovenko Aug 12, 2021
459917b
Merge remote-tracking branch 'upstream/master'
surovenko Aug 17, 2021
9ce50bd
Merge remote-tracking branch 'upstream/master'
surovenko Aug 18, 2021
8f7f147
Merge remote-tracking branch 'upstream/master'
surovenko Aug 19, 2021
a280757
Merge remote-tracking branch 'upstream/master'
surovenko Sep 22, 2021
036d5f1
Merge remote-tracking branch 'upstream/master'
surovenko Nov 19, 2021
33e883f
Merge remote-tracking branch 'upstream/master'
surovenko Nov 26, 2021
e729eb9
Merge remote-tracking branch 'upstream/master'
surovenko Dec 28, 2021
c202e93
Merge remote-tracking branch 'origin/master'
surovenko Feb 17, 2022
95877a7
Merge remote-tracking branch 'upstream/master'
surovenko Feb 22, 2022
bf8f638
Merge remote-tracking branch 'upstream/master'
surovenko Feb 28, 2022
461374f
Merge remote-tracking branch 'upstream/master'
surovenko Mar 5, 2022
b6a2fdc
Merge remote-tracking branch 'upstream/master'
surovenko Mar 9, 2022
92b44e3
Merge remote-tracking branch 'upstream/master'
surovenko May 23, 2022
42381eb
Merge remote-tracking branch 'upstream/master'
surovenko May 25, 2022
f629f34
Merge remote-tracking branch 'upstream/master'
surovenko May 26, 2022
9627d5d
Merge remote-tracking branch 'upstream/master'
surovenko May 27, 2022
3d0c2b2
Merge remote-tracking branch 'upstream/master'
surovenko Aug 10, 2022
0dfdb1c
Merge remote-tracking branch 'upstream/master'
surovenko Nov 14, 2022
9438a2e
Merge remote-tracking branch 'upstream/master'
Feb 1, 2023
4198c51
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Feb 15, 2023
4064f1f
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Mar 16, 2023
6b380a1
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Apr 5, 2023
6cd4e3f
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Apr 25, 2023
1794ae1
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Jun 2, 2023
42d2317
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Jun 8, 2023
691c896
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Aug 28, 2023
e3a97f6
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Sep 20, 2023
3669809
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Sep 29, 2023
312817c
-
asurovenko-zeta Nov 7, 2023
050688f
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Dec 6, 2023
efe75b0
Merge remote-tracking branch 'origin/master'
asurovenko-zeta Dec 29, 2023
37ba030
1
asurovenko-zeta Feb 3, 2024
169c80e
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Feb 5, 2024
681914e
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Feb 12, 2024
14d4d1e
-
asurovenko-zeta Feb 18, 2024
b142183
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Feb 28, 2024
fd465b6
Merge remote-tracking branch 'upstream/master'
asurovenko-zeta Feb 28, 2024
e2ba2ed
Merge remote-tracking branch 'origin/master'
asurovenko-zeta Mar 12, 2024
fe06e5b
ZetaGlobalSsp Adapter: crop page
asurovenko-zeta Mar 18, 2024
c4bdc83
Merge remote-tracking branch 'origin/master'
asurovenko-zeta May 9, 2024
7db9c11
Merge remote-tracking branch 'origin/master'
asurovenko-zeta May 20, 2024
dee944c
Merge remote-tracking branch 'origin/master'
asurovenko-zeta May 29, 2024
1b9662e
Merge remote-tracking branch 'origin/master'
asurovenko-zeta Jun 12, 2024
18de2b3
ZetaGlobalSsp adapter: merge params.site and ortb2.site
asurovenko-zeta Jun 12, 2024
a2b2943
Merge remote-tracking branch 'origin/master'
asurovenko-zeta Jun 14, 2024
244d9a4
Merge branch 'refs/heads/master' into zeta-global-ssp-adapter-merge-site
asurovenko-zeta Jun 14, 2024
729db3c
fix unit test
asurovenko-zeta Jun 14, 2024
a075583
extract buildVideo into utils
asurovenko-zeta Jun 25, 2024
59a8b8f
Revert "extract buildVideo into utils"
asurovenko-zeta Jun 26, 2024
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
4 changes: 2 additions & 2 deletions modules/zeta_global_sspBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ export const spec = {
id: bidderRequest.bidderRequestId,
cur: [DEFAULT_CUR],
imp: imps,
site: params.site ? params.site : {},
device: {...(bidderRequest.ortb2?.device || {}), ...params.device},
site: {...bidderRequest?.ortb2?.site, ...params?.site},
device: {...bidderRequest?.ortb2?.device, ...params?.device},
user: params.user ? params.user : {},
app: params.app ? params.app : {},
ext: {
Expand Down
11 changes: 11 additions & 0 deletions test/spec/modules/zeta_global_sspBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ describe('Zeta Ssp Bid Adapter', function () {
userIdAsEids: eids,
timeout: 500,
ortb2: {
site: {
inventorypartnerdomain: 'disqus.com'
},
device: {
sua: {
mobile: 1,
Expand Down Expand Up @@ -709,4 +712,12 @@ describe('Zeta Ssp Bid Adapter', function () {
expect(payload.ext.tags.nullTag).to.be.undefined;
expect(payload.ext.tags.complexEmptyTag).to.be.undefined;
});

it('Test that site payload param are merged from ortb2 and params', function () {
const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
const payload = JSON.parse(request.data);

expect(payload.site.page).to.eql('zetaglobal.com/page');
expect(payload.site.inventorypartnerdomain).to.eql('disqus.com');
});
});
Loading