8000 feat: Fix NotificationCenter Issue for ODPManager by mikechu-optimizely · Pull Request #324 · optimizely/csharp-sdk · GitHub
[go: up one dir, main page]
Skip to content

feat: Fix NotificationCenter Issue for ODPManager #324

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

Merged
merged 20 commits into from
Jan 18, 2023
Merged

feat: Fix NotificationCenter Issue for ODPManager #324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1a43162
PR changes
mikechu-optimizely Jan 6, 2023
ebd61f6
More PR changes
mikechu-optimizely Jan 6, 2023
41e01d8
proposed changes
Jan 10, 2023
7118ae4
Understanding & additional updates
mikechu-optimizely Jan 10, 2023
7e64331
WIP Refactors & test fixes
mikechu-optimizely Jan 10, 2023
bf16dd9
WIP correcting tests...
mikechu-optimizely Jan 10, 2023
6b829a2
Refactors
mikechu-optimizely Jan 11, 2023
fead3e9
WIP OdpEventManagerTest resolutions
mikechu-optimizely Jan 11, 2023
b8b5f0a
Remove NotificationCenter from NotificationCenterRegistry on Dispose
mikechu-optimizely Jan 12, 2023
1144b0c
Fix Disposed = true location
mikechu-optimizely Jan 12, 2023
f64ca55
Modify NCR Dispose
mikechu-optimizely Jan 12, 2023
5b7b674
Mods to NCR and NC disposal
mikechu-optimizely Jan 12, 2023
59d8995
Mods to NCR and NC disposal
mikechu-optimizely Jan 12, 2023
3f66c8c
Merge remote-tracking branch 'origin/mike/odp-usercontext-optimizelyc…
mikechu-optimizely Jan 12, 2023
1f09422
Fix OdpEventManager & tests
mikechu-optimizely Jan 12, 2023
91e6720
Remove double lock in NotificationCenterRegistry
mikechu-optimizely Jan 12, 2023
5d6b797
Fix final test corrections
mikechu-optimizely Jan 13, 2023
f689154
Pass logger into NotificationCenterRegistry 8000
mikechu-optimizely Jan 18, 2023
9dd3d69
Last PR change request
mikechu-optimizely Jan 18, 2023
556cfbf
Remove TODO comments
mikechu-optimizely Jan 18, 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
Prev Previous commit
Next Next commit
WIP correcting tests...
  • Loading branch information
@mikechu-optimizely
mikechu-optimizely committed Jan 10, 2023
commit bf16dd93356136533148a551b5f9418d8ab4903b
2 changes: 1 addition & 1 deletion OptimizelySDK.Tests/OdpTests/OdpEventManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public void ShouldAddAdditionalInformationToEachEvent()
eventManager.UpdateSettings(_odpConfig);

eventManager.SendEvent(_testEvents[0]);
cde.Wait();
cde.Wait(MAX_COUNT_DOWN_EVENT_WAIT_MS);

var eventsSentToApi = eventsCollector.FirstOrDefault();
var actualEvent = eventsSentToApi?.FirstOrDefault();
Expand Down
14 changes: 12 additions & 2 deletions OptimizelySDK.Tests/OdpTests/OdpManagerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public class OdpManagerTest

private readonly List<string> _emptySegmentsToCheck = new List<string>(0);


private Mock<ILogger> _mockLogger;
private Mock<IOdpEventManager> _mockOdpEventManager;
private Mock<IOdpSegmentManager> _mockSegmentManager;
Expand Down Expand Up @@ -103,7 +102,8 @@ public void ShouldStopEventManagerWhenCloseIsCalled()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();

manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

manager.Dispose();

_mockOdpEventManager.Verify(e => e.Stop(), Times.Once);
Expand All @@ -120,6 +120,7 @@ public void ShouldUseNewSettingsInEventManagerWhenOdpConfigIsUpdated()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

var wasUpdated = manager.UpdateSettings(UPDATED_API_KEY, UPDATED_ODP_ENDPOINT,
_updatedSegmentsToCheck);
Expand All @@ -142,6 +143,7 @@ public void ShouldUseNewSettingsInSegmentManagerWhenOdpConfigIsUpdated()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

var wasUpdated = manager.UpdateSettings(UPDATED_API_KEY, UPDATED_ODP_ENDPOINT,
_updatedSegmentsToCheck);
Expand Down Expand Up @@ -183,6 +185,7 @@ public void ShouldUpdateSettingsWithReset()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

