revert: "feat: PB-804 Redis Fix Option" (prebid#280) ♻️

This reverts commit fe95b42.
allar15 · Jul 24, 2023 · 4e3579f · 4e3579f
1 parent fe95b42
commit 4e3579f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 56 deletions.
diff --git a/endpoints/openrtb2/auction.go b/endpoints/openrtb2/auction.go
@@ -210,6 +210,7 @@ func (deps *endpointDeps) Auction(w http.ResponseWriter, r *http.Request, _ http
 		ctx = ctx_helpers.SetUnitID(ctx, extNextMillennium.UnitID)
 		requestExt.SetNextMillennium(extNextMillennium)
 	}
+	deps.parseBuyerUIDs(ctx, req)
 
 	timeout := deps.cfg.AuctionTimeouts.LimitAuctionTimeout(time.Duration(req.TMax) * time.Millisecond)
 	if timeout > 0 {
@@ -220,8 +221,6 @@ func (deps *endpointDeps) Auction(w http.ResponseWriter, r *http.Request, _ http
 	ao.TimeoutMS = timeout.Milliseconds()
 
 	usersyncs := usersync.ParseCookieFromRequest(r, &(deps.cfg.HostCookie))
-	deps.parseBuyerUIDs(ctx, req, extNextMillennium, usersyncs)
-
 	if req.App != nil {
 		labels.Source = metrics.DemandApp
 		labels.RType = metrics.ReqTypeORTB2App
@@ -335,7 +334,7 @@ func (deps *endpointDeps) Auction(w http.ResponseWriter, r *http.Request, _ http
 	}
 }
 
-func (deps *endpointDeps) parseBuyerUIDs(ctx context.Context, req *openrtb_ext.RequestWrapper, extNmm *openrtb_ext.ExtRequestNextMillennium, usersyncs *usersync.Cookie) {
+func (deps *endpointDeps) parseBuyerUIDs(ctx context.Context, req *openrtb_ext.RequestWrapper) {
 	userExt, err := req.GetUserExt()
 	if err != nil {
 		return
@@ -345,18 +344,18 @@ func (deps *endpointDeps) parseBuyerUIDs(ctx context.Context, req *openrtb_ext.R
 	if prebid == nil {
 		prebid = &openrtb_ext.ExtUserPrebid{}
 	}
-	if extNmm == nil {
-		extNmm = &openrtb_ext.ExtRequestNextMillennium{}
-	}
-	if usersyncs == nil {
-		usersyncs = &usersync.Cookie{}
-	}
 
 	if user := req.BidRequest.User; user != nil {
 		if uids, err := deps.redis.Get(ctx, user.BuyerUID); err == nil {
 			var uidsMap map[string]string
 			if err = json.Unmarshal(uids, &uidsMap); err == nil {
-				nextmillennium.SetBuyerUids(uidsMap, usersyncs, *extNmm, user, prebid)
+				prebid.BuyerUIDs = make(map[string]string)
+				for bidder, uid := range uidsMap {
+					if bidder == "rubicon" && user.BuyerUID == "" {
+						continue
+					}
+					prebid.BuyerUIDs[bidder] = uid
+				}
 				req.BidRequest.User.BuyerUID = ""
 			}
 		}

diff --git a/nextmillennium/browser_targeting.go b/nextmillennium/browser_targeting.go
@@ -17,9 +17,6 @@ func contains(s []string, e string) bool {
 	}
 	return false
 }
-func Contains(s []string, e string) bool {
-	return contains(s, e)
-}
 
 var deviceTypeInts = map[string]int{
 	"Computer": 2,

diff --git a/nextmillennium/setBuyerUids.go b/nextmillennium/setBuyerUids.go
diff --git a/openrtb_ext/request.go b/openrtb_ext/request.go
@@ -70,7 +70,6 @@ type ExtRequestNextMillennium struct {
 	OverwriteSChain bool                        `json:"overwriteSChain,omitempty"`
 	ReqDealIds      map[string]string           `json:"reqDealIds,omitempty"`
 	Comscore        bool                        `json:"comscore,omitempty"`
-	RedisFixBidders map[string]uint8            `json:"redisFixBidders,omitempty"`
 }
 type ExtRequestNextMillenniumGeo struct {
 	Country string `json:"country,omitempty"`