Move resx to resources folder

Gramli · Nov 30, 2023 · b31f57a · b31f57a
1 parent 62686e6
commit b31f57a
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 20 deletions.
diff --git a/src/Tests/UnitTests/Weather.Core.UnitTests/Commands/AddFavoriteHandlerTests.cs b/src/Tests/UnitTests/Weather.Core.UnitTests/Commands/AddFavoriteHandlerTests.cs
@@ -1,5 +1,6 @@
 using Weather.Core.Abstractions;
 using Weather.Core.Commands;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos.Commands;
 using Weather.Domain.Logging;
 using Weather.UnitTests.Common.Extensions;

diff --git a/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetCurrentWeatherHandlerTests.cs b/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetCurrentWeatherHandlerTests.cs
@@ -1,6 +1,7 @@
 using Validot.Results;
 using Weather.Core.Abstractions;
 using Weather.Core.Queries;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Dtos.Queries;
 using Weather.Domain.Logging;

diff --git a/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetFavoritesHandlerTests.cs b/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetFavoritesHandlerTests.cs
@@ -1,5 +1,6 @@
 using Weather.Core.Abstractions;
 using Weather.Core.Queries;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Http;
 using Weather.Domain.Logging;

diff --git a/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetForecastWeatherHandlerTests.cs b/src/Tests/UnitTests/Weather.Core.UnitTests/Queries/GetForecastWeatherHandlerTests.cs
@@ -1,6 +1,7 @@
 using Validot.Results;
 using Weather.Core.Abstractions;
 using Weather.Core.Queries;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Dtos.Queries;
 using Weather.Domain.Logging;

diff --git a/src/Tests/UnitTests/Weather.Infrastructure.UnitTests/Services/WeatherServiceTests.cs b/src/Tests/UnitTests/Weather.Infrastructure.UnitTests/Services/WeatherServiceTests.cs
@@ -1,5 +1,6 @@
 using Weather.Core.Abstractions;
 using Weather.Domain.Dtos;
+using Weather.Infrastructure.Resources;
 using Weather.Infrastructure.Services;
 using Wheaterbit.Client.Abstractions;
 using Wheaterbit.Client.Dtos;

diff --git a/src/Weather.Core/Commands/AddFavoriteHandler.cs b/src/Weather.Core/Commands/AddFavoriteHandler.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Validot;
 using Weather.Core.Abstractions;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos.Commands;
 using Weather.Domain.Extensions;
 using Weather.Domain.Http;

diff --git a/src/Weather.Core/Queries/GetCurrentWeatherHandler.cs b/src/Weather.Core/Queries/GetCurrentWeatherHandler.cs
@@ -2,12 +2,13 @@
 using Microsoft.Extensions.Logging;
 using Validot;
 using Weather.Core.Abstractions;
-using Weather.Domain;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Dtos.Queries;
 using Weather.Domain.Extensions;
 using Weather.Domain.Http;
 using Weather.Domain.Logging;
