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.

Sign up for GitHub

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

Modules activities #3057

Merged
merged 21 commits into from
Dec 11, 2023
+371 −51
Merged

Modules activities #3057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8bdbbae
Initial version
VeronikaSolovei9 Aug 25, 2023
89509aa
Replaced to generics
VeronikaSolovei9 Aug 25, 2023
03340ba
Minor refactoring
VeronikaSolovei9 Aug 25, 2023
a0c2acb
Working end to end with multiple modules: some restricted and some not
VeronikaSolovei9 Aug 27, 2023
0171679
Refactored duplicated code
VeronikaSolovei9 Aug 28, 2023
e7e03cb
Changed mutation functions to scrubber
VeronikaSolovei9 Aug 30, 2023
97b2639
Remover unnecessary error
VeronikaSolovei9 Aug 30, 2023
d0de9a9
Unit tests
VeronikaSolovei9 Sep 2, 2023
c830408
Imports sort
VeronikaSolovei9 Sep 2, 2023
2d9dfc9
Code clean up
VeronikaSolovei9 Sep 5, 2023
0c4a4db
Merge branch 'master' into modules_activities
VeronikaSolovei9 Sep 5, 2023
a026019
Merge fixes
VeronikaSolovei9 Sep 5, 2023
f2702ae
Merge branch 'master' into modules_activities
VeronikaSolovei9 Sep 12, 2023
90c4f20
Merge branch 'master' into modules_activities
VeronikaSolovei9 Nov 16, 2023
d019263
Merge with master and fixes
VeronikaSolovei9 Nov 17, 2023
30ca359
Merge branch 'master' into modules_activities
VeronikaSolovei9 Nov 28, 2023
e67b1d9
Code clean up
VeronikaSolovei9 Nov 28, 2023
9b71cd2
Interface rename, code clean up
VeronikaSolovei9 Dec 7, 2023
bf08739
Merge branch 'master' into modules_activities
VeronikaSolovei9 Dec 7, 2023
921a52d
Unit tests clean up
VeronikaSolovei9 Dec 8, 2023
fb6be8a
Unit tests clean up
VeronikaSolovei9 Dec 11, 2023
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
9 changes: 9 additions & 0 deletions hooks/hookexecution/execution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ func TestHandleModuleActivitiesBidderRequestPayload(t *testing.T) {
activityControl := privacy.NewActivityControl(test.privacyConfig)
newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
assert.Equal(t, test.expectedPayloadData.Request.BidRequest, newPayload.Request.BidRequest)
//check input payload didn't change
origInPayloadData := test.inPayloadData
assert.Equal(t, origInPayloadData, test.inPayloadData)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to move the line origInPayloadData := test.inPayloadData above the call to handleModuleActivities.

})
}
}
Expand Down Expand Up @@ -104,6 +107,9 @@ func TestHandleModuleActivitiesProcessedAuctionRequestPayload(t *testing.T) {
activityControl := privacy.NewActivityControl(test.privacyConfig)
newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
assert.Equal(t, test.expectedPayloadData.Request.BidRequest, newPayload.Request.BidRequest)
//check input payload didn't change
origInPayloadData := test.inPayloadData
assert.Equal(t, origInPayloadData, test.inPayloadData)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to move the line origInPayloadData := test.inPayloadData above the call to handleModuleActivities.

})
}
}
Expand Down Expand Up @@ -137,6 +143,9 @@ func TestHandleModuleActivitiesNoBidderRequestPayload(t *testing.T) {
activityControl := privacy.NewActivityControl(test.privacyConfig)
newPayload := handleModuleActivities(test.hookCode, activityControl, test.inPayloadData)
assert.Equal(t, test.expectedPayloadData, newPayload)
//check input payload didn't change
origInPayloadData := test.inPayloadData
assert.Equal(t, origInPayloadData, test.inPayloadData)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to move the line origInPayloadData := test.inPayloadData above the call to handleModuleActivities.

})
}
}
119 changes: 3 additions & 116 deletions hooks/hookexecution/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,66 +672,6 @@ func TestExecuteRawAuctionStage(t *testing.T) {
},
},
},
{
description: "Group payload not changes with transmitUFPD activity restriction",
givenBody: body,
givenUrl: urlString,
givenPlanBuilder: TestWithModuleContextsPlanBuilder{},
givenAccount: account,
expectedBody: body,
expectedReject: nil,
expectedModuleContexts: &moduleContexts{ctxs: map[string]hookstage.ModuleContext{
"module-1": {"raw-auction-ctx-1": "some-ctx-1", "raw-auction-ctx-3": "some-ctx-3"},
"module-2": {"raw-auction-ctx-2": "some-ctx-2"},
}},
privacyConfig: getTransmitUFPDActivityConfig("foo", false),
expectedStageOutcomes: []StageOutcome{
{
Entity: entityAuctionRequest,
Stage: hooks.StageRawAuctionRequest.String(),
Groups: []GroupOutcome{
{
InvocationResults: []HookOutcome{
{
AnalyticsTags: hookanalytics.Analytics{},
HookID: HookID{ModuleCode: "module-1", HookImplCode: "foo"},
Status: StatusSuccess,
Action: ActionNone,
Message: "",
DebugMessages: nil,
Errors: nil,
Warnings: nil,
},
{
AnalyticsTags: hookanalytics.Analytics{},
HookID: HookID{ModuleCode: "module-2", HookImplCode: "baz"},
Status: StatusSuccess,
Action: ActionNone,
Message: "",
DebugMessages: nil,
Errors: nil,
Warnings: nil,
},
},
},
{
InvocationResults: []HookOutcome{
{
AnalyticsTags: hookanalytics.Analytics{},
HookID: HookID{ModuleCode: "module-1", HookImplCode: "bar"},
Status: StatusSuccess,
Action: ActionNone,
Message: "",
DebugMessages: nil,
Errors: nil,
Warnings: nil,
},
},
},
},
},
},
},
}

