Fix/sonarcloud issues

src/Covid19Radar.Api.Common/Common/ErrorStrings.cs

@@ -4,7 +4,7 @@
 
 namespace Covid19Radar.Api.Common
 {
- public class ErrorStrings
+ public static class ErrorStrings
  {
 
  //1000: User error strings

src/Covid19Radar.Api.Common/Common/PartitionKeyRotation.cs

@@ -12,7 +12,7 @@ public class PartitionKeyRotation
  {
  private readonly KeyInformation[] Keys;
  private readonly int Max;
- private int Current = -1;
+ private int Current;
  public PartitionKeyRotation(string[] keys)
  {
  Keys = keys.Select((_, i) => new KeyInformation(_, i + 1)).ToArray();

src/Covid19Radar.Api.Common/Common/QueryCache.cs

@@ -14,7 +14,7 @@ namespace Covid19Radar.Api.Common
  /// <typeparam name="T">Return type</typeparam>
  public class QueryCache<T>
  {
- private readonly int CacheTimeout = Constants.CacheTimeout;
+ private readonly int CacheTimeout;
  private readonly EventWaitHandle Event = new EventWaitHandle(true, EventResetMode.AutoReset);
  private T Cache;
  private long Timestamp = 0;

src/Covid19Radar.Api.Common/DataAccess/CosmosSequenceRepository.cs

@@ -41,11 +41,10 @@ public async Task<ulong> GetNextAsync(string key, ulong startNo, int increment =
  int ms = (int)(ex.RetryAfter.HasValue ? ex.RetryAfter.Value.TotalMilliseconds : 5);
  _logger.LogInformation(ex, $"GetNextAsync Retry {i} RequestCharge:{ex.RequestCharge} RetryAfter:{ms}");
  await Task.Delay(ms);
- continue;
  }
  }
  _logger.LogWarning("GetNextAsync is over retry count.");
- throw new ApplicationException("GetNextAsync is over retry count.");
+ throw new Exception("GetNextAsync is over retry count.");
  }
 
  public async Task<ulong> GetNextAsync(PartitionKeyRotation.KeyInformation key, ulong startNo, int increment = 1)
@@ -67,11 +66,10 @@ public async Task<ulong> GetNextAsync(PartitionKeyRotation.KeyInformation key, u
  int ms = (int)(ex.RetryAfter.HasValue ? ex.RetryAfter.Value.TotalMilliseconds : 5);
  _logger.LogInformation(ex, $"GetNextAsync Retry {i} RequestCharge:{ex.RequestCharge} RetryAfter:{ms}");
  await Task.Delay(ms);
- continue;
- }
+ }
  }
  _logger.LogWarning("GetNextAsync is over retry count.");
- throw new ApplicationException("GetNextAsync is over retry count.");
+ throw new Exception("GetNextAsync is over retry count.");
  }
  }
 }

src/Covid19Radar.Api.Common/DataAccess/CosmosTemporaryExposureKeyRepository.cs

@@ -40,7 +40,7 @@ public async Task<TemporaryExposureKeyModel[]> GetNextAsync()
  var oldest = (int)new DateTimeOffset(DateTime.UtcNow.AddDays(Constants.OutOfDateDays).Date.Ticks, TimeSpan.Zero).ToUnixTimeSeconds() / 600;
  var query = _db.TemporaryExposureKey.GetItemLinqQueryable<TemporaryExposureKeyModel>(true)
  .Where(tek => tek.RollingStartIntervalNumber > oldest)
- .Where(tek => tek.Exported == false)
+ .Where(tek => !tek.Exported)
  .ToFeedIterator();
  var e = Enumerable.Empty<TemporaryExposureKeyModel>();
  while (query.HasMoreResults)

src/Covid19Radar.Api.Common/DataAccess/IDiagnosisRepository.cs

@@ -12,9 +12,9 @@ public interface IDiagnosisRepository
  {
 
  Task<DiagnosisModel[]> GetNotApprovedAsync();
- Task<DiagnosisModel> GetAsync(string SubmissionNumber, string UserUuid);
+ Task<DiagnosisModel> GetAsync(string submissionNumber, string userUuid);
 
- Task<DiagnosisModel> SubmitDiagnosisAsync(string SubmissionNumber, DateTimeOffset timestamp, string UserUuid, TemporaryExposureKeyModel[] Keys);
+ Task<DiagnosisModel> SubmitDiagnosisAsync(string submissionNumber, DateTimeOffset timestamp, string userUuid, TemporaryExposureKeyModel[] Keys);
 
  Task DeleteAsync(IUser user);
  }

