Updated with minor changes.

AshrafAlam · AshrafAlam · commit 1917769a2481 · 2022-05-11T17:53:02.000Z
diff --git a/Core/Eisk.Core/DomainService/DomainService.cs b/Core/Eisk.Core/DomainService/DomainService.cs
@@ -1,13 +1,12 @@
-﻿using Eisk.Core.Exceptions;
+﻿using Eisk.Core.DataService;
+using Eisk.Core.Exceptions;
+using Eisk.Core.Utils;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Eisk.Core.DomainService;
 
-using DataService;
-using Utils;
-
 public class DomainService<TDomain, TId>
     where TDomain : class, new()
 {
diff --git a/Core/Eisk.Core/Utils/ExceptionThrower.cs b/Core/Eisk.Core/Utils/ExceptionThrower.cs
@@ -1,6 +1,6 @@
-namespace Eisk.Core.Utils;
+using Eisk.Core.Exceptions;
 
-using Exceptions;
+namespace Eisk.Core.Utils;
 
 public class ExceptionThrower
 {
diff --git a/Core/Eisk.Core/Utils/ExpressionUtil.cs b/Core/Eisk.Core/Utils/ExpressionUtil.cs
@@ -1,10 +1,10 @@
-﻿using System;
+﻿using Eisk.Core.Exceptions;
+using System;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace Eisk.Core.Utils;
 
-using Exceptions;
+namespace Eisk.Core.Utils;
 
 public static class ExpressionUtil<TDomain>
 {
diff --git a/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidAlphanumeric.cs b/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidAlphanumeric.cs
@@ -1,6 +1,6 @@
-namespace Eisk.Test.Core.DataGen.InvalidData;
+using Eisk.Test.Core.DataGen.FieldGenerators;
 
-using FieldGenerators;
+namespace Eisk.Test.Core.DataGen.InvalidData;
 
 public class InvalidAlphanumeric : StringValueGenerator
 {
diff --git a/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidEmail.cs b/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidEmail.cs
@@ -1,6 +1,6 @@
-namespace Eisk.Test.Core.DataGen.InvalidData;
+using Eisk.Test.Core.DataGen.FieldGenerators;
 
-using FieldGenerators;
+namespace Eisk.Test.Core.DataGen.InvalidData;
 
 public class InvalidEmail : StringValueGenerator
 {
diff --git a/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidUri.cs b/Core/Eisk.Test.Core/DataGen/InvalidData/InvalidUri.cs
@@ -1,6 +1,6 @@
-namespace Eisk.Test.Core.DataGen.InvalidData;
+using Eisk.Test.Core.DataGen.FieldGenerators;
 
-using FieldGenerators;
+namespace Eisk.Test.Core.DataGen.InvalidData;
 
 public class InvalidUri : StringValueGenerator
 {
diff --git a/Core/Eisk.Test.Core/DataGen/InvalidData/StringWithSpecialCharacters.cs b/Core/Eisk.Test.Core/DataGen/InvalidData/StringWithSpecialCharacters.cs
@@ -1,6 +1,6 @@
-namespace Eisk.Test.Core.DataGen.InvalidData;
+using Eisk.Test.Core.DataGen.FieldGenerators;
 
-using FieldGenerators;
+namespace Eisk.Test.Core.DataGen.InvalidData;
 
 public class StringWithSpecialCharacters : StringValueGenerator
 {
diff --git a/Core/Eisk.Test.Core/TestBases/TestBase.cs b/Core/Eisk.Test.Core/TestBases/TestBase.cs
@@ -1,9 +1,9 @@
-﻿using System;
+﻿using Eisk.Core.Exceptions;
+using System;
 using Xunit;
 
-namespace Eisk.Test.Core.TestBases;
 
-using Eisk.Core.Exceptions;
+namespace Eisk.Test.Core.TestBases;
 
 public abstract class TestBase
 {
diff --git a/DomainCore/Eisk.DataServices.Interfaces/IEmployeeDataService.cs b/DomainCore/Eisk.DataServices.Interfaces/IEmployeeDataService.cs
@@ -1,11 +1,10 @@
+using Eisk.Core.DataService;
+using Eisk.Domains.Entities;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Eisk.DataServices.Interfaces;
 
-using Core.DataService;
-using Domains.Entities;
-
 public interface IEmployeeDataService : IEntityDataService<Employee>
 {
     Task<IList<Employee>> GetByFirstName(string firstName);
diff --git a/DomainCore/Eisk.DomainServices/EmployeeDomainService.cs b/DomainCore/Eisk.DomainServices/EmployeeDomainService.cs
@@ -1,10 +1,11 @@
+using Eisk.Core.DomainService;
+using Eisk.DataServices.Interfaces;
+using Eisk.Domains.Entities;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 namespace Eisk.DomainServices;
 
-using Core.DomainService;
-using DataServices.Interfaces;
-using Domains.Entities;
 
 public class EmployeeDomainService : DomainService<Employee, int>
 {
diff --git a/DomainCore/Eisk.Domains.TestData/EmployeeDataFactory.cs b/DomainCore/Eisk.Domains.TestData/EmployeeDataFactory.cs
@@ -1,10 +1,10 @@
 ﻿using Bogus;
+using Eisk.Domains.Entities;
+using Eisk.Domains.Enums;
+using Eisk.Test.Core.DataGen.DataFactories;
 
 namespace Eisk.Domains.TestData;
 
-using Eisk.Test.Core.DataGen.DataFactories;
-using Entities;
-using Enums;
 
 public class EmployeeDataFactory : EntityDomainDataFactory<Employee>
 {
diff --git a/DomainCore/Eisk.Domains/BaseEntities/Person.cs b/DomainCore/Eisk.Domains/BaseEntities/Person.cs
@@ -1,11 +1,11 @@
 ﻿using Eisk.Domains.Enums;
+using Eisk.Domains.ValueObjects;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Eisk.Domains.BaseEntities;
 
-using ValueObjects;
 
 public class Person
 {
diff --git a/DomainCore/Eisk.Domains/Entities/Employee.cs b/DomainCore/Eisk.Domains/Entities/Employee.cs
@@ -1,11 +1,11 @@
-﻿using System;
+﻿using Eisk.Domains.BaseEntities;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Eisk.Domains.Entities;
 
-using BaseEntities;
+namespace Eisk.Domains.Entities;
 
 [Table("Employees")]
 public class Employee : Person
diff --git a/Infrastructure.EFCore/Eisk.DataServices.EFCore/DataContext/AppDbContext.cs b/Infrastructure.EFCore/Eisk.DataServices.EFCore/DataContext/AppDbContext.cs
@@ -1,20 +1,18 @@
-﻿using Microsoft.EntityFrameworkCore;
+﻿using Eisk.Domains.Entities;
+using Microsoft.EntityFrameworkCore;
 
-namespace Eisk.DataServices.EFCore.DataContext
-{
-    using Domains.Entities;
+namespace Eisk.DataServices.EFCore.DataContext;
 
-    public class AppDbContext : DbContext
+public class AppDbContext : DbContext
+{
+    public AppDbContext(DbContextOptions<AppDbContext> options) : base(options)
     {
-        public AppDbContext(DbContextOptions<AppDbContext> options) : base(options)
-        {
-        }
+    }
 
-        public virtual DbSet<Employee> Employees { get; set; }
+    public virtual DbSet<Employee> Employees { get; set; }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            modelBuilder.Entity<Employee>().OwnsOne(c => c.Address);
-        }
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<Employee>().OwnsOne(c => c.Address);
     }
-}
+}
diff --git a/Infrastructure.EFCore/Eisk.DataServices.EFCore/EmployeeDataService.cs b/Infrastructure.EFCore/Eisk.DataServices.EFCore/EmployeeDataService.cs
@@ -1,14 +1,14 @@
 using Eisk.Core.DataService.EFCore;
+using Eisk.DataServices.EFCore.DataContext;
+using Eisk.DataServices.Interfaces;
+using Eisk.Domains.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Eisk.DataServices.EFCore;
 
-using DataContext;
-using Domains.Entities;
-using Interfaces;
 
 public class EmployeeDataService : EntityDataService<Employee>, IEmployeeDataService
 {
diff --git a/Infrastructure.EFCore/Eisk.DataServices.IntegrationTests.EFCore.SqlServer/EmployeeDataServiceTestsWithSqlServer.cs b/Infrastructure.EFCore/Eisk.DataServices.IntegrationTests.EFCore.SqlServer/EmployeeDataServiceTestsWithSqlServer.cs
@@ -1,12 +1,12 @@
+using Eisk.DataServices.EFCore;
+using Eisk.Domains.Entities;
+using Eisk.Domains.TestData;
+using Eisk.EFCore.Setup;
+using Eisk.Test.Core.TestBases;
 using Xunit;
 
 namespace Eisk.DataServices.IntegrationTests.EFCore.SqlServer;
 
-using Domains.Entities;
-using Domains.TestData;
-using Eisk.DataServices.EFCore;
-using Eisk.EFCore.Setup;
-using Test.Core.TestBases;
 
 public class EmployeeDataServiceTestsWithSqlServer : DataServiceSqlServerBaseIntegrationTests<Employee, int>, IClassFixture<DatabaseSetup>
 {
diff --git a/Infrastructure.EFCore/Eisk.EFCore.Setup/DbContextDataInitializer.cs b/Infrastructure.EFCore/Eisk.EFCore.Setup/DbContextDataInitializer.cs
@@ -1,11 +1,11 @@
-﻿using System.Linq;
+﻿using Eisk.DataServices.EFCore.DataContext;
+using Eisk.Domains.Entities;
+using Eisk.Domains.TestData;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Eisk.EFCore.Setup;
 
-using DataServices.EFCore.DataContext;
-using Domains.TestData;
-using Eisk.Domains.Entities;
-using System.Collections.Generic;
 
 public static class DbContextDataInitializer
 {
diff --git a/WebApi/Eisk.WebApi/Controllers/EmployeesController.cs b/WebApi/Eisk.WebApi/Controllers/EmployeesController.cs
@@ -1,10 +1,10 @@
-﻿namespace Eisk.WebApi.Controllers;
-
-using Core.WebApi;
-using Domains.Entities;
-using DomainServices;
+﻿using Eisk.Core.WebApi;
+using Eisk.Domains.Entities;
+using Eisk.DomainServices;
 using Microsoft.AspNetCore.Mvc;
 
+namespace Eisk.WebApi.Controllers;
+
 [ApiController]
 [Route("[controller]")]
 public class EmployeesController : WebApiControllerBase<Employee, int>
diff --git a/WebApi/Eisk.WebApi/Program.cs b/WebApi/Eisk.WebApi/Program.cs
@@ -20,7 +20,7 @@
     c.SwaggerDoc("v1", new OpenApiInfo
     {
         Title = "Eisk.WebApi",
-        Version = "v9.0.16",
+        Version = "v9.0.23",
         Description = "EISK makes it easy to write scalable and secured web api on top of Microsoft's new cutting edge .net core technologies.",
         Contact = new OpenApiContact
         {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-namespace Eisk.Core.Utils;`
	`1`	`+using Eisk.Core.Exceptions;`
`2`	`2`
`3`		`-using Exceptions;`
	`3`	`+namespace Eisk.Core.Utils;`
`4`	`4`
`5`	`5`	`public class ExceptionThrower`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-namespace Eisk.Test.Core.DataGen.InvalidData;`
	`1`	`+using Eisk.Test.Core.DataGen.FieldGenerators;`
`2`	`2`
`3`		`-using FieldGenerators;`
	`3`	`+namespace Eisk.Test.Core.DataGen.InvalidData;`
`4`	`4`
`5`	`5`	`public class InvalidAlphanumeric : StringValueGenerator`
`6`	`6`	`{`