From d760bf4ad233f89b1285fb910719288ca806d2f1 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Mon, 1 Aug 2022 14:43:30 +0900
Subject: [PATCH 1/3] Fixed get exposure risk calculation configuration

---
 ...eRiskCalculationConfigurationRepository.cs |  9 +++++
 .../HomePage/ContactedNotifyPageViewModel.cs  | 28 ++++++++++-----
 .../HomePage/ExposureCheckPageViewModel.cs    | 11 +-----
 .../HomePage/ExposuresPageViewModel.cs        | 29 +++++++++++-----
 .../ViewModels/HomePage/HomePageViewModel.cs  |  6 ++--
 .../Views/HomePage/ContactedNotifyPage.xaml   |  4 +--
 .../HomePage/ContactedNotifyPage.xaml.cs      | 26 +++++++++-----
 .../Views/HomePage/ExposureCheckPage.xaml.cs  |  3 +-
 .../Views/HomePage/ExposuresPage.xaml.cs      | 25 ++++++++++----
 .../ContactedNotifyPageViewModelTests.cs      | 34 +------------------
 .../ExposureCheckPageViewModelTests.cs        |  3 --
 .../HomePage/ExposuresPageViewModelTests.cs   | 15 --------
 .../HomePage/HomePageViewModelTests.cs        |  2 +-
 13 files changed, 96 insertions(+), 99 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs b/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
index 274cf03b3..765ca132a 100644
--- a/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
+++ b/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
@@ -147,6 +147,15 @@ private async Task<V1ExposureRiskCalculationConfiguration> GetExposureRiskCalcul
             {
                 _loggerService.Exception("HttpRequestException.", exception);
             }
+            catch (TaskCanceledException exception)
+            {
+                _loggerService.Exception("TaskCanceledException.", exception);
+            }
+            catch (Exception exception)
+            {
+                // Catch android timeout (Java.IO.IOException)
+                _loggerService.Exception("Exception.", exception);
+            }
 
             if (newExposureRiskCalculationConfiguration is null)
             {
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
index 443bf90c7..30d4753f8 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ContactedNotifyPageViewModel.cs
@@ -13,6 +13,9 @@
 using Covid19Radar.Services;
 using Chino;
 using System;
+using Covid19Radar.Model;
+using Covid19Radar.Views;
+using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Covid19Radar.ViewModels
 {
@@ -22,7 +25,7 @@ public class ContactedNotifyPageViewModel : ViewModelBase
         private readonly IExposureDataRepository _exposureDataRepository;
         private readonly IExposureRiskCalculationService _exposureRiskCalculationService;
 
-        private readonly IExposureRiskCalculationConfigurationRepository _exposureRiskCalculationConfigurationRepository;
+        private V1ExposureRiskCalculationConfiguration _exposureRiskCalculationConfiguration;
 
         private string _exposureDurationInMinutes = "";
         public string ExposureDurationInMinutes
@@ -42,13 +45,12 @@ public ContactedNotifyPageViewModel(
             INavigationService navigationService,
             ILoggerService loggerService,
             IExposureDataRepository exposureDataRepository,
-            IExposureRiskCalculationService exposureRiskCalculationService,
-            IExposureRiskCalculationConfigurationRepository exposureRiskCalculationConfigurationRepository) : base(navigationService)
+            IExposureRiskCalculationService exposureRiskCalculationService
+            ) : base(navigationService)
         {
             this.loggerService = loggerService;
             _exposureDataRepository = exposureDataRepository;
             _exposureRiskCalculationService = exposureRiskCalculationService;
-            _exposureRiskCalculationConfigurationRepository = exposureRiskCalculationConfigurationRepository;
 
             Title = AppResources.TitileUserStatusSettings;
         }
@@ -61,9 +63,8 @@ public override async void Initialize(INavigationParameters parameters)
             {
                 loggerService.StartMethod();
 
-                var exposureRiskCalculationConfiguration
-                    = await _exposureRiskCalculationConfigurationRepository.GetExposureRiskCalculationConfigurationAsync(preferCache: true);
-                loggerService.Info(exposureRiskCalculationConfiguration.ToString());
+                _exposureRiskCalculationConfiguration =
+                    parameters.GetValue<V1ExposureRiskCalculationConfiguration>(ContactedNotifyPage.ExposureRiskCalculationConfigurationKey);
 
                 var userExposureInformationList = _exposureDataRepository.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays);
 
@@ -89,7 +90,7 @@ var exposureRiskCalculationConfiguration
 
                     var dailySummary = dailySummaryMap[ew.Key];
 
-                    RiskLevel riskLevel = _exposureRiskCalculationService.CalcRiskLevel(dailySummary, ew.ToList(), exposureRiskCalculationConfiguration);
+                    RiskLevel riskLevel = _exposureRiskCalculationService.CalcRiskLevel(dailySummary, ew.ToList(), _exposureRiskCalculationConfiguration);
                     if (riskLevel >= RiskLevel.High)
                     {
                         exposureDurationInSec += ew.Sum(e => e.ScanInstances.Sum(s => s.SecondsSinceLastScan));
@@ -138,6 +139,17 @@ var exposureRiskCalculationConfiguration
             }
         }
 