for _, test := range testCases {
Expand Down Expand Up @@ -1231,68 +1171,15 @@ func TestExecuteBidderRequestStage(t *testing.T) {
},
},
},
{
description: "Group payload not changes with transmitUFPD activity restriction",
givenBidderRequest: &openrtb2.BidRequest{ID: "some-id", User: &openrtb2.User{ID: "user-id"}},
givenPlanBuilder: TestWithModuleContextsPlanBuilder{},
givenAccount: account,
expectedBidderRequest: expectedBidderRequest,
expectedReject: nil,
expectedModuleContexts: &moduleContexts{ctxs: map[string]hookstage.ModuleContext{
"module-1": {"bidder-request-ctx-1": "some-ctx-1"},
"module-2": {"bidder-request-ctx-2": "some-ctx-2"},
}},
privacyConfig: getTransmitUFPDActivityConfig("foo", false),
expectedStageOutcomes: []StageOutcome{
{
ExecutionTime: ExecutionTime{},
Entity: entity(bidderName),
Stage: hooks.StageBidderRequest.String(),
Groups: []GroupOutcome{
{
ExecutionTime: ExecutionTime{},
InvocationResults: []HookOutcome{
{
ExecutionTime: ExecutionTime{},
AnalyticsTags: hookanalytics.Analytics{},
HookID: HookID{ModuleCode: "module-1", HookImplCode: "foo"},
Status: StatusSuccess,
Action: ActionNone,
Message: "",
DebugMessages: nil,
Errors: nil,
Warnings: nil,
},
},
},
{
ExecutionTime: ExecutionTime{},
InvocationResults: []HookOutcome{
{
ExecutionTime: ExecutionTime{},
AnalyticsTags: hookanalytics.Analytics{},
HookID: HookID{ModuleCode: "module-2", HookImplCode: "bar"},
Status: StatusSuccess,
Action: ActionNone,
Message: "",
DebugMessages: nil,
Errors: nil,
Warnings: nil,
},
},
},
},
},
},
},
}

for _, test := range testCases {
t.Run(test.description, func(t *testing.T) {
exec := NewHookExecutor(test.givenPlanBuilder, EndpointAuction, &metricsConfig.NilMetricsEngine{})
exec.SetAccount(test.givenAccount)
ac := privacy.NewActivityControl(test.privacyConfig)
privacyConfig := getTransmitUFPDActivityConfig("foo", false)
ac := privacy.NewActivityControl(privacyConfig)
exec.SetActivityControl(ac)
exec.SetAccount(test.givenAccount)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you able to add this to all six stage tests?

  • TestExecuteRawAuctionStage
  • TestExecuteProcessedAuctionStage
  • TestExecuteBidderRequestStage
  • TestExecuteRawBidderResponseStage
  • TestExecuteAllProcessedBidResponsesStage
  • TestExecuteAuctionResponseStage


reject := exec.ExecuteBidderRequestStage(&openrtb_ext.RequestWrapper{BidRequest: test.givenBidderRequest}, bidderName)

Expand Down