Test

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs

@@ -22,22 +22,74 @@ public class QuestionDto : ExtensibleEntityDto<Guid>
 
         public string? GetMin()
         {
-            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Min.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
+                if (def?.Min == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.Min.ToString(), out var minValue))
+                    return minValue.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMax()
         {
-            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Max.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
+                if (def?.Max == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.Max.ToString(), out var maxValue))
+                    return maxValue.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMinLength()
         {
-            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MinLength.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
+                if (def?.MinLength == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.MinLength.ToString(), out var minLength))
+                    return minLength.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetMaxLength()
         {
-            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MaxLength.ToString();
+            try
+            {
+                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
+                if (def?.MaxLength == null)
+                    return null;
+                // Only allow Int64 values
+                if (long.TryParse(def.MaxLength.ToString(), out var maxLength))
+                    return maxLength.ToString();
+                return null;
+            }
+            catch
+            {
+                return null;
+            }
         }
 
         public string? GetYesValue()

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs

@@ -57,15 +57,27 @@ public static string ConvertInputType(this CustomFieldType type)
 
         public static CustomFieldDefinition? ConvertDefinition(this string definition, QuestionType type)
         {
-            return type switch
+            if (string.IsNullOrWhiteSpace(definition))
             {
-                QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
-                QuestionType.Number => JsonSerializer.Deserialize<NumericDefinition>(definition),
-                QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
-                QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
-                QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
-                _ => null,
-            };
+                return null;
+            }
+
+            try
+            {
+                return type switch
+                {
+                    QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
+                    QuestionType.Number => JsonSerializer.Deserialize<NumericDefinition>(definition),
+                    QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
+                    QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
+                    QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
+                    _ => null,
+                };
+            }
+            catch (JsonException)
+            {
+                return null;
+            }
         }
 
         public static string[] GetCheckedOptions(this string value)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs

@@ -29,23 +29,36 @@ public class NumericDefinitionWidget : AbpViewComponent
             .ApplyRequired(form);
         }
 
+        // Cache JsonSerializerOptions instance
+        private static readonly JsonSerializerOptions CachedJsonOptions = new JsonSerializerOptions
+        {
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
+        };
+
         public async Task<IViewComponentResult> InvokeAsync(string? definition)
         {
-            if (definition != null)
+            NumericDefinitionViewModel viewModel = new();
+
+            if (!string.IsNullOrWhiteSpace(definition))
             {
-                NumericDefinition? numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition);
-                if (numericDefinition != null)
+                try
                 {
-                    return View(await Task.FromResult(new NumericDefinitionViewModel()
+                    var numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition, CachedJsonOptions);
+
+                    if (numericDefinition != null)
                     {
-                        Min = numericDefinition.Min,
-                        Max = numericDefinition.Max,
-                        Required = numericDefinition.Required
-                    }));
+                        viewModel.Min = numericDefinition.Min;
+                        viewModel.Max = numericDefinition.Max;
+                        viewModel.Required = numericDefinition.Required;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Optionally log the error                    
                 }
             }
 
-            return View(await Task.FromResult(new NumericDefinitionViewModel()));
+            return View(await Task.FromResult(viewModel));
         }
     }
 

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/EmailGroupUsersDto.cs

@@ -0,0 +1,13 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.Notifications.EmailGroups
+{
+    public class EmailGroupUsersDto :EntityDto<Guid>
+    {
+
+        public Guid GroupId { get; set; }
+        public Guid UserId { get; set; }
+
+    }
+}

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/IEmailGroupUsersAppService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+
+namespace Unity.Notifications.EmailGroups
+{
+    public interface IEmailGroupUsersAppService
+    {
+        Task<EmailGroupUsersDto> InsertAsync (EmailGroupUsersDto dto);
+        Task<bool> DeleteUserAsync (Guid id);
+        Task<bool> DeleteUsersByGroupIdAsync (Guid id);
+        Task<bool> DeleteUsersByUserIdAsync(Guid id);
+        Task<List<EmailGroupUsersDto>> GetEmailGroupUsersByGroupIdAsync(Guid id);
+    }
+}

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/EmailGroupDto.cs