+        public IAsyncCommand OnExposureList => new AsyncCommand(async () =>
+        {
+            loggerService.StartMethod();
+
+            INavigationParameters navigaitonParameters
+                = ExposuresPage.BuildNavigationParams(_exposureRiskCalculationConfiguration);
+            await NavigationService.NavigateAsync(nameof(ExposuresPage), navigaitonParameters);
+
+            loggerService.EndMethod();
+        });
+
         public Command OnClickByForm => new Command(async () =>
         {
             loggerService.StartMethod();
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
index 27f95961b..be4fbc57d 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
@@ -27,7 +27,6 @@ public class ExposureCheckPageViewModel : ViewModelBase
     {
         private readonly ILoggerService _loggerService;
         private readonly IExposureDataRepository _exposureDataRepository;
-        private readonly IExposureRiskCalculationConfigurationRepository _exposureRiskCalculationConfigurationRepository;
         private readonly IExposureRiskCalculationService _exposureRiskCalculationService;
         private readonly ILocalPathService _localPathService;
         private readonly IExposureDataExportService _exposureDataExportService;
@@ -74,7 +73,6 @@ public ExposureCheckPageViewModel(
             ILocalPathService localPathService,
             IExposureDataExportService exposureDataExportService,
             IUserDataRepository userDataRepository,
-            IExposureRiskCalculationConfigurationRepository exposureRiskCalculationConfigurationRepository,
             IDateTimeUtility dateTimeUtility
             ) : base(navigationService)
         {
@@ -84,7 +82,6 @@ IDateTimeUtility dateTimeUtility
             _localPathService = localPathService;
             _exposureDataExportService = exposureDataExportService;
             _userDataRepository = userDataRepository;
-            _exposureRiskCalculationConfigurationRepository = exposureRiskCalculationConfigurationRepository;
             _dateTimeUtility = dateTimeUtility;
 
             ExposureCheckScores = new ObservableCollection<ExposureCheckScoreModel>();
@@ -94,7 +91,7 @@ IDateTimeUtility dateTimeUtility
                 );
         }
 
-        public override async void Initialize(INavigationParameters parameters)
+        public override void Initialize(INavigationParameters parameters)
         {
             base.Initialize(parameters);
 
@@ -103,12 +100,6 @@ public override async void Initialize(INavigationParameters parameters)
             _exposureRiskCalculationConfiguration
                 = parameters.GetValue<V1ExposureRiskCalculationConfiguration>(ExposureCheckPage.ExposureRiskCalculationConfigurationKey);
 
-            if (_exposureRiskCalculationConfiguration is null)
-            {
-                _exposureRiskCalculationConfiguration
-                    = await _exposureRiskCalculationConfigurationRepository.GetExposureRiskCalculationConfigurationAsync(preferCache: true);
-            }
-
             _loggerService.Info(_exposureRiskCalculationConfiguration.ToString());
 
             ShowExposureRiskCalculationConfiguration();
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
index 3190073f9..162b16c95 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
@@ -4,10 +4,12 @@
 
 using Chino;
 using Covid19Radar.Common;
+using Covid19Radar.Model;
 using Covid19Radar.Repository;
 using Covid19Radar.Resources;
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
+using Covid19Radar.Views;
 using Prism.Navigation;
 using System;
 using System.Collections.ObjectModel;
@@ -21,13 +23,14 @@ namespace Covid19Radar.ViewModels
     public class ExposuresPageViewModel : ViewModelBase
     {
         private readonly IExposureDataRepository _exposureDataRepository;
-        private readonly IExposureRiskCalculationConfigurationRepository _exposureRiskCalculationConfigurationRepository;
         private readonly IExposureRiskCalculationService _exposureRiskCalculationService;
         private readonly ILoggerService _loggerService;
 
         private readonly ILocalPathService _localPathService;
         private readonly IExposureDataExportService _exposureDataExportService;
 
+        private V1ExposureRiskCalculationConfiguration _exposureRiskCalculationConfiguration;
+
         public ObservableCollection<ExposureSummary> Exposures { get; set; }
 
         private string _utcDescription;
@@ -40,7 +43,6 @@ public string UtcDescription
         public ExposuresPageViewModel(
             INavigationService navigationService,
             IExposureDataRepository exposureDataRepository,
-            IExposureRiskCalculationConfigurationRepository exposureRiskCalculationConfigurationRepository,
             IExposureRiskCalculationService exposureRiskCalculationService,
             ILocalPathService localPathService,
             IExposureDataExportService exposureDataExportService,
@@ -48,7 +50,6 @@ ILoggerService loggerService
             ) : base(navigationService)
         {
             _exposureDataRepository = exposureDataRepository;
-            _exposureRiskCalculationConfigurationRepository = exposureRiskCalculationConfigurationRepository;
             _exposureRiskCalculationService = exposureRiskCalculationService;
             _localPathService = localPathService;
             _exposureDataExportService = exposureDataExportService;
@@ -62,14 +63,26 @@ ILoggerService loggerService
                 );
         }
 
+        public override void Initialize(INavigationParameters parameters)
+        {
+            base.Initialize(parameters);
+            _loggerService.StartMethod();
+
+            try
+            {
+                _exposureRiskCalculationConfiguration =
+                    parameters.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey);
+            }
+            finally
+            {
+                _loggerService.EndMethod();
+            }
+        }
+
         public async Task InitExposures()
         {
             var exposures = new ObservableCollection<ExposureSummary>();
 
-            var exposureRiskCalculationConfiguration
-                = await _exposureRiskCalculationConfigurationRepository.GetExposureRiskCalculationConfigurationAsync(preferCache: false);
-            _loggerService.Info(exposureRiskCalculationConfiguration.ToString());
-
             var dailySummaryList
                 = await _exposureDataRepository.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays);
             var dailySummaryMap = dailySummaryList.ToDictionary(ds => ds.GetDateTime());
@@ -95,7 +108,7 @@ var userExposureInformationList
                     RiskLevel riskLevel = _exposureRiskCalculationService.CalcRiskLevel(
                         dailySummary,
                         ew.ToList(),
-                        exposureRiskCalculationConfiguration
+                        _exposureRiskCalculationConfiguration
                         );
                     if (riskLevel < RiskLevel.High)
                     {
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
index a3e178a45..ff3a4e5d5 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
@@ -172,8 +172,6 @@ await UserDialogs.Instance.AlertAsync(
 
             // Load necessary files asynchronous
             _ = exposureConfigurationRepository.GetExposureConfigurationAsync();
-            _ = exposureRiskCalculationConfigurationRepository
-                .GetExposureRiskCalculationConfigurationAsync(preferCache: false);
 
             await localNotificationService.PrepareAsync();
 
@@ -284,7 +282,9 @@ private void ExposureDetectionAsync()
 
                 if (hasHighRiskExposure)
                 {
-                    await NavigationService.NavigateAsync(nameof(ContactedNotifyPage));
+                    INavigationParameters navigaitonParameters
+                        = ContactedNotifyPage.BuildNavigationParams(exposureRiskCalculationConfiguration);
+                    await NavigationService.NavigateAsync(nameof(ContactedNotifyPage), navigaitonParameters);
                     return;
                 }
                 else
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index 1c40e263e..b5922a12e 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@@ -66,7 +66,7 @@
                         </Label>
                         <Button
                             AutomationProperties.IsInAccessibleTree="True"
-                            Command="{prism:NavigateTo 'ExposuresPage'}"
+                            Command="{Binding Path=OnExposureList}"
                             Style="{StaticResource DefaultButton}"
                             Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
                         <StackLayout
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
index 0f0c7fcf2..dfaf55a79 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
@@ -2,13 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using Covid19Radar.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Essentials;
+using Covid19Radar.Model;
+using Prism.Navigation;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -17,10 +12,25 @@ namespace Covid19Radar.Views
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class ContactedNotifyPage : ContentPage
     {
+        public const string ExposureRiskCalculationConfigurationKey = "contacted_notify_page.exposure_risk_calculation_configuration";
+
+        public static INavigationParameters BuildNavigationParams(
+            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
+            INavigationParameters? baseParam = null
+            )
+        {
+            var param = new NavigationParameters();
+            param.CopyFrom(baseParam);
+
+            param.Add(ExposureRiskCalculationConfigurationKey, exposureRiskCalculationConfiguration);
+
+            return param;
+        }
+
         public ContactedNotifyPage()
         {
             InitializeComponent();
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
index 924e71499..96c20e143 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
@@ -1,6 +1,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 using Covid19Radar.Model;
 using Prism.Navigation;
 using Xamarin.Forms;
@@ -11,7 +12,7 @@ namespace Covid19Radar.Views
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class ExposureCheckPage : ContentPage
     {
-        public const string ExposureRiskCalculationConfigurationKey = "exposure_risk_calculation_configuration";
+        public const string ExposureRiskCalculationConfigurationKey = "exposure_check_page.exposure_risk_calculation_configuration";
 
         public static INavigationParameters BuildNavigationParams(
             V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
index a0cad88de..67706e79f 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
@@ -2,12 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using Covid19Radar.Model;
+using Prism.Navigation;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -16,9 +12,24 @@ namespace Covid19Radar.Views
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class ExposuresPage : ContentPage
     {
+        public const string ExposureRiskCalculationConfigurationKey = "exposures_page.exposure_risk_calculation_configuration";
+
+        public static INavigationParameters BuildNavigationParams(
+            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
+            INavigationParameters? baseParam = null
+            )
+        {
+            var param = new NavigationParameters();
+            param.CopyFrom(baseParam);
+
+            param.Add(ExposureRiskCalculationConfigurationKey, exposureRiskCalculationConfiguration);
+
+            return param;
+        }
+
         public ExposuresPage()
         {
             InitializeComponent();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
index 616421d2d..6c69929f0 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
@@ -26,7 +26,6 @@ public class ContactedNotifyPageViewModelTests : IDisposable
         private readonly MockRepository mockRepository;
         private readonly Mock<INavigationService> mockNavigationService;
         private readonly Mock<ILoggerService> mockLoggerService;
-        private readonly Mock<IExposureRiskCalculationConfigurationRepository> mockExposureRiskCalculationConfigurationRepository;
         private readonly Mock<IExposureRiskCalculationService> mockExposureRiskCalculationService;
         private readonly Mock<IExposureDataRepository> mockExposureDataRepository;
         private readonly CultureInfo originalAppResourceCalture;
@@ -46,7 +45,6 @@ public ContactedNotifyPageViewModelTests()
             mockNavigationService = mockRepository.Create<INavigationService>();
             mockLoggerService = mockRepository.Create<ILoggerService>();
             mockExposureRiskCalculationService = mockRepository.Create<IExposureRiskCalculationService>();
-            mockExposureRiskCalculationConfigurationRepository = mockRepository.Create<IExposureRiskCalculationConfigurationRepository>();
             mockExposureDataRepository = mockRepository.Create<IExposureDataRepository>();
         }
 
@@ -64,8 +62,7 @@ private ContactedNotifyPageViewModel CreateViewModel()
                     mockNavigationService.Object,
                     mockLoggerService.Object,
                     mockExposureDataRepository.Object,
-                    mockExposureRiskCalculationService.Object,
-                    mockExposureRiskCalculationConfigurationRepository.Object
+                    mockExposureRiskCalculationService.Object
                 );
         }
 
@@ -103,9 +100,6 @@ public void OnClickExposuresTest_Initialize()
                         }
                     }
                 }));
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureRiskCalculationService
                 .Setup(x => x.CalcRiskLevel(It.IsAny<DailySummary>(), It.IsAny<List<ExposureWindow>>(), It.IsAny<V1ExposureRiskCalculationConfiguration>()))
                 .Returns(RiskLevel.High);
@@ -147,9 +141,6 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_HighRisk()
                         }
                     }
                 }));
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureRiskCalculationService
                 .Setup(x => x.CalcRiskLevel(It.IsAny<DailySummary>(), It.IsAny<List<ExposureWindow>>(), It.IsAny<V1ExposureRiskCalculationConfiguration>()))
                 .Returns(RiskLevel.High);