+using Weather.Domain.Resources;
 
 namespace Weather.Core.Queries
 {

diff --git a/src/Weather.Core/Queries/GetFavoritesHandler.cs b/src/Weather.Core/Queries/GetFavoritesHandler.cs
@@ -3,11 +3,12 @@
 using Microsoft.Extensions.Logging;
 using Validot;
 using Weather.Core.Abstractions;
-using Weather.Domain;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Extensions;
 using Weather.Domain.Http;
 using Weather.Domain.Logging;
+using Weather.Domain.Resources;
 
 namespace Weather.Core.Queries
 {

diff --git a/src/Weather.Core/Queries/GetForecastWeatherHandler.cs b/src/Weather.Core/Queries/GetForecastWeatherHandler.cs
@@ -2,12 +2,13 @@
 using Microsoft.Extensions.Logging;
 using Validot;
 using Weather.Core.Abstractions;
-using Weather.Domain;
+using Weather.Core.Resources;
 using Weather.Domain.Dtos;
 using Weather.Domain.Dtos.Queries;
 using Weather.Domain.Extensions;
 using Weather.Domain.Http;
 using Weather.Domain.Logging;
+using Weather.Domain.Resources;
 
 namespace Weather.Core.Queries
 {

diff --git a/src/Weather.Core/ErrorMessages.Designer.cs → ....Core/Resources/ErrorMessages.Designer.cs b/src/Weather.Core/ErrorMessages.Designer.cs → ....Core/Resources/ErrorMessages.Designer.cs
diff --git a/src/Weather.Core/ErrorMessages.resx → ...Weather.Core/Resources/ErrorMessages.resx b/src/Weather.Core/ErrorMessages.resx → ...Weather.Core/Resources/ErrorMessages.resx
diff --git a/src/Weather.Core/Weather.Core.csproj b/src/Weather.Core/Weather.Core.csproj
@@ -22,15 +22,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="ErrorMessages.Designer.cs">
+    <Compile Update="Resources\ErrorMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>ErrorMessages.resx</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="ErrorMessages.resx">
+    <EmbeddedResource Update="Resources\ErrorMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>

diff --git a/...ather.Domain/ErrorLogMessages.Designer.cs → ...in/Resources/ErrorLogMessages.Designer.cs b/...ather.Domain/ErrorLogMessages.Designer.cs → ...in/Resources/ErrorLogMessages.Designer.cs
diff --git a/src/Weather.Domain/ErrorLogMessages.resx → ...er.Domain/Resources/ErrorLogMessages.resx b/src/Weather.Domain/ErrorLogMessages.resx → ...er.Domain/Resources/ErrorLogMessages.resx
diff --git a/src/Weather.Domain/Weather.Domain.csproj b/src/Weather.Domain/Weather.Domain.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="ErrorLogMessages.Designer.cs">
+    <Compile Update="Resources\ErrorLogMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>ErrorLogMessages.resx</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="ErrorLogMessages.resx">
+    <EmbeddedResource Update="Resources\ErrorLogMessages.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>ErrorLogMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>

diff --git a/src/Weather.Infrastructure/Configuration/ContainerConfigurationExtension.cs b/src/Weather.Infrastructure/Configuration/ContainerConfigurationExtension.cs
@@ -30,7 +30,8 @@ private static IServiceCollection AddServices(this IServiceCollection serviceCol
         private static IServiceCollection AddMapping(this IServiceCollection serviceCollection)
         {
             return serviceCollection
-                .AddAutoMapper(typeof(WeatherEntitiesProfile));
+                .AddAutoMapper(typeof(WeatherEntitiesProfile))
+                .AddAutoMapper(typeof(WeatherbitClientProfile));
         }
 
         private static IServiceCollection AddDatabase(this IServiceCollection serviceCollection)

diff --git a/...apping/Profiles/ExternalClientsProfile.cs → ...pping/Profiles/WeatherbitClientProfile.cs b/...apping/Profiles/ExternalClientsProfile.cs → ...pping/Profiles/WeatherbitClientProfile.cs
@@ -2,9 +2,9 @@
 
 namespace Weather.Infrastructure.Mapping.Profiles
 {
-    internal sealed class ExternalClientsProfile : Profile
+    internal sealed class WeatherbitClientProfile : Profile
     {
-        public ExternalClientsProfile()
+        public WeatherbitClientProfile()
         {
             CreateMap<Wheaterbit.Client.Dtos.CurrentWeatherDto, Domain.Dtos.CurrentWeatherDto>()
                 .ForMember(dest=>dest.Temperature, opt => opt.MapFrom(src => src.temp))

diff --git a/....Infrastructure/ErrorMessages.Designer.cs → ...cture/Resources/ErrorMessages.Designer.cs b/....Infrastructure/ErrorMessages.Designer.cs → ...cture/Resources/ErrorMessages.Designer.cs
diff --git a/...Weather.Infrastructure/ErrorMessages.resx → ...frastructure/Resources/ErrorMessages.resx b/...Weather.Infrastructure/ErrorMessages.resx → ...frastructure/Resources/ErrorMessages.resx
diff --git a/src/Weather.Infrastructure/Services/WeatherService.cs b/src/Weather.Infrastructure/Services/WeatherService.cs
@@ -1,10 +1,10 @@
 using Ardalis.GuardClauses;
 using AutoMapper;
 using FluentResults;
-using Microsoft.Extensions.Logging;
 using Weather.Core.Abstractions;
 using Weather.Domain.Dtos;
 using Weather.Domain.Extensions;
+using Weather.Infrastructure.Resources;
 using Wheaterbit.Client.Abstractions;
 
 namespace Weather.Infrastructure.Services

diff --git a/src/Weather.Infrastructure/Weather.Infrastructure.csproj b/src/Weather.Infrastructure/Weather.Infrastructure.csproj
@@ -23,15 +23,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="ErrorMessages.Designer.cs">
+    <Compile Update="Resources\ErrorMessages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>ErrorMessages.resx</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="ErrorMessages.resx">
+    <EmbeddedResource Update="Resources\ErrorMessages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ErrorMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>