Working on users view, added infrastructure lib

UserService.DatabaseLayer/DataModels/ModelBuilderExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.DataModels
 {

UserService.DatabaseLayer/DataModels/Node.cs

@@ -1,62 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace UserService.DatabaseLayer.DataModels
-{
-    public class OrganizationUnit : Node
-    {
-        public Member? Manager { get; set; }
-    }
-
-    public class SecurityGroup : Member
-    {
-    }
-
-    public class User : Member
-    {
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-        public bool IsActive { get; set; }
-
-        public string FullName => $"{FirstName} {LastName}";
-
-        public IEnumerable<UserMember> MemberOf { get; set; } = new List<UserMember>();
-    }
-
-    public class UserMember
-    {
-        public int MemberId { get; set; }
-        public Member? Member { get; set; }
-
-        public int UserId { get; set; }
-
-        public User? User { get; set; }
-    }
-
-    public abstract class Member : Node
-    {
-        [EmailAddress]
-        public string? EMail { get; set; }
-
-        public ICollection<UserMember> Members { get; set; } = new List<UserMember>();
-    }
-
-    public abstract class Node : ICloneable
-    {
-        public int Id { get; set; }
-        [Required] public string CommonName { get; set; } = null!;
-        public string? Description { get; set; }
-        public ICollection<Node> Children { get; set; } = new List<Node>();
-        public Node? Parent { get; set; } //Parent
-        public int? ParentId { get; set; }
-
-        public override string ToString() => CommonName;
-
-        public int Level => Parent?.Level + 1 ?? 0;
-
-        /// <inheritdoc />
-        public virtual object Clone() => MemberwiseClone();
-    }
-}

UserService.DatabaseLayer/DataModels/UserServiceDbContext.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.DataModels
 {

UserService.DatabaseLayer/Migrations/UserServiceDbContextModelSnapshot.cs

@@ -1,8 +1,7 @@
 // <auto-generated />
-using System;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using UserService.DatabaseLayer.DataModels;
 
 namespace UserService.DatabaseLayer.Migrations

UserService.DatabaseLayer/Repository/BaseRepository.cs

@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {

UserService.DatabaseLayer/Repository/IRepository.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {

UserService.DatabaseLayer/Repository/OrganizationUnitsRepository.cs

@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {

UserService.DatabaseLayer/Repository/SecurityGroupsRepository.cs

@@ -1,4 +1,4 @@
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {

UserService.DatabaseLayer/Repository/UsersRepository.cs

@@ -1,4 +1,4 @@
-using UserService.DatabaseLayer.DataModels;
+using UserService.Infrastructure.DataModels;
 
 namespace UserService.DatabaseLayer.Repository
 {

UserService.DatabaseLayer/UserService.DatabaseLayer.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <LangVersion>8</LangVersion>
+        <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -18,4 +18,8 @@
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\UserService.Infrastructure\UserService.Infrastructure.csproj" />
+    </ItemGroup>
+
 </Project>