@@ -195,9 +186,6 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
                         }
                     }
                 }));
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
 
             var contactedNotifyViewModel = CreateViewModel();
             contactedNotifyViewModel.Initialize(new NavigationParameters());
@@ -205,25 +193,5 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
             Assert.Empty(contactedNotifyViewModel.ExposureDurationInMinutes);
             Assert.Equal("2 件", contactedNotifyViewModel.ExposureCount);
         }
-
-        [Fact]
-        public void OnClickExposuresTest_Initialize_Exception()
-        {
-
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(true))
-                .Throws(new HttpRequestException());
-
-            var contactedNotifyViewModel = CreateViewModel();
-            contactedNotifyViewModel.Initialize(new NavigationParameters());
-
-            mockLoggerService
-                .Verify(x => x.Exception(
-                    "Failed to Initialize",
-                    It.IsAny<Exception>(),
-                    It.IsAny<string>(),
-                    It.IsAny<string>(),
-                    It.IsAny<int>()), Times.Once);
-        }
     }
 }
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
index b0b234c36..53785487b 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
@@ -31,7 +31,6 @@ public class ExposureCheckPageViewModelTests
         private readonly Mock<ILocalPathService> mockLocalPathService;
         private readonly Mock<IExposureDataExportService> mockExposureDataExportService;
         private readonly Mock<IUserDataRepository> mockUserDataRepository;
