Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

イベントログ送信時のリクエストパラメータの間違いを修正 #1086

Merged
2 commits merged into from
Jul 25, 2022
Merged

イベントログ送信時のリクエストパラメータの間違いを修正 #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e98df27
Fixed request parameter of event log api
Jul 22, 2022
bb81cac
Fixed unit test
Jul 22, 2022
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
2 changes: 1 addition & 1 deletion Covid19Radar/Covid19Radar/Services/EventLogService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private async Task<bool> SendAsync(string idempotencyKey, List<EventLog> eventLo
var request = new V1EventLogRequest()
{
IdempotencyKey = idempotencyKey,
Platform = _essentialsService.Platform,
Platform = _essentialsService.Platform.ToLowerInvariant(),
AppPackageName = _essentialsService.AppPackageName,
EventLogs = eventLogList,
};
Expand Down
29 changes: 28 additions & 1 deletion Covid19Radar/Tests/Covid19Radar.UnitTests/Services/EventLogServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ public async Task SendAllAsyncTest1()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 1);
Expand All @@ -100,7 +103,13 @@ public async Task SendAllAsyncTest1()
_loggerService.Verify(x => x.Info("Event log send successful.", It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Once());
_loggerService.Verify(x => x.Error(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<int>()), Times.Never());

_httpDataService.Verify(x => x.PutEventLog(It.Is<V1EventLogRequest>(x => x.EventLogs.Count == 1)), Times.Once());
_httpDataService.Verify(x => x.PutEventLog(
It.Is<V1EventLogRequest>(x =>
x.EventLogs.Count == 1 &&
x.Platform == "testplatform" &&
x.AppPackageName == "test.package.name"
)),
Times.Once());

_deviceVerifier.Verify(x => x.VerifyAsync(It.IsAny<V1EventLogRequest>()), Times.Once());

Expand All @@ -127,6 +136,9 @@ public async Task SendAllAsyncTest_withdrawn_consent()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 1);
Expand Down Expand Up @@ -168,6 +180,9 @@ public async Task SendAllAsyncTest_RetrySuccess()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 3);
Expand Down Expand Up @@ -202,6 +217,9 @@ public async Task SendAllAsyncTest_RetryFailure()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 3);
Expand Down Expand Up @@ -237,6 +255,9 @@ public async Task SendAllAsyncTest_RetryException()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 3);
Expand Down Expand Up @@ -272,6 +293,9 @@ public async Task SendAllAsyncTest_DisableAll()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(false);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 1);
Expand All @@ -298,6 +322,9 @@ public async Task SendAllAsyncTest_DeviceVerifierFailure()

_deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny<string>())).Returns(true);

_essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform");
_essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name");

// Test Case
var unitUnderTest = CreateService();
await unitUnderTest.SendAllAsync(long.MaxValue, 0);
Expand Down