feature flag implementation

src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetForecastWeatherHandlerTests.cs

@@ -59,7 +59,7 @@ public async Task GetForecastWeather_Failed()
             var getForecastWeatherQuery = new GetForecastWeatherQuery(1, 1);
 
             _getForecastWeatherQueryValidatorMock.Setup(x => x.Validate(It.IsAny<GetForecastWeatherQuery>())).Returns(new RequestValidationResult { IsValid = true });
-            _weatherServiceMock.Setup(x => x.GetForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Fail(errorMessage));
+            _weatherServiceMock.Setup(x => x.GetSixteenDayForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Fail(errorMessage));
             //Act
             var result = await _uut.HandleAsync(getForecastWeatherQuery, CancellationToken.None);
 
@@ -69,7 +69,7 @@ public async Task GetForecastWeather_Failed()
             Assert.Equal(ErrorMessages.ExternalApiError, result.Errors.Single());
             Assert.Null(result.Data);
             _getForecastWeatherQueryValidatorMock.Verify(x => x.Validate(It.Is<GetForecastWeatherQuery>(y => y.Equals(getForecastWeatherQuery))), Times.Once);
-            _weatherServiceMock.Verify(x => x.GetForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
+            _weatherServiceMock.Verify(x => x.GetSixteenDayForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
             _loggerMock.VerifyLog(LogLevel.Error, LogEvents.ForecastWeathersGet, errorMessage, Times.Once());
         }
 
@@ -81,7 +81,7 @@ public async Task GetForecastWeather_ValidationFailed()
             var forecastWeather = new ForecastWeatherDto();
 
             _getForecastWeatherQueryValidatorMock.Setup(x => x.Validate(It.IsAny<GetForecastWeatherQuery>())).Returns(new RequestValidationResult { IsValid = true });
-            _weatherServiceMock.Setup(x => x.GetForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok(forecastWeather));
+            _weatherServiceMock.Setup(x => x.GetSixteenDayForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok(forecastWeather));
             _forecastWeatherValidatorMock.Setup(x => x.Validate(It.IsAny<ForecastWeatherDto>())).Returns(new RequestValidationResult { IsValid = false });
 
             //Act
@@ -92,7 +92,7 @@ public async Task GetForecastWeather_ValidationFailed()
             Assert.Single(result.Errors);
             Assert.Null(result.Data);
             _getForecastWeatherQueryValidatorMock.Verify(x => x.Validate(It.Is<GetForecastWeatherQuery>(y => y.Equals(getForecastWeatherQuery))), Times.Once);
-            _weatherServiceMock.Verify(x => x.GetForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
+            _weatherServiceMock.Verify(x => x.GetSixteenDayForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
             _forecastWeatherValidatorMock.Verify(x => x.Validate(It.Is<ForecastWeatherDto>(y => y.Equals(forecastWeather))), Times.Once);
             _loggerMock.VerifyLog(LogLevel.Error, LogEvents.ForecastWeathersValidation, Times.Once());
         }
@@ -105,7 +105,7 @@ public async Task Success()
             var forecastWeather = new ForecastWeatherDto();
 
             _getForecastWeatherQueryValidatorMock.Setup(x => x.Validate(It.IsAny<GetForecastWeatherQuery>())).Returns(new RequestValidationResult { IsValid = true });
-            _weatherServiceMock.Setup(x => x.GetForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok(forecastWeather));
+            _weatherServiceMock.Setup(x => x.GetSixteenDayForecastWeather(It.IsAny<LocationDto>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok(forecastWeather));
             _forecastWeatherValidatorMock.Setup(x => x.Validate(It.IsAny<ForecastWeatherDto>())).Returns(new RequestValidationResult { IsValid = true });
 
             //Act
@@ -117,7 +117,7 @@ public async Task Success()
             Assert.NotNull(result.Data);
             Assert.Equal(forecastWeather, result.Data);
             _getForecastWeatherQueryValidatorMock.Verify(x => x.Validate(It.Is<GetForecastWeatherQuery>(y => y.Equals(getForecastWeatherQuery))), Times.Once);
-            _weatherServiceMock.Verify(x => x.GetForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
+            _weatherServiceMock.Verify(x => x.GetSixteenDayForecastWeather(It.Is<LocationDto>(y => y.Equals(getForecastWeatherQuery.Location)), It.IsAny<CancellationToken>()), Times.Once);
             _forecastWeatherValidatorMock.Verify(x => x.Validate(It.Is<ForecastWeatherDto>(y => y.Equals(forecastWeather))), Times.Once);
         }
     }

src/Tests/UnitTests/Weather.Infrastructure.UnitTests/Services/WeatherServiceTests.cs

@@ -133,7 +133,7 @@ public async Task GetForecastWeather_Failed()
 
             _weatherbiClientMock.Setup(x => x.GetSixteenDayForecast(It.IsAny<double>(), It.IsAny<double>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Fail(failedMessage));
             //Act
-            var result = await _uut.GetForecastWeather(location, CancellationToken.None);
+            var result = await _uut.GetSixteenDayForecastWeather(location, CancellationToken.None);
             //Assert
             Assert.True(result.IsFailed);
             Assert.Single(result.Errors);
@@ -149,7 +149,7 @@ public async Task GetForecastWeather_NullData()
 
             _weatherbiClientMock.Setup(x => x.GetSixteenDayForecast(It.IsAny<double>(), It.IsAny<double>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok((Wheaterbit.Client.Dtos.ForecastWeatherDto)null));
             //Act
-            var result = await _uut.GetForecastWeather(location, CancellationToken.None);
+            var result = await _uut.GetSixteenDayForecastWeather(location, CancellationToken.None);
             //Assert
             Assert.True(result.IsFailed);
             Assert.Single(result.Errors);
@@ -165,7 +165,7 @@ public async Task GetForecastWeather_EmptyData()
 
             _weatherbiClientMock.Setup(x => x.GetSixteenDayForecast(It.IsAny<double>(), It.IsAny<double>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Ok(new Wheaterbit.Client.Dtos.ForecastWeatherDto()));
             //Act
-            var result = await _uut.GetForecastWeather(location, CancellationToken.None);
+            var result = await _uut.GetSixteenDayForecastWeather(location, CancellationToken.None);
             //Assert
             Assert.True(result.IsFailed);
             Assert.Single(result.Errors);
@@ -193,7 +193,7 @@ public async Task GetForecastWeather_Success()
             _mapperMock.Setup(x => x.Map<Domain.Dtos.ForecastWeatherDto>(It.IsAny<Wheaterbit.Client.Dtos.ForecastWeatherDto>())).Returns(mapResult);
 
             //Act
-            var result = await _uut.GetForecastWeather(location, CancellationToken.None);
+            var result = await _uut.GetSixteenDayForecastWeather(location, CancellationToken.None);
 
             //Assert
             Assert.True(result.IsSuccess);

src/Weather.API/Ex.cs

@@ -0,0 +1,18 @@
+using SmallApiToolkit.Middleware;
+using System.Net;
+using System.Runtime.CompilerServices;
+
+namespace Weather.API
+{
+    public class Ex : ExceptionMiddleware
+    {
+        public Ex(RequestDelegate next, ILogger<ExceptionMiddleware> logger) : base(next, logger)
+        {
+        }
+
+        protected override (HttpStatusCode responseCode, string responseMessage) ExtractFromException(Exception generalEx)
+        {
+            return base.ExtractFromException(generalEx);
+        }
+    }
+}

src/Weather.API/Program.cs

@@ -1,7 +1,9 @@
+using Microsoft.FeatureManagement;
+using SmallApiToolkit.Extensions;
 using SmallApiToolkit.Middleware;
-using Weather.API.Configuration;
 using Weather.API.EndpointBuilders;
 using Weather.Core.Configuration;
+using Weather.Domain.FeatureFlags;
 using Weather.Infrastructure.Configuration;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -13,6 +15,19 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
+var corsPolicyName = builder.Services.AddCorsByConfiguration(builder.Configuration);
+
+builder.Services.AddFeatureManagement(builder.Configuration.GetSection(FeatureFlagKeys.FeatureFlagsKey));
+
+/*builder.Configuration.AddAzureAppConfiguration(options =>
+{
+    options.Connect("")
+    .UseFeatureFlags(featureFlagOptions =>
+    {
+        featureFlagOptions.SetRefreshInterval(TimeSpan.FromMinutes(1));
+    });
+});*/
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment())
@@ -21,6 +36,8 @@
     app.UseSwaggerUI();
 }
 
+app.UseCors(corsPolicyName);
+
 app.UseHttpsRedirection();
 
 app.UseMiddleware<ExceptionMiddleware>();

src/Weather.API/Weather.API.csproj

@@ -10,6 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="SmallApiToolkit" Version="1.0.0.7" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />

src/Weather.API/appsettings.json

@@ -5,10 +5,37 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
   "Weatherbit": {
     "BaseUrl": "https://weatherbit-v1-mashape.p.rapidapi.com",
     "XRapidAPIKey": "",
     "XRapidAPIHost": "weatherbit-v1-mashape.p.rapidapi.com"
+  },
+  "UseAzureForFeatureFlags": false,
+  "FeatureFlags": {
+    "useFiveDayForecast": true,
+    "useCelsiusForTemperature": true,
+    "allowToDeleteFavorites": [
+      {
+        "name": "TimeBiggerThan",
+        "parameters": {
+          "value": "9:00"
+        }
+      },
+      {
+        "name": "TimeLessThan",
+        "parameters": {
+          "value": "17:00"
+        }
+      }
+    ]
+  },
+  "CORS": {
+    "name": "allowLocalhostOrigins",
+    "urls": [
+      "http://127.0.0.1:4200",
+      "http://localhost:4200",
+      "https://127.0.0.1:4200",
+      "https://localhost:4200"
+    ]
   }
 }

src/Weather.Core/Abstractions/IWeatherService.cs

@@ -7,6 +7,7 @@ public interface IWeatherService
     {
         Task<Result<CurrentWeatherDto>> GetCurrentWeather(LocationDto locationDto, CancellationToken cancellationToken);
 
-        Task<Result<ForecastWeatherDto>> GetForecastWeather(LocationDto locationDto, CancellationToken cancellationToken);
+        Task<Result<ForecastWeatherDto>> GetSixteenDayForecastWeather(LocationDto locationDto, CancellationToken cancellationToken);
+        Task<Result<ForecastWeatherDto>> GetFiveDayForecastWeather(LocationDto locationDto, CancellationToken cancellationToken);
     }
 }

src/Weather.Core/Queries/GetFavoritesHandler.cs

@@ -1,6 +1,7 @@
 using Ardalis.GuardClauses;
 using FluentResults;
 using Microsoft.Extensions.Logging;
+using Microsoft.FeatureManagement;
 using SmallApiToolkit.Core.Extensions;
 using SmallApiToolkit.Core.RequestHandlers;
 using SmallApiToolkit.Core.Response;

src/Weather.Core/Queries/GetForecastWeatherHandler.cs

@@ -1,5 +1,7 @@
 using Ardalis.GuardClauses;
+using FluentResults;
 using Microsoft.Extensions.Logging;
+using Microsoft.FeatureManagement;
 using SmallApiToolkit.Core.Extensions;
 using SmallApiToolkit.Core.RequestHandlers;
 using SmallApiToolkit.Core.Response;
@@ -8,6 +10,7 @@
 using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Extensions;
+using Weather.Domain.FeatureFlags;
 using Weather.Domain.Logging;
 using Weather.Domain.Queries;
 using Weather.Domain.Resources;
@@ -19,20 +22,23 @@ internal sealed class GetForecastWeatherHandler : ValidationHttpRequestHandler<F
         private readonly IRequestValidator<ForecastWeatherDto> _forecastWeatherValidator;
         private readonly IWeatherService _weatherService;
         private readonly ILogger<GetForecastWeatherHandler> _logger;
+        private readonly IFeatureManager _featureManager;
         public GetForecastWeatherHandler(
             IRequestValidator<GetForecastWeatherQuery> getForecastWeatherQueryValidator, 
             IWeatherService weatherService,
             IRequestValidator<ForecastWeatherDto> forecastWeatherValidator,
-            ILogger<GetForecastWeatherHandler> logger)
+            ILogger<GetForecastWeatherHandler> logger,
+            IFeatureManager featureManager)
             : base(getForecastWeatherQueryValidator)
         {
             _weatherService = Guard.Against.Null(weatherService);
             _forecastWeatherValidator = Guard.Against.Null(forecastWeatherValidator);
             _logger = Guard.Against.Null(logger);
+            _featureManager = Guard.Against.Null(featureManager);
         }
         protected override async Task<HttpDataResponse<ForecastWeatherDto>> HandleValidRequestAsync(GetForecastWeatherQuery request, CancellationToken cancellationToken)
         {
-            var forecastResult = await _weatherService.GetForecastWeather(request.Location, cancellationToken);
+            var forecastResult = await GetForecastWeatherAsync(request, cancellationToken);
 
             if(forecastResult.IsFailed)
             {
@@ -49,5 +55,10 @@ protected override async Task<HttpDataResponse<ForecastWeatherDto>> HandleValidR
 
             return HttpDataResponses.AsOK(forecastResult.Value);
         }
+
+        private async Task<Result<ForecastWeatherDto>> GetForecastWeatherAsync(GetForecastWeatherQuery request, CancellationToken cancellationToken)
+            => await _featureManager.IsEnabledAsync(FeatureFlagKeys.UseFiveDayForecast) ?
+                await _weatherService.GetFiveDayForecastWeather(request.Location, cancellationToken) :
+                await _weatherService.GetSixteenDayForecastWeather(request.Location, cancellationToken);
     }
 }