-        private readonly Mock<IExposureRiskCalculationConfigurationRepository> mockExposureRiskCalculationConfigurationRepository;
         private readonly Mock<IDateTimeUtility> mockDateTimeUtility;
 
         public ExposureCheckPageViewModelTests()
@@ -44,7 +43,6 @@ public ExposureCheckPageViewModelTests()
             mockLocalPathService = mockRepository.Create<ILocalPathService>();
             mockExposureDataExportService = mockRepository.Create<IExposureDataExportService>();
             mockUserDataRepository = mockRepository.Create<IUserDataRepository>();
-            mockExposureRiskCalculationConfigurationRepository = mockRepository.Create<IExposureRiskCalculationConfigurationRepository>();
             mockDateTimeUtility = mockRepository.Create<IDateTimeUtility>();
         }
 
@@ -60,7 +58,6 @@ private ExposureCheckPageViewModel CreateViewModel()
                 mockLocalPathService.Object,
                 mockExposureDataExportService.Object,
                 mockUserDataRepository.Object,
-                mockExposureRiskCalculationConfigurationRepository.Object,
                 mockDateTimeUtility.Object
                 );
         }
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposuresPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposuresPageViewModelTests.cs
index 43270b275..71e769302 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposuresPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposuresPageViewModelTests.cs
@@ -25,7 +25,6 @@ public class ExposurePageViewModelTests
         private readonly Mock<INavigationService> mockNavigationService;
         private readonly Mock<IExposureDataRepository> mockExposureDataRepository;
         private readonly Mock<IExposureRiskCalculationService> mockExposureRiskCalculationService;
