Fix incorrect reporting of fetched from cache in async.

MarkCiliaVincenti · Jan 1, 2024 · d9beccd · d9beccd
1 parent 929a96a
commit d9beccd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/OpenWeatherMap.Cache.Tests/OpenWeatherMap.Cache.Tests.csproj b/OpenWeatherMap.Cache.Tests/OpenWeatherMap.Cache.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/OpenWeatherMap.Cache.Tests/Tests.cs b/OpenWeatherMap.Cache.Tests/Tests.cs
@@ -39,7 +39,7 @@ public async Task TestConcurrency()
             for (int i = 1; i <= tries; i++)
             {
                 tasks = Enumerable.Range(0, concurrency)
-                    .Select(async i =>
+                    .Select(async (i) =>
                     {
                         var location = new Models.Location(48.6371, -122.1237);
                         var readings = openWeatherMapCache.GetReadings(location);
@@ -74,8 +74,8 @@ public async Task TestConcurrency()
         public async Task TestConcurrencyAsync()
         {
             int apiCachePeriod = 1_000;
-            int concurrency = 100;
-            int tries = 5;
+            int concurrency = 2;
+            int tries = 1;
 
             var openWeatherMapCache = new OpenWeatherMapCache(_apiKey, apiCachePeriod);
             int totalFromCache = 0;
@@ -87,7 +87,7 @@ public async Task TestConcurrencyAsync()
             for (int i = 1; i <= tries; i++)
             {
                 tasks = Enumerable.Range(0, concurrency)
-                    .Select(async i =>
+                    .Select(async (i) =>
                     {
                         var location = new Models.Location(48.6371, -122.1237);
                         var readings = await openWeatherMapCache.GetReadingsAsync(location);
@@ -103,6 +103,7 @@ public async Task TestConcurrencyAsync()
                         {
                             Interlocked.Increment(ref totalFromAPI);
                         }
+                        await Task.Delay(0);
                     }).ToList().AsParallel();
                 await Task.WhenAll(tasks);
 

diff --git a/OpenWeatherMap.Cache.Tests/appsettings.json b/OpenWeatherMap.Cache.Tests/appsettings.json
@@ -1,3 +1,3 @@
 {
   "apiKey": "[API Key]"
-}
+}
diff --git a/OpenWeatherMap.Cache/OpenWeatherMap.Cache.csproj b/OpenWeatherMap.Cache/OpenWeatherMap.Cache.csproj
@@ -8,16 +8,16 @@
 		<PackageProjectUrl>https://github.com/MarkCiliaVincenti/OpenWeatherMap.Cache</PackageProjectUrl>
 		<Copyright>MIT</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>1.9.14</Version>
+		<Version>1.10.0</Version>
 		<PackageIcon>logo.png</PackageIcon>
-		<PackageReleaseNotes>Dependency update.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fix incorrect reporting of fetched from cache in async.</PackageReleaseNotes>
 		<Description>An asynchronous .NET Standard 2.0 library that allows you to fetch &amp; cache current weather readings from the OpenWeather API, with built-in resiliency that can extend the cache lifetime in case the API is unreachable.</Description>
-		<Copyright>© 2023 Mark Cilia Vincenti</Copyright>
+		<Copyright>© 2024 Mark Cilia Vincenti</Copyright>
 		<PackageTags>OpenWeather,OpenWeatherMap,cache,weather,API,.NET Standard,netstandard</PackageTags>
 		<RepositoryType>git</RepositoryType>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-		<AssemblyVersion>1.9.14.0</AssemblyVersion>
-		<FileVersion>1.9.14.0</FileVersion>
+		<AssemblyVersion>1.10.0.0</AssemblyVersion>
+		<FileVersion>1.10.0.0</FileVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<IsPackable>true</IsPackable>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>

diff --git a/OpenWeatherMap.Cache/OpenWeatherMapCache.cs b/OpenWeatherMap.Cache/OpenWeatherMapCache.cs
@@ -3,6 +3,7 @@
 using OpenWeatherMap.Cache.Constants;
 using OpenWeatherMap.Cache.Models;
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Net;
@@ -290,7 +291,7 @@ public async ValueTask<Readings> GetReadingsAsync<T>(T locationQuery, Cancellati
 
                 try
                 {
-                    var apiWeatherResult = await GetApiWeatherResultFromLocationQueryAsync(locationQuery, cancellationToken).ConfigureAwait(false);
+                    var apiWeatherResult = await GetApiWeatherResultFromLocationQueryAsync(locationQuery, cancellationToken).ConfigureAwait(true);
                     var newValue = new Readings(apiWeatherResult)
                     {
                         ApiRequestMade = true