@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.Notifications.EmailGroups
+{
+    public class EmailGroupDto :EntityDto<Guid>
+    {
+
+        public string Name { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+        public string Type { get; set; } = string.Empty;
+
+    }
+}

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/IEmailGroupsAppService.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+
+namespace Unity.Notifications.EmailGroups
+{
+    public interface IEmailGroupsAppService
+    {
+        Task<EmailGroupDto> CreateAsync (EmailGroupDto dto);
+        Task<EmailGroupDto> UpdateAsync (EmailGroupDto dto);
+        Task<bool> DeleteAsync (Guid id);
+        Task<List<EmailGroupDto>> GetListAsync();
+        Task<EmailGroupDto> GetEmailGroupByIdAsync(Guid id);
+    }
+}

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs

@@ -10,6 +10,8 @@ public class EmailHistoryDto : ExtensibleAuditedEntityDto<Guid>
     public string Status { get; set; } = string.Empty;
     public string FromAddress { get; set; } = string.Empty;
     public string ToAddress { get; set; } = string.Empty;
+    public string Cc { get; set; } = string.Empty;
+    public string Bcc { get; set; } = string.Empty;
     public DateTime? SentDateTime { get; set; }
     public string Body { get; set; } = string.Empty;
     public EmailHistoryUserDto? SentBy { get; set; }

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroupUsers/EmailGroupUsersAppService.cs

@@ -0,0 +1,85 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
+
+
+namespace Unity.Notifications.EmailGroups
+{
+
+    [Authorize]
+    [Dependency(ReplaceServices = true)]
+    [ExposeServices(typeof(EmailGroupUsersAppService), typeof(IEmailGroupUsersAppService))]
+    public class EmailGroupUsersAppService : ApplicationService, IEmailGroupUsersAppService
+    {
+        private readonly IEmailGroupUsersRepository _emailGroupUsersRepository;
+
+        public EmailGroupUsersAppService(IEmailGroupUsersRepository emailGroupUsersRepository)
+        {
+            _emailGroupUsersRepository = emailGroupUsersRepository;
+        }
+        public async Task<EmailGroupUsersDto> InsertAsync(EmailGroupUsersDto dto)
+        {
+            var newUser =  await _emailGroupUsersRepository.InsertAsync(new EmailGroupUser
+            {
+                GroupId = dto.GroupId,
+                UserId = dto.UserId,
+
+            });
+            return new EmailGroupUsersDto
+            {
+                Id = newUser.Id,
+                GroupId = newUser.GroupId,
+                UserId = newUser.UserId,
+            };
+        }
+
+
+
+        public async Task<bool> DeleteUserAsync(Guid id)
+        {
+            try
+            {
+                await _emailGroupUsersRepository.DeleteAsync(id);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"Error deleting email group with ID {id}: {ex.Message}");
+            }
+        }
+        public async Task<bool> DeleteUsersByUserIdAsync(Guid id)
+        {
+            try
+            {
+                await _emailGroupUsersRepository.DeleteAsync(id);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"Error deleting email group with ID {id}: {ex.Message}");
+            }
+        }
+        public async Task<bool> DeleteUsersByGroupIdAsync(Guid id)
+        {
+            try
+            {
+                await _emailGroupUsersRepository.DeleteAsync(id);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"Error deleting email group with ID {id}: {ex.Message}");
+            }
+        }
+
+        public async Task<List<EmailGroupUsersDto>> GetEmailGroupUsersByGroupIdAsync(Guid id)
+        {
+            var users = await _emailGroupUsersRepository.GetListAsync(u => u.GroupId == id);
+
+            return ObjectMapper.Map<List<EmailGroupUser>, List<EmailGroupUsersDto>>(users);
+        }
+    }
+}