-        private readonly Mock<IExposureRiskCalculationConfigurationRepository> mockExposureRiskCalculationConfigurationRepository;
         private readonly Mock<ILocalPathService> mockLocalPathService;
         private readonly Mock<IExposureDataExportService> mockExposureDataExportService;
         private readonly Mock<ILoggerService> mockLoggerService;
@@ -36,7 +35,6 @@ public ExposurePageViewModelTests()
             mockNavigationService = mockRepository.Create<INavigationService>();
             mockExposureDataRepository = mockRepository.Create<IExposureDataRepository>();
             mockExposureRiskCalculationService = mockRepository.Create<IExposureRiskCalculationService>();
-            mockExposureRiskCalculationConfigurationRepository = mockRepository.Create<IExposureRiskCalculationConfigurationRepository>();
             mockLocalPathService = mockRepository.Create<ILocalPathService>();
             mockExposureDataExportService = mockRepository.Create<IExposureDataExportService>();
             mockLoggerService = mockRepository.Create<ILoggerService>();
@@ -47,7 +45,6 @@ private ExposuresPageViewModel CreateViewModel()
             return new ExposuresPageViewModel(
                 mockNavigationService.Object,
                 mockExposureDataRepository.Object,
-                mockExposureRiskCalculationConfigurationRepository.Object,
                 mockExposureRiskCalculationService.Object,
                 mockLocalPathService.Object,
                 mockExposureDataExportService.Object,
@@ -68,9 +65,6 @@ public async void ExposureSummaryGroupingTest1()
             List<DailySummary> dummyDailySummaryList = new List<DailySummary>();
             List<ExposureWindow> dummyExposureWindowList = new List<ExposureWindow>();
 
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureDataRepository.Setup(x => x.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays)).Returns(dummyList);
             mockExposureDataRepository.Setup(x => x.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyDailySummaryList));
             mockExposureDataRepository.Setup(x => x.GetExposureWindowsAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyExposureWindowList));
