Merge pull request #190 from FoldingCoin/develop

v2.0.0-RC8

Api/StatsDownloadApi.Core.Tests/TestStandardTokenDistributionProvider.cs

@@ -1,10 +1,12 @@
 namespace StatsDownloadApi.Core.Tests
 {
     using System.Collections.Generic;
-    using Interfaces;
-    using Interfaces.DataTransfer;
+
     using NUnit.Framework;
 
+    using StatsDownloadApi.Interfaces;
+    using StatsDownloadApi.Interfaces.DataTransfer;
+
     [TestFixture]
     public class TestStandardTokenDistributionProvider
     {

Api/StatsDownloadApi.Core.Tests/TestStatsDownloadApiEmailProvider.cs

@@ -1,12 +1,16 @@
 namespace StatsDownloadApi.Core.Tests
 {
     using System;
-    using Interfaces;
+
     using NSubstitute;
     using NSubstitute.ClearExtensions;
+
     using NUnit.Framework;
+
     using StatsDownload.Email;
 
+    using StatsDownloadApi.Interfaces;
+
     [TestFixture]
     public class TestStatsDownloadApiEmailProvider
     {
@@ -32,8 +36,7 @@ public void Constructor_WhenNullDependencyProvided_ThrowsException()
         {
             Assert.Throws<ArgumentNullException>(() =>
                 NewStatsDownloadApiEmailProvider(null, emailSettingsServiceMock));
-            Assert.Throws<ArgumentNullException>(() =>
-                NewStatsDownloadApiEmailProvider(emailServiceMock, null));
+            Assert.Throws<ArgumentNullException>(() => NewStatsDownloadApiEmailProvider(emailServiceMock, null));
         }
 
         [TestCase(null)]
@@ -65,7 +68,8 @@ public void SendUnhandledExceptionEmail_WhenInvoked_SendsEmail()
         }
 
         private IStatsDownloadApiEmailService NewStatsDownloadApiEmailProvider(IEmailService emailService,
-            IEmailSettingsService emailSettingsService)
+                                                                               IEmailSettingsService
+                                                                                   emailSettingsService)
         {
             return new StatsDownloadApiEmailProvider(emailService, emailSettingsService);
         }

Api/StatsDownloadApi.Core/StandardTokenDistributionProvider.cs

@@ -3,8 +3,9 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using Interfaces;
-    using Interfaces.DataTransfer;
+
+    using StatsDownloadApi.Interfaces;
+    using StatsDownloadApi.Interfaces.DataTransfer;
 
     public class StandardTokenDistributionProvider : IStatsDownloadApiTokenDistributionService
     {
@@ -55,8 +56,8 @@ private void AddingUserToDistro(int amount, List<DistroUser> distro, long totalP
 
         private decimal GetRewardAmount(int amount, long totalPoints, long pointsGained)
         {
-            decimal rawAmount = Convert.ToDecimal(pointsGained) / Convert.ToDecimal(totalPoints) *
-                                Convert.ToDecimal(amount);
+            decimal rawAmount = Convert.ToDecimal(pointsGained) / Convert.ToDecimal(totalPoints)
+                                * Convert.ToDecimal(amount);
 
             return Round(rawAmount, MaxPrecision);
         }
@@ -67,10 +68,10 @@ private long GetTotalPoints(IList<FoldingUser> foldingUsers)
         }
 
         private DistroUser NewDistroUser(int amount, long totalPoints, string bitcoinAddress, long pointsGained,
-            long workUnitsGained)
+                                         long workUnitsGained)
         {
-            return new DistroUser(bitcoinAddress, pointsGained,
-                workUnitsGained, GetRewardAmount(amount, totalPoints, pointsGained));
+            return new DistroUser(bitcoinAddress, pointsGained, workUnitsGained,
+                GetRewardAmount(amount, totalPoints, pointsGained));
         }
     }
 }

Api/StatsDownloadApi.Core/StatsDownloadApiEmailProvider.cs

