Support bidder-specific device data #4197
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,9 +32,10 @@ const ( | |
| ) | ||
|
|
||
| type ResolvedFirstPartyData struct { | ||
| Site *openrtb2.Site | ||
| App *openrtb2.App | ||
| User *openrtb2.User | ||
| Device *openrtb2.Device | ||
| } | ||
|
|
||
| // ExtractGlobalFPD extracts request level FPD from the request and removes req.{site,app,user}.ext.data if exists | ||
|
|
@@ -159,13 +160,75 @@ func ResolveFPD(bidRequest *openrtb2.BidRequest, fpdBidderConfigData map[openrtb | |
| } | ||
| resolvedFpdConfig.Site = newSite | ||
|
|
||
| newDevice, err := resolveDevice(fpdConfig, bidRequest.Device) | ||
| if err != nil { | ||
| errL = append(errL, err) | ||
| } | ||
| resolvedFpdConfig.Device = newDevice | ||
|
|
||
| if len(errL) == 0 { | ||
| resolvedFpd[openrtb_ext.BidderName(bidderName)] = resolvedFpdConfig | ||
| } | ||
| } | ||
| return resolvedFpd, errL | ||
| } | ||
|
|
||
| // resolveDevice merges the device information from the FPD (First Party Data) configuration | ||
| // with the device information provided in the bid request. It returns a new Device object | ||
| // that contains the merged data. | ||
| func resolveDevice(fpdConfig *openrtb_ext.ORTB2, bidRequestDevice *openrtb2.Device) (*openrtb2.Device, error) { | ||
| var fpdConfigDevice json.RawMessage | ||
|
|
||
| if fpdConfig != nil && fpdConfig.Device != nil { | ||
| fpdConfigDevice = fpdConfig.Device | ||
| } | ||
|
|
||
| if bidRequestDevice == nil && fpdConfigDevice == nil { | ||
| return nil, nil | ||
| } | ||
|
|
||
| var newDevice *openrtb2.Device | ||
| if bidRequestDevice != nil { | ||
| newDevice = ptrutil.Clone(bidRequestDevice) | ||
| } else { | ||
| newDevice = &openrtb2.Device{} | ||
| } | ||
|
|
||
| if fpdConfigDevice != nil { | ||
| if err := jsonutil.MergeClone(newDevice, fpdConfigDevice); err != nil { | ||
| return nil, formatMergeCloneError(err) | ||
| } | ||
| } | ||
|
|
||
| err := validateDevice(newDevice) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return newDevice, nil | ||
| } | ||
|
There was a problem hiding this comment. Can you please add device validation before returning it? |
||
|
|
||
| func validateDevice(device *openrtb2.Device) error { | ||
| if device == nil { | ||
| return nil | ||
| } | ||
|
|
||
| // The following fields were previously uints in the OpenRTB library we use, but have | ||
| // since been changed to ints. We decided to maintain the non-negative check. | ||
| if device.W < 0 { | ||
| return errors.New("request.device.w must be a positive number") | ||
| } | ||
| if device.H < 0 { | ||
| return errors.New("request.device.h must be a positive number") | ||
| } | ||
| if device.PPI < 0 { | ||
| return errors.New("request.device.ppi must be a positive number") | ||
| } | ||
| if device.Geo != nil && device.Geo.Accuracy < 0 { | ||
| return errors.New("request.device.geo.accuracy must be a positive number") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func resolveUser(fpdConfig *openrtb_ext.ORTB2, bidRequestUser *openrtb2.User, globalFPD map[string][]byte, openRtbGlobalFPD map[string][]openrtb2.Data, bidderName string) (*openrtb2.User, error) { | ||
| var fpdConfigUser json.RawMessage | ||
|
|
||
|
|
@@ -377,6 +440,7 @@ func ExtractBidderConfigFPD(reqExt *openrtb_ext.RequestExt) (map[openrtb_ext.Bid | |
| fpdBidderData.Site = bidderConfig.Config.ORTB2.Site | ||
| fpdBidderData.App = bidderConfig.Config.ORTB2.App | ||
| fpdBidderData.User = bidderConfig.Config.ORTB2.User | ||
| fpdBidderData.Device = bidderConfig.Config.ORTB2.Device | ||
| } | ||
|
|
||
| fpd[bidderName] = fpdBidderData | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please add the following test case:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added in e65a0b2