@@ -95,9 +89,6 @@ public async void ExposureSummaryGroupingTest2()
             List<DailySummary> dummyDailySummaryList = new List<DailySummary>();
             List<ExposureWindow> dummyExposureWindowList = new List<ExposureWindow>();
 
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureDataRepository.Setup(x => x.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays)).Returns(testList);
             mockExposureDataRepository.Setup(x => x.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyDailySummaryList));
             mockExposureDataRepository.Setup(x => x.GetExposureWindowsAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyExposureWindowList));
@@ -119,9 +110,6 @@ public async void ExposureUnitOnceTest()
             List<DailySummary> dummyDailySummaryList = new List<DailySummary>();
             List<ExposureWindow> dummyExposureWindowList = new List<ExposureWindow>();
 
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureDataRepository.Setup(x => x.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays)).Returns(testList);
             mockExposureDataRepository.Setup(x => x.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyDailySummaryList));
             mockExposureDataRepository.Setup(x => x.GetExposureWindowsAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyExposureWindowList));
@@ -147,9 +135,6 @@ public async void ExposureUnitPluralTest()
             List<DailySummary> dummyDailySummaryList = new List<DailySummary>();
             List<ExposureWindow> dummyExposureWindowList = new List<ExposureWindow>();
 
-            mockExposureRiskCalculationConfigurationRepository
-                .Setup(x => x.GetExposureRiskCalculationConfigurationAsync(It.IsAny<bool>()))
-                .ReturnsAsync(new V1ExposureRiskCalculationConfiguration());
             mockExposureDataRepository.Setup(x => x.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays)).Returns(testList);
             mockExposureDataRepository.Setup(x => x.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyDailySummaryList));
             mockExposureDataRepository.Setup(x => x.GetExposureWindowsAsync(AppConstants.TermOfExposureRecordValidityInDays)).Returns(Task.FromResult(dummyExposureWindowList));
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
index 710f556ec..4005aa5bc 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
@@ -534,7 +534,7 @@ public void OnClickExposuresTest_HighRisk_NavigateContactedNotifyPage(int dayOff
             homePageViewModel.OnClickExposures.Execute(null);
 
             mockNavigationService
-                .Verify(x => x.NavigateAsync("ContactedNotifyPage"), Times.Once());
+                .Verify(x => x.NavigateAsync("ContactedNotifyPage", It.IsAny<INavigationParameters>()), Times.Once());
         }
 
         [Theory]

From 3765dd869c7d60b978b98e175d7aff4c45dc8850 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Mon, 1 Aug 2022 16:54:13 +0900
Subject: [PATCH 2/3] Fixed unit tests

---
 .../ContactedNotifyPageViewModelTests.cs      | 75 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
index 6c69929f0..04820034c 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
@@ -15,6 +15,7 @@
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
 using Covid19Radar.ViewModels;
+using Covid19Radar.Views;
 using Moq;
 using Prism.Navigation;
 using Xunit;
@@ -105,7 +106,7 @@ public void OnClickExposuresTest_Initialize()
                 .Returns(RiskLevel.High);
 
             var contactedNotifyViewModel = CreateViewModel();