src/Covid19Radar.Api.Common/DataStore/Cosmos.cs

@@ -80,7 +80,7 @@ private async Task GenerateAsync()
  && dbResult.StatusCode != System.Net.HttpStatusCode.Created)
  {
  Logger.LogError(dbResult.ToString());
- throw new ApplicationException(dbResult.ToString());
+ throw new Exception(dbResult.ToString());
  }
 
  // Container User

src/Covid19Radar.Api.Common/Services/IValidationInquiryLogService.cs

@@ -22,8 +22,8 @@ public class ValidateResult
  IsValid = false,
  ErrorActionResult = new BadRequestResult()
  };
- public bool IsValid;
- public IActionResult ErrorActionResult;
+ public bool IsValid { get; set; }
+ public IActionResult ErrorActionResult { get; set; }
  }
  }
 }

src/Covid19Radar.Api.Common/Services/IValidationServerService.cs

@@ -28,8 +28,8 @@ public class ValidateResult
  IsValid = false,
  ErrorActionResult = new BadRequestResult()
  };
- public bool IsValid;
- public IActionResult ErrorActionResult;
+ public bool IsValid { get; set; }
+ public IActionResult ErrorActionResult { get; set; }
  }
 
  }

src/Covid19Radar.Api.Common/Services/ValidationInquiryLogService.cs

