Working on organization unit table

UserService.DatabaseLayer/Repositories/UsersRepository.cs

@@ -18,7 +18,7 @@ namespace UserService.DatabaseLayer.Repositories
         {
             await using var db = new UserService2DB();
             var users = await db.NodeModels
-                .LoadWith(x=> x.Parent)
+                .LoadWith(x => x.Parent)
                 .Where(x => x.Discriminator == nameof(User))
                 .WhereOrDefault(predicate)
                 .Select(x => new User
@@ -28,8 +28,8 @@ namespace UserService.DatabaseLayer.Repositories
                     Description = x.Description,
                     FirstName = x.FirstName,
                     LastName = x.LastName,
-                    IsActive = x.IsActive,
-                    EMail = x.EMail, 
+                    IsActive = x.IsActive ?? false,
+                    EMail = x.EMail,
                     ParentId = x.ParentId,
                 })
                 .ToListAsync(token).ConfigureAwait(false);
@@ -37,7 +37,8 @@ namespace UserService.DatabaseLayer.Repositories
         }
 
         /// <inheritdoc />
-        public async Task<User?> GetAsync(Expression<Func<NodeModel, bool>> predicate, CancellationToken token = default)
+        public async Task<User?> GetAsync(Expression<Func<NodeModel, bool>> predicate,
+            CancellationToken token = default)
         {
             await using var db = new UserService2DB();
             var result = await db.NodeModels
@@ -49,18 +50,18 @@ namespace UserService.DatabaseLayer.Repositories
                     Description = x.Description,
                     FirstName = x.FirstName,
                     LastName = x.LastName,
-                    IsActive = x.IsActive,
+                    IsActive = x.IsActive ?? false,
                     EMail = x.EMail
                 }).FirstOrDefaultAsync(token).ConfigureAwait(false);
             return result;
         }
 
         /// <inheritdoc />
-        public async Task AddAsync(User entity, CancellationToken token = default)
+        public async Task<int> AddAsync(User entity, CancellationToken token = default)
         {
             await using var db = new UserService2DB();
 
-            await db.NodeModels.InsertAsync(() => new NodeModel
+            return await db.NodeModels.InsertWithInt32IdentityAsync(() => new NodeModel
             {
                 CommonName = entity.CommonName,
                 FirstName = entity.FirstName,