-            contactedNotifyViewModel.Initialize(new NavigationParameters());
+            contactedNotifyViewModel.Initialize(ContactedNotifyPage.BuildNavigationParams(new V1ExposureRiskCalculationConfiguration()));
 
             Assert.Equal("0001年1月1日 月曜日以前\n2 件", contactedNotifyViewModel.ExposureCount);
             Assert.Equal("1971年1月1日 金曜日以降\n1日間に合計1分間の接触", contactedNotifyViewModel.ExposureDurationInMinutes);
@@ -193,5 +194,77 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
             Assert.Empty(contactedNotifyViewModel.ExposureDurationInMinutes);
             Assert.Equal("2 件", contactedNotifyViewModel.ExposureCount);
         }
+
+        [Fact]
+        public async Task OnExposureListTest()
+        {
+            mockExposureDataRepository
+                .Setup(x => x.GetExposureInformationList(AppConstants.TermOfExposureRecordValidityInDays))
+                .Returns(new List<UserExposureInfo>()
+                {
+                    new UserExposureInfo(),
+                    new UserExposureInfo()
+                });
+            mockExposureDataRepository
+                .Setup(x => x.GetDailySummariesAsync(AppConstants.TermOfExposureRecordValidityInDays))
+                .Returns(Task.FromResult(new List<DailySummary>()
+                {
+                    new DailySummary()
+                    {
+                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365
+                    }
+                }));
+            mockExposureDataRepository
+                .Setup(x => x.GetExposureWindowsAsync(AppConstants.TermOfExposureRecordValidityInDays))
+                .Returns(Task.FromResult(new List<ExposureWindow>()
+                {
+                    new ExposureWindow()
+                    {
+                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365,
+                        ScanInstances = new List<ScanInstance>() {
+                            new ScanInstance()
+                            {
+                                SecondsSinceLastScan = 60
+                            }
+                        }
+                    }
+                }));
+            mockExposureRiskCalculationService
+                .Setup(x => x.CalcRiskLevel(It.IsAny<DailySummary>(), It.IsAny<List<ExposureWindow>>(), It.IsAny<V1ExposureRiskCalculationConfiguration>()))
+                .Returns(RiskLevel.High);
+
+            var exposureRiskCalculationConfiguration =
+                new V1ExposureRiskCalculationConfiguration
+                {
+                    FormatVersion = 1,
+                    DailySummary_DaySummary_ScoreSum = new V1ExposureRiskCalculationConfiguration.Threshold { Op = "Op1", Value = 1 },
+                    DailySummary_WeightedDurationAverage = new V1ExposureRiskCalculationConfiguration.Threshold { Op = "Op2", Value = 2 },
+                    ExposureWindow_ScanInstance_SecondsSinceLastScanSum = new V1ExposureRiskCalculationConfiguration.Threshold { Op = "Op3", Value = 3 },
+                    ExposureWindow_ScanInstance_TypicalAttenuationDb_Max = new V1ExposureRiskCalculationConfiguration.Threshold { Op = "Op4", Value = 4 },
+                    ExposureWindow_ScanInstance_TypicalAttenuationDb_Min = new V1ExposureRiskCalculationConfiguration.Threshold { Op = "Op5", Value = 5 }
+                };
+
+            ContactedNotifyPageViewModel unitUnderTest = CreateViewModel();
+            unitUnderTest.Initialize(ContactedNotifyPage.BuildNavigationParams(exposureRiskCalculationConfiguration));
+            await unitUnderTest.OnExposureList.ExecuteAsync();
+
+            mockNavigationService.Verify(x => x.NavigateAsync(
+                nameof(ExposuresPage),
+                It.Is<INavigationParameters>(x =>
+                    x.ContainsKey(ExposuresPage.ExposureRiskCalculationConfigurationKey) &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).FormatVersion == 1 &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).DailySummary_DaySummary_ScoreSum.Op == "Op1" &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).DailySummary_DaySummary_ScoreSum.Value == 1 &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).DailySummary_WeightedDurationAverage.Op == "Op2" &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).DailySummary_WeightedDurationAverage.Value == 2 &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_SecondsSinceLastScanSum.Op == "Op3" &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_SecondsSinceLastScanSum.Value == 3 &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_TypicalAttenuationDb_Max.Op == "Op4" &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_TypicalAttenuationDb_Max.Value == 4 &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_TypicalAttenuationDb_Min.Op == "Op5" &&
+                    x.GetValue<V1ExposureRiskCalculationConfiguration>(ExposuresPage.ExposureRiskCalculationConfigurationKey).ExposureWindow_ScanInstance_TypicalAttenuationDb_Min.Value == 5
+                )
+            ));
+        }
     }
 }