@@ -26,9 +26,9 @@ public ValidationInquiryLogService(ILogger<ValidationInquiryLogService> logger,
  public IValidationInquiryLogService.ValidateResult Validate(HttpRequest req)
  {
  Logger.LogInformation($"{nameof(ValidationInquiryLogService)} {nameof(Validate)}");
- var test = Config.InquiryLogApiKey();
- var test2 = req.Headers["x-api-key"].ToString();
- var test3 = req.Headers.ContainsKey("x-api-key");
+ Config.InquiryLogApiKey();
+ req.Headers["x-api-key"].ToString();
+ req.Headers.ContainsKey("x-api-key");
  if (!req.Headers.ContainsKey("x-api-key") || Config.InquiryLogApiKey() != req.Headers["x-api-key"].ToString())
  {
  return IValidationInquiryLogService.ValidateResult.Error;

src/Covid19Radar.Api.Common/Services/ValidationServerService.cs

@@ -16,21 +16,20 @@ namespace Covid19Radar.Api.Services
  public class ValidationServerService : IValidationServerService
  {
  private readonly ILogger<ValidationServerService> Logger;
- private readonly IConfiguration Config;
  private readonly bool AzureFrontDoorRestrictionEnabled;
  private readonly string AzureFrontDoorId;
 
 
  public ValidationServerService(IConfiguration config, ILogger<ValidationServerService> logger)
  {
  Logger = logger;
- Config = config;
- AzureFrontDoorRestrictionEnabled = Config.AzureFrontDoorRestrictionEnabled();
- AzureFrontDoorId = Config.AzureFrontDoorId();
+ AzureFrontDoorRestrictionEnabled = config.AzureFrontDoorRestrictionEnabled();
+ AzureFrontDoorId = config.AzureFrontDoorId();
  }
 
  public IValidationServerService.ValidateResult Validate(HttpRequest req)
  {
+ Logger.LogInformation($"{nameof(ValidationServerService)}#{nameof(Validate)}");
  if (AzureFrontDoorRestrictionEnabled)
  {
  if (!req.Headers.ContainsKey("X-Azure-FDID"))

src/Covid19Radar.Api.Tests/Background/Services/TemporaryExposureKeyBlobServiceTest.cs

@@ -6,12 +6,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Covid19Radar.Api.Tests.Background.Services
 {
@@ -31,6 +25,9 @@ public void CreateMethod()
  var logger = new Mock.LoggerMock<TemporaryExposureKeyBlobService>();
  // action
  var service = new TemporaryExposureKeyBlobService(config.Object, logger);
+
+ // assert
+ Assert.IsNotNull(service);
  }
 
  }

src/Covid19Radar.Api.Tests/Background/Services/TemporaryExposureKeySignServiceTest.cs

@@ -6,11 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Covid19Radar.Api.Tests.Background.Services
@@ -35,6 +31,8 @@ public void CreateMethod()
  var logger = new Mock.LoggerMock<TemporaryExposureKeySignService>();
  // action
  var service = new TemporaryExposureKeySignService(config.Object, logger);
+ // assert
+ Assert.IsNotNull(service);
  }
 
  [TestMethod]

src/Covid19Radar.Api.Tests/Common/DataAccess/CosmosDiagnosisRepositoryTest.cs

@@ -2,23 +2,15 @@
  * 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.Api;
-using Covid19Radar.Api.Common;
 using Covid19Radar.Api.DataAccess;
 using Covid19Radar.Api.DataStore;
 using Covid19Radar.Api.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Azure.Cosmos.Linq;
-using Microsoft.Azure.Documents.SystemFunctions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Reflection.Emit;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -36,6 +28,9 @@ public void CreateMethod()
  var logger = new Mock.LoggerMock<CosmosDiagnosisRepository>();
  // action
  var instance = new CosmosDiagnosisRepository(cosmos.Object, logger);
+ // assert
+ Assert.IsNotNull(instance);
+
  }
 
  [DataTestMethod]

src/Covid19Radar.Api.Tests/Common/DataStore/CosmosTest.cs

@@ -2,22 +2,14 @@
  * 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 Castle.Core.Logging;
-using Covid19Radar.Api;
-using Covid19Radar.Api.Common;
 using Covid19Radar.Api.DataStore;
 using Covid19Radar.Api.Tests.Mock;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Scripts;
-using Microsoft.Azure.Documents.Client;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 using System.Threading;
 
 namespace Covid19Radar.Api.Tests.Common.DataStore
@@ -50,10 +42,12 @@ public void CreateMethod()
  client.Setup(_ => _.CreateDatabaseIfNotExistsAsync
  (It.IsAny<string>(), It.IsAny<int?>(), It.IsAny<Microsoft.Azure.Cosmos.RequestOptions>(), It.IsAny<CancellationToken>()))
  .ReturnsAsync(databaseResponse.Object);
- 
+
  var logger = new LoggerMock<ICosmos>();
  // action
  var instance = new Cosmos(config.Object, client.Object, logger);
+ // assert
+ Assert.IsNotNull(instance);
  }
 
  [TestMethod]
@@ -84,7 +78,8 @@ public void CreateMethodThrowException()
  var logger = new LoggerMock<ICosmos>();
  // action
 #if DEBUG
- Assert.ThrowsException<AggregateException>(() => {
+ Assert.ThrowsException<AggregateException>(() =>
+ {
  var instance = new Cosmos(config.Object, client.Object, logger);
  });
 #else 

src/Covid19Radar.Api.Tests/Common/KeyLockTest.cs

@@ -2,9 +2,7 @@
  * 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.Api;
 using Covid19Radar.Api.Common;
-using Microsoft.AspNetCore.Http;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
@@ -36,7 +34,10 @@ public void CreateMethod(string uuid)
  var dic = Dictionary;
  dic.Clear();
  // action
- using (var l = new KeyLock(uuid)) { }
+ using (var l = new KeyLock(uuid))
+ {
+ Assert.IsNotNull(l);
+ }
  }
 
  [TestMethod]
@@ -121,7 +122,7 @@ public void CreateMultipleSame()
  // Assert
  Assert.AreEqual(255, dic.Count);
 
- foreach(var lockItem in lockItems.ToArray())
+ foreach (var lockItem in lockItems.ToArray())
  {
  // dispose
  lockItem.Dispose();

src/Covid19Radar.Api.Tests/Common/Models/DiagnosisModelTest.cs

@@ -2,8 +2,6 @@
  * 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 Covid19Radar.Api.Common;
 using Covid19Radar.Api.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -18,6 +16,8 @@ public void CreateMethod()
  {
  // action
  var model = new DiagnosisModel();
+ // assert
+ Assert.IsNotNull(model);
  }
 
  [TestMethod]

src/Covid19Radar.Api.Tests/Common/Models/SequenceModelTest.cs

@@ -3,8 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 
-using System;
-using Covid19Radar.Api.Common;
 using Covid19Radar.Api.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -19,6 +17,8 @@ public void CreateMethod()
  {
  // action
  var model = new SequenceModel();
+ // assert
+ Assert.IsNotNull(model);
  }
 
  [TestMethod]

src/Covid19Radar.Api.Tests/Common/Models/TemporaryExposureKeyExportModelTest.cs

@@ -18,6 +18,8 @@ public void CreateMethod()
  {
  // action
  var model = new TemporaryExposureKeyExportModel();
+ // assert
+ Assert.IsNotNull(model);
  }
 
  [TestMethod]