Merge pull request #5 from PandaTechAM/development

Fix faker issue

Author: ruboarm

.github/workflows/main.yml

@@ -13,17 +13,15 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dotnet-version: [ '8.x.x' ]
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: ${{ matrix.dotnet-version }}
+          global-json-file: global.json
 
       - name: Build
         run: dotnet build ${{ env.PROJECT_PATH }}

Communicator.sln

@@ -2,9 +2,21 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communicator", "src\Communicator\Communicator.csproj", "{25001943-A870-4E17-A9B9-0D190CEC819B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communicator.Tests", "src\Communicator.Tests\Communicator.Tests.csproj", "{0305E58F-1C47-454C-B10B-A223F2561A85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communicator.Tests", "test\Communicator.Tests\Communicator.Tests.csproj", "{0305E58F-1C47-454C-B10B-A223F2561A85}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communicator.Demo", "src\Communicator.Demo\Communicator.Demo.csproj", "{5AF7F69F-4713-423A-964F-797D37E1C5B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Communicator.Demo", "test\Communicator.Demo\Communicator.Demo.csproj", "{5AF7F69F-4713-423A-964F-797D37E1C5B4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAE7039F-7312-451A-9598-CEAD4530B77D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9C906F7E-E8B8-4C2B-BE8B-E299061DC1F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00745863-66E5-47D0-A25A-577E5E93E82C}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\main.yml = .github\workflows\main.yml
+		.gitignore = .gitignore
+		global.json = global.json
+		Readme.md = Readme.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,4 +37,9 @@ Global
 		{5AF7F69F-4713-423A-964F-797D37E1C5B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AF7F69F-4713-423A-964F-797D37E1C5B4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0305E58F-1C47-454C-B10B-A223F2561A85} = {9C906F7E-E8B8-4C2B-BE8B-E299061DC1F6}
+		{5AF7F69F-4713-423A-964F-797D37E1C5B4} = {9C906F7E-E8B8-4C2B-BE8B-E299061DC1F6}
+		{25001943-A870-4E17-A9B9-0D190CEC819B} = {DAE7039F-7312-451A-9598-CEAD4530B77D}
+	EndGlobalSection
 EndGlobal

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.300",
+    "rollForward": "latestMajor"
+  }
+}

src/Communicator.Demo/appsettings.Development.json

@@ -8,12 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <PackageId>Pandatech.Communicator</PackageId>
         <Title>SMS and Email Communication helper</Title>
         <PackageTags>Pandatech, library, Sms, Email, Messages</PackageTags>
         <Description>A versatile .NET library for integrating SMS and email functionalities. Supports multiple SMS providers and easy configuration through appsettings.json or web builders, ideal for efficient and reliable messaging in any application..</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-communicator</RepositoryUrl>
+        <!--todo: to update this note-->
         <PackageReleaseNotes>InitialCommit - fake functionalities</PackageReleaseNotes>
     </PropertyGroup>
 

src/Communicator/Communicator.csproj

@@ -7,22 +7,14 @@ internal static class CommunicatorConfigurator
 {
     internal static CommunicatorOptions? ReadConfigurationOptions(IConfiguration configuration)
     {
-        try
-        {
-            var communicatorSection = configuration.GetSection("Communicator");
-            
-            if (!communicatorSection.Exists()) return null;
-            
-            var communicatorOptions = new CommunicatorOptions();
-                
-            communicatorSection.Bind(communicatorOptions);
-            
-            return communicatorOptions;
+        var communicatorSection = configuration.GetSection("Communicator");
 
-        }
-        catch (Exception exception)
-        {
-            throw new Exception(exception.Message);
-        }
+        if (!communicatorSection.Exists()) return null;
+
+        var communicatorOptions = new CommunicatorOptions();
+
+        communicatorSection.Bind(communicatorOptions);
+
+        return communicatorOptions;
     }
 }

src/Communicator/Helpers/CommunicatorConfigurator.cs

@@ -27,7 +27,7 @@ internal static void Validate(this CommunicatorOptions options)
 
         var notSupportedChannels = emailConfigKeys?.Concat(smsConfigKeys ?? []).ToList();
 
-        if (notSupportedChannels?.Count != 0)
+        if (notSupportedChannels is not null && notSupportedChannels.Count != 0)
         {
             throw new InvalidOperationException(
                 $"There are unsupported Channels provided {string.Join(",", notSupportedChannels!)}.");

src/Communicator/Helpers/OptionsValidator.cs

@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Communicator\Communicator.csproj" />
+      <ProjectReference Include="..\..\src\Communicator\Communicator.csproj" />
     </ItemGroup>
 
 </Project>