Floors: Modify fetchrate to usefetchdatarate (#3972)

Author: pm-nikhil-vaidya

floors/fetcher.go

@@ -309,8 +309,8 @@ func validateRules(config config.AccountFloorFetch, priceFloors *openrtb_ext.Pri
 		return errors.New("skip rate should be greater than or equal to 0 and less than 100")
 	}
 
-	if priceFloors.Data.FetchRate != nil && (*priceFloors.Data.FetchRate < dataRateMin || *priceFloors.Data.FetchRate > dataRateMax) {
-		return errors.New("FetchRate should be greater than or equal to 0 and less than or equal to 100")
+	if priceFloors.Data.UseFetchDataRate != nil && (*priceFloors.Data.UseFetchDataRate < dataRateMin || *priceFloors.Data.UseFetchDataRate > dataRateMax) {
+		return errors.New("usefetchdatarate should be greater than or equal to 0 and less than or equal to 100")
 	}
 
 	for _, modelGroup := range priceFloors.Data.ModelGroups {

floors/fetcher_test.go

@@ -398,7 +398,7 @@ func TestValidatePriceFloorRules(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "Invalid FetchRate",
+			name: "Invalid UseFetchDataRate",
 			args: args{
 				configs: config.AccountFloorFetch{
 					Enabled:       true,
@@ -417,7 +417,7 @@ func TestValidatePriceFloorRules(t *testing.T) {
 								"*|*|www.website.com": 15.01,
 							},
 						}},
-						FetchRate: ptrutil.ToPtr(-11),
+						UseFetchDataRate: ptrutil.ToPtr(-11),
 					},
 				},
 			},

floors/floors.go

@@ -166,7 +166,7 @@ func resolveFloors(account config.Account, bidRequestWrapper *openrtb_ext.Reques
 		fetchResult, fetchStatus = priceFloorFetcher.Fetch(account.PriceFloors)
 	}
 
-	if fetchResult != nil && fetchStatus == openrtb_ext.FetchSuccess && useFetchedData(fetchResult.Data.FetchRate) {
+	if fetchResult != nil && fetchStatus == openrtb_ext.FetchSuccess && useFetchedData(fetchResult.Data.UseFetchDataRate) {
 		mergedFloor := mergeFloors(reqFloor, fetchResult, conversions)
 		floorRules, errList = createFloorsFrom(mergedFloor, account, fetchStatus, openrtb_ext.FetchLocation)
 	} else if reqFloor != nil {

floors/floors_test.go

@@ -791,7 +791,7 @@ func (m *MockFetchDataRate0) Fetch(configs config.AccountPriceFloors) (*openrtb_
 					},
 				},
 			},
-			FetchRate: ptrutil.ToPtr(0),
+			UseFetchDataRate: ptrutil.ToPtr(0),
 		},
 	}
 	return &priceFloors, openrtb_ext.FetchSuccess
@@ -831,7 +831,7 @@ func (m *MockFetchDataRate100) Fetch(configs config.AccountPriceFloors) (*openrt
 					},
 				},
 			},
-			FetchRate: ptrutil.ToPtr(100),
+			UseFetchDataRate: ptrutil.ToPtr(100),
 		},
 	}
 	return &priceFloors, openrtb_ext.FetchSuccess
@@ -979,7 +979,7 @@ func TestResolveFloorsWithUseDataRate(t *testing.T) {
 							},
 						},
 					},
-					FetchRate: ptrutil.ToPtr(100),
+					UseFetchDataRate: ptrutil.ToPtr(100),
 				},
 			},
 		},

openrtb_ext/floors.go

@@ -89,7 +89,7 @@ type PriceFloorData struct {
 	ModelTimestamp      int                    `json:"modeltimestamp,omitempty"`
 	ModelGroups         []PriceFloorModelGroup `json:"modelgroups,omitempty"`
 	FloorProvider       string                 `json:"floorprovider,omitempty"`
-	FetchRate           *int                   `json:"fetchrate,omitempty"`
+	UseFetchDataRate    *int                   `json:"usefetchdatarate,omitempty"`
 }
 
 type PriceFloorModelGroup struct {