@@ -1,9 +1,11 @@
 namespace StatsDownloadApi.Core
 {
     using System;
-    using Interfaces;
+
     using StatsDownload.Email;
 
+    using StatsDownloadApi.Interfaces;
+
     public class StatsDownloadApiEmailProvider : IStatsDownloadApiEmailService
     {
         private readonly IEmailService emailService;
@@ -21,8 +23,7 @@ public void SendUnhandledExceptionEmail(Exception exception)
         {
             string subject = GetSubject(EmailMessages.UnhandledExceptionHeader);
 
-            emailService.SendEmail(subject,
-                string.Format(EmailMessages.UnhandledExceptionBody, exception.Message));
+            emailService.SendEmail(subject, string.Format(EmailMessages.UnhandledExceptionBody, exception.Message));
         }
 
         private string GetSubject(string baseSubject)

Api/StatsDownloadApi.Core/StatsDownloadApiProvider.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     using StatsDownload.Core.Interfaces;
     using StatsDownload.Core.Interfaces.Enums;
@@ -41,13 +42,15 @@ public StatsDownloadApiProvider(IStatsDownloadApiDatabaseService statsDownloadAp
                                                         nameof(statsDownloadApiDataStoreService));
         }
 
-        public GetDistroResponse GetDistro(DateTime? startDate, DateTime? endDate, int? amount)
+        public async Task<GetDistroResponse> GetDistro(DateTime? startDate, DateTime? endDate, int? amount)
         {
             loggingService.LogMethodInvoked();
 
             IList<ApiError> errors = new List<ApiError>();
 
-            if (IsNotPreparedToRunDistro(startDate, endDate, amount, errors))
+            bool isNotPreparedToRun = await IsNotPreparedToRunDistro(startDate, endDate, amount, errors);
+
+            if (isNotPreparedToRun)
             {
                 loggingService.LogMethodFinished();
                 return new GetDistroResponse(errors);
@@ -63,13 +66,15 @@ public GetDistroResponse GetDistro(DateTime? startDate, DateTime? endDate, int?
             return distroResponse;
         }
 
-        public GetMemberStatsResponse GetMemberStats(DateTime? startDate, DateTime? endDate)
+        public async Task<GetMemberStatsResponse> GetMemberStats(DateTime? startDate, DateTime? endDate)
         {
             loggingService.LogMethodInvoked();
 
             IList<ApiError> errors = new List<ApiError>();
 
-            if (IsNotPreparedToGetMemberStats(startDate, endDate, errors))
+            bool isNotPreparedToRun = await IsNotPreparedToGetMemberStats(startDate, endDate, errors);
+
+            if (isNotPreparedToRun)
             {
                 loggingService.LogMethodFinished();
                 return new GetMemberStatsResponse(errors);
@@ -93,13 +98,15 @@ public GetMemberStatsResponse GetMemberStats(DateTime? startDate, DateTime? endD
             return memberStatsResponse;
         }
 
-        public GetTeamsResponse GetTeams()
+        public async Task<GetTeamsResponse> GetTeams()
         {
             loggingService.LogMethodInvoked();
 
             var errors = new List<ApiError>();
 
-            if (IsNotPreparedToGetTeams(errors))
+            bool isNotPreparedToRun = await IsNotPreparedToGetTeams(errors);
+
+            if (isNotPreparedToRun)
             {
                 loggingService.LogMethodFinished();
                 return new GetTeamsResponse(errors);
@@ -125,31 +132,32 @@ private IList<FoldingUser> GetFoldingMembers(DateTime? startDate, DateTime? endD
                 endDate.GetValueOrDefault());
         }
 
-        private bool IsNotPreparedToGetMemberStats(DateTime? startDate, DateTime? endDate, IList<ApiError> errors)
+        private async Task<bool> IsNotPreparedToGetMemberStats(DateTime? startDate, DateTime? endDate,
+                                                               IList<ApiError> errors)
         {
             ValidateStartDate(startDate, errors);
             ValidateEndDate(endDate, errors);
             ValidateDateRange(startDate, endDate, errors);
-            ValidateApiIsAvailable(errors);
+            await ValidateApiIsAvailable(errors);
 
             return errors.Count > 0;
         }
 
-        private bool IsNotPreparedToGetTeams(IList<ApiError> errors)
+        private async Task<bool> IsNotPreparedToGetTeams(IList<ApiError> errors)
         {
-            ValidateApiIsAvailable(errors);
+            await ValidateApiIsAvailable(errors);
 
             return errors.Count > 0;
         }
 
-        private bool IsNotPreparedToRunDistro(DateTime? startDate, DateTime? endDate, int? amount,
-                                              IList<ApiError> errors)
+        private async Task<bool> IsNotPreparedToRunDistro(DateTime? startDate, DateTime? endDate, int? amount,
+                                                          IList<ApiError> errors)
         {
             ValidateStartDate(startDate, errors);
             ValidateEndDate(endDate, errors);
             ValidateDateRange(startDate, endDate, errors);
             ValidateAmount(amount, errors);
-            ValidateApiIsAvailable(errors);
+            await ValidateApiIsAvailable(errors);
 
             return errors.Count > 0;
         }
@@ -173,10 +181,10 @@ private void ValidateAmount(int? amount, IList<ApiError> errors)
             }
         }
 
-        private void ValidateApiIsAvailable(IList<ApiError> errors)
+        private async Task ValidateApiIsAvailable(IList<ApiError> errors)
         {
             ValidateDatabaseIsAvailable(errors);
-            ValidateDataStoreIsAvailable(errors);
+            await ValidateDataStoreIsAvailable(errors);
         }
 
         private void ValidateDatabaseIsAvailable(IList<ApiError> errors)
@@ -196,9 +204,11 @@ private void ValidateDatabaseIsAvailable(IList<ApiError> errors)
             }
         }
 
-        private void ValidateDataStoreIsAvailable(IList<ApiError> errors)
+        private async Task ValidateDataStoreIsAvailable(IList<ApiError> errors)
         {
-            if (!statsDownloadApiDataStoreService.IsAvailable())
+            bool isAvailable = await statsDownloadApiDataStoreService.IsAvailable();
+
+            if (!isAvailable)
             {
                 errors.Add(Constants.ApiErrors.DataStoreUnavailable);
             }

Api/StatsDownloadApi.DataStore.Tests/TestStatsDownloadApiDataStoreProvider.cs

@@ -1,6 +1,7 @@
 namespace StatsDownloadApi.DataStore.Tests
 {
     using System;
+    using System.Threading.Tasks;
 
     using NSubstitute;
 
@@ -66,8 +67,6 @@ public void SetUp()
                 fileValidationServiceMock, filePayloadApiSettingsServiceMock, loggingServiceMock);
         }
 
-        private ILoggingService loggingServiceMock;
-
         private IStatsDownloadApiDatabaseService databaseServiceMock;
 
         private IDataStoreService dataStoreServiceMock;
@@ -76,6 +75,8 @@ public void SetUp()
 
         private IFileValidationService fileValidationServiceMock;
 
+        private ILoggingService loggingServiceMock;
+
         private IStatsDownloadApiDataStoreService systemUnderTest;
 
         private readonly ValidatedFile validatedFileMock1 =
@@ -96,13 +97,11 @@ public void GetFoldingMembers_WhenInvoked_GetsAndValidatesStatsFiles()
             {
                 databaseServiceMock.Received(1).GetValidatedFiles(DateTime.MinValue, DateTime.MaxValue);
 
-                filePayloadApiSettingsServiceMock
-                    .Received(1).SetFilePayloadApiSettings(Arg.Any<FilePayload>());
+                filePayloadApiSettingsServiceMock.Received(1).SetFilePayloadApiSettings(Arg.Any<FilePayload>());
                 dataStoreServiceMock.Received(1).DownloadFile(Arg.Any<FilePayload>(), validatedFileMock1);
                 fileValidationServiceMock.Received(1).ValidateFile(Arg.Any<FilePayload>());
 
-                filePayloadApiSettingsServiceMock
-                    .Received(1).SetFilePayloadApiSettings(Arg.Any<FilePayload>());
+                filePayloadApiSettingsServiceMock.Received(1).SetFilePayloadApiSettings(Arg.Any<FilePayload>());
                 dataStoreServiceMock.Received(1).DownloadFile(Arg.Any<FilePayload>(), validatedFileMock3);
                 fileValidationServiceMock.Received(1).ValidateFile(Arg.Any<FilePayload>());
             });
@@ -138,11 +137,11 @@ public void GetTeams_WhenInvoked()
 
         [TestCase(true)]
         [TestCase(false)]
-        public void IsAvailable_WhenInvoked_DefersToDataStore(bool expected)
+        public async Task IsAvailable_WhenInvoked_DefersToDataStore(bool expected)
         {
             dataStoreServiceMock.IsAvailable().Returns(expected);
 
-            bool actual = systemUnderTest.IsAvailable();
+            bool actual = await systemUnderTest.IsAvailable();
 
             Assert.That(actual, Is.EqualTo(expected));
         }

Api/StatsDownloadApi.DataStore/StatsDownloadApiDataStoreCacheProvider.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Runtime.CompilerServices;
+    using System.Threading.Tasks;
 
     using LazyCache;
 
@@ -39,7 +40,7 @@ public Team[] GetTeams()
             return GetOrAdd(() => innerService.GetTeams(), DateTimeOffset.Now.AddHours(cacheDurationInHours));
         }
 
-        public bool IsAvailable()
+        public Task<bool> IsAvailable()
         {
             return innerService.IsAvailable();
         }

Api/StatsDownloadApi.DataStore/StatsDownloadApiDataStoreProvider.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Threading.Tasks;
 
     using StatsDownload.Core.Interfaces;
     using StatsDownload.Core.Interfaces.DataTransfer;
@@ -64,7 +65,7 @@ public Team[] GetTeams()
             return teams;
         }
 
-        public bool IsAvailable()
+        public Task<bool> IsAvailable()
         {
             return dataStoreService.IsAvailable();
         }

Api/StatsDownloadApi.Database/Constants.cs

@@ -18,8 +18,7 @@ public static class StatsDownloadApiDatabase
             {
                 //GetFoldingMembersProcedureName,
                 //GetMembersProcedureName, GetTeamsProcedureName
-                GetValidatedFilesProcedureName,
-                ValidatedFilesViewName
+                GetValidatedFilesProcedureName, ValidatedFilesViewName
             };
 
             public static string GetValidatedFilesProcedureName =>