ModelMetadata + GlobalUsings + ImplicitUsings

havit · Mar 29, 2022 · 1ad74aa · 1ad74aa
1 parent 66cf6f8
commit 1ad74aa
Show file tree

Hide file tree

Showing 52 changed files with 112 additions and 114 deletions.
diff --git a/Contracts/Contracts.csproj b/Contracts/Contracts.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.Contracts</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Contracts</RootNamespace>
 	</PropertyGroup>

diff --git a/Contracts/GlobalUsings.cs b/Contracts/GlobalUsings.cs
@@ -1,8 +1 @@
-global using System;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Text;
-global using System.Threading;
-global using System.Threading.Tasks;
-
-global using Havit.Diagnostics.Contracts;
+global using Havit.Diagnostics.Contracts;
diff --git a/Contracts/Infrastructure/IDataSeedFacade.cs b/Contracts/Infrastructure/IDataSeedFacade.cs
@@ -0,0 +1,12 @@
+using Havit.ComponentModel;
+
+namespace Havit.Bonusario.Contracts.Infrastructure
+{
+	[ApiContract]
+	public interface IDataSeedFacade
+	{
+		Task SeedDataProfile(string profileName);
+
+		Task<Dto<string[]>> GetDataSeedProfiles();
+	}
+}
diff --git a/Contracts/Infrastructure/IMaintenanceFacade.cs b/Contracts/Infrastructure/IMaintenanceFacade.cs
@@ -0,0 +1,10 @@
+using Havit.ComponentModel;
+
+namespace Havit.Bonusario.Contracts.Infrastructure
+{
+	[ApiContract]
+	public interface IMaintenanceFacade
+	{
+		Task ClearCache(CancellationToken cancellationToken = default);
+	}
+}
diff --git a/Contracts/System/IDataSeedFacade.cs b/Contracts/System/IDataSeedFacade.cs
diff --git a/Contracts/System/IMaintenanceFacade.cs b/Contracts/System/IMaintenanceFacade.cs
diff --git a/...ata/Common/ApplicationSettingsMetadata.cs → ...ata/Common/ApplicationSettingsMetadata.cs b/...ata/Common/ApplicationSettingsMetadata.cs → ...ata/Common/ApplicationSettingsMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata.Common
+namespace Havit.Bonusario.Contracts.ModelMetadata.Common
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class ApplicationSettingsMetadata

diff --git a/...l/_generated/Metadata/EmployeeMetadata.cs → ...nerated/ModelMetadata/EmployeeMetadata.cs b/...l/_generated/Metadata/EmployeeMetadata.cs → ...nerated/ModelMetadata/EmployeeMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata
+namespace Havit.Bonusario.Contracts.ModelMetadata
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class EmployeeMetadata

diff --git a/Model/_generated/Metadata/EntryMetadata.cs → ..._generated/ModelMetadata/EntryMetadata.cs b/Model/_generated/Metadata/EntryMetadata.cs → ..._generated/ModelMetadata/EntryMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata
+namespace Havit.Bonusario.Contracts.ModelMetadata
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class EntryMetadata

diff --git a/...l/_generated/Metadata/EntryTagMetadata.cs → ...nerated/ModelMetadata/EntryTagMetadata.cs b/...l/_generated/Metadata/EntryTagMetadata.cs → ...nerated/ModelMetadata/EntryTagMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata
+namespace Havit.Bonusario.Contracts.ModelMetadata
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class EntryTagMetadata

diff --git a/...etadata/Localizations/LanguageMetadata.cs → ...etadata/Localizations/LanguageMetadata.cs b/...etadata/Localizations/LanguageMetadata.cs → ...etadata/Localizations/LanguageMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata.Localizations
+namespace Havit.Bonusario.Contracts.ModelMetadata.Localizations
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class LanguageMetadata

diff --git a/Model/_generated/Metadata/PeriodMetadata.cs → ...generated/ModelMetadata/PeriodMetadata.cs b/Model/_generated/Metadata/PeriodMetadata.cs → ...generated/ModelMetadata/PeriodMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata
+namespace Havit.Bonusario.Contracts.ModelMetadata
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class PeriodMetadata