From 6a3eb917eee58ce559e162fd5076f12bf2a7c597 Mon Sep 17 00:00:00 2001
From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com>
Date: Tue, 2 Aug 2022 08:21:17 +0900
Subject: [PATCH 3/3] Fixed code-smells

---
 .../Views/HomePage/ContactedNotifyPage.xaml.cs   |  7 +------
 .../Views/HomePage/ExposureCheckPage.xaml.cs     |  7 +------
 .../Views/HomePage/ExposuresPage.xaml.cs         |  7 +------
 .../ContactedNotifyPageViewModelTests.cs         | 16 ++++++++--------
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
index dfaf55a79..4d75cc636 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml.cs
@@ -15,15 +15,10 @@ public partial class ContactedNotifyPage : ContentPage
         public const string ExposureRiskCalculationConfigurationKey = "contacted_notify_page.exposure_risk_calculation_configuration";
 
         public static INavigationParameters BuildNavigationParams(
-            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
-            INavigationParameters? baseParam = null
-            )
+            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration)
         {
             var param = new NavigationParameters();
-            param.CopyFrom(baseParam);
-
             param.Add(ExposureRiskCalculationConfigurationKey, exposureRiskCalculationConfiguration);
-
             return param;
         }
 
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
index 96c20e143..5e4033d58 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
@@ -15,15 +15,10 @@ public partial class ExposureCheckPage : ContentPage
         public const string ExposureRiskCalculationConfigurationKey = "exposure_check_page.exposure_risk_calculation_configuration";
 
         public static INavigationParameters BuildNavigationParams(
-            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
-            INavigationParameters? baseParam = null
-            )
+            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration)
         {
             var param = new NavigationParameters();
-            param.CopyFrom(baseParam);
-
             param.Add(ExposureRiskCalculationConfigurationKey, exposureRiskCalculationConfiguration);
-
             return param;
         }
 
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
index 67706e79f..723cda552 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml.cs
@@ -15,15 +15,10 @@ public partial class ExposuresPage : ContentPage
         public const string ExposureRiskCalculationConfigurationKey = "exposures_page.exposure_risk_calculation_configuration";
 
         public static INavigationParameters BuildNavigationParams(
-            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration,
-            INavigationParameters? baseParam = null
-            )
+            V1ExposureRiskCalculationConfiguration exposureRiskCalculationConfiguration)
         {
             var param = new NavigationParameters();
-            param.CopyFrom(baseParam);
-
             param.Add(ExposureRiskCalculationConfigurationKey, exposureRiskCalculationConfiguration);
-
             return param;
         }
 
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
index 04820034c..8456ec748 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ContactedNotifyPageViewModelTests.cs
@@ -83,7 +83,7 @@ public void OnClickExposuresTest_Initialize()
                 {
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365
                     }
                 }));
             mockExposureDataRepository
@@ -92,7 +92,7 @@ public void OnClickExposuresTest_Initialize()
                 {
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365,
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365,
                         ScanInstances = new List<ScanInstance>() {
                             new ScanInstance()
                             {
@@ -124,7 +124,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_HighRisk()
                 {
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365
                     }
                 }));
             mockExposureDataRepository
@@ -133,7 +133,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_HighRisk()
                 {
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365,
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365,
                         ScanInstances = new List<ScanInstance>() {
                             new ScanInstance()
                             {
@@ -169,7 +169,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
                 {
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365
                     }
                 }));
             mockExposureDataRepository
@@ -178,7 +178,7 @@ public void OnClickExposuresTest_Initialize_NoExposureInformation_NoHighRisk()
                 {
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365,
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365,
                         ScanInstances = new List<ScanInstance>() {
                             new ScanInstance()
                             {
@@ -211,7 +211,7 @@ public async Task OnExposureListTest()
                 {
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365
                     }
                 }));
             mockExposureDataRepository
@@ -220,7 +220,7 @@ public async Task OnExposureListTest()
                 {
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = 1000l * 60 * 60 * 24 * 365,
+                        DateMillisSinceEpoch = 1000L * 60 * 60 * 24 * 365,
                         ScanInstances = new List<ScanInstance>() {
                             new ScanInstance()
                             {