src/Weather.Core/Weather.Core.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
     <PackageReference Include="FluentResults" Version="3.16.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
     <PackageReference Include="SmallApiToolkit.Core" Version="1.0.0.7" />
     <PackageReference Include="Validot" Version="2.5.0" />
   </ItemGroup>

src/Weather.Domain/Dtos/ForecastWeatherDto.cs

@@ -2,7 +2,7 @@
 {
     public sealed class ForecastWeatherDto
     { 
-        public IReadOnlyCollection<ForecastTemperatureDto> ForecastTemperatures { get; init; } = new List<ForecastTemperatureDto>();
+        public IReadOnlyCollection<ForecastTemperatureDto> ForecastTemperatures { get; init; } = [];
 
         public string CityName { get; init; } = string.Empty;
     }

src/Weather.Domain/Extensions/CelsiusExtensions.cs

@@ -0,0 +1,9 @@
+namespace Weather.Domain.Extensions
+{
+    public static class CelsiusExtensions
+    {
+        private const double FahrenheitCelsiusConst = 33.8;
+        public static double ToCelsius(double fahrenheit)
+            => fahrenheit * FahrenheitCelsiusConst;
+    }
+}

src/Weather.Domain/FeatureFlags/FeatureFlagKeys.cs

@@ -0,0 +1,9 @@
+namespace Weather.Domain.FeatureFlags
+{
+    public static class FeatureFlagKeys
+    {
+        public static readonly string FeatureFlagsKey = "FeatureFlags";
+        public static readonly string UseFiveDayForecast = "useFiveDayForecast";
+        public static readonly string UseCelsiusForTemperature = "useCelsiusForTemperature";
+    }
+}

src/Weather.Infrastructure/Services/WeatherService.cs

@@ -41,9 +41,15 @@ public async Task<Result<CurrentWeatherDto>> GetCurrentWeather(LocationDto locat
             return _mapper.Map<CurrentWeatherDto>(currentWeatherResult.Value.Data.Single());
         }
 
-        public async Task<Result<ForecastWeatherDto>> GetForecastWeather(LocationDto locationDto, CancellationToken cancellationToken)
+        public async Task<Result<ForecastWeatherDto>> GetFiveDayForecastWeather(LocationDto locationDto, CancellationToken cancellationToken)
+            => await GetForecastWeather(_weatherbitHttpClient.GetFiveDayForecast(locationDto.Latitude, locationDto.Longitude, cancellationToken));
+
+        public async Task<Result<ForecastWeatherDto>> GetSixteenDayForecastWeather(LocationDto locationDto, CancellationToken cancellationToken)
+            => await GetForecastWeather(_weatherbitHttpClient.GetSixteenDayForecast(locationDto.Latitude, locationDto.Longitude, cancellationToken));
+
+        private async Task<Result<ForecastWeatherDto>> GetForecastWeather(Task<Result<Wheaterbit.Client.Dtos.ForecastWeatherDto>> getData)
         {
-            var forecastWeatherResult = await _weatherbitHttpClient.GetSixteenDayForecast(locationDto.Latitude, locationDto.Longitude, cancellationToken);
+            var forecastWeatherResult = await getData;
             if (forecastWeatherResult.IsFailed)
             {
                 return Result.Fail(forecastWeatherResult.Errors);

src/Wheaterbit.Client/Abstractions/IJsonSerializerSettingsFactory.cs

@@ -5,5 +5,6 @@ namespace Wheaterbit.Client.Abstractions
     public interface IJsonSerializerSettingsFactory
     {
         JsonSerializerSettings Create();
+        JsonSerializerSettings CreateWithHoursOnly();
     }
 }

src/Wheaterbit.Client/Abstractions/IWeatherbitHttpClient.cs

@@ -7,5 +7,6 @@ public interface IWeatherbitHttpClient
     {
         Task<Result<ForecastWeatherDto>> GetSixteenDayForecast(double latitude, double longitude, CancellationToken cancellationToken);
         Task<Result<CurrentWeatherDataDto>> GetCurrentWeather(double latitude, double longitude, CancellationToken cancellationToken);
+        Task<Result<ForecastWeatherDto>> GetFiveDayForecast(double latitude, double longitude, CancellationToken cancellationToken);
     }
 }

src/Wheaterbit.Client/Dtos/ForecastTemperatureDto.cs

@@ -2,7 +2,7 @@
 {
     public sealed class ForecastTemperatureDto
     {
-        public double temp { get; init; }
-        public DateTime datetime { get; init; }
+        public double? temp { get; init; }
+        public DateTime? datetime { get; init; }
     }
 }

src/Wheaterbit.Client/Dtos/ForecastWeatherDto.cs

@@ -2,8 +2,8 @@
 {
     public sealed class ForecastWeatherDto
     {
-        public IReadOnlyCollection<ForecastTemperatureDto> Data { get; init; } = new List<ForecastTemperatureDto>();
+        public IReadOnlyCollection<ForecastTemperatureDto>? Data { get; init; } = [];
 
-        public string city_name { get; init; } = string.Empty;
+        public string? city_name { get; init; } = string.Empty;
     }
 }

src/Wheaterbit.Client/Factories/JsonSerializerSettingsFactory.cs

@@ -12,5 +12,13 @@ public JsonSerializerSettings Create()
                 DateFormatString = "yyyy-MM-dd hh:mm"
             };
         }
+
+        public JsonSerializerSettings CreateWithHoursOnly()
+        {
+            return new JsonSerializerSettings
+            {
+                DateFormatString = "yyyy-MM-dd:HH",
+            };
+        }
     }
 }