Skip to content

Commit

Permalink
add ut
Browse files Browse the repository at this point in the history
  • Loading branch information
@pm-nilesh-chate
pm-nilesh-chate committed Jan 11, 2024
1 parent fdd72c6 commit c73d388
Show file tree
Hide file tree
Showing 4 changed files with 334 additions and 66 deletions.
7 changes: 1 addition & 6 deletions config/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type Account struct {
DefaultBidLimit int `mapstructure:"default_bid_limit" json:"default_bid_limit"`
BidAdjustments *openrtb_ext.ExtRequestPrebidBidAdjustments `mapstructure:"bidadjustments" json:"bidadjustments"`
Privacy AccountPrivacy `mapstructure:"privacy" json:"privacy"`
Auction AuctionPrivacy `mapstructure:"auctionprivacy" json:"auctionprivacy"`
Auction Auction `mapstructure:"auction" json:"auction"`
}

// CookieSync represents the account-level defaults for the cookie sync endpoint.
Expand Down Expand Up @@ -363,8 +363,3 @@ func (ip *IPv4) Validate(errs []error) []error {
}
return errs
}

type PrivacySandbox struct {
CookieDeprecation bool `mapstructure:"cookiedeprecation" json:"cookiedeprecation"`
CookieDeprecationExpirationSec int `mapstructure:"cookiedeprecationexpirationsec" json:"cookiedeprecationexpirationsec"`
}
11 changes: 9 additions & 2 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ type Configuration struct {
Hooks Hooks `mapstructure:"hooks"`
Validations Validations `mapstructure:"validations"`
PriceFloors PriceFloors `mapstructure:"price_floors"`

Auction Auction `mapstructure:"auction"`
}

type PriceFloors struct {
Expand Down Expand Up @@ -1286,7 +1288,12 @@ type TmaxAdjustments struct {
BidderResponseDurationMin uint `mapstructure:"bidder_response_duration_min_ms"`
}

type AuctionPrivacy struct {
TopicsDomain string `mapstructure:"topicsdomain"`
type Auction struct {
PrivacySandbox PrivacySandbox `mapstructure:"privacysandbox" json:"privacysandbox"`
}

type PrivacySandbox struct {
TopicsDomain string `mapstructure:"topicsdomain"`
CookieDeprecation bool `mapstructure:"cookiedeprecation"`
CookieDeprecationExpirationSec int `mapstructure:"cookiedeprecationexpirationsec"`
}
53 changes: 15 additions & 38 deletions endpoints/openrtb2/auction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2014,7 +2014,7 @@ func (deps *endpointDeps) setFieldsImplicitly(httpReq *http.Request, r *openrtb_

setAuctionTypeImplicitly(r)

setSecBrowsingTopcisImplicitly(httpReq, r)
setSecBrowsingTopcisImplicitly(httpReq, r, deps.cfg)
}

// setDeviceImplicitly uses implicit info from httpReq to populate bidReq.Device
Expand All @@ -2034,11 +2034,16 @@ func setAuctionTypeImplicitly(r *openrtb_ext.RequestWrapper) {
}

// (100);v=chrome.1:1:20, (200);v=chrome.1:1:40, (300);v=chrome.1:1:60, ();p=P
func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.RequestWrapper) {
func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.RequestWrapper, cfg *config.Configuration) {
if r.User == nil {
r.User = &openrtb2.User{}
}

topicsDomain := "TOPICS_DOMAIN"
if cfg != nil {
topicsDomain = cfg.Auction.PrivacySandbox.TopicsDomain
}

secBrowsingTopics := httpReq.Header.Get("Sec-Browsing-Topics")
if secBrowsingTopics == "" {
return
Expand All @@ -2049,7 +2054,7 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
secBrowsingTopicsArr := strings.Split(secBrowsingTopics, ",")
c := 0
for _, seg := range secBrowsingTopicsArr {
if c > 10 {
if c >= 10 {
break
}

Expand Down Expand Up @@ -2090,15 +2095,7 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
}
segtax := 600 + (taxanomy - 1)
segclass := strings.TrimSpace(taxanomyModel[2])
// modelVer := strings.TrimSpace(taxanomyModel[2])
// segclass, err := strconv.Atoi(modelVer)
// if err != nil {
// continue
// }

// if _, ok := userData["TOPICS_DOMAIN"]; !ok {
// userData["TOPICS_DOMAIN"] = map[int]map[int][]string{}
// }

if _, ok := userData[segtax]; !ok {
userData[segtax] = map[string]map[string]map[string]struct{}{}
}
Expand All @@ -2107,14 +2104,14 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
userData[segtax][segclass] = map[string]map[string]struct{}{}
}

if _, ok := userData[segtax][segclass]["TOPICS_DOMAIN"]; !ok {
userData[segtax][segclass]["TOPICS_DOMAIN"] = map[string]struct{}{}
if _, ok := userData[segtax][segclass][topicsDomain]; !ok {
userData[segtax][segclass][topicsDomain] = map[string]struct{}{}
}

for _, segId := range segmentsIdArr {
segId = strings.TrimSpace(segId)
if segid, err := strconv.Atoi(segId); err == nil && segid > 0 {
userData[segtax][segclass]["TOPICS_DOMAIN"][segId] = struct{}{}
userData[segtax][segclass][topicsDomain][segId] = struct{}{}
}
}

Expand All @@ -2127,12 +2124,10 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
}

requestUserData := map[int]map[string]map[string]map[string]struct{}{}
for _, data := range r.User.Data {
for i, data := range r.User.Data {
ext := &extData{}
if err := json.Unmarshal(data.Ext, ext); err != nil {
continue
}

_ = json.Unmarshal(data.Ext, ext)
if ext.Segtax == 0 || ext.Segclass == "" {
continue
}
Expand Down Expand Up @@ -2160,7 +2155,7 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
if _, ok := userData[ext.Segtax][ext.Segclass][data.Name]; ok {
for segId := range userData[ext.Segtax][ext.Segclass][data.Name] {
if _, ok := requestUserData[ext.Segtax][ext.Segclass][data.Name][segId]; !ok {
data.Segment = append(data.Segment, openrtb2.Segment{
r.User.Data[i].Segment = append(r.User.Data[i].Segment, openrtb2.Segment{
ID: segId,
})
}
Expand All @@ -2174,22 +2169,6 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
if !merged {
continue
}

// if _, ok := userData[ext.Segtax]; !ok {
// userData[ext.Segtax] = map[string]map[string]map[string]struct{}{}
// }

// if _, ok := userData[ext.Segtax][ext.Segclass]; !ok {
// userData[ext.Segtax][ext.Segclass] = map[string]map[string]struct{}{}
// }

// if _, ok := userData[ext.Segtax][ext.Segclass][data.Name]; !ok {
// userData[ext.Segtax][ext.Segclass][data.Name] = map[string]struct{}{}
// }

// for _, segId := range data.Segment {
// userData[ext.Segtax][ext.Segclass][data.Name][segId.ID] = struct{}{}
// }
}

for segtax, SegclassSegName := range userData {
Expand All @@ -2207,8 +2186,6 @@ func setSecBrowsingTopcisImplicitly(httpReq *http.Request, r *openrtb_ext.Reques
}
}
}

// r.User.Ext = json.RawMessage(fmt.Sprintf(`{"consent": "%s"}`, secBrowsingTopic))
}

func setSiteImplicitly(httpReq *http.Request, r *openrtb_ext.RequestWrapper) {
Expand Down
Loading

0 comments on commit c73d388

Please sign in to comment.