Merge pull request #1184 from cocoa-mhlw/feature/survey-end-date

調査終了日を定数を使うように修正
cocoa-mhlw · Oct 20, 2022 · 2b74a7e · 2b74a7e
2 parents 9dd82c8 + 40b7339
commit 2b74a7e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs
@@ -18,8 +18,6 @@ public class EndOfServiceNoticePageViewModel : ViewModelBase
 
  private readonly ILoggerService _loggerService;
 
- private readonly long FullStopDateTime = TimeZoneInfo.ConvertTime(new DateTime(2022, 12, 31, 0, 0, 0), AppConstants.TIMEZONE_JST).ToUnixEpoch();
-
  public EndOfServiceNoticePageViewModel(
  INavigationService navigationService,
  ILoggerService loggerService
@@ -41,7 +39,7 @@ ILoggerService loggerService
  {
  _loggerService.StartMethod();
 
- if (Utils.JstNow().ToUnixEpoch() <= FullStopDateTime && Utils.IsCurrentUICultureJaJp())
+ if (DateTime.UtcNow.ToUnixEpoch() <= AppConstants.SURVEY_END_DATE_UTC.ToUnixEpoch() && Utils.IsCurrentUICultureJaJp())
  {
  await NavigationService.NavigateAsync(nameof(SurveyRequestPage));
  }