diff --git a/.../_generated/Metadata/PeriodSetMetadata.cs → ...erated/ModelMetadata/PeriodSetMetadata.cs b/.../_generated/Metadata/PeriodSetMetadata.cs → ...erated/ModelMetadata/PeriodSetMetadata.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Havit.Bonusario.Model.Metadata
+namespace Havit.Bonusario.Contracts.ModelMetadata
 {
 	[System.CodeDom.Compiler.GeneratedCode("Havit.Data.EntityFrameworkCore.CodeGenerator", "1.0")]
 	public static class PeriodSetMetadata

diff --git a/DataLayer.Tests/DataLayer.Tests.csproj b/DataLayer.Tests/DataLayer.Tests.csproj
@@ -2,9 +2,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.DataLayer.Tests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.DataLayer.Tests</RootNamespace>
+		<!-- Nasměrujeme publish složku mimo bin aby nedocházelo ke dvojímu spoštění unit testů (ze bin\Release\netcoreapp a bin\Release\netcoreapp\publish) -->
 		<PublishDir>obj\$(Configuration)\publish</PublishDir>
 	</PropertyGroup>
 

diff --git a/DataLayer.Tests/GlobalUsings.cs b/DataLayer.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/DataLayer/DataLayer.csproj b/DataLayer/DataLayer.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.DataLayer</AssemblyName>
 		<RootNamespace>Havit.Bonusario.DataLayer</RootNamespace>
 	</PropertyGroup>

diff --git a/DataLayer/GlobalUsings.cs b/DataLayer/GlobalUsings.cs
@@ -1,8 +1 @@
-global using System;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Text;
-global using System.Threading;
-global using System.Threading.Tasks;
-
-global using Havit.Diagnostics.Contracts;
+global using Havit.Diagnostics.Contracts;
diff --git a/DataLayer/efcore.codegenerator.json b/DataLayer/efcore.codegenerator.json
@@ -0,0 +1,4 @@
+{
+	"MetadataProjectPath": "Contracts",
+	"MetadataNamespace": "ModelMetadata"
+}
diff --git a/DependencyInjection/DependencyInjection.csproj b/DependencyInjection/DependencyInjection.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.DependencyInjection</AssemblyName>
 		<RootNamespace>Havit.Bonusario.DependencyInjection</RootNamespace>
 	</PropertyGroup>

diff --git a/DependencyInjection/GlobalUsings.cs b/DependencyInjection/GlobalUsings.cs
@@ -1,8 +1 @@
-global using System;
-global using System.Collections.Generic;
-global using System.Linq;
-global using System.Text;
-global using System.Threading;
-global using System.Threading.Tasks;
-
-global using Havit.Diagnostics.Contracts;
+global using Havit.Diagnostics.Contracts;
diff --git a/Entity.Tests/Entity.Tests.csproj b/Entity.Tests/Entity.Tests.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.Entity.Tests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Entity.Tests</RootNamespace>

diff --git a/Entity.Tests/GlobalUsings.cs b/Entity.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/Entity/Entity.csproj b/Entity/Entity.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.Entity</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Entity</RootNamespace>
 	</PropertyGroup>

diff --git a/Entity/GlobalUsings.cs b/Entity/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/Facades.Tests/Facades.Tests.csproj b/Facades.Tests/Facades.Tests.csproj
@@ -2,9 +2,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.Facades.Tests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Facades.Tests</RootNamespace>
+		<!-- Nasměrujeme publish složku mimo bin aby nedocházelo ke dvojímu spoštění unit testů (ze bin\Release\netcoreapp a bin\Release\netcoreapp\publish) -->
 		<PublishDir>obj\$(Configuration)\publish</PublishDir>
 	</PropertyGroup>
 

diff --git a/Facades.Tests/GlobalUsings.cs b/Facades.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/Facades/Facades.csproj b/Facades/Facades.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.Facades</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Facades</RootNamespace>
 	</PropertyGroup>

diff --git a/Facades/GlobalUsings.cs b/Facades/GlobalUsings.cs
@@ -0,0 +1,2 @@
+global using Havit.Data.Patterns.DataSeeds;
+global using Havit.Diagnostics.Contracts;
diff --git a/Facades/System/DataSeedFacade.cs → Facades/Infrastructure/DataSeedFacade.cs b/Facades/System/DataSeedFacade.cs → Facades/Infrastructure/DataSeedFacade.cs
@@ -2,20 +2,19 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Havit;
 using Havit.Data.Patterns.DataSeeds;
 using Havit.Data.Patterns.DataSeeds.Profiles;
 using Havit.Extensions.DependencyInjection.Abstractions;
 using Havit.Bonusario.Contracts;
-using Havit.Bonusario.Contracts.System;
 using Havit.Bonusario.DataLayer.Seeds.Core;
 using Havit.Bonusario.Facades.Infrastructure.Security;
 using Havit.Bonusario.Facades.Infrastructure.Security.Authorization;
 using Havit.Bonusario.Services.Infrastructure;
 using Havit.Services.Caching;
 using Microsoft.AspNetCore.Authorization;
+using Havit.Bonusario.Contracts.Infrastructure;
 
-namespace Havit.Bonusario.Facades.System
+namespace Havit.Bonusario.Facades.Infrastructure.System
 {
 	/// <summary>
 	/// Fasáda k seedování dat.
@@ -48,7 +47,7 @@ public Task SeedDataProfile(string profileName)
 			// they get seeded and another seed asks for GetAll(), the newly seeded entities are not included.
 			cacheService.Clear();
 
-			Type type = GetProfileTypes().FirstOrDefault(item => String.Equals(item.Name, profileName, StringComparison.InvariantCultureIgnoreCase));
+			Type type = GetProfileTypes().FirstOrDefault(item => string.Equals(item.Name, profileName, StringComparison.InvariantCultureIgnoreCase));
 
 			if (type == null)
 			{

diff --git a/Facades/System/MaintenanceFacade.cs → Facades/Infrastructure/MaintenanceFacade.cs b/Facades/System/MaintenanceFacade.cs → Facades/Infrastructure/MaintenanceFacade.cs
@@ -5,11 +5,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Havit.Extensions.DependencyInjection.Abstractions;
-using Havit.Bonusario.Contracts.System;
 using Havit.Services.Caching;
 using Microsoft.AspNetCore.Authorization;
+using Havit.Bonusario.Contracts.Infrastructure;
 
-namespace Havit.Bonusario.Facades.System
+namespace Havit.Bonusario.Facades.Infrastructure.System
 {
 	[Service]
 	[Authorize] // TODO Auth

diff --git a/IntegrationTests/GlobalUsings.cs b/IntegrationTests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj
@@ -2,9 +2,12 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.IntegrationTests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.IntegrationTests</RootNamespace>
+		<!-- Nasměrujeme publish složku mimo bin aby nedocházelo ke dvojímu spoštění unit testů (ze bin\Release\netcoreapp a bin\Release\netcoreapp\publish) -->
+		<PublishDir>obj\$(Configuration)\publish</PublishDir>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Model.Tests/GlobalUsings.cs b/Model.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/Model.Tests/Model.Tests.csproj b/Model.Tests/Model.Tests.csproj
@@ -2,9 +2,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.Model.Tests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Model.Tests</RootNamespace>
+		<!-- Nasměrujeme publish složku mimo bin aby nedocházelo ke dvojímu spoštění unit testů (ze bin\Release\netcoreapp a bin\Release\netcoreapp\publish) -->
 		<PublishDir>obj\$(Configuration)\publish</PublishDir>
 	</PropertyGroup>
 

diff --git a/Model/GlobalUsings.cs b/Model/GlobalUsings.cs
@@ -1,9 +1,3 @@
-global using System;
-global using System.Collections.Generic;
-global using System.ComponentModel.DataAnnotations;
-global using System.Linq;
-global using System.Text;
-global using System.Threading;
-global using System.Threading.Tasks;
+global using System.ComponentModel.DataAnnotations;
 
 global using Havit.Diagnostics.Contracts;
diff --git a/Model/Model.csproj b/Model/Model.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<AssemblyName>Havit.Bonusario.Model</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Model</RootNamespace>
 	</PropertyGroup>

diff --git a/Resources/Resources.csproj b/Resources/Resources.csproj
@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-	  <AssemblyName>Havit.Bonusario.Resources</AssemblyName>
-	  <RootNamespace>Havit.Bonusario.Resources</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<AssemblyName>Havit.Bonusario.Resources</AssemblyName>
+		<RootNamespace>Havit.Bonusario.Resources</RootNamespace>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Havit.Extensions.Localization" Version="1.0.5" />
-    <PackageReference Include="Havit.SourceGenerators.StrongApiStringLocalizers" Version="1.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Havit.Extensions.Localization" Version="1.0.5" />
+		<PackageReference Include="Havit.SourceGenerators.StrongApiStringLocalizers" Version="1.0.8" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Model\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="Model\" />
+	</ItemGroup>
 
 </Project>
diff --git a/Services.Tests/GlobalUsings.cs b/Services.Tests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
diff --git a/Services.Tests/Services.Tests.csproj b/Services.Tests/Services.Tests.csproj
@@ -2,9 +2,11 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Havit.Bonusario.Services.Tests</AssemblyName>
 		<RootNamespace>Havit.Bonusario.Services.Tests</RootNamespace>
+		<!-- Nasměrujeme publish složku mimo bin aby nedocházelo ke dvojímu spoštění unit testů (ze bin\Release\netcoreapp a bin\Release\netcoreapp\publish) -->
 		<PublishDir>obj\$(Configuration)\publish</PublishDir>
 	</PropertyGroup>
 

diff --git a/Services/GlobalUsings.cs b/Services/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Havit.Diagnostics.Contracts;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		global using Havit.Data.Patterns.DataSeeds;
		global using Havit.Diagnostics.Contracts;