NPOM 21

LML.NPOManagement.Bll/Interfaces/IUserService.cs

@@ -19,5 +19,6 @@ public interface IUserService
         Task<int> UserInformationRegistration(UserInformationModel userInformationModel, IConfiguration configuration);
         Task<UserTypeModel> AddUserType(UserInformationModel userInformationModel);
         Task<UserModel> ActivationUser(string token, IConfiguration configuration);
+        Task<List<SearchModel>> GetSearchResult(string firstChars, bool includeGroups);
     }
 }

LML.NPOManagement.Bll/Model/SearchModel.cs

@@ -0,0 +1,11 @@
+using System;
+namespace LML.NPOManagement.Bll.Model
+{
+    public class SearchModel
+    {
+        public int Id { get; set; }
+        public SearchType Type { get; set; }
+        public String Name { get; set; }
+    }
+}
+

LML.NPOManagement.Bll/Model/SearchType.cs

@@ -0,0 +1,10 @@
+using System;
+namespace LML.NPOManagement.Bll.Model
+{
+    public enum SearchType
+    {
+        User,
+        Group
+    }
+}
+

LML.NPOManagement.Bll/Services/UserService.cs

@@ -263,5 +263,49 @@ public async Task<bool> ModifyUserInfo(UserInformationModel userInformationModel
             await _dbContext.SaveChangesAsync();
             return true;
         }
+
+        public async Task<List<SearchModel>> GetSearchResult(string firstChars, bool includeGroups)
+        {
+            var users = await _dbContext.UserInformations
+                .Where(u => u.FirstName.Contains(firstChars) || u.LastName.Contains(firstChars))
+                .ToListAsync();
+
+            var groups = new List<UsersGroup>();
+
+            if (includeGroups)
+            {
+                 groups = await _dbContext.UsersGroups
+                .Where(g => g.GroupName.Contains(firstChars))
+                .ToListAsync();
+            }
+
+            List<SearchModel> result = new();
+
+            foreach (var user in users)
+            {
+                var searchModel = new SearchModel()
+                {
+                    Id = user.Id,
+                    Name = user.FirstName + " " + user.LastName,
+                    Type = SearchType.User
+                };
+
+                result.Add(searchModel);
+            }
+
+            foreach (var group in groups)
+            {
+                var searchModel = new SearchModel()
+                {
+                    Id = group.Id,
+                    Name = group.GroupName,
+                    Type = SearchType.Group
+                };
+
+                result.Add(searchModel);
+            }
+
+            return result;
+        }
     }
-}
+}

LML.NPOManagement.Dal/INPOManagementContext.cs

@@ -20,7 +20,8 @@ public interface INPOManagementContext
         DbSet<UserIdea> UserIdeas { get; set; } 
         DbSet<UserInformation> UserInformations { get; set; } 
         DbSet<UserInventory> UserInventories { get; set; } 
-        DbSet<UserType> UserTypes { get; set; } 
+        DbSet<UserType> UserTypes { get; set; }
+        DbSet<UsersGroup> UsersGroups { get; set; }
         Task<int> SaveChangesAsync();
         void SaveChanges();
     }

LML.NPOManagement.Dal/Models/User.cs

@@ -11,7 +11,9 @@ public User()
             UserIdeas = new HashSet<UserIdea>();
             UserInformations = new HashSet<UserInformation>();
             UserInventories = new HashSet<UserInventory>();
+            UsersGroups = new HashSet<UsersGroup>();
             Accounts = new HashSet<Account>();
+            Groups = new HashSet<UsersGroup>();
             Notifications = new HashSet<Notification>();
             Roles = new HashSet<Role>();
             UserTypes = new HashSet<UserType>();
@@ -21,13 +23,16 @@ public User()
         public string Email { get; set; } = null!;
         public string Password { get; set; } = null!;
         public string? Status { get; set; }
+        public int? StatusId { get; set; }
 
         public virtual ICollection<InvestorInformation> InvestorInformations { get; set; }
         public virtual ICollection<UserIdea> UserIdeas { get; set; }
         public virtual ICollection<UserInformation> UserInformations { get; set; }
         public virtual ICollection<UserInventory> UserInventories { get; set; }
+        public virtual ICollection<UsersGroup> UsersGroups { get; set; }
 
         public virtual ICollection<Account> Accounts { get; set; }
+        public virtual ICollection<UsersGroup> Groups { get; set; }
         public virtual ICollection<Notification> Notifications { get; set; }
         public virtual ICollection<Role> Roles { get; set; }
         public virtual ICollection<UserType> UserTypes { get; set; }

LML.NPOManagement.Dal/Models/UsersGroup.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace LML.NPOManagement.Dal.Models
+{
+    public partial class UsersGroup
+    {
+        public UsersGroup()
+        {
+            Users = new HashSet<User>();
+        }
+
+        public int Id { get; set; }
+        public int CreatedByUserId { get; set; }
+        public string GroupName { get; set; } = null!;
+        public DateTime CreatedAt { get; set; }
+        public string? Description { get; set; }
+
+        public virtual User CreatedByUser { get; set; } = null!;
+
+        public virtual ICollection<User> Users { get; set; }
+    }
+}