var wasUpdated = manager.UpdateSettings(UPDATED_API_KEY, UPDATED_ODP_ENDPOINT,
_updatedSegmentsToCheck);
Expand All @@ -200,6 +203,7 @@ public void ShouldDisableOdpThroughConfiguration()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

manager.SendEvent(TEST_EVENT_TYPE, TEST_EVENT_ACTION, _testEventIdentifiers,
_testEventData);
Expand Down Expand Up @@ -230,6 +234,7 @@ public void ShouldGetEventManager()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

Assert.IsNotNull(manager.EventManager);
}
Expand All @@ -242,6 +247,7 @@ public void ShouldGetSegmentManager()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

Assert.IsNotNull(manager.SegmentManager);
}
Expand All @@ -255,6 +261,7 @@ public void ShouldIdentifyUserWhenOdpIsIntegrated()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

manager.IdentifyUser(VALID_FS_USER_ID);
manager.Dispose();
Expand All @@ -272,6 +279,7 @@ public void ShouldNotIdentifyUserWhenOdpDisabled()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build(false);
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

manager.IdentifyUser(VALID_FS_USER_ID);
manager.Dispose();
Expand All @@ -290,6 +298,7 @@ public void ShouldSendEventWhenOdpIsIntegrated()
WithEventManager(_mockOdpEventManager.Object).
WithLogger(_mockLogger.Object).
Build();
manager.UpdateSettings(API_KEY, API_HOST, _emptySegmentsToCheck);

manager.SendEvent(TEST_EVENT_TYPE, TEST_EVENT_ACTION, _testEventIdentifiers,
_testEventData);
Expand All @@ -305,6 +314,7 @@ public void ShouldNotSendEventOdpNotIntegrated()
var manager = new OdpManager.Builder().
WithLogger(_mockLogger.Object).
Build(false); // do not enable
manager.UpdateSettings(string.Empty, string.Empty, _emptySegmentsToCheck);

manager.SendEvent(TEST_EVENT_TYPE, TEST_EVENT_ACTION, _testEventIdentifiers,
_testEventData);
Expand Down
2 changes: 1 addition & 1 deletion OptimizelySDK/Odp/OdpEventManager.cs
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void DropQueue()
/// </summary>
public void Start()
{
if (!_odpConfig.IsReady())
if (_odpConfig == null || !_odpConfig.IsReady())
{
_logger.Log(LogLevel.WARN, Constants.ODP_NOT_INTEGRATED_MESSAGE);

Expand Down
7 changes: 4 additions & 3 deletions OptimizelySDK/Odp/OdpManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private OdpManager() { }
public bool UpdateSettings(string apiKey, string apiHost, List<string> segmentsToCheck)
{
var newConfig = new OdpConfig(apiKey, apiHost, segmentsToCheck);
if (_odpConfig.Equals(newConfig))
if (_odpConfig == null || _odpConfig.Equals(newConfig))
{
return false;
}
Expand Down Expand Up @@ -264,7 +264,7 @@ private ICache<List<string>> GetCache()
/// <returns>True if EventManager can process events otherwise False</returns>
private bool EventManagerOrConfigNotReady()
{
return EventManager == null || !_enabled || !_odpConfig.IsReady();
return EventManager == null || !_enabled || _odpConfig == null || !_odpConfig.IsReady();
}

/// <summary>
Expand All @@ -273,7 +273,8 @@ private bool EventManagerOrConfigNotReady()
/// <returns>True if SegmentManager can fetch audience segments otherwise False</returns>
private bool SegmentManagerOrConfigNotReady()
{
return SegmentManager == null || !_enabled || !_odpConfig.IsReady();
return SegmentManager == null || !_enabled || _odpConfig == null ||
!_odpConfig.IsReady();
}
}
}
1 change: 0 additions & 1 deletion OptimizelySDK/Optimizely.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ public Optimizely(ProjectConfigManager configManager,
// in case if notification is lost.
OdpManager?.UpdateSettings(projectConfig.PublicKeyForOdp, projectConfig.HostForOdp,
projectConfig.Segments.ToList());

#else
InitializeComponents(eventDispatcher, logger, errorHandler, userProfileService,
notificationCenter, eventProcessor, defaultDecideOptions);
Expand Down
0