Skip to content

Example sync code #7172

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

Draft
eliykat wants to merge 1 commit into
base: tools/PM-31885-SendControls-Policy
Choose a base branch
from
+22 −30
Draft

Example sync code #7172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 10 additions & 18 deletions ...AdminConsole/OrganizationFeatures/Policies/PolicyValidators/DisableSendSyncPolicyEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,26 @@ public async Task ExecutePostUpsertSideEffectAsync(
Policy postUpsertedPolicyState,
Policy? previousPolicyState)
{
var policyUpdate = policyRequest.PolicyUpdate;
var organizationId = policyRequest.PolicyUpdate.OrganizationId;

// Step 1: sync DisableSend.Enabled -> SendControlsPolicy.Data.DisableSend
var sendControlsPolicy = await policyRepository.GetByOrganizationIdTypeAsync(
policyUpdate.OrganizationId, PolicyType.SendControls) ?? new Policy
organizationId, PolicyType.SendControls) ?? new Policy
{
Id = CoreHelpers.GenerateComb(),
OrganizationId = policyUpdate.OrganizationId,
OrganizationId = organizationId,
Type = PolicyType.SendControls,
};

var sendOptionsPolicy = await policyRepository.GetByOrganizationIdTypeAsync(
policyUpdate.OrganizationId, PolicyType.SendOptions) ?? new Policy
{
Id = CoreHelpers.GenerateComb(),
OrganizationId = policyUpdate.OrganizationId,
Type = PolicyType.SendOptions,
};

var sendControlsPolicyData =
sendControlsPolicy.GetDataModel<SendControlsPolicyData>();

var sendOptionsPolicyData = sendOptionsPolicy.GetDataModel<SendOptionsPolicyData>();

var sendControlsPolicyData = sendControlsPolicy.GetDataModel<SendControlsPolicyData>();
sendControlsPolicyData.DisableSend = postUpsertedPolicyState.Enabled;
sendControlsPolicyData.DisableHideEmail = sendOptionsPolicy.Enabled && sendOptionsPolicyData.DisableHideEmail;
sendControlsPolicy.Enabled = sendControlsPolicyData.DisableSend || sendControlsPolicyData.DisableHideEmail;
sendControlsPolicy.SetDataModel(sendControlsPolicyData);

// Step 2: sync Enabled status. SendControlsPolicy is enabled if either legacy policy is enabled
sendControlsPolicy.Enabled = postUpsertedPolicyState.Enabled ||
((await policyRepository.GetByOrganizationIdTypeAsync(
organizationId, PolicyType.SendOptions))?.Enabled ?? false);

await policyRepository.UpsertAsync(sendControlsPolicy);
}
}
24 changes: 12 additions & 12 deletions ...AdminConsole/OrganizationFeatures/Policies/PolicyValidators/SendOptionsSyncPolicyEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@ public async Task ExecutePostUpsertSideEffectAsync(
Policy postUpsertedPolicyState,
Policy? previousPolicyState)
{
var policyUpdate = policyRequest.PolicyUpdate;
var organizationId = policyRequest.PolicyUpdate.OrganizationId;

// Step 1: sync SendOptionsPolicy.Data.DisableSend -> SendControlsPolicy.Data.DisableSend
var sendControlsPolicy = await policyRepository.GetByOrganizationIdTypeAsync(
policyUpdate.OrganizationId, PolicyType.SendControls) ?? new Policy
organizationId, PolicyType.SendControls) ?? new Policy
{
Id = CoreHelpers.GenerateComb(),
OrganizationId = policyUpdate.OrganizationId,
OrganizationId = organizationId,
Type = PolicyType.SendControls,
};

var sendControlsPolicyData =
sendControlsPolicy.GetDataModel<SendControlsPolicyData>();

var disableSendPolicyState = await policyRepository.GetByOrganizationIdTypeAsync(
policyUpdate.OrganizationId, PolicyType.DisableSend);

sendControlsPolicyData.DisableSend = disableSendPolicyState?.Enabled ?? false;
sendControlsPolicyData.DisableHideEmail = postUpsertedPolicyState.Enabled && postUpsertedPolicyState.GetDataModel<SendOptionsPolicyData>().DisableHideEmail;
sendControlsPolicy.Enabled = sendControlsPolicyData.DisableSend || sendControlsPolicyData.DisableHideEmail;
var sendControlsPolicyData = sendControlsPolicy.GetDataModel<SendControlsPolicyData>();
sendControlsPolicyData.DisableHideEmail = postUpsertedPolicyState.GetDataModel<SendOptionsPolicyData>().DisableHideEmail;
sendControlsPolicy.SetDataModel(sendControlsPolicyData);

// Step 2: sync Enabled status. SendControlsPolicy is enabled if either legacy policy is enabled
// Optimization: DisableSendPolicy.Enabled maps to SendControlsPolicy.Data.DisableSend - so we can use that
// as a proxy for that legacy policy state
sendControlsPolicy.Enabled = postUpsertedPolicyState.Enabled ||
sendControlsPolicyData.DisableSend;

Comment on lines +41 to +45
Copy link
Member Author

@eliykat eliykat Mar 7, 2026

Choose a reason for hiding this comment

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

This optimization is not required if it's confusing. It could just follow the exact same pattern as the other file.

await policyRepository.UpsertAsync(sendControlsPolicy);
}
}
Loading