From 39d4a1f499a5efb3e561d859743a04f832be42dd Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Thu, 21 May 2026 09:13:24 -0700
Subject: [PATCH 01/14] AB#32881 submissions and description

---
 .../Configuration/FieldPathTypeDto.cs         |    7 +
 .../Configuration/MapMetadataDto.cs           |    5 +
 .../Configuration/ReportColumnsMapDto.cs      |   12 +
 .../Configuration/UpsertColumnMappingDto.cs   |    5 +
 .../ConsolidatedFormVersionFieldsProvider.cs  |  253 +
 .../ConsolidatedWorksheetFieldsProvider.cs    |  316 ++
 .../Configuration/ReportMappingUtils.cs       |   22 +-
 .../Domain/Configuration/ReportColumnsMap.cs  |   13 +
 .../ReportColumnsMapRepository.cs             |    2 +
 .../ReportingApplicationMapperlyProfile.cs    |    8 +
 .../Configuration/Providers.cs                |   14 +
 .../ReportingConfiguration/Default.cshtml     |   88 +-
 .../ReportingConfiguration/Default.js         |  203 +-
 .../ReportingConfigurationViewComponent.cs    |   20 +-
 ...lidatedWorksheetViewGeneration.Designer.cs | 4947 ++++++++++++++++
 ..._AddConsolidatedWorksheetViewGeneration.cs |   36 +
 ...datedFormVersionViewGeneration.Designer.cs | 4948 +++++++++++++++++
 ...ddConsolidatedFormVersionViewGeneration.cs |   36 +
 ...generate_consolidated_formversion_view.sql |   51 +
 .../generate_consolidated_worksheet_view.sql  |   51 +
 .../get_consolidated_formversion_data.sql     |  336 ++
 .../get_consolidated_worksheet_data.sql       |  278 +
 ...ty.GrantManager.EntityFrameworkCore.csproj |   16 +
 23 files changed, 11612 insertions(+), 55 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
index 6d74905038..8178d8866a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
@@ -39,5 +39,12 @@ public class FieldPathTypeDto
         /// The path to reach the data, this is a datacentric version of the Path, and could be the same
         /// </summary>
         public string DataPath { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Optional version label used only by the consolidated worksheet provider.
+        /// Null means the field is merged across all versions; non-null (e.g., "v1") means the field
+        /// is specific to that form version (conflict or version-exclusive field).
+        /// </summary>
+        public string? VersionLabel { get; set; } = null;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/MapMetadataDto.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/MapMetadataDto.cs
index c6b57d93a7..2b948f6597 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/MapMetadataDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/MapMetadataDto.cs
@@ -16,5 +16,10 @@ public class MapMetadataDto
         /// used for display purposes, change detection analysis, and mapping management operations.
         /// </summary>
         public Dictionary<string, string> Info { get; set; } = new Dictionary<string, string>();
+
+        /// <summary>
+        /// Gets or sets the optional free-text description for this mapping configuration (max 500 characters).
+        /// </summary>
+        public string? Description { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/ReportColumnsMapDto.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/ReportColumnsMapDto.cs
index f7116f3223..6583e3cf69 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/ReportColumnsMapDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/ReportColumnsMapDto.cs
@@ -72,6 +72,11 @@ public class MappingDto
         /// Each row defines how a source field maps to a database column with type, path, and label information.
         /// </summary>
         public MapRowDto[] Rows { get; set; } = [];
+
+        /// <summary>
+        /// Gets or sets optional metadata for this mapping configuration including description and info context.
+        /// </summary>
+        public MapMetadataDto? Metadata { get; set; }
     }
 
     /// <summary>
@@ -128,5 +133,12 @@ public class MapRowDto
         /// Represents the component type path (e.g., "form->panel->textfield") in the source schema structure.
         /// </summary>
         public string TypePath { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets an optional version label indicating which form version this column belongs to.
+        /// Used exclusively for consolidated worksheet views: null means the column is merged across all versions;
+        /// a non-null value (e.g., "v1", "v2") means the column is specific to that form version.
+        /// </summary>
+        public string? VersionLabel { get; set; } = null;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/UpsertColumnMappingDto.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/UpsertColumnMappingDto.cs
index 01042b9ebc..9c3a227ebb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/UpsertColumnMappingDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/UpsertColumnMappingDto.cs
@@ -15,6 +15,11 @@ public class UpsertColumnMappingDto
         /// of the auto-generated mapping configuration while preserving automatic naming for unmapped fields.
         /// </summary>
         public UpsertMapRowDto[] Rows { get; set; } = [];
+
+        /// <summary>
+        /// Gets or sets the optional free-text description for this mapping configuration (max 500 characters).
+        /// </summary>
+        public string? Description { get; set; }
     }
 
     /// <summary>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
new file mode 100644
index 0000000000..0f0d1e3bbb
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.GrantManager.ApplicationForms;
+using Unity.GrantManager.Reporting.Configuration;
+using Unity.Reporting.Domain.Configuration;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.Reporting.Configuration.FieldsProviders
+{
+    /// <summary>
+    /// Fields provider for consolidated form version submission views that span all form versions.
+    /// Reads live field metadata directly from the form metadata service across all form versions,
+    /// merges fields by (Label, Path, Type), and detects version changes for break notification.
+    /// The CorrelationId for this provider is the FormId (not a specific form version ID).
+    /// </summary>
+    public class ConsolidatedFormVersionFieldsProvider(
+        IApplicationFormAppService applicationFormAppService,
+        IFormMetadataService formMetadataService)
+        : IFieldsProvider, ITransientDependency
+    {
+        public string CorrelationProvider => Providers.FormVersionConsolidated;
+
+        /// <summary>
+        /// Retrieves and merges submission field metadata across all form versions for consolidated view configuration.
+        /// Fields matching on (Label, Path, Type) are merged into a single column entry.
+        /// Fields with the same (Label, Path) but different Type produce per-version conflict entries.
+        /// Fields unique to one version are included with a VersionLabel marker.
+        /// </summary>
+        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid formId)
+        {
+            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var versionsWithFields = new List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)>();
+            var metadataInfo = new Dictionary<string, string>();
+
+            foreach (var version in versions.OrderBy(v => v.Version))
+            {
+                var versionLabel = $"v{version.Version}";
+                var fullMetadata = await formMetadataService.GetFormComponentMetaDataAsync(version.Id);
+
+                var fields = fullMetadata.Components
+                    .Select(ConvertToFieldPathType)
+                    .Where(x => x != null)
+                    .Select(x => x!)
+                    .ToArray();
+
+                if (fields.Length == 0)
+                    continue;
+
+                versionsWithFields.Add((version.Id, versionLabel, fields));
+                metadataInfo[$"formversion_{version.Id}"] = versionLabel;
+            }
+
+            var mergedFields = MergeFields(versionsWithFields);
+            var mapMetadata = new MapMetadataDto { Info = metadataInfo };
+
+            return new FieldPathMetaMapDto { Fields = [.. mergedFields], Metadata = mapMetadata };
+        }
+
+        /// <summary>
+        /// Detects changes in form versions since the consolidated mapping was last saved.
+        /// Returns a semicolon-joined change description or null if nothing has changed.
+        /// Since form version fields are immutable, only added/removed versions are tracked.
+        /// </summary>
+        public async Task<string?> DetectChangesAsync(Guid formId, ReportColumnsMap reportColumnsMap)
+        {
+            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var currentInfo = new Dictionary<string, string>();
+
+            foreach (var version in versions)
+            {
+                var versionLabel = $"v{version.Version}";
+                var fullMetadata = await formMetadataService.GetFormComponentMetaDataAsync(version.Id);
+
+                if (fullMetadata.Components.Count == 0)
+                    continue;
+
+                currentInfo[$"formversion_{version.Id}"] = versionLabel;
+            }
+
+            var storedInfo = GetStoredInfo(reportColumnsMap);
+            var changes = DetectInfoChanges(storedInfo, currentInfo);
+
+            return changes.Count > 0 ? string.Join("; ", changes) : null;
+        }
+
+        private static FieldPathTypeDto? ConvertToFieldPathType(FormComponentMetaDataItemDto? item)
+        {
+            if (item == null)
+                return null;
+
+            return new FieldPathTypeDto
+            {
+                Id = item.Id,
+                Path = item.Path,
+                Type = item.Type,
+                Key = item.Key,
+                Label = item.Label,
+                TypePath = item.TypePath,
+                DataPath = item.DataPath
+            };
+        }
+
+        private static List<FieldPathTypeDto> MergeFields(
+            List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)> versionsWithFields)
+        {
+            var exactMatchGroups = new Dictionary<string, List<(string VersionLabel, FieldPathTypeDto Field)>>(StringComparer.OrdinalIgnoreCase);
+            var pathGroups = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            {
+                foreach (var field in fields)
+                {
+                    var exactKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}|{field.Type?.ToLowerInvariant()}";
+                    var pathKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}";
+
+                    if (!exactMatchGroups.TryGetValue(exactKey, out var exactList))
+                    {
+                        exactList = [];
+                        exactMatchGroups[exactKey] = exactList;
+                    }
+                    if (!exactList.Any(e => e.VersionLabel == versionLabel))
+                    {
+                        exactList.Add((versionLabel, field));
+                    }
+
+                    if (!pathGroups.TryGetValue(pathKey, out var typeSet))
+                    {
+                        typeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                        pathGroups[pathKey] = typeSet;
+                    }
+                    typeSet.Add(field.Type?.ToLowerInvariant() ?? string.Empty);
+                }
+            }
+
+            var result = new List<FieldPathTypeDto>();
+            var processedExactKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            {
+                foreach (var field in fields)
+                {
+                    var exactKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}|{field.Type?.ToLowerInvariant()}";
+                    var pathKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}";
+
+                    if (processedExactKeys.Contains(exactKey))
+                        continue;
+
+                    processedExactKeys.Add(exactKey);
+
+                    var typesForPath = pathGroups[pathKey];
+                    var exactGroup = exactMatchGroups[exactKey];
+                    var versionsHavingThisExact = exactGroup.Select(e => e.VersionLabel).ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+                    if (typesForPath.Count > 1)
+                    {
+                        // Conflict: same (label, path) but different types — emit per-version entry
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = versionLabel
+                        });
+                    }
+                    else if (versionsWithFields.Count > 1 && versionsHavingThisExact.Count == versionsWithFields.Count)
+                    {
+                        // Merged: exact match across all versions — no version label
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = null
+                        });
+                    }
+                    else
+                    {
+                        // Version-exclusive field: present in some but not all versions
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = versionLabel
+                        });
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static Dictionary<string, string> GetStoredInfo(ReportColumnsMap reportColumnsMap)
+        {
+            if (string.IsNullOrEmpty(reportColumnsMap.Mapping))
+                return [];
+
+            try
+            {
+                var mapping = JsonSerializer.Deserialize<Mapping>(reportColumnsMap.Mapping);
+                return mapping?.Metadata?.Info ?? [];
+            }
+            catch
+            {
+                return [];
+            }
+        }
+
+        private static List<string> DetectInfoChanges(
+            Dictionary<string, string> storedInfo,
+            Dictionary<string, string> currentInfo)
+        {
+            var changes = new List<string>();
+
+            var addedVersionKeys = currentInfo.Keys
+                .Where(k => k.StartsWith("formversion_", StringComparison.OrdinalIgnoreCase))
+                .Except(storedInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in addedVersionKeys)
+            {
+                var label = currentInfo[key];
+                changes.Add($"Version added: {label}");
+            }
+
+            var removedVersionKeys = storedInfo.Keys
+                .Where(k => k.StartsWith("formversion_", StringComparison.OrdinalIgnoreCase))
+                .Except(currentInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in removedVersionKeys)
+            {
+                var label = storedInfo[key];
+                changes.Add($"Version removed: {label}");
+            }
+
+            return changes;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
new file mode 100644
index 0000000000..89d78b9238
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
@@ -0,0 +1,316 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.Flex.Reporting.Configuration;
+using Unity.Flex.WorksheetLinks;
+using Unity.GrantManager.ApplicationForms;
+using Unity.Reporting.Domain.Configuration;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.Reporting.Configuration.FieldsProviders
+{
+    /// <summary>
+    /// Fields provider for consolidated worksheet views that span all form versions.
+    /// Reads live worksheet field metadata directly from the Flex module across all form versions,
+    /// merges fields by (Label, Path, Type), and detects version/worksheet changes for break notification.
+    /// The CorrelationId for this provider is the FormId (not a specific form version ID).
+    /// </summary>
+    public class ConsolidatedWorksheetFieldsProvider(
+        IApplicationFormAppService applicationFormAppService,
+        IWorksheetsMetadataService worksheetsMetadataService,
+        IWorksheetLinkAppService worksheetLinkAppService)
+        : IFieldsProvider, ITransientDependency
+    {
+        public string CorrelationProvider => Providers.WorksheetConsolidated;
+
+        /// <summary>
+        /// Retrieves and merges worksheet field metadata across all form versions for consolidated view configuration.
+        /// Fields matching on (Label, Path, Type) are merged into a single column entry.
+        /// Fields with the same (Label, Path) but different Type produce per-version conflict entries.
+        /// Fields unique to one version are included with a VersionLabel marker.
+        /// </summary>
+        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid formId)
+        {
+            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var versionsWithFields = new List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)>();
+            var metadataInfo = new Dictionary<string, string>();
+
+            foreach (var version in versions.OrderBy(v => v.Version))
+            {
+                var versionLabel = $"v{version.Version}";
+                var links = await worksheetLinkAppService.GetListByCorrelationAsync(version.Id, "FormVersion");
+
+                if (links.Count == 0)
+                    continue;
+
+                var allComponents = new List<FieldPathTypeDto>();
+
+                foreach (var link in links)
+                {
+                    var metadata = await worksheetsMetadataService.GetWorksheetSchemaMetaDataAsync(link.WorksheetId, version.Id);
+                    var components = metadata.Components
+                        .Select(ConvertToFieldPathType)
+                        .Where(x => x != null)
+                        .Select(x => x!);
+                    allComponents.AddRange(components);
+
+                    var worksheetTitle = link.Worksheet?.Title ?? "Unknown Worksheet";
+                    var worksheetName = link.Worksheet?.Name ?? "Unknown";
+                    metadataInfo[$"ws_{version.Id}_{link.WorksheetId}"] = $"{worksheetTitle} ({worksheetName})";
+                }
+
+                versionsWithFields.Add((version.Id, versionLabel, [.. allComponents]));
+                metadataInfo[$"formversion_{version.Id}"] = versionLabel;
+            }
+
+            var mergedFields = MergeFields(versionsWithFields);
+            var mapMetadata = new MapMetadataDto { Info = metadataInfo };
+
+            return new FieldPathMetaMapDto { Fields = [.. mergedFields], Metadata = mapMetadata };
+        }
+
+        /// <summary>
+        /// Detects changes in form versions and worksheet links since the consolidated mapping was last saved.
+        /// Returns a semicolon-joined change description or null if nothing has changed.
+        /// </summary>
+        public async Task<string?> DetectChangesAsync(Guid formId, ReportColumnsMap reportColumnsMap)
+        {
+            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var currentInfo = new Dictionary<string, string>();
+
+            foreach (var version in versions)
+            {
+                var versionLabel = $"v{version.Version}";
+                var links = await worksheetLinkAppService.GetListByCorrelationAsync(version.Id, "FormVersion");
+
+                if (links.Count == 0)
+                    continue;
+
+                currentInfo[$"formversion_{version.Id}"] = versionLabel;
+
+                foreach (var link in links)
+                {
+                    var worksheetTitle = link.Worksheet?.Title ?? "Unknown Worksheet";
+                    var worksheetName = link.Worksheet?.Name ?? "Unknown";
+                    currentInfo[$"ws_{version.Id}_{link.WorksheetId}"] = $"{worksheetTitle} ({worksheetName})";
+                }
+            }
+
+            var storedInfo = GetStoredInfo(reportColumnsMap);
+            var changes = DetectInfoChanges(storedInfo, currentInfo);
+
+            return changes.Count > 0 ? string.Join("; ", changes) : null;
+        }
+
+        private static FieldPathTypeDto? ConvertToFieldPathType(WorksheetComponentMetaDataItemDto? item)
+        {
+            if (item == null)
+                return null;
+
+            return new FieldPathTypeDto
+            {
+                Id = item.Id,
+                Path = item.Path,
+                Type = item.Type,
+                Key = item.Key,
+                Label = item.Label,
+                TypePath = item.TypePath,
+                DataPath = item.DataPath
+            };
+        }
+
+        private static List<FieldPathTypeDto> MergeFields(
+            List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)> versionsWithFields)
+        {
+            // Track: (label.lower, path.lower, type.lower) → list of (versionLabel, field)
+            var exactMatchGroups = new Dictionary<string, List<(string VersionLabel, FieldPathTypeDto Field)>>(StringComparer.OrdinalIgnoreCase);
+            // Track: (label.lower, path.lower) → set of types seen
+            var pathGroups = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            {
+                foreach (var field in fields)
+                {
+                    var exactKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}|{field.Type?.ToLowerInvariant()}";
+                    var pathKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}";
+
+                    if (!exactMatchGroups.TryGetValue(exactKey, out var exactList))
+                    {
+                        exactList = [];
+                        exactMatchGroups[exactKey] = exactList;
+                    }
+                    // Only add first occurrence per version (avoid duplicates within same version)
+                    if (!exactList.Any(e => e.VersionLabel == versionLabel))
+                    {
+                        exactList.Add((versionLabel, field));
+                    }
+
+                    if (!pathGroups.TryGetValue(pathKey, out var typeSet))
+                    {
+                        typeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                        pathGroups[pathKey] = typeSet;
+                    }
+                    typeSet.Add(field.Type?.ToLowerInvariant() ?? string.Empty);
+                }
+            }
+
+            var result = new List<FieldPathTypeDto>();
+            var processedExactKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            {
+                foreach (var field in fields)
+                {
+                    var exactKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}|{field.Type?.ToLowerInvariant()}";
+                    var pathKey = $"{field.Label?.ToLowerInvariant()}|{field.Path?.ToLowerInvariant()}";
+
+                    if (processedExactKeys.Contains(exactKey))
+                        continue;
+
+                    processedExactKeys.Add(exactKey);
+
+                    var typesForPath = pathGroups[pathKey];
+                    var exactGroup = exactMatchGroups[exactKey];
+                    var allVersionLabels = versionsWithFields.Select(v => v.VersionLabel).ToList();
+                    var versionsHavingThisExact = exactGroup.Select(e => e.VersionLabel).ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+                    if (typesForPath.Count > 1)
+                    {
+                        // Conflict: same (label, path) but different types — emit per-version entry
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = versionLabel
+                        });
+                    }
+                    else if (versionsWithFields.Count > 1 && versionsHavingThisExact.Count == versionsWithFields.Count)
+                    {
+                        // Merged: exact match across all versions — no version label
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = null
+                        });
+                    }
+                    else
+                    {
+                        // Version-exclusive field: present in some but not all versions
+                        result.Add(new FieldPathTypeDto
+                        {
+                            Id = field.Id,
+                            Key = field.Key,
+                            Label = field.Label,
+                            Path = field.Path,
+                            Type = field.Type,
+                            TypePath = field.TypePath,
+                            DataPath = field.DataPath,
+                            VersionLabel = versionLabel
+                        });
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static Dictionary<string, string> GetStoredInfo(ReportColumnsMap reportColumnsMap)
+        {
+            if (string.IsNullOrEmpty(reportColumnsMap.Mapping))
+                return [];
+
+            try
+            {
+                var mapping = JsonSerializer.Deserialize<Mapping>(reportColumnsMap.Mapping);
+                return mapping?.Metadata?.Info ?? [];
+            }
+            catch
+            {
+                return [];
+            }
+        }
+
+        private static List<string> DetectInfoChanges(
+            Dictionary<string, string> storedInfo,
+            Dictionary<string, string> currentInfo)
+        {
+            var changes = new List<string>();
+
+            // Detect added/removed form versions
+            var addedVersionKeys = currentInfo.Keys
+                .Where(k => k.StartsWith("formversion_", StringComparison.OrdinalIgnoreCase))
+                .Except(storedInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in addedVersionKeys)
+            {
+                var label = currentInfo[key];
+                changes.Add($"Version added: {label} (has worksheets)");
+            }
+
+            var removedVersionKeys = storedInfo.Keys
+                .Where(k => k.StartsWith("formversion_", StringComparison.OrdinalIgnoreCase))
+                .Except(currentInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in removedVersionKeys)
+            {
+                var label = storedInfo[key];
+                changes.Add($"Version removed: {label}");
+            }
+
+            // Detect added/removed worksheets within versions
+            var addedWsKeys = currentInfo.Keys
+                .Where(k => k.StartsWith("ws_", StringComparison.OrdinalIgnoreCase))
+                .Except(storedInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in addedWsKeys)
+            {
+                var worksheetInfo = currentInfo[key];
+                var versionLabel = GetVersionLabelFromWsKey(key, currentInfo);
+                changes.Add($"Worksheet added to {versionLabel}: {worksheetInfo}");
+            }
+
+            var removedWsKeys = storedInfo.Keys
+                .Where(k => k.StartsWith("ws_", StringComparison.OrdinalIgnoreCase))
+                .Except(currentInfo.Keys, StringComparer.OrdinalIgnoreCase);
+
+            foreach (var key in removedWsKeys)
+            {
+                var worksheetInfo = storedInfo[key];
+                var versionLabel = GetVersionLabelFromWsKey(key, storedInfo);
+                changes.Add($"Worksheet removed from {versionLabel}: {worksheetInfo}");
+            }
+
+            return changes;
+        }
+
+        // ws_{versionId}_{worksheetId} → look up formversion_{versionId} in info
+        // versionId is a GUID (36 chars) starting at position 3 (after "ws_")
+        private static string GetVersionLabelFromWsKey(string wsKey, Dictionary<string, string> info)
+        {
+            const int guidLength = 36;
+            const int prefixLength = 3; // "ws_"
+
+            if (wsKey.Length >= prefixLength + guidLength)
+            {
+                var versionIdStr = wsKey.Substring(prefixLength, guidLength);
+                var versionKey = $"formversion_{versionIdStr}";
+                if (info.TryGetValue(versionKey, out var label))
+                    return label;
+            }
+            return "unknown version";
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
index 6c36736706..956a7aff06 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
@@ -343,7 +343,8 @@ internal static ReportColumnsMap CreateNewMap(UpsertReportColumnsMapDto upsertRe
                     Path = field.Path,
                     DataPath = field.DataPath,
                     TypePath = field.TypePath,
-                    Id = field.Id
+                    Id = field.Id,
+                    VersionLabel = field.VersionLabel
                 };
             }).ToList();
 
@@ -351,7 +352,11 @@ internal static ReportColumnsMap CreateNewMap(UpsertReportColumnsMapDto upsertRe
             var mapping = new Mapping
             {
                 Rows = [.. mapRows],
-                Metadata = new MapMetadata() { Info = fieldsMap.Metadata?.Info }
+                Metadata = new MapMetadata()
+                {
+                    Info = fieldsMap.Metadata?.Info,
+                    Description = upsertReportColmnsMapDto.Mapping?.Description
+                }
             };
 
             // Create and return the map entity
@@ -447,15 +452,20 @@ internal static ReportColumnsMap UpdateExistingMap(UpsertReportColumnsMapDto upd
                     Path = field.Path,
                     DataPath = field.DataPath,
                     TypePath = field.TypePath,
-                    Id = field.Id
+                    Id = field.Id,
+                    VersionLabel = field.VersionLabel
                 };
             }).ToList();
 
             // Create new mapping object and serialize it
-            var updatedMapping = new Mapping 
-            { 
+            var updatedMapping = new Mapping
+            {
                 Rows = [.. mapRows],
-                Metadata = new MapMetadata() { Info = fieldsMap.Metadata?.Info }
+                Metadata = new MapMetadata()
+                {
+                    Info = fieldsMap.Metadata?.Info,
+                    Description = updateReportColumnsMapDto.Mapping?.Description
+                }
             };
             existing.Mapping = JsonSerializer.Serialize(updatedMapping);
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
index df20a20437..2a55f14830 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
@@ -133,6 +133,13 @@ public class MapRow
         /// Represents the component type path (e.g., "form->panel->textfield") in the source schema.
         /// </summary>
         public string TypePath { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Gets or sets an optional version label indicating which form version this column belongs to.
+        /// Used exclusively for consolidated worksheet views: null means the column is merged across all versions;
+        /// a non-null value (e.g., "v1", "v2") means the column is specific to that form version (conflict or version-exclusive field).
+        /// </summary>
+        public string? VersionLabel { get; set; } = null;
     }
 
     /// <summary>
@@ -148,5 +155,11 @@ public class MapMetadata
         /// used for display purposes and change detection analysis.
         /// </summary>
         public Dictionary<string, string>? Info { get; set; } = null;
+
+        /// <summary>
+        /// Gets or sets an optional free-text description for this mapping configuration.
+        /// Maximum 500 characters. Used to document the purpose or context of this reporting configuration.
+        /// </summary>
+        public string? Description { get; set; } = null;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
index 2e559ef4cf..782c0c3385 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
@@ -91,6 +91,8 @@ public async Task GenerateViewAsync(Guid correlationId, string correlationProvid
                     "formversion" => $@"CALL ""Reporting"".generate_formversion_view({correlationId});",
                     "worksheet" => $@"CALL ""Reporting"".generate_worksheet_view({correlationId});",
                     "scoresheet" => $@"CALL ""Reporting"".generate_scoresheet_view({correlationId});",
+                    "worksheetconsolidated" => $@"CALL ""Reporting"".generate_consolidated_worksheet_view({correlationId});",
+                    "formversionconsolidated" => $@"CALL ""Reporting"".generate_consolidated_formversion_view({correlationId});",
                     _ => throw new ArgumentException($"Unsupported correlation provider: {correlationProvider}"),
                 };
                 await dbContext.Database.ExecuteSqlAsync(sql);
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/ReportingApplicationMapperlyProfile.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/ReportingApplicationMapperlyProfile.cs
index 134acf454e..75ddf45272 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/ReportingApplicationMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/ReportingApplicationMapperlyProfile.cs
@@ -49,3 +49,11 @@ public partial class MapRowToMapRowDtoMapper : MapperBase<MapRow, MapRowDto>
 
     public override partial void Map(MapRow source, MapRowDto destination);
 }
+
+[Mapper]
+public partial class MapMetadataToMapMetadataDtoMapper : MapperBase<MapMetadata, MapMetadataDto>
+{
+    public override partial MapMetadataDto Map(MapMetadata source);
+
+    public override partial void Map(MapMetadata source, MapMetadataDto destination);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
index 8fe4e5cf08..9c58c4a50c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
@@ -28,5 +28,19 @@ public static class Providers
         /// Scoresheets contain structured evaluation criteria and scoring mechanisms for application review.
         /// </summary>
         public static string Scoresheet => "scoresheet";
+
+        /// <summary>
+        /// Gets the correlation provider identifier for consolidated worksheet views spanning all form versions.
+        /// Used when creating a single unified report view that merges worksheet data across all versions of a form.
+        /// The CorrelationId for this provider is the FormId (not a specific version ID).
+        /// </summary>
+        public static string WorksheetConsolidated => "worksheetconsolidated";
+
+        /// <summary>
+        /// Gets the correlation provider identifier for consolidated form version submission views spanning all form versions.
+        /// Used when creating a single unified report view that merges submission data across all versions of a form.
+        /// The CorrelationId for this provider is the FormId (not a specific version ID).
+        /// </summary>
+        public static string FormVersionConsolidated => "formversionconsolidated";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index c8ded88444..9ccec09378 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -19,12 +19,12 @@
     <div class="provider-toggle-section mb-1">
         <div class="d-flex align-items-center gap-3">
             <fieldset class="btn-group" aria-label="Provider toggle">
-                <input type="radio" class="btn-check" name="provider-toggle" id="provider-submissions" value="formversion" @(Model.Provider == "formversion" ? "checked" : "")>
+                <input type="radio" class="btn-check" name="provider-toggle" id="provider-submissions" value="formversion" @((Model.Provider == "formversion" || Model.Provider == "formversionconsolidated") ? "checked" : "")>
                 <label class="btn btn-outline-primary" for="provider-submissions">Submissions</label>
 
                 @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
                 {
-                    <input type="radio" class="btn-check" name="provider-toggle" id="provider-worksheets" value="worksheet" @(Model.Provider == "worksheet" ? "checked" : "")>
+                    <input type="radio" class="btn-check" name="provider-toggle" id="provider-worksheets" value="worksheet" @((Model.Provider == "worksheet" || Model.Provider == "worksheetconsolidated") ? "checked" : "")>
                     <label class="btn btn-outline-primary" for="provider-worksheets">Worksheets</label>
 
                     <input type="radio" class="btn-check" name="provider-toggle" id="provider-scoresheets" value="scoresheet" @(Model.Provider == "scoresheet" ? "checked" : "")>
@@ -43,34 +43,44 @@
     </div>
 
     <div class="report-config-controls">
-        @if (Model.IsVersionSelectorVisible)
-        {
-            <div>
-                <abp-select asp-for="SelectedVersionId"
-                            asp-items="@Model.FormVersions"
-                            label="Version Selector"
-                            id="versionSelector" />
+        <div>
+            <div id="submissions-mode-toggle" class="mb-1" style="@((Model.Provider == "formversion" || Model.Provider == "formversionconsolidated") ? "" : "display:none;")">
+                <fieldset class="btn-group btn-group-sm" aria-label="Submissions mode">
+                    <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-consolidated" value="formversionconsolidated" @(Model.Provider == "formversionconsolidated" ? "checked" : "")>
+                    <label class="btn btn-outline-primary" for="submissions-mode-consolidated">Consolidated</label>
+                    <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-perversion" value="formversion" @(Model.Provider == "formversion" ? "checked" : "")>
+                    <label class="btn btn-outline-primary" for="submissions-mode-perversion">Per Version</label>
+                </fieldset>
             </div>
-        }
-        else
-        {
-            <!-- Hidden version selector for scoresheet mode -->
-            <div style="display: none;">
+
+            @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
+            {
+                <div id="worksheet-mode-toggle" class="mb-1" style="@((Model.Provider == "worksheet" || Model.Provider == "worksheetconsolidated") ? "" : "display:none;")">
+                    <fieldset class="btn-group btn-group-sm" aria-label="Worksheet mode">
+                        <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-consolidated" value="worksheetconsolidated" @(Model.Provider == "worksheetconsolidated" ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="worksheet-mode-consolidated">Consolidated</label>
+                        <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-perversion" value="worksheet" @(Model.Provider == "worksheet" ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="worksheet-mode-perversion">Per Version</label>
+                    </fieldset>
+                </div>
+            }
+
+            <div id="version-selector-container" style="@(Model.IsVersionSelectorVisible ? "" : "display:none;")">
                 <abp-select asp-for="SelectedVersionId"
                             asp-items="@Model.FormVersions"
                             label="Version Selector"
                             id="versionSelector" />
             </div>
-            <!-- Show form info for scoresheet mode -->
-            <div class="form-info-display">
+
+            <div class="form-info-display" style="display:none;">
                 <div class="form-group">
-                    <label class="form-label">Form Configuration</label>
+                    <span class="form-label">Form Configuration</span>
                     <div class="form-control-static">
                         <strong>Form ID:</strong> @Model.FormId
                     </div>
                 </div>
             </div>
-        }
+        </div>
         <div class="d-flex" style="gap:5px; align-items: center;">
 
             @if (Model.CorrelationId.HasValue)
@@ -90,6 +100,15 @@
                             data-bs-placement="top"
                             data-bs-original-title="Generate view"
                             class="btn unt-btn-primary btn-primary @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
+
+                <abp-button id="btn-edit-description"
+                            text="Description"
+                            icon-type="Other"
+                            icon="fl fl-info"
+                            data-bs-toggle="tooltip"
+                            data-bs-placement="top"
+                            data-bs-original-title="Edit configuration description"
+                            class="btn unt-btn-outline-primary btn-outline-primary report-config-btn-height-fix"></abp-button>
             }
 
             <div id="div-duplicate-keys-warning"
@@ -247,6 +266,39 @@
     </div>
 </div>
 
+<!-- Description Modal -->
+<div class="modal fade" id="descriptionModal" tabindex="-1" aria-labelledby="descriptionModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="descriptionModalLabel">Configuration Description</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="alert alert-info py-2 px-3 mb-3">
+                    <i class="fa fa-info-circle me-2" aria-hidden="true"></i>
+                    <small>This description provides context for external tools — such as AI-assisted reporting — to better understand the purpose of this view.</small>
+                </div>
+                <div class="mb-3">
+                    <label for="reportingDescription" class="form-label">Description</label>
+                    <textarea id="reportingDescription"
+                              class="form-control"
+                              maxlength="500"
+                              rows="5"
+                              placeholder="Optional description for this reporting configuration (max 500 characters)"></textarea>
+                    <div class="d-flex justify-content-end mt-1">
+                        <small class="text-muted" id="descriptionCharCount">0 / 500</small>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-primary" id="confirmDescription">Apply</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <!-- Delete Configuration Modal -->
 <div class="modal fade" id="deleteConfigurationModal" tabindex="-1" aria-labelledby="deleteConfigurationModalLabel" aria-hidden="true">
     <div class="modal-dialog">
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index fa9d2ff123..4729ee494e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -42,6 +42,30 @@ $(function () {
                 columnName: 'Report Column',
                 typePath: 'Type Path'
             }
+        },
+        worksheetconsolidated: {
+            name: 'Consolidated Worksheets',
+            correlationProvider: 'worksheetconsolidated',
+            columns: {
+                label: 'Worksheet Label',
+                key: 'Worksheet Property Name',
+                type: 'Worksheet Type',
+                path: 'Path',
+                columnName: 'Report Column',
+                typePath: 'Type Path'
+            }
+        },
+        formversionconsolidated: {
+            name: 'Consolidated Submissions',
+            correlationProvider: 'formversionconsolidated',
+            columns: {
+                label: 'CHEFS Label',
+                key: 'CHEFS Property Name',
+                type: 'CHEFS Type',
+                path: 'Path',
+                columnName: 'Report Column',
+                typePath: 'Type Path'
+            }
         }
     };
 
@@ -162,28 +186,48 @@ $(function () {
 
     // Function to get current correlation ID based on provider
     function getCurrentCorrelationId() {
-        if (currentProvider === 'scoresheet') {
-            // For scoresheets, use form ID
+        if (currentProvider === 'scoresheet' || currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
+            // Form-level providers use the form ID as correlation ID
             return $('#reportingFormId').val();
         } else {
-            // For form versions and worksheets, use version ID
+            // For form versions and per-version worksheets, use version ID
             return $('#versionSelector').val() || $('#reportingVersionId').val();
         }
     }
 
     // Function to show/hide version selector based on provider
     function updateVersionSelectorVisibility() {
-        const $versionSelectorContainer = $('#versionSelector').closest('div');
+        const $versionSelectorContainer = $('#version-selector-container');
         const $formInfoDisplay = $('.form-info-display');
+        const $worksheetModeToggle = $('#worksheet-mode-toggle');
+        const $submissionsModeToggle = $('#submissions-mode-toggle');
 
         if (currentProvider === 'scoresheet') {
-            // Hide version selector and show form info for scoresheets
+            $versionSelectorContainer.hide();
+            $formInfoDisplay.hide();
+            $worksheetModeToggle.hide();
+            $submissionsModeToggle.hide();
+        } else if (currentProvider === 'worksheetconsolidated') {
             $versionSelectorContainer.hide();
             $formInfoDisplay.show();
+            $worksheetModeToggle.show();
+            $submissionsModeToggle.hide();
+        } else if (currentProvider === 'worksheet') {
+            $versionSelectorContainer.show();
+            $formInfoDisplay.hide();
+            $worksheetModeToggle.show();
+            $submissionsModeToggle.hide();
+        } else if (currentProvider === 'formversionconsolidated') {
+            $versionSelectorContainer.hide();
+            $formInfoDisplay.show();
+            $worksheetModeToggle.hide();
+            $submissionsModeToggle.show();
         } else {
-            // Show version selector and hide form info for other providers
+            // formversion (per-version)
             $versionSelectorContainer.show();
             $formInfoDisplay.hide();
+            $worksheetModeToggle.hide();
+            $submissionsModeToggle.show();
         }
     }
 
@@ -196,8 +240,18 @@ $(function () {
         // Check for unsaved changes
         if (hasUnsavedChanges) {
             if (!confirm('You have unsaved changes. Switching providers will discard these changes. Do you want to continue?')) {
-                // Reset the toggle to current provider
-                $(`input[name="provider-toggle"][value="${currentProvider}"]`).prop('checked', true);
+                // Reset the top-level toggle
+                const topLevelValue = (currentProvider === 'worksheetconsolidated') ? 'worksheet'
+                    : (currentProvider === 'formversionconsolidated') ? 'formversion'
+                    : currentProvider;
+                $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
+                // Reset sub-toggles to match current provider
+                if (currentProvider === 'worksheet' || currentProvider === 'worksheetconsolidated') {
+                    $(`input[name="worksheet-mode"][value="${currentProvider}"]`).prop('checked', true);
+                }
+                if (currentProvider === 'formversion' || currentProvider === 'formversionconsolidated') {
+                    $(`input[name="submissions-mode"][value="${currentProvider}"]`).prop('checked', true);
+                }
                 return;
             }
         }
@@ -205,7 +259,27 @@ $(function () {
         // Update current provider
         currentProvider = newProvider;
 
-        // Update version selector visibility
+        // Sync worksheet sub-toggle radio
+        if (newProvider === 'worksheet' || newProvider === 'worksheetconsolidated') {
+            $(`input[name="worksheet-mode"][value="${newProvider}"]`).prop('checked', true);
+        }
+
+        // Sync submissions sub-toggle radio
+        if (newProvider === 'formversion' || newProvider === 'formversionconsolidated') {
+            $(`input[name="submissions-mode"][value="${newProvider}"]`).prop('checked', true);
+        }
+
+        // Keep top-level "Worksheets" button checked when switching to consolidated worksheet
+        if (newProvider === 'worksheetconsolidated') {
+            $('input[name="provider-toggle"][value="worksheet"]').prop('checked', true);
+        }
+
+        // Keep top-level "Submissions" button checked when switching to consolidated formversion
+        if (newProvider === 'formversionconsolidated') {
+            $('input[name="provider-toggle"][value="formversion"]').prop('checked', true);
+        }
+
+        // Update version selector, form info, and sub-toggle visibility
         updateVersionSelectorVisibility();
 
         // Reset changes state since we're switching providers
@@ -249,7 +323,7 @@ $(function () {
             { index: 2, title: columns.type },
             { index: 3, title: columns.path },
             { index: 4, title: columns.columnName },
-            { index: 5, title: columns.typePath}
+            { index: 5, title: columns.typePath }
         ];
 
         columnIndices.forEach(col => {
@@ -257,12 +331,35 @@ $(function () {
             header.text(col.title);
         });
 
+        // Show the Version(s) column only for consolidated providers
+        dataTable.column('versionLabel:name').visible(currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated');
+
         // Force redraw to update headers
         dataTable.draw(false);
     }
 
     // Handle provider toggle change event
     $(document).on('change', 'input[name="provider-toggle"]', function () {
+        let newProvider = $(this).val();
+        // When entering worksheet mode from outside, default to consolidated worksheet
+        if (newProvider === 'worksheet' && currentProvider !== 'worksheet' && currentProvider !== 'worksheetconsolidated') {
+            newProvider = 'worksheetconsolidated';
+        }
+        // When entering submissions mode from outside, default to consolidated formversion
+        if (newProvider === 'formversion' && currentProvider !== 'formversion' && currentProvider !== 'formversionconsolidated') {
+            newProvider = 'formversionconsolidated';
+        }
+        handleProviderChange(newProvider);
+    });
+
+    // Handle worksheet sub-toggle (Per Version / Consolidated)
+    $(document).on('change', 'input[name="worksheet-mode"]', function () {
+        const newProvider = $(this).val();
+        handleProviderChange(newProvider);
+    });
+
+    // Handle submissions sub-toggle (Per Version / Consolidated)
+    $(document).on('change', 'input[name="submissions-mode"]', function () {
         const newProvider = $(this).val();
         handleProviderChange(newProvider);
     });
@@ -387,10 +484,10 @@ $(function () {
         abp.message.warn(alertMessage, 'Schema Changes Detected');
     }
 
-    // Handle version selector change (only for non-scoresheet providers)
+    // Handle version selector change (only for per-version providers)
     $('#versionSelector').on('change', function () {
-        // Skip version selector handling for scoresheet provider
-        if (currentProvider === 'scoresheet') {
+        // Skip version selector handling for form-level providers
+        if (currentProvider === 'scoresheet' || currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
             return;
         }
 
@@ -450,7 +547,11 @@ $(function () {
     // Helper function to transform configuration data (module-level to reduce nesting)
     function transformConfigurationResult(result) {
         processDetectedChanges(result.detectedChanges);
-        
+
+        // Populate description field from saved metadata
+        const description = result.mapping.metadata?.description || '';
+        setDescription(description);
+
         const items = result.mapping.rows.map(row => ({
             label: row.label,
             key: row.propertyName,
@@ -458,7 +559,8 @@ $(function () {
             path: row.path,
             dataPath: row.dataPath,
             columnName: row.columnName || '',
-            typePath: row.typePath
+            typePath: row.typePath,
+            versionLabel: row.versionLabel || null
         }));
 
         return {
@@ -473,7 +575,7 @@ $(function () {
     //   - worksheet/scoresheet: use Label only, no fallback to Key
     // No cross-field fallback ensures the client and server produce identical defaults.
     function getDefaultColumnNameSource(field) {
-        if (currentProvider === 'formversion') {
+        if (currentProvider === 'formversion' || currentProvider === 'formversionconsolidated') {
             return field.key || '';
         }
         return field.label || '';
@@ -481,6 +583,9 @@ $(function () {
 
     // Helper function to transform fields metadata (module-level to reduce nesting)
     function transformFieldsMetadata(fieldsMetadata) {
+        // No saved configuration exists, clear description field
+        setDescription('');
+
         const items = fieldsMetadata.fields.map(field => ({
             label: field.label || field.key,
             key: field.key,
@@ -488,7 +593,8 @@ $(function () {
             path: field.path,
             dataPath: field.dataPath,
             columnName: getDefaultColumnNameSource(field),
-            typePath: field.typePath
+            typePath: field.typePath,
+            versionLabel: field.versionLabel || null
         }));
 
         return {
@@ -617,6 +723,22 @@ $(function () {
                     }
                     return data;
                 }
+            },
+            {
+                title: 'Version(s)',
+                data: 'versionLabel',
+                name: 'versionLabel',
+                className: 'data-table-header',
+                width: '90px',
+                index: 6,
+                orderable: true,
+                visible: currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated',
+                render: function (data, type, _) {
+                    if (type === 'display') {
+                        return data || 'All';
+                    }
+                    return data || '';
+                }
             }
         ];
 
@@ -665,9 +787,14 @@ $(function () {
             }).catch(handleDataLoadingError);
         };
 
+        const defaultVisibleColumns = ['label', 'key', 'type', 'path', 'columnName'];
+        if (currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
+            defaultVisibleColumns.push('versionLabel');
+        }
+
         dataTable = initializeDataTable({
             dt,
-            defaultVisibleColumns: ['label', 'key', 'type', 'path', 'columnName'],
+            defaultVisibleColumns,
             listColumns,
             defaultSortColumn: 0,
             dataEndpoint: dataEndpoint,
@@ -1123,6 +1250,43 @@ $(function () {
         });
     });
 
+    // Description field helpers
+    function getDescription() {
+        return ($('#reportingDescription').val() || '').trim();
+    }
+
+    function setDescription(value) {
+        const text = value || '';
+        $('#reportingDescription').val(text);
+        $('#descriptionCharCount').text(text.length + ' / 500');
+    }
+
+    // Description character counter (live update inside modal)
+    $(document).on('input', '#reportingDescription', function () {
+        $('#descriptionCharCount').text($(this).val().length + ' / 500');
+    });
+
+    // Open description modal – snapshot current value so Cancel can revert
+    $('#btn-edit-description').on('click', function () {
+        $('#reportingDescription').data('snapshot', getDescription());
+        const modal = new bootstrap.Modal(document.getElementById('descriptionModal'));
+        modal.show();
+    });
+
+    // Cancel: restore snapshot
+    $(document).on('click', '#descriptionModal .btn-secondary', function () {
+        const snapshot = $('#reportingDescription').data('snapshot');
+        if (snapshot !== undefined) {
+            setDescription(snapshot);
+        }
+    });
+
+    // Apply description and mark as changed
+    $(document).on('click', '#confirmDescription', function () {
+        markAsChanged();
+        bootstrap.Modal.getInstance(document.getElementById('descriptionModal')).hide();
+    });
+
     // Track changes in the data grid
     function markAsChanged() {
         hasUnsavedChanges = true;
@@ -1230,7 +1394,8 @@ $(function () {
             correlationId: correlationId,
             correlationProvider: getCorrelationProvider(),
             mapping: {
-                rows: getCurrentTableData()
+                rows: getCurrentTableData(),
+                description: getDescription()
             }
         };
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
index 78a55e441a..3bff95b27d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
@@ -29,12 +29,6 @@ public class ReportingConfigurationViewComponent : AbpViewComponent
         private readonly IApplicationFormAppService _applicationFormAppService;
         private readonly IReportMappingService _reportMappingService;
 
-        /// <summary>
-        /// Initializes a new instance of the ReportingConfigurationViewComponent with required dependency injection services.
-        /// Sets up application form service for form version management and report mapping service for configuration operations.
-        /// </summary>
-        /// <param name="applicationFormAppService">The service for managing application forms and version data.</param>
-        /// <param name="reportMappingService">The service for managing report mappings and field configurations.</param>
         public ReportingConfigurationViewComponent(
             IApplicationFormAppService applicationFormAppService,
             IReportMappingService reportMappingService)
@@ -55,19 +49,21 @@ public ReportingConfigurationViewComponent(
         /// <returns>A view component result containing the configuration interface with populated view model and provider-specific settings.</returns>
         public async Task<IViewComponentResult> InvokeAsync(Guid formId, Guid? selectedVersionId = null, string? provider = null)
         {
-            // Determine the correlation provider - default to formversion if not specified
-            var correlationProvider = !string.IsNullOrEmpty(provider) ? provider : Providers.FormVersion;
-            
+            // Determine the correlation provider - default to formversionconsolidated if not specified
+            var correlationProvider = !string.IsNullOrEmpty(provider) ? provider : Providers.FormVersionConsolidated;
+
             // Determine correlation ID based on provider
             Guid? correlationId = null;
-            if (correlationProvider == Providers.Scoresheet)
+            if (correlationProvider == Providers.Scoresheet
+                || correlationProvider == Providers.WorksheetConsolidated
+                || correlationProvider == Providers.FormVersionConsolidated)
             {
-                // For scoresheets, use the form ID directly
+                // Form-level providers correlate with the form ID directly
                 correlationId = formId;
             }
             else
             {
-                // For form versions and other providers, use the selected version ID
+                // For form versions and per-version worksheet providers, use the selected version ID
                 correlationId = selectedVersionId;
             }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.Designer.cs
new file mode 100644
index 0000000000..c753647682
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.Designer.cs
@@ -0,0 +1,4947 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260519000001_AddConsolidatedWorksheetViewGeneration")]
+    partial class AddConsolidatedWorksheetViewGeneration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("RenderFormIoToHtml")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RenderedHTML")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.cs
new file mode 100644
index 0000000000..98d07fb30a
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000001_AddConsolidatedWorksheetViewGeneration.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.IO;
+using System.Reflection;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddConsolidatedWorksheetViewGeneration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+
+            ApplyScript(migrationBuilder, assembly, "Unity.GrantManager.Scripts.get_consolidated_worksheet_data.sql");
+            ApplyScript(migrationBuilder, assembly, "Unity.GrantManager.Scripts.generate_consolidated_worksheet_view.sql");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+
+        private static void ApplyScript(MigrationBuilder migrationBuilder, Assembly assembly, string resourceName)
+        {
+            using Stream stream = assembly.GetManifestResourceStream(resourceName)
+                ?? throw new InvalidOperationException($"Could not find embedded resource: {resourceName}");
+            using StreamReader reader = new(stream);
+            string sql = reader.ReadToEnd();
+            migrationBuilder.Sql(sql);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.Designer.cs
new file mode 100644
index 0000000000..f4f58337f4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.Designer.cs
@@ -0,0 +1,4948 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260519000002_AddConsolidatedFormVersionViewGeneration")]
+    partial class AddConsolidatedFormVersionViewGeneration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("RenderFormIoToHtml")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RenderedHTML")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.cs
new file mode 100644
index 0000000000..7b7c368462
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260519000002_AddConsolidatedFormVersionViewGeneration.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.IO;
+using System.Reflection;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddConsolidatedFormVersionViewGeneration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+
+            ApplyScript(migrationBuilder, assembly, "Unity.GrantManager.Scripts.get_consolidated_formversion_data.sql");
+            ApplyScript(migrationBuilder, assembly, "Unity.GrantManager.Scripts.generate_consolidated_formversion_view.sql");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+
+        private static void ApplyScript(MigrationBuilder migrationBuilder, Assembly assembly, string resourceName)
+        {
+            using Stream stream = assembly.GetManifestResourceStream(resourceName)
+                ?? throw new InvalidOperationException($"Could not find embedded resource: {resourceName}");
+            using StreamReader reader = new(stream);
+            string sql = reader.ReadToEnd();
+            migrationBuilder.Sql(sql);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
new file mode 100644
index 0000000000..3a0ebe5551
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
@@ -0,0 +1,51 @@
+CREATE OR REPLACE PROCEDURE "Reporting".generate_consolidated_formversion_view(IN form_id uuid)
+ LANGUAGE plpgsql
+AS $procedure$
+DECLARE
+    view_name TEXT;
+    mapping_data JSONB;
+    mapping_rows JSONB;
+    data_clause TEXT;
+    report_map_id UUID;
+BEGIN
+    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for formversionconsolidated provider
+    SELECT "Id", "ViewName", "Mapping"::JSONB INTO report_map_id, view_name, mapping_data
+    FROM "Reporting"."ReportColumnsMaps"
+    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'formversionconsolidated';
+
+    -- Check if we found the mapping
+    IF mapping_data IS NULL OR report_map_id IS NULL THEN
+        RAISE EXCEPTION 'No consolidated formversion mapping found for FormId: %', form_id;
+    END IF;
+
+    -- Generate a view name if it is empty or null
+    IF view_name IS NULL OR trim(view_name) = '' THEN
+        view_name := 'consolidated_formversion_view_' || replace(form_id::text, '-', '_');
+    END IF;
+
+    -- Extract the rows array from mapping data to validate
+    mapping_rows := mapping_data->'Rows';
+
+    -- Check if rows exist
+    IF mapping_rows IS NULL OR jsonb_array_length(mapping_rows) = 0 THEN
+        RAISE EXCEPTION 'No mapping rows found for consolidated formversion FormId: %', form_id;
+    END IF;
+
+    -- Get the data clause from the consolidated formversion data function
+    data_clause := "Reporting".get_consolidated_formversion_data(form_id, report_map_id);
+
+    RAISE NOTICE 'View name: %', view_name;
+    RAISE NOTICE 'Data clause: %', data_clause;
+
+    -- Drop existing view to avoid conflicts on regeneration
+    EXECUTE format('DROP VIEW IF EXISTS "Reporting".%I', view_name);
+
+    -- Create the view
+    EXECUTE format('CREATE VIEW "Reporting".%I AS %s',
+        view_name,
+        data_clause
+    );
+
+    RAISE NOTICE 'Successfully created consolidated formversion view: %', view_name;
+END;
+$procedure$;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
new file mode 100644
index 0000000000..ffe6f51d93
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
@@ -0,0 +1,51 @@
+CREATE OR REPLACE PROCEDURE "Reporting".generate_consolidated_worksheet_view(IN form_id uuid)
+ LANGUAGE plpgsql
+AS $procedure$
+DECLARE
+    view_name TEXT;
+    mapping_data JSONB;
+    mapping_rows JSONB;
+    data_clause TEXT;
+    report_map_id UUID;
+BEGIN
+    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for worksheetconsolidated provider
+    SELECT "Id", "ViewName", "Mapping"::JSONB INTO report_map_id, view_name, mapping_data
+    FROM "Reporting"."ReportColumnsMaps"
+    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'worksheetconsolidated';
+
+    -- Check if we found the mapping
+    IF mapping_data IS NULL OR report_map_id IS NULL THEN
+        RAISE EXCEPTION 'No consolidated worksheet mapping found for FormId: %', form_id;
+    END IF;
+
+    -- Generate a view name if it is empty or null
+    IF view_name IS NULL OR trim(view_name) = '' THEN
+        view_name := 'consolidated_worksheet_view_' || replace(form_id::text, '-', '_');
+    END IF;
+
+    -- Extract the rows array from mapping data to validate
+    mapping_rows := mapping_data->'Rows';
+
+    -- Check if rows exist
+    IF mapping_rows IS NULL OR jsonb_array_length(mapping_rows) = 0 THEN
+        RAISE EXCEPTION 'No mapping rows found for consolidated worksheet FormId: %', form_id;
+    END IF;
+
+    -- Get the data clause from the consolidated worksheet data function
+    data_clause := "Reporting".get_consolidated_worksheet_data(form_id, report_map_id);
+
+    RAISE NOTICE 'View name: %', view_name;
+    RAISE NOTICE 'Data clause: %', data_clause;
+
+    -- Drop existing view to avoid conflicts on regeneration
+    EXECUTE format('DROP VIEW IF EXISTS "Reporting".%I', view_name);
+
+    -- Create the view
+    EXECUTE format('CREATE VIEW "Reporting".%I AS %s',
+        view_name,
+        data_clause
+    );
+
+    RAISE NOTICE 'Successfully created consolidated worksheet view: %', view_name;
+END;
+$procedure$;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
new file mode 100644
index 0000000000..75d07e6b80
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
@@ -0,0 +1,336 @@
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_formversion_data(form_id uuid, report_map_id uuid)
+ RETURNS text
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+    mapping_rows JSONB;
+    row_data JSONB;
+    column_name TEXT;
+    column_type TEXT;
+    property_name TEXT;
+    data_path_raw TEXT;
+    type_path TEXT;
+    datagrid_name TEXT;
+    datagrid_id TEXT;
+    version_id UUID;
+    version_lbl TEXT;
+    all_columns JSONB := '{}';
+    unique_datagrids JSONB := '{}';
+    has_root_fields BOOLEAN := false;
+    has_datagrids BOOLEAN := false;
+    column_list TEXT;
+    base_select_clause TEXT;
+    legacy_select_clause TEXT;
+    current_select_clause TEXT;
+    legacy_from_clause TEXT;
+    current_from_clause TEXT;
+    json_path TEXT;
+    path_parts TEXT[];
+    field_name TEXT;
+    data_path TEXT;
+    legacy_source_prefix TEXT;
+    current_source_prefix TEXT;
+    all_queries TEXT[];
+    i INTEGER;
+    j INTEGER;
+BEGIN
+    -- Fetch the mapping data for this report map ID
+    SELECT "Mapping"->'Rows' INTO mapping_rows
+    FROM "Reporting"."ReportColumnsMaps"
+    WHERE "Id" = report_map_id;
+
+    IF mapping_rows IS NULL OR jsonb_array_length(mapping_rows) = 0 THEN
+        RAISE EXCEPTION 'No mapping rows found for consolidated formversion report map: %', report_map_id;
+    END IF;
+
+    -- First pass: collect all unique column names and detect datagrids
+    FOR i IN 0..(jsonb_array_length(mapping_rows) - 1) LOOP
+        row_data := mapping_rows->i;
+        IF (row_data->>'Parent')::boolean = true THEN CONTINUE; END IF;
+
+        column_name := row_data->>'ColumnName';
+        column_type := lower(COALESCE(row_data->>'Type', 'text'));
+        type_path := row_data->>'TypePath';
+        data_path_raw := row_data->>'DataPath';
+        datagrid_id := row_data->>'Id';
+
+        -- Only store first occurrence per column_name
+        IF NOT (all_columns ? column_name) THEN
+            all_columns := all_columns || jsonb_build_object(column_name, jsonb_build_object(
+                'type', column_type,
+                'type_path', COALESCE(type_path, ''),
+                'data_path', COALESCE(data_path_raw, '')
+            ));
+        END IF;
+
+        IF type_path IS NOT NULL AND type_path LIKE '%datagrid%' THEN
+            has_datagrids := true;
+            IF data_path_raw IS NOT NULL THEN
+                IF data_path_raw ~ '^\(DK[0-9]+\)' THEN
+                    datagrid_name := split_part(regexp_replace(data_path_raw, '^\(DK[0-9]+\)', ''), '->', 1);
+                ELSE
+                    datagrid_name := split_part(data_path_raw, '->', 1);
+                END IF;
+                IF datagrid_name IS NOT NULL AND datagrid_name != '' AND NOT (unique_datagrids ? datagrid_name) THEN
+                    unique_datagrids := unique_datagrids || jsonb_build_object(datagrid_name, datagrid_id);
+                END IF;
+            END IF;
+        ELSE
+            has_root_fields := true;
+        END IF;
+    END LOOP;
+
+    -- Build typed NULL column list (ordered by column name for consistent UNION ALL column order)
+    column_list := '';
+    FOR column_name IN SELECT jsonb_object_keys(all_columns) ORDER BY jsonb_object_keys(all_columns) LOOP
+        IF column_list != '' THEN column_list := column_list || ', '; END IF;
+        column_type := all_columns->column_name->>'type';
+        CASE column_type
+            WHEN 'number' THEN column_list := column_list || format('NULL::NUMERIC AS %I', column_name);
+            WHEN 'currency' THEN column_list := column_list || format('NULL::DECIMAL(18,2) AS %I', column_name);
+            WHEN 'option', 'checkbox' THEN column_list := column_list || format('NULL::BOOLEAN AS %I', column_name);
+            ELSE column_list := column_list || format('NULL::TEXT AS %I', column_name);
+        END CASE;
+    END LOOP;
+
+    all_queries := '{}';
+
+    -- Loop over each form version from metadata (ordered by version label)
+    FOR version_id, version_lbl IN
+        SELECT replace(kv.key, 'formversion_', '')::uuid, kv.value
+        FROM "Reporting"."ReportColumnsMaps" rcm,
+        jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+        WHERE rcm."Id" = report_map_id
+          AND kv.key LIKE 'formversion_%'
+        ORDER BY kv.value
+    LOOP
+
+        -- ===== ROOT QUERY for this version =====
+        IF has_root_fields THEN
+            base_select_clause := format(
+                'afs."Id" AS submission_id, afs."ApplicationId" AS application_id, ''root'' AS row_identifier, %L AS form_version_label',
+                version_lbl
+            );
+            IF column_list != '' THEN
+                base_select_clause := base_select_clause || ', ' || column_list;
+            END IF;
+
+            legacy_from_clause := 'public."ApplicationFormSubmissions" afs';
+            current_from_clause := 'public."ApplicationFormSubmissions" afs';
+            legacy_select_clause := base_select_clause;
+            current_select_clause := base_select_clause;
+
+            FOR i IN 0..(jsonb_array_length(mapping_rows) - 1) LOOP
+                row_data := mapping_rows->i;
+                IF (row_data->>'Parent')::boolean = true THEN CONTINUE; END IF;
+                IF (row_data->>'TypePath') IS NOT NULL AND (row_data->>'TypePath') LIKE '%datagrid%' THEN CONTINUE; END IF;
+
+                column_name := row_data->>'ColumnName';
+                column_type := lower(COALESCE(row_data->>'Type', 'text'));
+                property_name := row_data->>'PropertyName';
+                data_path_raw := row_data->>'DataPath';
+
+                -- Version gating: skip columns that belong to a different version
+                IF (row_data->>'VersionLabel') IS NOT NULL AND (row_data->>'VersionLabel') != version_lbl THEN
+                    CONTINUE; -- Leave as typed NULL placeholder
+                END IF;
+
+                -- Build json_path from DataPath or PropertyName
+                IF data_path_raw IS NOT NULL AND trim(data_path_raw) != '' THEN
+                    path_parts := string_to_array(data_path_raw, '->');
+                    json_path := '';
+                    FOR j IN 1..array_length(path_parts, 1) LOOP
+                        IF trim(path_parts[j]) = '' THEN CONTINUE; END IF;
+                        IF json_path != '' THEN json_path := json_path || '->'; END IF;
+                        json_path := json_path || format('''%s''', trim(path_parts[j]));
+                    END LOOP;
+                    json_path := '->' || json_path;
+                ELSE
+                    json_path := format('->''%s''', property_name);
+                END IF;
+
+                legacy_source_prefix := 'afs."Submission"->''submission''->''data''';
+                current_source_prefix := 'afs."Submission"->''submission''->''submission''->''data''';
+
+                CASE column_type
+                    WHEN 'textfield', 'textarea', 'email', 'select', 'phoneNumber' THEN
+                        IF json_path LIKE '%->%' THEN
+                            json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                        END IF;
+                        data_path := format('(%s%s)', '{}', json_path);
+                    WHEN 'number' THEN
+                        IF json_path LIKE '%->%' THEN
+                            json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                        END IF;
+                        data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN (%s%s)::NUMERIC ELSE NULL END)', '{}', json_path, '{}', json_path, '{}', json_path);
+                    WHEN 'currency' THEN
+                        IF json_path LIKE '%->%' THEN
+                            json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                        END IF;
+                        data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN (%s%s)::DECIMAL(18,2) ELSE NULL END)', '{}', json_path, '{}', json_path, '{}', json_path);
+                    WHEN 'option', 'checkbox' THEN
+                        IF json_path LIKE '%->%' THEN
+                            json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                        END IF;
+                        data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^(true|false|t|f|1|0|yes|no)$'' THEN CASE WHEN lower((%s%s)) IN (''true'', ''t'', ''1'', ''yes'') THEN true WHEN lower((%s%s)) IN (''false'', ''f'', ''0'', ''no'') THEN false ELSE NULL END ELSE NULL END)',
+                            '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
+                    ELSE
+                        IF json_path LIKE '%->%' THEN
+                            json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                        END IF;
+                        data_path := format('(%s%s)', '{}', json_path);
+                END CASE;
+
+                -- Replace typed NULL placeholder with actual extraction
+                CASE column_type
+                    WHEN 'number' THEN
+                        legacy_select_clause := regexp_replace(legacy_select_clause,
+                            format('NULL::NUMERIC AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', legacy_source_prefix), column_name));
+                        current_select_clause := regexp_replace(current_select_clause,
+                            format('NULL::NUMERIC AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', current_source_prefix), column_name));
+                    WHEN 'currency' THEN
+                        legacy_select_clause := regexp_replace(legacy_select_clause,
+                            format('NULL::DECIMAL\(18,2\) AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', legacy_source_prefix), column_name));
+                        current_select_clause := regexp_replace(current_select_clause,
+                            format('NULL::DECIMAL\(18,2\) AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', current_source_prefix), column_name));
+                    WHEN 'option', 'checkbox' THEN
+                        legacy_select_clause := regexp_replace(legacy_select_clause,
+                            format('NULL::BOOLEAN AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', legacy_source_prefix), column_name));
+                        current_select_clause := regexp_replace(current_select_clause,
+                            format('NULL::BOOLEAN AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', current_source_prefix), column_name));
+                    ELSE
+                        legacy_select_clause := regexp_replace(legacy_select_clause,
+                            format('NULL::TEXT AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', legacy_source_prefix), column_name));
+                        current_select_clause := regexp_replace(current_select_clause,
+                            format('NULL::TEXT AS %I([^_A-Za-z0-9]|$)', column_name),
+                            format('%s AS %I\1', replace(data_path, '{}', current_source_prefix), column_name));
+                END CASE;
+            END LOOP;
+
+            all_queries := all_queries || format(
+                '(SELECT %s FROM %s WHERE afs."ApplicationFormVersionId" = %L AND afs."Submission"->''submission''->''submission'' IS NULL) UNION ALL (SELECT %s FROM %s WHERE afs."ApplicationFormVersionId" = %L AND afs."Submission"->''submission''->''submission'' IS NOT NULL)',
+                legacy_select_clause, legacy_from_clause, version_id,
+                current_select_clause, current_from_clause, version_id
+            );
+        END IF;
+
+        -- ===== DATAGRID QUERIES for this version =====
+        IF has_datagrids THEN
+            FOR datagrid_name IN SELECT jsonb_object_keys(unique_datagrids) LOOP
+                datagrid_id := unique_datagrids->>datagrid_name;
+
+                base_select_clause := format(
+                    'afs."Id" AS submission_id, afs."ApplicationId" AS application_id, %L || ''_r'' || dg_%s_tbl.dg_%s_row_num AS row_identifier, %L AS form_version_label',
+                    datagrid_name, datagrid_id, datagrid_id, version_lbl
+                );
+                IF column_list != '' THEN
+                    base_select_clause := base_select_clause || ', ' || column_list;
+                END IF;
+
+                legacy_from_clause := format(
+                    'public."ApplicationFormSubmissions" afs CROSS JOIN LATERAL (
+                        SELECT elem AS dg_%s, row_number() OVER() AS dg_%s_row_num
+                        FROM jsonb_array_elements(COALESCE(afs."Submission"->''submission''->''data''->''%s'', ''[null]''::jsonb)) AS elem
+                    ) AS dg_%s_tbl',
+                    datagrid_id, datagrid_id, datagrid_name, datagrid_id
+                );
+
+                current_from_clause := format(
+                    'public."ApplicationFormSubmissions" afs CROSS JOIN LATERAL (
+                        SELECT elem AS dg_%s, row_number() OVER() AS dg_%s_row_num
+                        FROM jsonb_array_elements(COALESCE(afs."Submission"->''submission''->''submission''->''data''->''%s'', ''[null]''::jsonb)) AS elem
+                    ) AS dg_%s_tbl',
+                    datagrid_id, datagrid_id, datagrid_name, datagrid_id
+                );
+
+                legacy_select_clause := base_select_clause;
+                current_select_clause := base_select_clause;
+
+                FOR i IN 0..(jsonb_array_length(mapping_rows) - 1) LOOP
+                    row_data := mapping_rows->i;
+                    type_path := row_data->>'TypePath';
+                    IF (row_data->>'Parent')::boolean = true OR type_path IS NULL OR NOT (type_path LIKE '%datagrid%') THEN CONTINUE; END IF;
+
+                    column_name := row_data->>'ColumnName';
+                    column_type := lower(COALESCE(row_data->>'Type', 'text'));
+                    data_path_raw := row_data->>'DataPath';
+
+                    -- Version gating
+                    IF (row_data->>'VersionLabel') IS NOT NULL AND (row_data->>'VersionLabel') != version_lbl THEN
+                        CONTINUE;
+                    END IF;
+
+                    -- Check if this field belongs to the current datagrid
+                    IF data_path_raw ~ '^\(DK[0-9]+\)' THEN
+                        IF split_part(regexp_replace(data_path_raw, '^\(DK[0-9]+\)', ''), '->', 1) != datagrid_name THEN CONTINUE; END IF;
+                        field_name := split_part(regexp_replace(data_path_raw, '^\(DK[0-9]+\)', ''), '->', 2);
+                    ELSE
+                        IF split_part(data_path_raw, '->', 1) != datagrid_name THEN CONTINUE; END IF;
+                        field_name := split_part(data_path_raw, '->', 2);
+                    END IF;
+
+                    json_path := format('->''%s''', trim(field_name));
+                    -- Same source prefix for both schemas since datagrids use lateral joins
+                    legacy_source_prefix := 'dg_' || datagrid_id || '_tbl.dg_' || datagrid_id;
+                    current_source_prefix := 'dg_' || datagrid_id || '_tbl.dg_' || datagrid_id;
+
+                    CASE column_type
+                        WHEN 'textfield', 'textarea', 'email', 'select', 'phoneNumber' THEN
+                            json_path := replace(json_path, '->', '->>');
+                            data_path := format('(%s%s)', '{}', json_path);
+                            legacy_select_clause := replace(legacy_select_clause, format('NULL::TEXT AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));
+                            current_select_clause := replace(current_select_clause, format('NULL::TEXT AS %I', column_name), format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name));
+                        WHEN 'number' THEN
+                            json_path := replace(json_path, '->', '->>');
+                            data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN (%s%s)::NUMERIC ELSE NULL END)', '{}', json_path, '{}', json_path, '{}', json_path);
+                            legacy_select_clause := replace(legacy_select_clause, format('NULL::NUMERIC AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));
+                            current_select_clause := replace(current_select_clause, format('NULL::NUMERIC AS %I', column_name), format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name));
+                        WHEN 'currency' THEN
+                            json_path := replace(json_path, '->', '->>');
+                            data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN (%s%s)::DECIMAL(18,2) ELSE NULL END)', '{}', json_path, '{}', json_path, '{}', json_path);
+                            legacy_select_clause := replace(legacy_select_clause, format('NULL::DECIMAL(18,2) AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));
+                            current_select_clause := replace(current_select_clause, format('NULL::DECIMAL(18,2) AS %I', column_name), format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name));
+                        WHEN 'option', 'checkbox' THEN
+                            json_path := replace(json_path, '->', '->>');
+                            data_path := format('(CASE WHEN (%s%s) IS NULL THEN NULL WHEN (%s%s) ~ ''^(true|false|t|f|1|0|yes|no)$'' THEN CASE WHEN lower((%s%s)) IN (''true'', ''t'', ''1'', ''yes'') THEN true WHEN lower((%s%s)) IN (''false'', ''f'', ''0'', ''no'') THEN false ELSE NULL END ELSE NULL END)',
+                                '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
+                            legacy_select_clause := replace(legacy_select_clause, format('NULL::BOOLEAN AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));
+                            current_select_clause := replace(current_select_clause, format('NULL::BOOLEAN AS %I', column_name), format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name));
+                        ELSE
+                            json_path := replace(json_path, '->', '->>');
+                            data_path := format('(%s%s)', '{}', json_path);
+                            legacy_select_clause := replace(legacy_select_clause, format('NULL::TEXT AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));
+                            current_select_clause := replace(current_select_clause, format('NULL::TEXT AS %I', column_name), format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name));
+                    END CASE;
+                END LOOP;
+
+                all_queries := all_queries || format(
+                    '(SELECT %s FROM %s WHERE afs."ApplicationFormVersionId" = %L AND afs."Submission"->''submission''->''submission'' IS NULL AND dg_%s_tbl.dg_%s != ''null''::jsonb) UNION ALL (SELECT %s FROM %s WHERE afs."ApplicationFormVersionId" = %L AND afs."Submission"->''submission''->''submission'' IS NOT NULL AND dg_%s_tbl.dg_%s != ''null''::jsonb)',
+                    legacy_select_clause, legacy_from_clause, version_id, datagrid_id, datagrid_id,
+                    current_select_clause, current_from_clause, version_id, datagrid_id, datagrid_id
+                );
+            END LOOP;
+        END IF;
+
+    END LOOP;
+
+    RETURN array_to_string(all_queries, ' UNION ALL ');
+END;
+$function$;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql
new file mode 100644
index 0000000000..ca0b9540d2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql
@@ -0,0 +1,278 @@
+
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_worksheet_data(form_id uuid, report_map_id uuid)
+ RETURNS text
+ LANGUAGE plpgsql
+AS $function$
+BEGIN
+    RETURN (
+        WITH mapping_data AS (
+            SELECT
+                row_number() OVER() as mapping_index,
+                row_data->>'ColumnName' as column_name,
+                lower(row_data->>'Type') as column_type,
+                row_data->>'DataPath' as data_path_raw,
+                row_data->>'TypePath' as type_path,
+                row_data->>'Path' as field_path,
+                row_data->>'PropertyName' as property_name,
+                row_data->>'VersionLabel' as version_label,
+                CASE
+                    WHEN row_data->>'DataPath' IS NOT NULL AND row_data->>'DataPath' ~ '^\('
+                    THEN substring(row_data->>'DataPath' from '^\(([^)]+)\)')
+                    ELSE split_part(row_data->>'Path', '->', 1)
+                END as worksheet_name,
+                CASE
+                    WHEN row_data->>'DataPath' ~ '^\('
+                    THEN regexp_replace(row_data->>'DataPath', '^\([^)]+\)', '')
+                    ELSE row_data->>'DataPath'
+                END as clean_data_path
+            FROM
+                "Reporting"."ReportColumnsMaps" rcm,
+                jsonb_array_elements(rcm."Mapping"->'Rows') as row_data
+            WHERE
+                rcm."Id" = report_map_id
+                AND (row_data->>'Parent')::boolean IS NOT TRUE
+        ),
+        -- Use DISTINCT ON to ensure each column gets only one mapping (first occurrence)
+        unique_mappings AS (
+            SELECT DISTINCT ON (column_name)
+                mapping_index, column_name, column_type, data_path_raw, type_path,
+                field_path, property_name, version_label, worksheet_name, clean_data_path,
+                split_part(clean_data_path, '->', 1) as datagrid_name,
+                split_part(clean_data_path, '->', 2) as field_name
+            FROM mapping_data
+            ORDER BY column_name, mapping_index
+        ),
+        -- Load form version IDs from the consolidated mapping metadata
+        -- Keys are like "formversion_{versionId}" with value "v1", "v2", etc.
+        version_info AS (
+            SELECT
+                replace(kv.key, 'formversion_', '')::uuid as version_id,
+                kv.value as version_label
+            FROM "Reporting"."ReportColumnsMaps" rcm,
+            jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+            WHERE rcm."Id" = report_map_id
+              AND kv.key LIKE 'formversion_%'
+        ),
+        -- Get unique worksheet names from the mapping data
+        unique_worksheet_names AS (
+            SELECT DISTINCT worksheet_name
+            FROM unique_mappings
+            WHERE worksheet_name IS NOT NULL AND worksheet_name <> ''
+        ),
+        -- Get unique datagrid combinations (worksheet_name, datagrid_name) from mapping
+        unique_datagrid_combinations AS (
+            SELECT DISTINCT worksheet_name, datagrid_name
+            FROM unique_mappings
+            WHERE type_path LIKE '%datagrid%'
+              AND datagrid_name IS NOT NULL AND datagrid_name <> ''
+        ),
+        -- Build datagrid queries: one per (version, worksheet, datagrid) combination
+        datagrid_queries AS (
+            SELECT format('
+                SELECT
+                    wi."Id" AS worksheet_instance_id,
+                    wi."CorrelationId" AS application_id,
+                    COALESCE(w."Name", ''Unknown'') AS worksheet_name,
+                    %L || ''_r'' || dg_tbl.row_num AS row_identifier,
+                    %L AS form_version_label,
+                    %s
+                FROM "Flex"."WorksheetInstances" wi
+                LEFT JOIN "Flex"."Worksheets" w ON wi."WorksheetId" = w."Id"
+                CROSS JOIN LATERAL (
+                    SELECT
+                        row_elem as dg_data,
+                        row_number() OVER() as row_num
+                    FROM jsonb_array_elements(
+                        COALESCE(
+                            (SELECT "Reporting".safe_to_jsonb(v_elem->>''value'')->''rows''
+                             FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem
+                             WHERE v_elem->>''key'' = %L),
+                             ''[null]''::jsonb
+                        )
+                    ) AS row_elem
+                ) AS dg_tbl
+                WHERE wi."WorksheetCorrelationId" = %L
+                  AND w."Name" = %L
+                  AND dg_tbl.dg_data != ''null''::jsonb',
+
+                udc.datagrid_name,   -- row identifier prefix
+                vi.version_label,    -- form_version_label literal
+
+                -- Build ALL columns with type-appropriate extraction
+                (SELECT string_agg(
+                    CASE
+                        -- This column belongs to this worksheet-datagrid AND this version (or is merged)
+                        WHEN um.worksheet_name = udc.worksheet_name
+                          AND um.datagrid_name = udc.datagrid_name
+                          AND (um.version_label IS NULL OR um.version_label = vi.version_label) THEN
+                            CASE um.column_type
+                                WHEN 'currency' THEN
+                                    format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL WHEN replace(btrim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)), '','', '''') ~ ''^-?[0-9]+\.?[0-9]*$'' THEN replace(btrim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)), '','', '''')::DECIMAL(18,2) ELSE NULL END) AS %I',
+                                        um.field_name, um.field_name, um.field_name, um.column_name)
+                                WHEN 'number' THEN
+                                    format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L))::NUMERIC ELSE NULL END) AS %I',
+                                        um.field_name, um.field_name, um.field_name, um.column_name)
+                                WHEN 'numeric' THEN
+                                    format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L))::NUMERIC ELSE NULL END) AS %I',
+                                        um.field_name, um.field_name, um.field_name, um.column_name)
+                                WHEN 'date' THEN
+                                    format('"Reporting".safe_to_date((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) AS %I',
+                                        um.field_name, um.column_name)
+                                WHEN 'datetime' THEN
+                                    format('"Reporting".safe_to_timestamp((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) AS %I',
+                                        um.field_name, um.column_name)
+                                WHEN 'checkbox' THEN
+                                    CASE
+                                        WHEN um.type_path LIKE '%checkboxgroup%' THEN
+                                            format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL ELSE (SELECT (checkbox_elem->>''value'')::BOOLEAN FROM jsonb_array_elements(((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L))::jsonb) AS checkbox_elem WHERE checkbox_elem->>''key'' = %L) END) AS %I',
+                                                split_part(um.clean_data_path, '->', 1),
+                                                split_part(um.clean_data_path, '->', 1),
+                                                split_part(um.clean_data_path, '->', 2),
+                                                um.column_name)
+                                        ELSE
+                                            format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL WHEN lower(trim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L))) IN (''true'', ''t'', ''1'', ''yes'', ''on'') THEN TRUE WHEN lower(trim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L))) IN (''false'', ''f'', ''0'', ''no'', ''off'', '''') THEN FALSE ELSE NULL END) AS %I',
+                                                um.field_name, um.field_name, um.field_name, um.column_name)
+                                    END
+                                WHEN 'radio' THEN
+                                    format('((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) AS %I',
+                                        um.field_name, um.column_name)
+                                ELSE
+                                    format('((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) AS %I',
+                                        um.field_name, um.column_name)
+                            END
+                        -- Column doesn't apply to this version/worksheet-datagrid — emit typed NULL
+                        ELSE
+                            CASE um.column_type
+                                WHEN 'currency' THEN format('NULL::DECIMAL(18,2) AS %I', um.column_name)
+                                WHEN 'number' THEN format('NULL::NUMERIC AS %I', um.column_name)
+                                WHEN 'numeric' THEN format('NULL::NUMERIC AS %I', um.column_name)
+                                WHEN 'date' THEN format('NULL::DATE AS %I', um.column_name)
+                                WHEN 'datetime' THEN format('NULL::TIMESTAMP AS %I', um.column_name)
+                                WHEN 'checkbox' THEN format('NULL::BOOLEAN AS %I', um.column_name)
+                                WHEN 'radio' THEN format('NULL::TEXT AS %I', um.column_name)
+                                ELSE format('NULL::TEXT AS %I', um.column_name)
+                            END
+                    END, ', ' ORDER BY um.column_name
+                ) FROM unique_mappings um),
+
+                udc.datagrid_name,    -- for COALESCE clause
+                vi.version_id,        -- for WHERE WorksheetCorrelationId
+                udc.worksheet_name    -- for WHERE worksheet Name
+
+            ) as query_text
+            FROM unique_datagrid_combinations udc
+            CROSS JOIN version_info vi
+            ORDER BY vi.version_label, udc.worksheet_name, udc.datagrid_name
+        ),
+        -- Build root-level (non-datagrid) queries: one per (version, worksheet) combination
+        root_queries AS (
+            SELECT format('
+                SELECT
+                    wi."Id" AS worksheet_instance_id,
+                    wi."CorrelationId" AS application_id,
+                    COALESCE(w."Name", ''Unknown'') AS worksheet_name,
+                    ''root'' AS row_identifier,
+                    %L AS form_version_label,
+                    %s
+                FROM "Flex"."WorksheetInstances" wi
+                LEFT JOIN "Flex"."Worksheets" w ON wi."WorksheetId" = w."Id"
+                WHERE wi."WorksheetCorrelationId" = %L
+                  AND w."Name" = %L',
+
+                vi.version_label,    -- form_version_label literal
+
+                -- Build ALL columns with type-appropriate extraction
+                (SELECT string_agg(
+                    CASE
+                        -- This column belongs to this worksheet root AND this version (or is merged)
+                        WHEN um.worksheet_name = uwn.worksheet_name
+                          AND (um.type_path NOT LIKE '%datagrid%' OR um.type_path IS NULL)
+                          AND (um.version_label IS NULL OR um.version_label = vi.version_label) THEN
+                            CASE um.column_type
+                                WHEN 'currency' THEN
+                                    format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL WHEN replace(btrim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)), '','', '''') ~ ''^-?[0-9]+\.?[0-9]*$'' THEN replace(btrim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)), '','', '''')::DECIMAL(18,2) ELSE NULL END) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        um.column_name)
+                                WHEN 'number' THEN
+                                    format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L))::NUMERIC ELSE NULL END) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        um.column_name)
+                                WHEN 'numeric' THEN
+                                    format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) ~ ''^-?[0-9]+\.?[0-9]*$'' THEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L))::NUMERIC ELSE NULL END) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        um.column_name)
+                                WHEN 'date' THEN
+                                    format('"Reporting".safe_to_date((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        um.column_name)
+                                WHEN 'datetime' THEN
+                                    format('"Reporting".safe_to_timestamp((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name),
+                                        um.column_name)
+                                WHEN 'checkbox' THEN
+                                    CASE
+                                        WHEN um.type_path LIKE '%checkboxgroup%' THEN
+                                            format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL ELSE (SELECT (checkbox_elem->>''value'')::BOOLEAN FROM jsonb_array_elements(((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L))::jsonb) AS checkbox_elem WHERE checkbox_elem->>''key'' = %L) END) AS %I',
+                                                split_part(COALESCE(um.clean_data_path, um.property_name), '->', 1),
+                                                split_part(COALESCE(um.clean_data_path, um.property_name), '->', 1),
+                                                split_part(COALESCE(um.clean_data_path, um.property_name), '->', 2),
+                                                um.column_name)
+                                        ELSE
+                                            format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL WHEN lower(trim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L))) IN (''true'', ''t'', ''1'', ''yes'', ''on'') THEN TRUE WHEN lower(trim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L))) IN (''false'', ''f'', ''0'', ''no'', ''off'', '''') THEN FALSE ELSE NULL END) AS %I',
+                                                COALESCE(um.clean_data_path, um.property_name),
+                                                COALESCE(um.clean_data_path, um.property_name),
+                                                COALESCE(um.clean_data_path, um.property_name),
+                                                um.column_name)
+                                    END
+                                WHEN 'radio' THEN
+                                    format('((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name), um.column_name)
+                                ELSE
+                                    format('((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) AS %I',
+                                        COALESCE(um.clean_data_path, um.property_name), um.column_name)
+                            END
+                        -- Column doesn't apply to this version/worksheet root — emit typed NULL
+                        ELSE
+                            CASE um.column_type
+                                WHEN 'currency' THEN format('NULL::DECIMAL(18,2) AS %I', um.column_name)
+                                WHEN 'number' THEN format('NULL::NUMERIC AS %I', um.column_name)
+                                WHEN 'numeric' THEN format('NULL::NUMERIC AS %I', um.column_name)
+                                WHEN 'date' THEN format('NULL::DATE AS %I', um.column_name)
+                                WHEN 'datetime' THEN format('NULL::TIMESTAMP AS %I', um.column_name)
+                                WHEN 'checkbox' THEN format('NULL::BOOLEAN AS %I', um.column_name)
+                                WHEN 'radio' THEN format('NULL::TEXT AS %I', um.column_name)
+                                ELSE format('NULL::TEXT AS %I', um.column_name)
+                            END
+                    END, ', ' ORDER BY um.column_name
+                ) FROM unique_mappings um),
+
+                vi.version_id,        -- for WHERE WorksheetCorrelationId
+                uwn.worksheet_name    -- for WHERE worksheet Name
+
+            ) as query_text
+            FROM unique_worksheet_names uwn
+            CROSS JOIN version_info vi
+            ORDER BY vi.version_label, uwn.worksheet_name
+        ),
+        -- Combine all queries
+        all_queries AS (
+            SELECT query_text FROM datagrid_queries
+            UNION ALL
+            SELECT query_text FROM root_queries
+        )
+        SELECT format('
+            WITH worksheet_data AS (
+                %s
+            )
+            SELECT * FROM worksheet_data ORDER BY form_version_label, worksheet_name, row_identifier
+        ', string_agg(query_text, ' UNION ALL '))
+        FROM all_queries
+    );
+END;
+$function$;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
index 5cb2b1d7ba..40700cd5bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Unity.GrantManager.EntityFrameworkCore.csproj
@@ -19,6 +19,10 @@
 	  <None Remove="Scripts\safe_to_timestamp.sql" />
 	  <None Remove="Scripts\safe_to_date.sql" />
 	  <None Remove="Scripts\safe_to_jsonb.sql" />
+	  <None Remove="Scripts\get_consolidated_worksheet_data.sql" />
+	  <None Remove="Scripts\generate_consolidated_worksheet_view.sql" />
+	  <None Remove="Scripts\get_consolidated_formversion_data.sql" />
+	  <None Remove="Scripts\generate_consolidated_formversion_view.sql" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -49,6 +53,18 @@
 	  <EmbeddedResource Include="Scripts\safe_to_jsonb.sql">
 		<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 	  </EmbeddedResource>
+	  <EmbeddedResource Include="Scripts\get_consolidated_worksheet_data.sql">
+		<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </EmbeddedResource>
+	  <EmbeddedResource Include="Scripts\generate_consolidated_worksheet_view.sql">
+		<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </EmbeddedResource>
+	  <EmbeddedResource Include="Scripts\get_consolidated_formversion_data.sql">
+		<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </EmbeddedResource>
+	  <EmbeddedResource Include="Scripts\generate_consolidated_formversion_view.sql">
+		<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </EmbeddedResource>
 	</ItemGroup>
 
 	<ItemGroup>

From 7eeaae4b8bc007be4a9e147ceb0508e8b8e9a57b Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 22 May 2026 08:39:57 -0700
Subject: [PATCH 02/14] AB#32881 layout improvements

---
 .../Configuration/FieldPathTypeDto.cs         |   7 +-
 .../ConsolidatedFormVersionFieldsProvider.cs  |   2 +-
 .../ConsolidatedWorksheetFieldsProvider.cs    |   3 +-
 .../Domain/Configuration/ReportColumnsMap.cs  |   7 +-
 .../ReportColumnsMapRepository.cs             |   4 +-
 .../Configuration/Providers.cs                |   4 +-
 .../ReportingConfiguration/Default.cshtml     | 238 ++++++++----------
 .../ReportingConfiguration/Default.css        | 103 +++-----
 .../ReportingConfiguration/Default.js         | 134 +++++-----
 .../ReportingConfigurationViewComponent.cs    |   2 +-
 .../Default.cshtml                            |   2 +-
 ...generate_consolidated_formversion_view.sql |   4 +-
 .../generate_consolidated_worksheet_view.sql  |   4 +-
 .../get_consolidated_formversion_data.sql     |   6 +-
 .../get_consolidated_worksheet_data.sql       |   4 +-
 15 files changed, 229 insertions(+), 295 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
index 8178d8866a..e50335bf1c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/FieldPathTypeDto.cs
@@ -41,9 +41,10 @@ public class FieldPathTypeDto
         public string DataPath { get; set; } = string.Empty;
 
         /// <summary>
-        /// Optional version label used only by the consolidated worksheet provider.
-        /// Null means the field is merged across all versions; non-null (e.g., "v1") means the field
-        /// is specific to that form version (conflict or version-exclusive field).
+        /// Optional version label used only by the consolidated providers.
+        /// Null means the field is merged across all versions ("All").
+        /// A single value (e.g., "v1") means the field is exclusive to that version.
+        /// A comma-separated value (e.g., "v1, v2") means the field appears in those versions but not all.
         /// </summary>
         public string? VersionLabel { get; set; } = null;
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
index 0f0d1e3bbb..9a881ae449 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
@@ -196,7 +196,7 @@ private static List<FieldPathTypeDto> MergeFields(
                             Type = field.Type,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
-                            VersionLabel = versionLabel
+                            VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
                         });
                     }
                 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
index 89d78b9238..329f24fa1e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
@@ -173,7 +173,6 @@ private static List<FieldPathTypeDto> MergeFields(
 
                     var typesForPath = pathGroups[pathKey];
                     var exactGroup = exactMatchGroups[exactKey];
-                    var allVersionLabels = versionsWithFields.Select(v => v.VersionLabel).ToList();
                     var versionsHavingThisExact = exactGroup.Select(e => e.VersionLabel).ToHashSet(StringComparer.OrdinalIgnoreCase);
 
                     if (typesForPath.Count > 1)
@@ -218,7 +217,7 @@ private static List<FieldPathTypeDto> MergeFields(
                             Type = field.Type,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
-                            VersionLabel = versionLabel
+                            VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
                         });
                     }
                 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
index 2a55f14830..7bd059bb13 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/ReportColumnsMap.cs
@@ -135,9 +135,10 @@ public class MapRow
         public string TypePath { get; set; } = string.Empty;
 
         /// <summary>
-        /// Gets or sets an optional version label indicating which form version this column belongs to.
-        /// Used exclusively for consolidated worksheet views: null means the column is merged across all versions;
-        /// a non-null value (e.g., "v1", "v2") means the column is specific to that form version (conflict or version-exclusive field).
+        /// Gets or sets an optional version label indicating which form version(s) this column belongs to.
+        /// Used exclusively for consolidated views: null means the column is merged across all versions ("All");
+        /// a single value (e.g., "v1") means the column is exclusive to that version;
+        /// a comma-separated value (e.g., "v1, v2") means the column appears in those versions but not all.
         /// </summary>
         public string? VersionLabel { get; set; } = null;
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
index 782c0c3385..08593ddb8a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
@@ -91,8 +91,8 @@ public async Task GenerateViewAsync(Guid correlationId, string correlationProvid
                     "formversion" => $@"CALL ""Reporting"".generate_formversion_view({correlationId});",
                     "worksheet" => $@"CALL ""Reporting"".generate_worksheet_view({correlationId});",
                     "scoresheet" => $@"CALL ""Reporting"".generate_scoresheet_view({correlationId});",
-                    "worksheetconsolidated" => $@"CALL ""Reporting"".generate_consolidated_worksheet_view({correlationId});",
-                    "formversionconsolidated" => $@"CALL ""Reporting"".generate_consolidated_formversion_view({correlationId});",
+                    "worksheet_consolidated" => $@"CALL ""Reporting"".generate_consolidated_worksheet_view({correlationId});",
+                    "formversion_consolidated" => $@"CALL ""Reporting"".generate_consolidated_formversion_view({correlationId});",
                     _ => throw new ArgumentException($"Unsupported correlation provider: {correlationProvider}"),
                 };
                 await dbContext.Database.ExecuteSqlAsync(sql);
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
index 9c58c4a50c..301a8c4c72 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Domain.Shared/Configuration/Providers.cs
@@ -34,13 +34,13 @@ public static class Providers
         /// Used when creating a single unified report view that merges worksheet data across all versions of a form.
         /// The CorrelationId for this provider is the FormId (not a specific version ID).
         /// </summary>
-        public static string WorksheetConsolidated => "worksheetconsolidated";
+        public static string WorksheetConsolidated => "worksheet_consolidated";
 
         /// <summary>
         /// Gets the correlation provider identifier for consolidated form version submission views spanning all form versions.
         /// Used when creating a single unified report view that merges submission data across all versions of a form.
         /// The CorrelationId for this provider is the FormId (not a specific version ID).
         /// </summary>
-        public static string FormVersionConsolidated => "formversionconsolidated";
+        public static string FormVersionConsolidated => "formversion_consolidated";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index 9ccec09378..6bb5f5967b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -15,73 +15,47 @@
     <input type="hidden" id="hasDuplicateKeys" value="@Model.HasDuplicateKeys.ToString().ToLower()" />
     <input type="hidden" id="reportingViewStatus" value="@Model.ViewStatus" />
 
-    <!-- Provider Toggle Section -->
-    <div class="provider-toggle-section mb-1">
-        <div class="d-flex align-items-center gap-3">
-            <fieldset class="btn-group" aria-label="Provider toggle">
-                <input type="radio" class="btn-check" name="provider-toggle" id="provider-submissions" value="formversion" @((Model.Provider == "formversion" || Model.Provider == "formversionconsolidated") ? "checked" : "")>
-                <label class="btn btn-outline-primary" for="provider-submissions">Submissions</label>
+    <!-- Provider Toggle + Action Buttons Row -->
+    <div class="provider-toggle-section">
+        <div class="d-flex justify-content-between align-items-center">
+            <div class="d-flex flex-wrap align-items-center gap-3">
+                <fieldset class="btn-group provider-toggle-group" aria-label="Provider toggle">
+                    <input type="radio" class="btn-check" name="provider-toggle" id="provider-submissions" value="formversion" @((Model.Provider == "formversion" || Model.Provider == "formversion_consolidated") ? "checked" : "")>
+                    <label class="btn btn-outline-primary" for="provider-submissions">Submissions</label>
 
-                @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
-                {
-                    <input type="radio" class="btn-check" name="provider-toggle" id="provider-worksheets" value="worksheet" @((Model.Provider == "worksheet" || Model.Provider == "worksheetconsolidated") ? "checked" : "")>
-                    <label class="btn btn-outline-primary" for="provider-worksheets">Worksheets</label>
-
-                    <input type="radio" class="btn-check" name="provider-toggle" id="provider-scoresheets" value="scoresheet" @(Model.Provider == "scoresheet" ? "checked" : "")>
-                    <label class="btn btn-outline-primary" for="provider-scoresheets">Scoresheets</label>
-                }
-            </fieldset>
-
-            <!-- Development Banner -->
-            <div class="alert alert-info d-inline-flex align-items-center mb-0 py-2 px-3" role="alert">
-                <i class="fa fa-info-circle me-2" aria-hidden="true"></i>
-                <span class="small">
-                    <strong>Note:</strong> This feature is under development
-                </span>
-            </div>
-        </div>
-    </div>
+                    @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
+                    {
+                        <input type="radio" class="btn-check" name="provider-toggle" id="provider-worksheets" value="worksheet" @((Model.Provider == "worksheet" || Model.Provider == "worksheet_consolidated") ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="provider-worksheets">Worksheets</label>
 
-    <div class="report-config-controls">
-        <div>
-            <div id="submissions-mode-toggle" class="mb-1" style="@((Model.Provider == "formversion" || Model.Provider == "formversionconsolidated") ? "" : "display:none;")">
-                <fieldset class="btn-group btn-group-sm" aria-label="Submissions mode">
-                    <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-consolidated" value="formversionconsolidated" @(Model.Provider == "formversionconsolidated" ? "checked" : "")>
-                    <label class="btn btn-outline-primary" for="submissions-mode-consolidated">Consolidated</label>
-                    <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-perversion" value="formversion" @(Model.Provider == "formversion" ? "checked" : "")>
-                    <label class="btn btn-outline-primary" for="submissions-mode-perversion">Per Version</label>
+                        <input type="radio" class="btn-check" name="provider-toggle" id="provider-scoresheets" value="scoresheet" @(Model.Provider == "scoresheet" ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="provider-scoresheets">Scoresheets</label>
+                    }
                 </fieldset>
-            </div>
 
-            @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
-            {
-                <div id="worksheet-mode-toggle" class="mb-1" style="@((Model.Provider == "worksheet" || Model.Provider == "worksheetconsolidated") ? "" : "display:none;")">
-                    <fieldset class="btn-group btn-group-sm" aria-label="Worksheet mode">
-                        <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-consolidated" value="worksheetconsolidated" @(Model.Provider == "worksheetconsolidated" ? "checked" : "")>
-                        <label class="btn btn-outline-primary" for="worksheet-mode-consolidated">Consolidated</label>
-                        <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-perversion" value="worksheet" @(Model.Provider == "worksheet" ? "checked" : "")>
-                        <label class="btn btn-outline-primary" for="worksheet-mode-perversion">Per Version</label>
+                <div id="submissions-mode-toggle" style="@((Model.Provider == "formversion" || Model.Provider == "formversion_consolidated") ? "" : "display:none;")">
+                    <fieldset class="btn-group btn-group-sm provider-toggle-group" aria-label="Submissions mode">
+                        <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-consolidated" value="formversion_consolidated" @(Model.Provider == "formversion_consolidated" ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="submissions-mode-consolidated">Consolidated</label>
+                        <input type="radio" class="btn-check" name="submissions-mode" id="submissions-mode-perversion" value="formversion" @(Model.Provider == "formversion" ? "checked" : "")>
+                        <label class="btn btn-outline-primary" for="submissions-mode-perversion">Per Version</label>
                     </fieldset>
                 </div>
-            }
 
-            <div id="version-selector-container" style="@(Model.IsVersionSelectorVisible ? "" : "display:none;")">
-                <abp-select asp-for="SelectedVersionId"
-                            asp-items="@Model.FormVersions"
-                            label="Version Selector"
-                            id="versionSelector" />
-            </div>
-
-            <div class="form-info-display" style="display:none;">
-                <div class="form-group">
-                    <span class="form-label">Form Configuration</span>
-                    <div class="form-control-static">
-                        <strong>Form ID:</strong> @Model.FormId
+                @if (await FeatureChecker.IsEnabledAsync("Unity.Flex"))
+                {
+                    <div id="worksheet-mode-toggle" style="@((Model.Provider == "worksheet" || Model.Provider == "worksheet_consolidated") ? "" : "display:none;")">
+                        <fieldset class="btn-group btn-group-sm provider-toggle-group" aria-label="Worksheet mode">
+                            <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-consolidated" value="worksheet_consolidated" @(Model.Provider == "worksheet_consolidated" ? "checked" : "")>
+                            <label class="btn btn-outline-primary" for="worksheet-mode-consolidated">Consolidated</label>
+                            <input type="radio" class="btn-check" name="worksheet-mode" id="worksheet-mode-perversion" value="worksheet" @(Model.Provider == "worksheet" ? "checked" : "")>
+                            <label class="btn btn-outline-primary" for="worksheet-mode-perversion">Per Version</label>
+                        </fieldset>
                     </div>
-                </div>
+                }
             </div>
-        </div>
-        <div class="d-flex" style="gap:5px; align-items: center;">
+
+            <div class="d-flex align-items-center flex-shrink-0" style="gap:5px;">
 
             @if (Model.CorrelationId.HasValue)
             {
@@ -93,7 +67,7 @@
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
             {
                 <abp-button id="btn-generate-view-report-configuration"
-                            text="Generate View"
+                            text="Generate"
                             icon-type="Other"
                             icon="fl fl-datagrid"
                             data-bs-toggle="tooltip"
@@ -101,38 +75,8 @@
                             data-bs-original-title="Generate view"
                             class="btn unt-btn-primary btn-primary @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
 
-                <abp-button id="btn-edit-description"
-                            text="Description"
-                            icon-type="Other"
-                            icon="fl fl-info"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="top"
-                            data-bs-original-title="Edit configuration description"
-                            class="btn unt-btn-outline-primary btn-outline-primary report-config-btn-height-fix"></abp-button>
             }
 
-            <div id="div-duplicate-keys-warning"
-                 class="duplicate-keys-warning report-config-btn-height-fix d-flex align-items-center @(Model.HasDuplicateKeys ? "" : "duplicate-keys-div-hidden")"
-                 data-bs-toggle="tooltip"
-                 data-bs-placement="top"
-                 data-bs-original-title="There are duplicate keys detected and catered for, this may affect the view generation and resulting data">
-                <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
-                <small class="text-warning">
-                    <strong>Warning</strong>
-                </small>
-            </div>
-
-            <div id="div-dynamic-columns-warning"
-                 class="dynamic-columns-warning report-config-btn-height-fix d-flex align-items-center dynamic-columns-div-hidden"
-                 data-bs-toggle="tooltip"
-                 data-bs-placement="top"
-                 data-bs-original-title="A DataGrid has dynamic columns but no matching field mapping was found in the form submission schema. Map the worksheet DataGrid to a CHEFS form field to resolve the individual columns.">
-                <i class="fa fa-info-circle text-info me-2" style="font-size: 1.2em;"></i>
-                <small class="text-info">
-                    <strong>Unmapped DataGrid</strong>
-                </small>
-            </div>
-
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Delete))
             {
                 <abp-button id="btn-delete-report-configuration"
@@ -167,12 +111,55 @@
                         class="btn unt-btn-outline-primary btn-outline-primary mx-1"
                         style="display: none;"></abp-button>
 
+            @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
+            {
+                <fieldset class="btn-group">
+                    <button type="button"
+                            class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle"
+                            data-bs-toggle="dropdown"
+                            aria-expanded="false">
+                        <i class="fl fl-code me-1"></i> JSON
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <a class="dropdown-item" href="#" id="btn-export-json-mapping">
+                                <i class="fl fl-arrow-export me-2"></i> Export
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="#" id="btn-import-json-mapping">
+                                <i class="fl fl-arrow-import me-2"></i> Import
+                            </a>
+                        </li>
+                        <li>
+                            <a class="dropdown-item" href="#" id="btn-edit-json-mapping">
+                                <i class="fl fl-code me-2"></i> Edit JSON
+                            </a>
+                        </li>
+                        <li><hr class="dropdown-divider"></li>
+                        <li>
+                            <a class="dropdown-item" href="#" id="btn-edit-description">
+                                <i class="fl fl-info me-2"></i> Description
+                            </a>
+                        </li>
+                    </ul>
+                </fieldset>
+            }
+
             <abp-button id="btn-back-report-configuration"
                         text="Back"
                         data-bs-toggle="tooltip"
                         data-bs-placement="top"
                         data-bs-original-title="Navigate back to the Forms"
                         class="btn unt-btn-outline-primary btn-outline-primary mx-1 report-config-btn-height-fix"></abp-button>
+            </div>
+        </div>
+
+        <div id="version-selector-container" class="mt-2" style="@(Model.IsVersionSelectorVisible ? "" : "display:none;")">
+            <div class="d-flex align-items-center gap-2">
+                <label for="versionSelector" class="form-label mb-0 text-nowrap">Version</label>
+                <select asp-for="SelectedVersionId" asp-items="@Model.FormVersions" id="versionSelector" class="form-select form-select-sm"></select>
+            </div>
         </div>
     </div>
 
@@ -183,45 +170,43 @@
             <div class="filter-search-action-bar_search-wrapper">
                 <input type="search" id="search-report-config" placeholder="Search" class="tbl-search">
             </div>
-            @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
-            {
-                <div id="reportConfigDynamicButtons" class="dynamic-buttons-div button-gap-1">
-                    <abp-button id="btn-generate-unique-column-names"
-                                text="Column Helper"
-                                icon-type="Other"
-                                icon="fl fl-font"
-                                data-bs-toggle="tooltip"
-                                data-bs-placement="top"
-                                data-bs-original-title="Generate unique column names for all fields with duplicate names"
-                                class="btn unt-btn-outline-primary btn-outline-primary"></abp-button>
+            <div class="d-flex align-items-center gap-2">
+                <div id="div-duplicate-keys-warning"
+                     class="duplicate-keys-warning report-config-btn-height-fix d-flex align-items-center @(Model.HasDuplicateKeys ? "" : "duplicate-keys-div-hidden")"
+                     data-bs-toggle="tooltip"
+                     data-bs-placement="top"
+                     data-bs-original-title="There are duplicate keys detected and catered for, this may affect the view generation and resulting data">
+                    <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
+                    <small class="text-warning">
+                        <strong>Warning</strong>
+                    </small>
+                </div>
 
-                    <fieldset class="btn-group">
-                        <button type="button"
-                                class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle"
-                                data-bs-toggle="dropdown"
-                                aria-expanded="false">
-                            <i class="fl fl-code me-1"></i> JSON Mapping
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a class="dropdown-item" href="#" id="btn-export-json-mapping">
-                                    <i class="fl fl-arrow-export me-2"></i> Export
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="#" id="btn-import-json-mapping">
-                                    <i class="fl fl-arrow-import me-2"></i> Import
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="#" id="btn-edit-json-mapping">
-                                    <i class="fl fl-code me-2"></i> Edit JSON
-                                </a>
-                            </li>
-                        </ul>
-                    </fieldset>
+                <div id="div-dynamic-columns-warning"
+                     class="dynamic-columns-warning report-config-btn-height-fix d-flex align-items-center dynamic-columns-div-hidden"
+                     data-bs-toggle="tooltip"
+                     data-bs-placement="top"
+                     data-bs-original-title="A DataGrid has dynamic columns but no matching field mapping was found in the form submission schema. Map the worksheet DataGrid to a CHEFS form field to resolve the individual columns.">
+                    <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
+                    <small class="text-warning">
+                        <strong>Unmapped DataGrid</strong>
+                    </small>
                 </div>
-            }
+
+                @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
+                {
+                    <div id="reportConfigDynamicButtons" class="dynamic-buttons-div button-gap-1">
+                        <abp-button id="btn-generate-unique-column-names"
+                                    text="Column Helper"
+                                    icon-type="Other"
+                                    icon="fl fl-font"
+                                    data-bs-toggle="tooltip"
+                                    data-bs-placement="top"
+                                    data-bs-original-title="Generate unique column names for all fields with duplicate names"
+                                    class="btn unt-btn-outline-primary btn-outline-primary"></abp-button>
+                    </div>
+                }
+            </div>
         </div>
 
         <!-- Table Container -->
@@ -242,7 +227,6 @@
             <div class="modal-body">
                 <form id="generateViewForm">
                     <div class="mb-3">
-                        <label for="viewNameInput" class="form-label">View Name</label>
                         <input type="text" class="form-control" id="viewNameInput" placeholder="Enter view name" required>
                         <div class="invalid-feedback" id="viewNameFeedback"></div>
                         <div class="form-text">
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
index d130b52d4c..2fd292f5c2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
@@ -8,12 +8,13 @@
     margin-bottom: 0.5rem;
 }
 
-    .provider-toggle-section .btn-group {
+
+    .provider-toggle-group {
         display: flex;
         justify-content: flex-start;
     }
 
-        .provider-toggle-section .btn-group .btn {
+        .provider-toggle-group .btn {
             flex: none;
             min-width: 100px;
             padding: 0.375rem 0.75rem;
@@ -21,20 +22,20 @@
             transition: all 0.15s ease-in-out;
         }
 
-    .provider-toggle-section .btn-check:checked + .btn {
-        background-color: #0d6efd;
-        border-color: #0d6efd;
+    .provider-toggle-group .btn-check:checked + .btn {
+        background-color: #255A90;
+        border-color: #255A90;
         color: #fff;
     }
 
-    .provider-toggle-section .btn-outline-primary {
-        color: #0d6efd;
-        border-color: #0d6efd;
+    .provider-toggle-group .btn-outline-primary {
+        color: #255A90;
+        border-color: #255A90;
     }
 
-        .provider-toggle-section .btn-outline-primary:hover {
-            background-color: #0d6efd;
-            border-color: #0d6efd;
+        .provider-toggle-group .btn-outline-primary:hover {
+            background-color: #5595D9;
+            border-color: #3470B1;
             color: #fff;
         }
 
@@ -190,113 +191,75 @@
     display: none !important;
 }
 
-/* Duplicate Keys Warning Styling */
-.duplicate-keys-warning {
-    max-width: 220px;
-    word-wrap: break-word;
-    padding: 0.375rem 0.75rem;
-    background-color: #fff3cd;
-    border: 1px solid #ffeaa7;
-    border-radius: 0.375rem;
-    cursor: help;
-    transition: background-color 0.15s ease-in-out;
-}
-
-    .duplicate-keys-warning:hover {
-        background-color: #ffecb5;
-    }
-
-    .duplicate-keys-warning small {
-        line-height: 1.3;
-        font-size: 0.8rem;
-    }
-
-    .duplicate-keys-warning i {
-        flex-shrink: 0;
-        font-size: 1.1em;
-        margin-top: 0.1rem;
-    }
-
-/* Responsive adjustments for warning */
-@media (max-width: 768px) {
-    .duplicate-keys-warning {
-        max-width: 180px;
-        padding: 0.25rem 0.5rem;
-    }
-
-        .duplicate-keys-warning small {
-            font-size: 0.75rem;
-        }
-
-        .duplicate-keys-warning i {
-            font-size: 1em;
-        }
-}
-
-@media (max-width: 576px) {
-    .duplicate-keys-warning {
-        max-width: 150px;
-    }
-
-        .duplicate-keys-warning small {
-            font-size: 0.7rem;
-            line-height: 1.2;
-        }
-}
-
 /* Hidden dynamic columns warning block */
 .dynamic-columns-div-hidden {
     display: none !important;
 }
 
-/* Dynamic Columns Warning Styling */
+/* Warning block shared styling */
+.duplicate-keys-warning,
 .dynamic-columns-warning {
     max-width: 220px;
     word-wrap: break-word;
     padding: 0.375rem 0.75rem;
-    background-color: #d1ecf1;
-    border: 1px solid #bee5eb;
+    background-color: #ff9f38;
+    border: 1px solid #e08800;
     border-radius: 0.375rem;
+    color: #fff;
     cursor: help;
     transition: background-color 0.15s ease-in-out;
 }
 
+    .duplicate-keys-warning:hover,
     .dynamic-columns-warning:hover {
-        background-color: #c1e2e9;
+        background-color: #e88a20;
+    }
+
+    .duplicate-keys-warning small,
+    .dynamic-columns-warning small,
+    .duplicate-keys-warning i,
+    .dynamic-columns-warning i {
+        color: #fff !important;
     }
 
+    .duplicate-keys-warning small,
     .dynamic-columns-warning small {
         line-height: 1.3;
         font-size: 0.8rem;
     }
 
+    .duplicate-keys-warning i,
     .dynamic-columns-warning i {
         flex-shrink: 0;
         font-size: 1.1em;
         margin-top: 0.1rem;
     }
 
-/* Responsive adjustments for dynamic columns warning */
 @media (max-width: 768px) {
+    .duplicate-keys-warning,
     .dynamic-columns-warning {
         max-width: 180px;
         padding: 0.25rem 0.5rem;
     }
 
+        .duplicate-keys-warning small,
         .dynamic-columns-warning small {
             font-size: 0.75rem;
         }
 
+        .duplicate-keys-warning i,
         .dynamic-columns-warning i {
             font-size: 1em;
         }
 }
 
 @media (max-width: 576px) {
+    .duplicate-keys-warning,
     .dynamic-columns-warning {
         max-width: 150px;
     }
 
+        .duplicate-keys-warning small,
         .dynamic-columns-warning small {
             font-size: 0.7rem;
             line-height: 1.2;
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index 4729ee494e..eeb93e5b4d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -43,9 +43,9 @@ $(function () {
                 typePath: 'Type Path'
             }
         },
-        worksheetconsolidated: {
+        worksheet_consolidated: {
             name: 'Consolidated Worksheets',
-            correlationProvider: 'worksheetconsolidated',
+            correlationProvider: 'worksheet_consolidated',
             columns: {
                 label: 'Worksheet Label',
                 key: 'Worksheet Property Name',
@@ -55,9 +55,9 @@ $(function () {
                 typePath: 'Type Path'
             }
         },
-        formversionconsolidated: {
+        formversion_consolidated: {
             name: 'Consolidated Submissions',
-            correlationProvider: 'formversionconsolidated',
+            correlationProvider: 'formversion_consolidated',
             columns: {
                 label: 'CHEFS Label',
                 key: 'CHEFS Property Name',
@@ -186,7 +186,7 @@ $(function () {
 
     // Function to get current correlation ID based on provider
     function getCurrentCorrelationId() {
-        if (currentProvider === 'scoresheet' || currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
+        if (currentProvider === 'scoresheet' || currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated') {
             // Form-level providers use the form ID as correlation ID
             return $('#reportingFormId').val();
         } else {
@@ -198,112 +198,93 @@ $(function () {
     // Function to show/hide version selector based on provider
     function updateVersionSelectorVisibility() {
         const $versionSelectorContainer = $('#version-selector-container');
-        const $formInfoDisplay = $('.form-info-display');
         const $worksheetModeToggle = $('#worksheet-mode-toggle');
         const $submissionsModeToggle = $('#submissions-mode-toggle');
 
         if (currentProvider === 'scoresheet') {
             $versionSelectorContainer.hide();
-            $formInfoDisplay.hide();
             $worksheetModeToggle.hide();
             $submissionsModeToggle.hide();
-        } else if (currentProvider === 'worksheetconsolidated') {
+        } else if (currentProvider === 'worksheet_consolidated') {
             $versionSelectorContainer.hide();
-            $formInfoDisplay.show();
             $worksheetModeToggle.show();
             $submissionsModeToggle.hide();
         } else if (currentProvider === 'worksheet') {
             $versionSelectorContainer.show();
-            $formInfoDisplay.hide();
             $worksheetModeToggle.show();
             $submissionsModeToggle.hide();
-        } else if (currentProvider === 'formversionconsolidated') {
+        } else if (currentProvider === 'formversion_consolidated') {
             $versionSelectorContainer.hide();
-            $formInfoDisplay.show();
             $worksheetModeToggle.hide();
             $submissionsModeToggle.show();
         } else {
             // formversion (per-version)
             $versionSelectorContainer.show();
-            $formInfoDisplay.hide();
             $worksheetModeToggle.hide();
             $submissionsModeToggle.show();
         }
     }
 
-    // Function to handle provider change
-    function handleProviderChange(newProvider) {
-        if (newProvider === currentProvider) {
-            return; // No change needed
-        }
+    function getTopLevelProviderValue(provider) {
+        if (provider === 'worksheet_consolidated') return 'worksheet';
+        if (provider === 'formversion_consolidated') return 'formversion';
+        return provider;
+    }
 
-        // Check for unsaved changes
-        if (hasUnsavedChanges) {
-            if (!confirm('You have unsaved changes. Switching providers will discard these changes. Do you want to continue?')) {
-                // Reset the top-level toggle
-                const topLevelValue = (currentProvider === 'worksheetconsolidated') ? 'worksheet'
-                    : (currentProvider === 'formversionconsolidated') ? 'formversion'
-                    : currentProvider;
-                $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
-                // Reset sub-toggles to match current provider
-                if (currentProvider === 'worksheet' || currentProvider === 'worksheetconsolidated') {
-                    $(`input[name="worksheet-mode"][value="${currentProvider}"]`).prop('checked', true);
-                }
-                if (currentProvider === 'formversion' || currentProvider === 'formversionconsolidated') {
-                    $(`input[name="submissions-mode"][value="${currentProvider}"]`).prop('checked', true);
-                }
-                return;
-            }
+    function resetTogglesToCurrentProvider() {
+        const topLevelValue = getTopLevelProviderValue(currentProvider);
+        $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
+        if (currentProvider === 'worksheet' || currentProvider === 'worksheet_consolidated') {
+            $(`input[name="worksheet-mode"][value="${currentProvider}"]`).prop('checked', true);
         }
+        if (currentProvider === 'formversion' || currentProvider === 'formversion_consolidated') {
+            $(`input[name="submissions-mode"][value="${currentProvider}"]`).prop('checked', true);
+        }
+    }
 
-        // Update current provider
-        currentProvider = newProvider;
-
-        // Sync worksheet sub-toggle radio
-        if (newProvider === 'worksheet' || newProvider === 'worksheetconsolidated') {
+    function syncTogglesToProvider(newProvider) {
+        const topLevelValue = getTopLevelProviderValue(newProvider);
+        $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
+        if (newProvider === 'worksheet' || newProvider === 'worksheet_consolidated') {
             $(`input[name="worksheet-mode"][value="${newProvider}"]`).prop('checked', true);
         }
-
-        // Sync submissions sub-toggle radio
-        if (newProvider === 'formversion' || newProvider === 'formversionconsolidated') {
+        if (newProvider === 'formversion' || newProvider === 'formversion_consolidated') {
             $(`input[name="submissions-mode"][value="${newProvider}"]`).prop('checked', true);
         }
+    }
 
-        // Keep top-level "Worksheets" button checked when switching to consolidated worksheet
-        if (newProvider === 'worksheetconsolidated') {
-            $('input[name="provider-toggle"][value="worksheet"]').prop('checked', true);
-        }
+    function refreshConfigurationState(correlationId) {
+        checkConfigurationExists(correlationId, function (exists) {
+            updateGenerateViewButtonVisibility(exists);
+            updateDeleteButtonVisibility(exists);
+        });
+        refreshViewStatusWidget(correlationId, getCorrelationProvider());
+    }
 
-        // Keep top-level "Submissions" button checked when switching to consolidated formversion
-        if (newProvider === 'formversionconsolidated') {
-            $('input[name="provider-toggle"][value="formversion"]').prop('checked', true);
+    // Function to handle provider change
+    function handleProviderChange(newProvider) {
+        if (newProvider === currentProvider) return;
+
+        if (hasUnsavedChanges && !confirm('You have unsaved changes. Switching providers will discard these changes. Do you want to continue?')) {
+            resetTogglesToCurrentProvider();
+            return;
         }
 
-        // Update version selector, form info, and sub-toggle visibility
+        currentProvider = newProvider;
+        syncTogglesToProvider(newProvider);
         updateVersionSelectorVisibility();
-
-        // Reset changes state since we're switching providers
         resetChangesState();
-
-        // Update column headers in the DataTable
+        $('#reportingViewStatus').val('');
         updateDataTableColumnHeaders();
 
-        // Check if configuration exists for the new provider and update button visibility
         const correlationId = getCurrentCorrelationId();
         if (correlationId) {
-            checkConfigurationExists(correlationId, function (exists) {
-                updateGenerateViewButtonVisibility(exists);
-                updateDeleteButtonVisibility(exists);
-            });
-
-            // Refresh the view status widget for the new provider
-            refreshViewStatusWidget(correlationId, getCorrelationProvider());
+            refreshConfigurationState(correlationId);
         } else {
             updateGenerateViewButtonVisibility(false);
             updateDeleteButtonVisibility(false);
         }
 
-        // Reload the DataTable with new provider
         if (dataTable) {
             dataTable.ajax.reload();
         }
@@ -332,7 +313,7 @@ $(function () {
         });
 
         // Show the Version(s) column only for consolidated providers
-        dataTable.column('versionLabel:name').visible(currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated');
+        dataTable.column('versionLabel:name').visible(currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated');
 
         // Force redraw to update headers
         dataTable.draw(false);
@@ -342,12 +323,12 @@ $(function () {
     $(document).on('change', 'input[name="provider-toggle"]', function () {
         let newProvider = $(this).val();
         // When entering worksheet mode from outside, default to consolidated worksheet
-        if (newProvider === 'worksheet' && currentProvider !== 'worksheet' && currentProvider !== 'worksheetconsolidated') {
-            newProvider = 'worksheetconsolidated';
+        if (newProvider === 'worksheet' && currentProvider !== 'worksheet' && currentProvider !== 'worksheet_consolidated') {
+            newProvider = 'worksheet_consolidated';
         }
         // When entering submissions mode from outside, default to consolidated formversion
-        if (newProvider === 'formversion' && currentProvider !== 'formversion' && currentProvider !== 'formversionconsolidated') {
-            newProvider = 'formversionconsolidated';
+        if (newProvider === 'formversion' && currentProvider !== 'formversion' && currentProvider !== 'formversion_consolidated') {
+            newProvider = 'formversion_consolidated';
         }
         handleProviderChange(newProvider);
     });
@@ -487,7 +468,7 @@ $(function () {
     // Handle version selector change (only for per-version providers)
     $('#versionSelector').on('change', function () {
         // Skip version selector handling for form-level providers
-        if (currentProvider === 'scoresheet' || currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
+        if (currentProvider === 'scoresheet' || currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated') {
             return;
         }
 
@@ -512,6 +493,9 @@ $(function () {
 
         // Reset changes state since we're loading new data
         resetChangesState();
+
+        // Clear cached view status — the widget will reflect the real state after refresh
+        $('#reportingViewStatus').val('');
     });
 
     // Function to check if configuration exists
@@ -575,7 +559,7 @@ $(function () {
     //   - worksheet/scoresheet: use Label only, no fallback to Key
     // No cross-field fallback ensures the client and server produce identical defaults.
     function getDefaultColumnNameSource(field) {
-        if (currentProvider === 'formversion' || currentProvider === 'formversionconsolidated') {
+        if (currentProvider === 'formversion' || currentProvider === 'formversion_consolidated') {
             return field.key || '';
         }
         return field.label || '';
@@ -732,7 +716,7 @@ $(function () {
                 width: '90px',
                 index: 6,
                 orderable: true,
-                visible: currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated',
+                visible: currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated',
                 render: function (data, type, _) {
                     if (type === 'display') {
                         return data || 'All';
@@ -788,7 +772,7 @@ $(function () {
         };
 
         const defaultVisibleColumns = ['label', 'key', 'type', 'path', 'columnName'];
-        if (currentProvider === 'worksheetconsolidated' || currentProvider === 'formversionconsolidated') {
+        if (currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated') {
             defaultVisibleColumns.push('versionLabel');
         }
 
@@ -2246,7 +2230,7 @@ $(function () {
     });
 
     // Add intersection observer for visibility detection (fallback)
-    if (window.IntersectionObserver) {
+    if (globalThis.IntersectionObserver) {
         const observer = new IntersectionObserver((entries) => {
             entries.forEach(entry => {
                 if (entry.isIntersecting && entry.target.id === 'nav-reporting-configuration') {
@@ -2264,7 +2248,7 @@ $(function () {
     }
 
     // Additional fallback: MutationObserver to detect class changes on the tab panel
-    if (window.MutationObserver) {
+    if (globalThis.MutationObserver) {
         const tabObserver = new MutationObserver((mutations) => {
             mutations.forEach((mutation) => {
                 if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
index 3bff95b27d..5849c2e96c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
@@ -49,7 +49,7 @@ public ReportingConfigurationViewComponent(
         /// <returns>A view component result containing the configuration interface with populated view model and provider-specific settings.</returns>
         public async Task<IViewComponentResult> InvokeAsync(Guid formId, Guid? selectedVersionId = null, string? provider = null)
         {
-            // Determine the correlation provider - default to formversionconsolidated if not specified
+            // Determine the correlation provider - default to formversion_consolidated if not specified
             var correlationProvider = !string.IsNullOrEmpty(provider) ? provider : Providers.FormVersionConsolidated;
 
             // Determine correlation ID based on provider
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/Default.cshtml
index e32fb0f606..de5d27d1fe 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/Default.cshtml
@@ -48,7 +48,7 @@
 
     <div class="view-status-compact d-flex align-items-center" style="gap: 8px; margin-right: 10px; @(Model.HasMapping ? "" : "display: none;")">
 
-        <span>View Name: </span><span class="view-name-text">@Model.ViewName</span>
+        <span class="view-name-text">@Model.ViewName</span>
 
         @if (!string.IsNullOrEmpty(statusIcon))
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
index 3a0ebe5551..11ba61e8ea 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
@@ -8,10 +8,10 @@ DECLARE
     data_clause TEXT;
     report_map_id UUID;
 BEGIN
-    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for formversionconsolidated provider
+    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for formversion_consolidated provider
     SELECT "Id", "ViewName", "Mapping"::JSONB INTO report_map_id, view_name, mapping_data
     FROM "Reporting"."ReportColumnsMaps"
-    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'formversionconsolidated';
+    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'formversion_consolidated';
 
     -- Check if we found the mapping
     IF mapping_data IS NULL OR report_map_id IS NULL THEN
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
index ffe6f51d93..06db9c8738 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
@@ -8,10 +8,10 @@ DECLARE
     data_clause TEXT;
     report_map_id UUID;
 BEGIN
-    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for worksheetconsolidated provider
+    -- Fetch the view name, mapping data, and ID from ReportColumnsMap for worksheet_consolidated provider
     SELECT "Id", "ViewName", "Mapping"::JSONB INTO report_map_id, view_name, mapping_data
     FROM "Reporting"."ReportColumnsMaps"
-    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'worksheetconsolidated';
+    WHERE "CorrelationId" = form_id AND "CorrelationProvider" = 'worksheet_consolidated';
 
     -- Check if we found the mapping
     IF mapping_data IS NULL OR report_map_id IS NULL THEN
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
index 75d07e6b80..910253dc30 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
@@ -130,8 +130,10 @@ BEGIN
                 property_name := row_data->>'PropertyName';
                 data_path_raw := row_data->>'DataPath';
 
-                -- Version gating: skip columns that belong to a different version
-                IF (row_data->>'VersionLabel') IS NOT NULL AND (row_data->>'VersionLabel') != version_lbl THEN
+                -- Version gating: skip columns that don't include this version
+                -- VersionLabel is null (All), a single version ("v1"), or comma-separated ("v1, v2")
+                IF (row_data->>'VersionLabel') IS NOT NULL
+                   AND NOT (version_lbl = ANY(string_to_array(row_data->>'VersionLabel', ', '))) THEN
                     CONTINUE; -- Leave as typed NULL placeholder
                 END IF;
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql
index ca0b9540d2..cc1fcc39cc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_worksheet_data.sql
@@ -104,7 +104,7 @@ BEGIN
                         -- This column belongs to this worksheet-datagrid AND this version (or is merged)
                         WHEN um.worksheet_name = udc.worksheet_name
                           AND um.datagrid_name = udc.datagrid_name
-                          AND (um.version_label IS NULL OR um.version_label = vi.version_label) THEN
+                          AND (um.version_label IS NULL OR vi.version_label = ANY(string_to_array(um.version_label, ', '))) THEN
                             CASE um.column_type
                                 WHEN 'currency' THEN
                                     format('(CASE WHEN ((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)) IS NULL THEN NULL WHEN replace(btrim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)), '','', '''') ~ ''^-?[0-9]+\.?[0-9]*$'' THEN replace(btrim((SELECT cell_elem->>''value'' FROM jsonb_array_elements(dg_tbl.dg_data->''cells'') AS cell_elem WHERE cell_elem->>''key'' = %L)), '','', '''')::DECIMAL(18,2) ELSE NULL END) AS %I',
@@ -187,7 +187,7 @@ BEGIN
                         -- This column belongs to this worksheet root AND this version (or is merged)
                         WHEN um.worksheet_name = uwn.worksheet_name
                           AND (um.type_path NOT LIKE '%datagrid%' OR um.type_path IS NULL)
-                          AND (um.version_label IS NULL OR um.version_label = vi.version_label) THEN
+                          AND (um.version_label IS NULL OR vi.version_label = ANY(string_to_array(um.version_label, ', '))) THEN
                             CASE um.column_type
                                 WHEN 'currency' THEN
                                     format('(CASE WHEN ((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)) IS NULL THEN NULL WHEN replace(btrim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)), '','', '''') ~ ''^-?[0-9]+\.?[0-9]*$'' THEN replace(btrim((SELECT v_elem->>''value'' FROM jsonb_array_elements(wi."CurrentValue"->''values'') AS v_elem WHERE v_elem->>''key'' = %L)), '','', '''')::DECIMAL(18,2) ELSE NULL END) AS %I',

From ce48de5bcf828d05313e673d7896d281a8e23b3c Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 22 May 2026 09:27:31 -0700
Subject: [PATCH 03/14] AB#32881 reduce cognitive complexity

---
 .../ReportingConfiguration/Default.js         | 131 ++++++------------
 1 file changed, 43 insertions(+), 88 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index eeb93e5b4d..5e8e3ecff5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -1239,10 +1239,9 @@ $(function () {
         return ($('#reportingDescription').val() || '').trim();
     }
 
-    function setDescription(value) {
-        const text = value || '';
-        $('#reportingDescription').val(text);
-        $('#descriptionCharCount').text(text.length + ' / 500');
+    function setDescription(value = '') {
+        $('#reportingDescription').val(value);
+        $('#descriptionCharCount').text(value.length + ' / 500');
     }
 
     // Description character counter (live update inside modal)
@@ -1553,10 +1552,10 @@ $(function () {
                     correlationProvider: getCorrelationProvider()
                 }
             }).done(function (isAvailable) {
-                if (!isAvailable) {
-                    callback(false, ['View name is already in use by another reporting configuration']);
-                } else {
+                if (isAvailable) {
                     callback(true, []);
+                } else {
+                    callback(false, ['View name is already in use by another reporting configuration']);
                 }
             }).fail(function (error) {
                 callback(false, ['Error checking view name availability']);
@@ -1697,52 +1696,7 @@ $(function () {
                 console.error('Error generating view - Error:', error);
                 console.error('Error generating view - XHR:', xhr);
 
-                let errorMessage = 'Failed to generate database view';
-
-                // Handle different error scenarios
-                if (xhr.status === 0) {
-                    errorMessage = 'Network error: Could not connect to the server';
-                } else if (xhr.status === 400) {
-                    // Try to extract detailed error message from response
-                    try {
-                        const errorResponse = JSON.parse(xhr.responseText);
-                        if (errorResponse?.error?.message) {
-                            errorMessage = errorResponse?.error?.message;
-                        } else if (typeof errorResponse === 'string') {
-                            errorMessage = errorResponse;
-                        } else {
-                            errorMessage = 'Bad request: Please check your input and try again';
-                        }
-                    } catch (parseError) {
-                        console.error(parseError);
-                        errorMessage = xhr.responseText || 'Bad request: Please check your input and try again';
-                    }
-                } else if (xhr.status === 401) {
-                    errorMessage = 'Unauthorized: Please log in and try again';
-                } else if (xhr.status === 403) {
-                    errorMessage = 'Forbidden: You do not have permission to perform this action';
-                } else if (xhr.status === 404) {
-                    errorMessage = 'Configuration not found: Please ensure the configuration exists and try again';
-                } else if (xhr.status === 500) {
-                    errorMessage = 'Server error: Please try again later or contact support';
-                } else if (xhr.responseText) {
-                    try {
-                        const parsedError = JSON.parse(xhr.responseText);
-                        if (parsedError?.error?.message) {
-                            errorMessage = parsedError?.error?.message;
-                        } else if (parsedError?.message) {
-                            errorMessage = parsedError?.message;
-                        } else {
-                            errorMessage = xhr.responseText;
-                        }
-                    } catch (parseError) {
-                        console.error('Failed to parse error response:', parseError);
-                        errorMessage = xhr.responseText;
-                    }
-                } else if (error && error !== 'parsererror') {
-                    errorMessage = error;
-                }
-
+                const errorMessage = getViewGenerationErrorMessage(xhr, error);
                 abp.message.error(errorMessage);
             },
             complete: function () {
@@ -1863,41 +1817,7 @@ $(function () {
             modal.hide();
 
         }).fail(function (xhr, status, error) {
-            let errorMessage = 'Failed to delete configuration';
-
-            // Handle different error scenarios
-            if (xhr.status === 0) {
-                errorMessage = 'Network error: Could not connect to the server';
-            } else if (xhr.status === 400) {
-                const errorResponse = JSON.parse(xhr.responseText);
-                if (errorResponse?.error?.message) {
-                    errorMessage = errorResponse?.error?.message;
-                } else if (typeof errorResponse === 'string') {
-                    errorMessage = errorResponse;
-                } else {
-                    errorMessage = 'Bad request: Please check your input and try again';
-                }
-            } else if (xhr.status === 401) {
-                errorMessage = 'Unauthorized: Please log in and try again';
-            } else if (xhr.status === 403) {
-                errorMessage = 'Forbidden: You do not have permission to perform this action';
-            } else if (xhr.status === 404) {
-                errorMessage = 'Configuration not found: The configuration may have already been deleted';
-            } else if (xhr.status === 500) {
-                errorMessage = 'Server error: Please try again later or contact support';
-            } else if (xhr.responseText) {
-                const parsedError = JSON.parse(xhr.responseText);
-                if (parsedError?.error?.message) {
-                    errorMessage = parsedError?.error?.message;
-                } else if (parsedError?.message) {
-                    errorMessage = parsedError?.message;
-                } else {
-                    errorMessage = xhr.responseText;
-                }
-            } else if (error && error !== 'parsererror') {
-                errorMessage = error;
-            }
-
+            const errorMessage = getDeleteErrorMessage(xhr, error);
             abp.message.error(errorMessage);
         }).always(function () {
             // Reset modal button states
@@ -1909,6 +1829,41 @@ $(function () {
         });
     });
 
+    // Extract error handling logic to reduce cognitive complexity
+    function getDeleteErrorMessage(xhr, error) {
+        if (xhr.status === 0) {
+            return 'Network error: Could not connect to the server';
+        }
+        
+        if (xhr.status === 400) {
+            const errorResponse = JSON.parse(xhr.responseText);
+            return errorResponse?.error?.message || (typeof errorResponse === 'string' ? errorResponse : 'Bad request: Please check your input and try again');
+        }
+        
+        if (xhr.status === 401) {
+            return 'Unauthorized: Please log in and try again';
+        }
+        
+        if (xhr.status === 403) {
+            return 'Forbidden: You do not have permission to perform this action';
+        }
+        
+        if (xhr.status === 404) {
+            return 'Configuration not found: The configuration may have already been deleted';
+        }
+        
+        if (xhr.status === 500) {
+            return 'Server error: Please try again later or contact support';
+        }
+        
+        if (xhr.responseText) {
+            const parsedError = JSON.parse(xhr.responseText);
+            return parsedError?.error?.message || parsedError?.message || xhr.responseText;
+        }
+        
+        return (error && error !== 'parsererror') ? error : 'Failed to delete configuration';
+    }
+
     // Update the function to handle both generate and delete button visibility
     // This function was modified earlier to support both buttons
     function updateButtonsVisibility(hasConfiguration) {

From d70b683d80f398f96af8f3851b99a8141eac6e6c Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Mon, 25 May 2026 13:06:13 -0700
Subject: [PATCH 04/14] AB#32881 update version handling duplicate keys

---
 .../ConsolidatedWorksheetFieldsProvider.cs    |  7 ++-
 .../WorksheetFieldsProvider.cs                |  4 ++
 .../FieldsProviders/WorksheetFieldsUtils.cs   | 53 +++++++++++++++++++
 .../ReportingConfiguration/Default.cshtml     |  2 +-
 .../ReportingConfiguration/Default.js         | 47 ++++++++++++++--
 .../ReportingConfigurationViewComponent.cs    | 30 ++++++++---
 6 files changed, 130 insertions(+), 13 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsUtils.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
index 329f24fa1e..5aa0d21392 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
@@ -61,7 +61,12 @@ public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid formId)
                     metadataInfo[$"ws_{version.Id}_{link.WorksheetId}"] = $"{worksheetTitle} ({worksheetName})";
                 }
 
-                versionsWithFields.Add((version.Id, versionLabel, [.. allComponents]));
+                // Stamp within-version duplicate DataPaths with (DK1), (DK2), … before merging,
+                // so MergeFields() treats them as distinct paths and preserves both rather than
+                // silently dropping the second occurrence.
+                var versionComponents = allComponents.ToArray();
+                WorksheetFieldsUtils.UniqueifyDataPaths(versionComponents);
+                versionsWithFields.Add((version.Id, versionLabel, versionComponents));
                 metadataInfo[$"formversion_{version.Id}"] = versionLabel;
             }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsProvider.cs
index b609850c8e..4e984e35a7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsProvider.cs
@@ -51,6 +51,10 @@ public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid correlationId
                 .Where(x => x != null)
                 .Select(x => x!)];
 
+            // Mirror submission behaviour: stamp within-version duplicate DataPaths with (DK1), (DK2), …
+            // so that each row is distinguishable and the Duplicate Keys warning is triggered.
+            WorksheetFieldsUtils.UniqueifyDataPaths(convertedMetadata);
+
             return new FieldPathMetaMapDto() { Fields = convertedMetadata, Metadata = mapMetadata };
         }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsUtils.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsUtils.cs
new file mode 100644
index 0000000000..e15431de24
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/WorksheetFieldsUtils.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using System.Linq;
+using Unity.Reporting.Domain.Configuration;
+
+namespace Unity.Reporting.Configuration.FieldsProviders
+{
+    /// <summary>
+    /// Shared utilities for worksheet fields providers.
+    /// </summary>
+    internal static class WorksheetFieldsUtils
+    {
+        /// <summary>
+        /// Prefixes duplicate DataPaths with (DK1), (DK2), … on both <see cref="FieldPathTypeDto.Path"/>
+        /// and <see cref="FieldPathTypeDto.DataPath"/>, mirroring the behaviour of
+        /// <c>FormMetadataService.UniqueifyPaths()</c> for worksheet fields.
+        /// <para>
+        /// Unlike the submissions path (where DataPath is derived from Path after uniqueification),
+        /// worksheet DataPaths are constructed independently in the schema parser, so both properties
+        /// must be prefixed here.
+        /// </para>
+        /// Mutates the array in place.
+        /// </summary>
+        /// <returns><c>true</c> if any duplicates were found and prefixed, otherwise <c>false</c>.</returns>
+        internal static bool UniqueifyDataPaths(FieldPathTypeDto[] fields)
+        {
+            // Identify which DataPath values appear more than once
+            var duplicatePaths = fields
+                .Where(f => !string.IsNullOrEmpty(f.DataPath))
+                .GroupBy(f => f.DataPath, System.StringComparer.OrdinalIgnoreCase)
+                .Where(g => g.Count() > 1)
+                .Select(g => g.Key)
+                .ToHashSet(System.StringComparer.OrdinalIgnoreCase);
+
+            if (duplicatePaths.Count == 0) return false;
+
+            var counters = new Dictionary<string, int>(System.StringComparer.OrdinalIgnoreCase);
+
+            foreach (var field in fields)
+            {
+                if (string.IsNullOrEmpty(field.DataPath) || !duplicatePaths.Contains(field.DataPath))
+                    continue;
+
+                counters[field.DataPath] = counters.GetValueOrDefault(field.DataPath, 0) + 1;
+                int n = counters[field.DataPath];
+
+                field.Path = $"(DK{n}){field.Path}";
+                field.DataPath = $"(DK{n}){field.DataPath}";
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index 6bb5f5967b..73ca2a06fa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -178,7 +178,7 @@
                      data-bs-original-title="There are duplicate keys detected and catered for, this may affect the view generation and resulting data">
                     <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
                     <small class="text-warning">
-                        <strong>Warning</strong>
+                        <strong>Duplicate Keys</strong>
                     </small>
                 </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index 5e8e3ecff5..9724fe80dc 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -365,12 +365,31 @@ $(function () {
         }
     }
 
-    // Function to check for duplicate keys in current table data
+    // Function to check for duplicate keys in current table data.
+    // Covers two cases:
+    //   1. Auto-generated (DKx) prefix markers added by the server when CHEFS fields share a key.
+    //   2. Literal path duplicates — two rows with the exact same DataPath value (e.g. same
+    //      worksheet field appearing twice from different version sync artefacts).
     function checkForDuplicateKeysInTable() {
         if (!dataTable) return false;
 
-        return dataTable.rows().data().toArray().some(function (data) {
+        const rows = dataTable.rows().data().toArray();
+
+        // Case 1: (DKx) prefix present on any row
+        if (rows.some(function (data) {
             return hasDuplicateKeyPrefix(data.path) || hasDuplicateKeyPrefix(data.dataPath);
+        })) {
+            return true;
+        }
+
+        // Case 2: two or more rows share the exact same path value
+        const seenPaths = new Set();
+        return rows.some(function (data) {
+            const p = (data.dataPath || data.path || '').toLowerCase();
+            if (!p) return false;
+            if (seenPaths.has(p)) return true;
+            seenPaths.add(p);
+            return false;
         });
     }
 
@@ -519,12 +538,21 @@ $(function () {
         });
     }
 
+    // Holds a schema-change message that arrived while the reporting tab was not visible.
+    // Displayed the first time the user navigates to the reporting configuration tab.
+    let pendingDetectedChanges = null;
+
     // Helper function to process detected changes alert (module-level to reduce nesting)
     function processDetectedChanges(detectedChanges) {
         if (detectedChanges?.trim() !== '') {
-            setTimeout(function () {
-                displayDetectedChangesAlert(detectedChanges);
-            }, 100);
+            if (isReportingTabVisible()) {
+                setTimeout(function () {
+                    displayDetectedChangesAlert(detectedChanges);
+                }, 100);
+            } else {
+                // Store for display when the reporting configuration tab is opened
+                pendingDetectedChanges = detectedChanges;
+            }
         }
     }
 
@@ -2175,6 +2203,15 @@ $(function () {
     // Listen for Bootstrap tab shown event
     $('button[data-bs-target="#nav-reporting-configuration"]').on('shown.bs.tab', function (e) {
         handleTabVisibilityChange();
+
+        // Show any schema-change alert that was deferred because the tab was not yet visible
+        if (pendingDetectedChanges) {
+            const changes = pendingDetectedChanges;
+            pendingDetectedChanges = null;
+            setTimeout(function () {
+                displayDetectedChangesAlert(changes);
+            }, 100);
+        }
     });
 
     // Alternative: Listen for tab clicks
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
index 5849c2e96c..2543ae69a0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationViewComponent.cs
@@ -141,9 +141,19 @@ private static bool CheckForDuplicateKeys(IEnumerable<MapRowDto>? rows)
         {
             if (rows == null) return false;
 
-            return rows.Any(row =>
-                HasDuplicateKeyPrefix(row.Path) ||
-                HasDuplicateKeyPrefix(row.DataPath));
+            var rowList = rows.ToList();
+
+            // Check for auto-generated (DKx) prefix markers
+            if (rowList.Any(row => HasDuplicateKeyPrefix(row.Path) || HasDuplicateKeyPrefix(row.DataPath)))
+                return true;
+
+            // Check for literal path duplicates (two rows sharing the exact same DataPath/Path value)
+            var paths = rowList
+                .Select(row => row.DataPath ?? row.Path)
+                .Where(p => !string.IsNullOrEmpty(p))
+                .ToList();
+
+            return paths.Count != paths.Distinct(StringComparer.OrdinalIgnoreCase).Count();
         }
 
         /// <summary>
@@ -157,9 +167,17 @@ private static bool CheckForDuplicateKeys(FieldPathTypeDto[]? fields)
         {
             if (fields == null) return false;
 
-            return fields.Any(field =>
-                HasDuplicateKeyPrefix(field.Path) ||
-                HasDuplicateKeyPrefix(field.DataPath));
+            // Check for auto-generated (DKx) prefix markers
+            if (fields.Any(field => HasDuplicateKeyPrefix(field.Path) || HasDuplicateKeyPrefix(field.DataPath)))
+                return true;
+
+            // Check for literal path duplicates (two fields sharing the exact same DataPath/Path value)
+            var paths = fields
+                .Select(field => field.DataPath ?? field.Path)
+                .Where(p => !string.IsNullOrEmpty(p))
+                .ToList();
+
+            return paths.Count != paths.Distinct(StringComparer.OrdinalIgnoreCase).Count();
         }
 
         /// <summary>

From 75f4191b98b636994b1ca5d27fbf189f80ace5aa Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Mon, 25 May 2026 15:07:35 -0700
Subject: [PATCH 05/14] AB#32881 sonarQ cleanup

---
 .../ReportingConfiguration/Default.css        |  8 +-
 .../ReportingConfiguration/Default.js         | 90 +++++++++----------
 .../sonar-project.properties                  |  2 +-
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
index 2fd292f5c2..4b259b88c2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
@@ -34,8 +34,8 @@
     }
 
         .provider-toggle-group .btn-outline-primary:hover {
-            background-color: #5595D9;
-            border-color: #3470B1;
+            background-color: #3470B1;
+            border-color: #255A90;
             color: #fff;
         }
 
@@ -205,7 +205,7 @@
     background-color: #ff9f38;
     border: 1px solid #e08800;
     border-radius: 0.375rem;
-    color: #fff;
+    color: #212529;
     cursor: help;
     transition: background-color 0.15s ease-in-out;
 }
@@ -219,7 +219,7 @@
     .dynamic-columns-warning small,
     .duplicate-keys-warning i,
     .dynamic-columns-warning i {
-        color: #fff !important;
+        color: #212529 !important;
     }
 
     .duplicate-keys-warning small,
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index 9724fe80dc..dd783185b5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -225,14 +225,8 @@ $(function () {
         }
     }
 
-    function getTopLevelProviderValue(provider) {
-        if (provider === 'worksheet_consolidated') return 'worksheet';
-        if (provider === 'formversion_consolidated') return 'formversion';
-        return provider;
-    }
-
     function resetTogglesToCurrentProvider() {
-        const topLevelValue = getTopLevelProviderValue(currentProvider);
+        const topLevelValue = getWorksheetTopLevelProviderValue(currentProvider);
         $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
         if (currentProvider === 'worksheet' || currentProvider === 'worksheet_consolidated') {
             $(`input[name="worksheet-mode"][value="${currentProvider}"]`).prop('checked', true);
@@ -1845,7 +1839,7 @@ $(function () {
             modal.hide();
 
         }).fail(function (xhr, status, error) {
-            const errorMessage = getDeleteErrorMessage(xhr, error);
+            const errorMessage = getReportingDeleteErrorMessage(xhr, error);
             abp.message.error(errorMessage);
         }).always(function () {
             // Reset modal button states
@@ -1855,42 +1849,7 @@ $(function () {
             // Re-enable main control buttons
             setControlButtonsLoadingState(false);
         });
-    });
-
-    // Extract error handling logic to reduce cognitive complexity
-    function getDeleteErrorMessage(xhr, error) {
-        if (xhr.status === 0) {
-            return 'Network error: Could not connect to the server';
-        }
-        
-        if (xhr.status === 400) {
-            const errorResponse = JSON.parse(xhr.responseText);
-            return errorResponse?.error?.message || (typeof errorResponse === 'string' ? errorResponse : 'Bad request: Please check your input and try again');
-        }
-        
-        if (xhr.status === 401) {
-            return 'Unauthorized: Please log in and try again';
-        }
-        
-        if (xhr.status === 403) {
-            return 'Forbidden: You do not have permission to perform this action';
-        }
-        
-        if (xhr.status === 404) {
-            return 'Configuration not found: The configuration may have already been deleted';
-        }
-        
-        if (xhr.status === 500) {
-            return 'Server error: Please try again later or contact support';
-        }
-        
-        if (xhr.responseText) {
-            const parsedError = JSON.parse(xhr.responseText);
-            return parsedError?.error?.message || parsedError?.message || xhr.responseText;
-        }
-        
-        return (error && error !== 'parsererror') ? error : 'Failed to delete configuration';
-    }
+    });    
 
     // Update the function to handle both generate and delete button visibility
     // This function was modified earlier to support both buttons
@@ -2270,4 +2229,45 @@ $(function () {
             $('#reportingViewStatus').val(data.finalStatus);
         }
     });
-});
\ No newline at end of file
+});
+
+function getWorksheetTopLevelProviderValue(provider) {
+    if (provider === 'worksheet_consolidated') return 'worksheet';
+    if (provider === 'formversion_consolidated') return 'formversion';
+    return provider;
+}
+
+// Extract error handling logic to reduce cognitive complexity
+function getReportingDeleteErrorMessage(xhr, error) {
+    if (xhr.status === 0) {
+        return 'Network error: Could not connect to the server';
+    }
+    
+    if (xhr.status === 400) {
+        const errorResponse = JSON.parse(xhr.responseText);
+        return errorResponse?.error?.message || (typeof errorResponse === 'string' ? errorResponse : 'Bad request: Please check your input and try again');
+    }
+    
+    if (xhr.status === 401) {
+        return 'Unauthorized: Please log in and try again';
+    }
+    
+    if (xhr.status === 403) {
+        return 'Forbidden: You do not have permission to perform this action';
+    }
+    
+    if (xhr.status === 404) {
+        return 'Configuration not found: The configuration may have already been deleted';
+    }
+    
+    if (xhr.status === 500) {
+        return 'Server error: Please try again later or contact support';
+    }
+    
+    if (xhr.responseText) {
+        const parsedError = JSON.parse(xhr.responseText);
+        return parsedError?.error?.message || parsedError?.message || xhr.responseText;
+    }
+    
+    return (error && error !== 'parsererror') ? error : 'Failed to delete configuration';
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/sonar-project.properties b/applications/Unity.GrantManager/sonar-project.properties
index c241a4c4a4..ef578dfb60 100644
--- a/applications/Unity.GrantManager/sonar-project.properties
+++ b/applications/Unity.GrantManager/sonar-project.properties
@@ -16,7 +16,7 @@ sonar.tests=test
 sonar.qualitygate.wait=true
 
 # SonarQube Exclusions (from existing Azure configuration)
-sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,modules/Unity.Payments/src/Unity.Payments.Web/Pages/BatchPayments/Index.js,**/bin/**,**/obj/**,**/wwwroot/lib/**,**/*.Designer.cs,**/node_modules/**
+sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,modules/Unity.Payments/src/Unity.Payments.Web/Pages/BatchPayments/Index.js,src/Unity.GrantManager.EntityFrameworkCore/Scripts/**,**/bin/**,**/obj/**,**/wwwroot/lib/**,**/*.Designer.cs,**/node_modules/**
 
 # Test exclusions
 sonar.test.exclusions=**/bin/**,**/obj/**

From de77a56f7864ebb61dbacfb8a21646150b05d458 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Mon, 25 May 2026 15:24:37 -0700
Subject: [PATCH 06/14] AB#32881 copilot suggestions

---
 .../Shared/Components/ReportingConfiguration/Default.js  | 4 ++--
 .../Scripts/generate_consolidated_formversion_view.sql   | 3 +--
 .../Scripts/generate_consolidated_worksheet_view.sql     | 3 +--
 .../Scripts/get_consolidated_formversion_data.sql        | 9 +++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index dd783185b5..f47d10d44d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -1839,7 +1839,7 @@ $(function () {
             modal.hide();
 
         }).fail(function (xhr, status, error) {
-            const errorMessage = getReportingDeleteErrorMessage(xhr, error);
+            const errorMessage = getReportingErrorMessage(xhr, error);
             abp.message.error(errorMessage);
         }).always(function () {
             // Reset modal button states
@@ -2238,7 +2238,7 @@ function getWorksheetTopLevelProviderValue(provider) {
 }
 
 // Extract error handling logic to reduce cognitive complexity
-function getReportingDeleteErrorMessage(xhr, error) {
+function getReportingErrorMessage(xhr, error) {
     if (xhr.status === 0) {
         return 'Network error: Could not connect to the server';
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
index 11ba61e8ea..1c05db9cdc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_formversion_view.sql
@@ -34,8 +34,7 @@ BEGIN
     -- Get the data clause from the consolidated formversion data function
     data_clause := "Reporting".get_consolidated_formversion_data(form_id, report_map_id);
 
-    RAISE NOTICE 'View name: %', view_name;
-    RAISE NOTICE 'Data clause: %', data_clause;
+    RAISE NOTICE 'View name: %', view_name;    
 
     -- Drop existing view to avoid conflicts on regeneration
     EXECUTE format('DROP VIEW IF EXISTS "Reporting".%I', view_name);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
index 06db9c8738..0c91244742 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/generate_consolidated_worksheet_view.sql
@@ -34,8 +34,7 @@ BEGIN
     -- Get the data clause from the consolidated worksheet data function
     data_clause := "Reporting".get_consolidated_worksheet_data(form_id, report_map_id);
 
-    RAISE NOTICE 'View name: %', view_name;
-    RAISE NOTICE 'Data clause: %', data_clause;
+    RAISE NOTICE 'View name: %', view_name;    
 
     -- Drop existing view to avoid conflicts on regeneration
     EXECUTE format('DROP VIEW IF EXISTS "Reporting".%I', view_name);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
index 910253dc30..97f42be490 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_consolidated_formversion_data.sql
@@ -155,7 +155,7 @@ BEGIN
                 current_source_prefix := 'afs."Submission"->''submission''->''submission''->''data''';
 
                 CASE column_type
-                    WHEN 'textfield', 'textarea', 'email', 'select', 'phoneNumber' THEN
+                    WHEN 'textfield', 'textarea', 'email', 'select', 'phonenumber' THEN
                         IF json_path LIKE '%->%' THEN
                             json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
                         ELSE
@@ -274,8 +274,9 @@ BEGIN
                     column_type := lower(COALESCE(row_data->>'Type', 'text'));
                     data_path_raw := row_data->>'DataPath';
 
-                    -- Version gating
-                    IF (row_data->>'VersionLabel') IS NOT NULL AND (row_data->>'VersionLabel') != version_lbl THEN
+                    -- Version gating                    
+                    IF (row_data->>'VersionLabel') IS NOT NULL 
+                    AND NOT (version_lbl = ANY(string_to_array((row_data->>'VersionLabel'), ', '))) THEN
                         CONTINUE;
                     END IF;
 
@@ -294,7 +295,7 @@ BEGIN
                     current_source_prefix := 'dg_' || datagrid_id || '_tbl.dg_' || datagrid_id;
 
                     CASE column_type
-                        WHEN 'textfield', 'textarea', 'email', 'select', 'phoneNumber' THEN
+                        WHEN 'textfield', 'textarea', 'email', 'select', 'phonenumber' THEN
                             json_path := replace(json_path, '->', '->>');
                             data_path := format('(%s%s)', '{}', json_path);
                             legacy_select_clause := replace(legacy_select_clause, format('NULL::TEXT AS %I', column_name), format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name));

From ec90ef51bfc79be84ec5a7fe09f2dc7f16f67b83 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Mon, 25 May 2026 15:30:54 -0700
Subject: [PATCH 07/14] AB#32881 fix incorrect function name call

---
 .../Views/Shared/Components/ReportingConfiguration/Default.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index f47d10d44d..b032155861 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -1718,7 +1718,7 @@ $(function () {
                 console.error('Error generating view - Error:', error);
                 console.error('Error generating view - XHR:', xhr);
 
-                const errorMessage = getViewGenerationErrorMessage(xhr, error);
+                const errorMessage = getReportingErrorMessage(xhr, error);
                 abp.message.error(errorMessage);
             },
             complete: function () {

From 973b8f7b21b5d2678cd4f2dc0a720c242a0f402e Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 26 May 2026 07:33:17 -0700
Subject: [PATCH 08/14] AB#32881 warning banner updates

---
 .../Components/ReportingConfiguration/Default.cshtml       | 4 ++--
 .../Shared/Components/ReportingConfiguration/Default.css   | 7 +++++--
 .../Shared/Components/ReportingConfiguration/Default.js    | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index 73ca2a06fa..3dbbafc307 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -176,7 +176,7 @@
                      data-bs-toggle="tooltip"
                      data-bs-placement="top"
                      data-bs-original-title="There are duplicate keys detected and catered for, this may affect the view generation and resulting data">
-                    <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
+                    <i class="fa fa-exclamation-triangle text-warning me-2"></i>
                     <small class="text-warning">
                         <strong>Duplicate Keys</strong>
                     </small>
@@ -187,7 +187,7 @@
                      data-bs-toggle="tooltip"
                      data-bs-placement="top"
                      data-bs-original-title="A DataGrid has dynamic columns but no matching field mapping was found in the form submission schema. Map the worksheet DataGrid to a CHEFS form field to resolve the individual columns.">
-                    <i class="fa fa-exclamation-triangle text-warning me-2" style="font-size: 1.2em;"></i>
+                    <i class="fa fa-exclamation-triangle text-warning me-2"></i>
                     <small class="text-warning">
                         <strong>Unmapped DataGrid</strong>
                     </small>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
index 4b259b88c2..11439605b3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
@@ -203,8 +203,6 @@
     word-wrap: break-word;
     padding: 0.375rem 0.75rem;
     background-color: #ff9f38;
-    border: 1px solid #e08800;
-    border-radius: 0.375rem;
     color: #212529;
     cursor: help;
     transition: background-color 0.15s ease-in-out;
@@ -228,6 +226,11 @@
         font-size: 0.8rem;
     }
 
+    .duplicate-keys-warning strong,
+    .dynamic-columns-warning strong {
+        font-weight: 400;
+    }
+
     .duplicate-keys-warning i,
     .dynamic-columns-warning i {
         flex-shrink: 0;
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index b032155861..a4a7758199 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -226,7 +226,7 @@ $(function () {
     }
 
     function resetTogglesToCurrentProvider() {
-        const topLevelValue = getWorksheetTopLevelProviderValue(currentProvider);
+        const topLevelValue = getTopLevelProviderValue(currentProvider);
         $(`input[name="provider-toggle"][value="${topLevelValue}"]`).prop('checked', true);
         if (currentProvider === 'worksheet' || currentProvider === 'worksheet_consolidated') {
             $(`input[name="worksheet-mode"][value="${currentProvider}"]`).prop('checked', true);
@@ -2231,7 +2231,7 @@ $(function () {
     });
 });
 
-function getWorksheetTopLevelProviderValue(provider) {
+function getTopLevelProviderValue(provider) {
     if (provider === 'worksheet_consolidated') return 'worksheet';
     if (provider === 'formversion_consolidated') return 'formversion';
     return provider;

From 92ce7af5a4162d9489e2fd32abc3d221a7cd2132 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 26 May 2026 10:07:46 -0700
Subject: [PATCH 09/14] AB#32881 update documentation

---
 .../reporting/reporting-architecture.md       | 329 ++++++++++++++++++
 .../reporting/reporting-configuration.md      |   0
 2 files changed, 329 insertions(+)
 create mode 100644 documentation/reporting/reporting-architecture.md
 rename {applications/Unity.GrantManager/documentation => documentation}/reporting/reporting-configuration.md (100%)

diff --git a/documentation/reporting/reporting-architecture.md b/documentation/reporting/reporting-architecture.md
new file mode 100644
index 0000000000..063a15e266
--- /dev/null
+++ b/documentation/reporting/reporting-architecture.md
@@ -0,0 +1,329 @@
+# Reporting Architecture
+
+## Overview
+
+The Unity Grant Manager reporting stack is built in discrete, purposeful layers. Each layer abstracts and enriches the one beneath it, so data moves from raw storage through structured views, into curated semantic models, and finally into specific visualisations or exports — with clear boundaries and responsibilities at every step.
+
+```
+Raw Database  →  Views (Reporting schema)  →  Metabase Models  →  Cards / Questions
+   (source)         (structured, flat)         (shared context)     (specific outputs)
+```
+
+Any reporting tool — not just Metabase — can be pointed at the raw database and generated views to build its own layer on top. Metabase is our current choice, not a hard dependency.
+
+---
+
+## Architecture Layers
+
+```mermaid
+flowchart TD
+    subgraph DB["PostgreSQL Database"]
+        direction TB
+        RAW["🗄️ Raw Tables\n(Applications, JSON form data,\nworksheet records, scoresheet records)"]
+        RSCHEMA["📐 Reporting Schema\n(Generated Views — flattened JSON)"]
+    end
+
+    subgraph APP["Unity.GrantManager Application"]
+        CFG["⚙️ Reporting Configuration\n(field mapping + view generation)"]
+        CHEFS["📋 CHEFS Form Submissions\nformversion / formversion_consolidated"]
+        WS["📝 Unity.Flex Worksheets\nworksheet / worksheet_consolidated"]
+        SS["🎯 Unity.Flex Scoresheets\nscoresheet"]
+    end
+
+    subgraph MB["Metabase (External BI Tool)"]
+        MODELS["📦 Metabase Models\n(curated, shared semantic sources)"]
+        CARDS["📊 Cards & Dashboards\n(specific questions & visualisations)"]
+    end
+
+    ALT["🔌 Alternative Reporting Tools\n(Power BI, Tableau, custom tools, etc.)"]
+
+    RAW -->|"raw columns available\ndirectly"| MB
+    RAW -->|"source JSON\ndigested by"| CFG
+    CFG -->|"generates stored views\nvia background job"| RSCHEMA
+    CHEFS --> CFG
+    WS --> CFG
+    SS --> CFG
+    RSCHEMA -->|"flat, named columns\nready to consume"| MODELS
+    RAW -->|"raw columns\n(for models that need them)"| MODELS
+    MODELS -->|"shared semantic layer\nqueried by"| CARDS
+    RSCHEMA -->|"views exposed to"| ALT
+    RAW -->|"raw tables exposed to"| ALT
+
+    style DB fill:#e8f4f8,stroke:#2980b9
+    style APP fill:#eafaf1,stroke:#27ae60
+    style MB fill:#fef9e7,stroke:#f39c12
+    style ALT fill:#f9ebea,stroke:#e74c3c
+```
+
+---
+
+## Layer 1 — Raw Database
+
+**What it is:** The PostgreSQL database that the application writes to directly. This is the authoritative source of record.
+
+**What it contains:**
+- Application records, applicant details, statuses, assignments, dates
+- Form submission data stored as **JSON blobs** inside columns (CHEFS submissions)
+- Worksheet field values (Unity.Flex) — current state
+- Scoresheet field values (Unity.Flex) — current state
+
+**Key characteristic:** Form submission JSON is opaque to standard SQL queries. A tool cannot easily filter or aggregate on individual form fields without first understanding the schema — that is what the next layer solves.
+
+**Access:** Any database role with appropriate `SELECT` grants can read raw tables directly. Metabase models (or any other tool) may source from here when they need columns that are already structured (e.g., `ApplicationId`, `Status`, dates).
+
+---
+
+## Layer 2 — Views (Reporting Schema)
+
+**What it is:** PostgreSQL views in the `Reporting` schema, generated by the Unity.GrantManager **Reporting Configuration** system. These views do the hard work of extracting individual fields out of the JSON and presenting them as ordinary, flat, named columns.
+
+**How they are created:**
+
+```mermaid
+sequenceDiagram
+    participant Admin
+    participant Config as Reporting Configuration UI
+    participant Service as ReportMappingService
+    participant Job as Background Job
+    participant DB as PostgreSQL (Reporting schema)
+
+    Admin->>Config: Select source (form version / worksheet / scoresheet)
+    Config->>Service: Fetch field metadata from provider
+    Service-->>Config: Field list (keys, labels, paths)
+    Admin->>Config: Map fields → column names, save
+    Admin->>Config: Click "Generate View"
+    Config->>Service: GenerateViewAsync(correlationId, provider, viewName)
+    Service->>Job: Enqueue GenerateViewBackgroundJob
+    Job->>DB: CALL Reporting.generate_*_view(correlationId)
+    DB-->>Job: View created/updated
+    Job->>DB: GRANT SELECT ON view TO reporting_role
+    Job-->>Config: Status → SUCCESS
+```
+
+**Provider types and data characteristics:**
+
+| Provider | Correlation ID | Data Nature | Use Case |
+|----------|---------------|-------------|----------|
+| `formversion` | Form Version ID | **Point-in-time / static** — immutable snapshot of a specific CHEFS form version's submission data | Reporting on what applicants submitted for a given form version |
+| `formversion_consolidated` | Form ID | **Point-in-time / static** — merged across all versions of a form | Cross-version submission reporting for a single form |
+| `worksheet` | Form Version ID | **Current state** — live worksheet field values as they exist today | Reporting on current worksheet data linked to a form version |
+| `worksheet_consolidated` | Form ID | **Current state** — merged across all versions | Cross-version worksheet reporting |
+| `scoresheet` | Form ID | **Current state** — live evaluation/scoring data | Reporting on assessor scores and evaluation criteria |
+
+> **Important distinction:** `formversion` views capture what was submitted and do not change retroactively. `worksheet` and `scoresheet` views reflect the current state of those records, meaning the view data can change as worksheets and scoresheets are updated.
+
+**What a view looks like:**
+
+Before the view:
+```sql
+-- Raw: JSON blob, not queryable field-by-field
+SELECT submission_data FROM Applications WHERE ...
+-- Result: {"firstName":"Jane","projectBudget":50000,"region":"North"}
+```
+
+After the view:
+```sql
+-- View: flat, named columns
+SELECT application_id, first_name, project_budget, region
+FROM "Reporting"."my_form_v2_submissions"
+WHERE region = 'North'
+```
+
+**Schema and naming:**
+- All views live in the `Reporting` PostgreSQL schema
+- View names and column names are sanitised to valid PostgreSQL identifiers (lowercase, underscores, max 63 chars)
+- Column names are auto-generated from field keys or labels depending on provider, and can be overridden by administrators
+- A database role is granted `SELECT` on each view after generation, which is what Metabase (or any other tool) uses to connect
+
+---
+
+## Layer 3 — Metabase Models
+
+**What it is:** Metabase **Models** are curated, shared data sources defined inside Metabase. They sit between the raw data / views and the end-user questions, acting as a semantic layer.
+
+**What they solve:** Views expose the right columns, but they don't carry business meaning on their own. A model adds:
+- Friendly field names and descriptions visible to all report authors
+- Implicit joins between related sources (e.g., linking a form submission view to application metadata)
+- Pre-applied filters or transformations that should be consistent across all downstream reports
+- A single trusted definition that multiple cards can reference — change the model, and all cards using it update automatically
+
+**Source options for a model:**
+
+```mermaid
+flowchart LR
+    RAW["Raw Table\n(e.g., Applications)"]
+    VIEW["Reporting View\n(e.g., my_form_submissions)"]
+    MODEL["Metabase Model\n(e.g., Grant Applications — Full)"]
+
+    RAW -->|structured columns| MODEL
+    VIEW -->|flattened form fields| MODEL
+```
+
+A model may combine a raw table (for structured application columns) with one or more reporting views (for form field columns) through a join — giving report authors a single, unified source.
+
+**Examples:**
+
+| Model Name | Sources | Purpose |
+|------------|---------|---------|
+| `Grant Applications — Core` | Raw `Applications` table | Status, dates, applicant, assignments |
+| `Application Form Responses — FY2024` | `formversion` view | Flattened CHEFS submission fields for a specific form version |
+| `Assessment Scoresheets` | `scoresheet` view + `Applications` raw | Evaluation scores joined to application metadata |
+| `Worksheet Summary` | `worksheet_consolidated` view | All worksheet responses across form versions |
+
+---
+
+## Layer 4 — Cards, Questions & Dashboards
+
+**What it is:** The specific reports, charts, tables, and dashboards that end users see and use. In Metabase these are called **Cards** (saved questions) and **Dashboards** (collections of cards).
+
+**Key characteristic:** Cards are narrow and specific. They answer one question ("How many applications by region this quarter?") by querying a model. Because cards inherit from models, the underlying data logic is not duplicated in every card.
+
+**Types:**
+- **No-code questions** — built using Metabase's visual query builder on top of a model; no SQL required
+- **Native SQL questions** — custom SQL queries written directly against the database (can reference views or raw tables by name)
+- **Dashboards** — assembled from multiple cards, often with filters and parameters
+
+---
+
+## Full Abstraction Flow
+
+```mermaid
+flowchart LR
+    J["JSON in\nraw columns"]
+    V["Named columns\nin Reporting view"]
+    M["Shared model\nin Metabase"]
+    C["Specific card\nor dashboard"]
+
+    J -->|"Reporting\nConfiguration\ngenerates view"| V
+    V -->|"Metabase admin\ndefines model"| M
+    M -->|"Report author\nbuilds card"| C
+
+    style J fill:#fdecea,stroke:#e74c3c
+    style V fill:#e8f4f8,stroke:#2980b9
+    style M fill:#eafaf1,stroke:#27ae60
+    style C fill:#fef9e7,stroke:#f39c12
+```
+
+| Step | Who does it | What changes |
+|------|-------------|--------------|
+| Raw → View | Application administrator (Reporting Configuration UI) | Unstructured JSON → flat, queryable SQL columns |
+| View → Model | Metabase administrator | Flat columns → named, joined, business-meaningful source |
+| Model → Card | Report author | Abstract source → specific question / visualisation |
+
+Each layer adds meaning without duplicating data. The raw database is the single source of truth; everything above it is a structured lens on top.
+
+---
+
+## Tool Independence
+
+Metabase is the current BI tool, but the architecture does not depend on it. The `Reporting` schema views are standard PostgreSQL views, accessible to any tool that can connect to the database with the reporting role.
+
+```mermaid
+flowchart TD
+    DB["PostgreSQL\n(Raw Tables + Reporting Views)"]
+
+    MB["Metabase\n(current)"]
+    PBI["Power BI"]
+    TAB["Tableau"]
+    CUSTOM["Custom Application\n/ API"]
+
+    DB -->|"reporting role\nSELECT grant"| MB
+    DB -->|"reporting role\nSELECT grant"| PBI
+    DB -->|"reporting role\nSELECT grant"| TAB
+    DB -->|"reporting role\nSELECT grant"| CUSTOM
+```
+
+A team adopting a different tool would:
+1. Connect the tool to the PostgreSQL database using the reporting role credentials
+2. Point to the `Reporting` schema views for form/worksheet/scoresheet field data
+3. Point to raw tables for structured application metadata
+4. Rebuild the semantic / model layer within that tool's conventions
+
+The view generation system (Reporting Configuration) remains the same regardless of which tool sits above it.
+
+---
+
+## Use Cases
+
+### Use Case 1 — Form Submission Reporting (Point-in-Time)
+
+> *"Show me all applications submitted under Form Version 3, with the project budget and region fields."*
+
+- **Source:** `formversion` view generated from CHEFS form version 3's schema
+- **Data nature:** Static — reflects what applicants submitted; does not change even if the form is updated later
+- **Path:** Raw JSON submission → Reporting Configuration maps fields → view generated in `Reporting` schema → Metabase model joins view with application metadata → card filters and displays
+
+---
+
+### Use Case 2 — Worksheet Progress Tracking (Current State)
+
+> *"What is the current completion status of worksheets for all open applications?"*
+
+- **Source:** `worksheet` or `worksheet_consolidated` view
+- **Data nature:** Current — reflects the live state of worksheet data as assessors fill it in
+- **Path:** Unity.Flex worksheet records → Reporting Configuration maps fields → view generated → Metabase model → dashboard card refreshes to show latest state
+
+---
+
+### Use Case 3 — Scoresheet Evaluation Summary (Current State)
+
+> *"What are the average scores per criterion across all applications in this intake?"*
+
+- **Source:** `scoresheet` view joined to `Applications` raw table
+- **Data nature:** Current — reflects assessor scores at query time
+- **Path:** Unity.Flex scoresheet records → view generated → Metabase model with join → aggregation card on dashboard
+
+---
+
+### Use Case 4 — Cross-Version Consolidated Reporting
+
+> *"Aggregate project budget across all versions of Form X, even though different versions had different field names."*
+
+- **Source:** `formversion_consolidated` view (CorrelationId = FormId, not a specific version)
+- **Data nature:** Static per submission, but the view covers all versions
+- **Path:** Reporting Configuration generates a consolidated stored procedure (`generate_consolidated_formversion_view`) → single view normalises fields across versions → Metabase model → report
+
+---
+
+### Use Case 5 — Custom SQL Report (Direct View Access)
+
+> *"Write a custom SQL query joining form fields with application dates for an ad-hoc data export."*
+
+- **Source:** Directly queries `Reporting` schema view by name in a Metabase native SQL question or any other SQL client
+- No model required — the view itself is the queryable surface
+- Example:
+  ```sql
+  SELECT
+      v.application_id,
+      v.project_budget,
+      v.region,
+      a."Status",
+      a."SubmissionDate"
+  FROM "Reporting"."my_form_v2_submissions" v
+  JOIN "Applications" a ON v.application_id = a."Id"
+  WHERE a."Status" = 'Approved'
+  ORDER BY v.project_budget DESC
+  ```
+
+---
+
+### Use Case 6 — Alternative Tool Integration
+
+> *"We want to use Power BI instead of Metabase."*
+
+- Connect Power BI to PostgreSQL using the reporting role
+- Import or DirectQuery against `Reporting` schema views (for form/worksheet/scoresheet fields)
+- Import or DirectQuery against raw tables (for application metadata)
+- Build Power BI datasets (equivalent of Metabase models) on top
+- Views remain unchanged — the Reporting Configuration system generates and maintains them regardless of which tool reads them
+
+---
+
+## Summary
+
+| Layer | Technology | Managed by | Data shape |
+|-------|-----------|-----------|------------|
+| Raw Database | PostgreSQL tables | Application writes | Normalised rows + JSON blobs |
+| Reporting Views | PostgreSQL views (`Reporting` schema) | Reporting Configuration UI | Flat, named columns |
+| Models | Metabase Models | Metabase authors | Named, joined, business-labelled sources |
+| Cards / Dashboards | Metabase Questions & Dashboards | Report authors | Specific questions and visualisations |
diff --git a/applications/Unity.GrantManager/documentation/reporting/reporting-configuration.md b/documentation/reporting/reporting-configuration.md
similarity index 100%
rename from applications/Unity.GrantManager/documentation/reporting/reporting-configuration.md
rename to documentation/reporting/reporting-configuration.md

From 9a3e9e43f0851cfcf4b4e9740fba2ca622df30b8 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 26 May 2026 12:11:52 -0700
Subject: [PATCH 10/14] AB#32881 copilot feedback fixes

---
 .../ConsolidatedFormVersionFieldsProvider.cs  |  9 +++-
 .../ConsolidatedWorksheetFieldsProvider.cs    |  9 +++-
 .../ReportingConfiguration/Default.cshtml     |  5 +-
 .../ReportingConfiguration/Default.js         | 50 +++++++++++++------
 4 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
index 9a881ae449..a81086a22f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
@@ -156,7 +156,12 @@ private static List<FieldPathTypeDto> MergeFields(
 
                     if (typesForPath.Count > 1)
                     {
-                        // Conflict: same (label, path) but different types — emit per-version entry
+                        // Conflict: same (label, path) but different types — emit one row per
+                        // distinct type, labelled with every version that carries that type.
+                        // exactGroup already holds every (versionLabel, field) pair for this
+                        // exact (label, path, type) triple, so join them all rather than using
+                        // the outer-loop versionLabel (which would only reflect the first version
+                        // encountered due to processedExactKeys suppressing subsequent entries).
                         result.Add(new FieldPathTypeDto
                         {
                             Id = field.Id,
@@ -166,7 +171,7 @@ private static List<FieldPathTypeDto> MergeFields(
                             Type = field.Type,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
-                            VersionLabel = versionLabel
+                            VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
                         });
                     }
                     else if (versionsWithFields.Count > 1 && versionsHavingThisExact.Count == versionsWithFields.Count)
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
index 5aa0d21392..1ad032d941 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
@@ -182,7 +182,12 @@ private static List<FieldPathTypeDto> MergeFields(
 
                     if (typesForPath.Count > 1)
                     {
-                        // Conflict: same (label, path) but different types — emit per-version entry
+                        // Conflict: same (label, path) but different types — emit one row per
+                        // distinct type, labelled with every version that carries that type.
+                        // exactGroup already holds every (versionLabel, field) pair for this
+                        // exact (label, path, type) triple, so join them all rather than using
+                        // the outer-loop versionLabel (which would only reflect the first version
+                        // encountered due to processedExactKeys suppressing subsequent entries).
                         result.Add(new FieldPathTypeDto
                         {
                             Id = field.Id,
@@ -192,7 +197,7 @@ private static List<FieldPathTypeDto> MergeFields(
                             Type = field.Type,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
-                            VersionLabel = versionLabel
+                            VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
                         });
                     }
                     else if (versionsWithFields.Count > 1 && versionsHavingThisExact.Count == versionsWithFields.Count)
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index 3dbbafc307..f419f5b7a5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -227,9 +227,10 @@
             <div class="modal-body">
                 <form id="generateViewForm">
                     <div class="mb-3">
-                        <input type="text" class="form-control" id="viewNameInput" placeholder="Enter view name" required>
+                        <label for="viewNameInput" class="form-label">View Name</label>
+                        <input type="text" class="form-control" id="viewNameInput" placeholder="Enter view name" required aria-describedby="viewNameFeedback viewNameHint">
                         <div class="invalid-feedback" id="viewNameFeedback"></div>
-                        <div class="form-text">
+                        <div class="form-text" id="viewNameHint">
                             View name must start with a letter or underscore, contain only letters, numbers, and underscores,
                             and be between 1-63 characters long.
                         </div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index a4a7758199..532d8e0b3c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -953,9 +953,11 @@ $(function () {
             if (error?.responseJSON?.error?.message) {
                 errorMessage = error.responseJSON.error.message;
             } else if (error?.responseText) {
-                const parsedError = JSON.parse(error.responseText);
+                const parsedError = tryParseJson(error.responseText);
                 if (parsedError?.message) {
                     errorMessage = parsedError.message;
+                } else {
+                    errorMessage = error.responseText;
                 }
             }
             abp.message.error(errorMessage);
@@ -1718,7 +1720,7 @@ $(function () {
                 console.error('Error generating view - Error:', error);
                 console.error('Error generating view - XHR:', xhr);
 
-                const errorMessage = getReportingErrorMessage(xhr, error);
+                const errorMessage = getReportingErrorMessage(xhr, error, 'Failed to generate view');
                 abp.message.error(errorMessage);
             },
             complete: function () {
@@ -1839,7 +1841,7 @@ $(function () {
             modal.hide();
 
         }).fail(function (xhr, status, error) {
-            const errorMessage = getReportingErrorMessage(xhr, error);
+            const errorMessage = getReportingErrorMessage(xhr, error, 'Failed to delete configuration');
             abp.message.error(errorMessage);
         }).always(function () {
             // Reset modal button states
@@ -2237,37 +2239,53 @@ function getTopLevelProviderValue(provider) {
     return provider;
 }
 
-// Extract error handling logic to reduce cognitive complexity
-function getReportingErrorMessage(xhr, error) {
+// Safe JSON.parse wrapper — returns null instead of throwing on invalid input.
+function tryParseJson(text) {
+    if (!text || typeof text !== 'string') return null;
+    try {
+        return JSON.parse(text);
+    } catch (e) {
+        return null;
+    }
+}
+
+// Extract error handling logic to reduce cognitive complexity.
+// `fallbackMessage` is shown when no structured error detail is available; callers
+// should pass a short operation-specific string (e.g. 'Failed to generate view').
+function getReportingErrorMessage(xhr, error, fallbackMessage) {
+    fallbackMessage = fallbackMessage || 'An error occurred. Please try again';
     if (xhr.status === 0) {
         return 'Network error: Could not connect to the server';
     }
-    
+
     if (xhr.status === 400) {
-        const errorResponse = JSON.parse(xhr.responseText);
-        return errorResponse?.error?.message || (typeof errorResponse === 'string' ? errorResponse : 'Bad request: Please check your input and try again');
+        const errorResponse = tryParseJson(xhr.responseText);
+        return errorResponse?.error?.message
+            || (typeof errorResponse === 'string' ? errorResponse : null)
+            || xhr.responseText
+            || 'Bad request: Please check your input and try again';
     }
-    
+
     if (xhr.status === 401) {
         return 'Unauthorized: Please log in and try again';
     }
-    
+
     if (xhr.status === 403) {
         return 'Forbidden: You do not have permission to perform this action';
     }
-    
+
     if (xhr.status === 404) {
         return 'Configuration not found: The configuration may have already been deleted';
     }
-    
+
     if (xhr.status === 500) {
         return 'Server error: Please try again later or contact support';
     }
-    
+
     if (xhr.responseText) {
-        const parsedError = JSON.parse(xhr.responseText);
+        const parsedError = tryParseJson(xhr.responseText);
         return parsedError?.error?.message || parsedError?.message || xhr.responseText;
     }
-    
-    return (error && error !== 'parsererror') ? error : 'Failed to delete configuration';
+
+    return (error && error !== 'parsererror') ? error : fallbackMessage;
 }
\ No newline at end of file

From 9c04bb0ad52f68a69385e3075bf5e013a5a386f0 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Tue, 26 May 2026 13:19:11 -0700
Subject: [PATCH 11/14] AB#30755: Change Applicant Status to Inactive/Active

---
 .../Applicants/ApplicantAppService.cs         | 13 ++++++
 .../Applicants/IApplicantAppService.cs        |  1 +
 .../Pages/Applicants/Details.cshtml           | 34 ++++++++++++++
 .../Pages/Applicants/Details.cshtml.cs        |  2 +-
 .../Pages/Applicants/Details.css              | 12 +++++
 .../Pages/Applicants/Details.js               | 46 +++++++++++++++++++
 .../ApplicantBreadcrumbWidgetViewComponent.cs |  4 +-
 .../ApplicantBreadcrumbWidgetViewModel.cs     |  2 +-
 .../ApplicantBreadcrumbWidget/Default.cshtml  |  5 +-
 9 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
index e5613a39ad..0746a6744b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
@@ -235,6 +235,19 @@ public async Task<Applicant> PartialUpdateApplicantSummaryAsync(Guid applicantId
         return await applicantRepository.UpdateAsync(applicant);
     }
 
+    [Authorize(GrantApplicationPermissions.Applicants.Edit)]
+    public async Task UpdateApplicantStatusAsync(Guid applicantId, string status)
+    {
+        if (status != "Active" && status != "Inactive")
+        {
+            throw new UserFriendlyException($"Invalid applicant status '{status}'. Allowed values are Active or Inactive.");
+        }
+
+        var applicant = await applicantRepository.GetAsync(applicantId);
+        applicant.Status = status;
+        await applicantRepository.UpdateAsync(applicant);
+    }
+
     public async Task UpdateApplicantContactAddressesAsync(Guid applicantId, UpdateApplicantContactAddressesDto input)
     {
         if (applicantId == Guid.Empty)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
index 396be48bce..8a359cc45c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
@@ -24,4 +24,5 @@ public interface IApplicantAppService : IApplicationService
     Task<PagedResultDto<ApplicantListDto>> GetListAsync(ApplicantListRequestDto input);
     Task<Applicant> PartialUpdateApplicantSummaryAsync(Guid applicantId, PartialUpdateDto<UpdateApplicantSummaryDto> input);
     Task UpdateApplicantContactAddressesAsync(Guid applicantId, UpdateApplicantContactAddressesDto input);
+    Task UpdateApplicantStatusAsync(Guid applicantId, string status);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
index de3a5fd5ce..c05bb09d04 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
@@ -1,12 +1,15 @@
 @page "/GrantApplicants/Details"
 @using Microsoft.Extensions.Localization
 @using Unity.GrantManager.Localization
+@using Unity.GrantManager.Permissions
 @using Unity.GrantManager.Web.Pages.Applicants
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.Authorization.Permissions
 
 @model DetailsModel
 @inject IStringLocalizer<GrantManagerResource> L
 @inject IPageLayout PageLayout
+@inject IPermissionChecker PermissionChecker
 
 @{
     PageLayout.Content.Title = L["Applicants"].Value;
@@ -25,7 +28,38 @@
     @await Component.InvokeAsync("ApplicantBreadcrumbWidget", new { applicantId = @Model.ApplicantId })
 </div>
 
+@if (await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Applicants.Edit))
+{
+    <div class="action-bar p-2 fade-in-load" id="applicantActionBar">
+        <div id="ApplicantActionBarStart" class="d-flex align-items-stretch justify-content-start gap-2">
+            <div class="order-first">
+                <abp-dropdown id="ApplicantStatusDropdown">
+                    <abp-dropdown-button button-type="Light"
+                        text="@L["GrantApplication:ActionButtonName"].Value" />
+                    <ul class="dropdown-menu">
+                        <li>
+                            <abp-button id="ApplicantStatusActiveButton"
+                                        button-type="Light"
+                                        class="dropdown-item applicant-status-action"
+                                        disabled="@(Model.Status == "Active")"
+                                        data-status="Active">Active</abp-button>
+                        </li>
+                        <li>
+                            <abp-button id="ApplicantStatusInactiveButton"
+                                        button-type="Light"
+                                        class="dropdown-item applicant-status-action"
+                                        disabled="@(Model.Status == "Inactive")"
+                                        data-status="Inactive">Inactive</abp-button>
+                        </li>
+                    </ul>
+                </abp-dropdown>
+            </div>
+        </div>
+    </div>
+}
+
 <input type="hidden" id="DetailsViewApplicantId" value="@Model.ApplicantId" />
+<input type="hidden" id="ApplicantCurrentStatus" value="@Model.Status" />
 <input type="hidden" id="CurrentUserId" value="@Model.CurrentUserId" />
 <input type="hidden" id="CurrentUserName" value="@Model.CurrentUserName" />
 <input type="hidden" id="Extensions" value="@Model.Extensions" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
index c81d8d95df..261fac752d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
@@ -75,7 +75,7 @@ public async Task<IActionResult> OnGetAsync()
                     : "Applicant Name";
 
                 UnityApplicantId = Applicant.UnityApplicantId ?? "N/A";
-                Status = Applicant.Status ?? "Active";
+                Status = Applicant.Status ?? string.Empty;
 
                 return Page();
             }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
index 93a234809f..b305b80ba5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.css
@@ -1,5 +1,17 @@
 /* Applicant Details Page Styles */
 
+.action-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #dee2e6;
+    min-height: 56px;
+}
+
+.margin-left-auto {
+    margin-left: auto;
+}
+
 /* Main container */
 .applicant-details-container {
     width: 100%;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
index 0256da0440..38438044c3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js
@@ -49,6 +49,7 @@ $(document).ready(function () {
     // Handle resizable divider
     initializeResizableDivider();
     initCommentsWidget();
+    initializeStatusActions();
 });
 
 const LEFT_INTERNAL_SCROLL_TABS = new Set(['nav-submissions']);
@@ -456,3 +457,48 @@ function uploadFiles(inputId, urlStr, channel) {
 PubSub.subscribe('update_applicant_attachment_count', function (msg, data) {
     $('#applicant_attachment_count').text(data.files);
 });
+
+function initializeStatusActions() {
+    const applicantId = decodeURIComponent($('#DetailsViewApplicantId').val());
+
+    $(document).on('click', '.applicant-status-action', function () {
+        const $btn = $(this);
+        const newStatus = $btn.data('status');
+
+        abp.message.confirm(
+            `Set applicant status to "${newStatus}"?`,
+            'Confirm Status Change',
+            function (confirmed) {
+                if (!confirmed) return;
+
+                $('#ApplicantStatusDropdown .dropdown-toggle').buttonBusy();
+
+                unity.grantManager.applicants.applicant
+                    .updateApplicantStatus(applicantId, newStatus)
+                    .then(function () {
+                        const $badge = $('.applicant-details-breadcrumb .applicant-status');
+                        if ($badge.length) {
+                            $badge.text(newStatus).show();
+                        } else {
+                            $('.applicant-details-breadcrumb').append(
+                                $('<div class="applicant-status"></div>').text(newStatus)
+                            );
+                        }
+
+                        $('#ApplicantStatusActiveButton').prop('disabled', newStatus === 'Active');
+                        $('#ApplicantStatusInactiveButton').prop('disabled', newStatus === 'Inactive');
+                        $('#ApplicantCurrentStatus').val(newStatus);
+
+                        abp.notify.success(`Applicant status set to ${newStatus}.`, 'Status Updated');
+                    })
+                    .catch(function (err) {
+                        abp.notify.error(abp.localization.localize('Error', 'AbpUi'));
+                        console.warn('Status update failed:', err);
+                    })
+                    .always(function () {
+                        $('#ApplicantStatusDropdown .dropdown-toggle').buttonBusy(false);
+                    });
+            }
+        );
+    });
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewComponent.cs
index 3c8442049f..6b800c3fa0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewComponent.cs
@@ -28,7 +28,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                     ApplicantName = !string.IsNullOrEmpty(applicant.ApplicantName) 
                             ? applicant.ApplicantName 
                             : "Applicant Name",
-                    Status = applicant.Status ?? "Active"
+                    Status = applicant.Status
                 };
 
                 return View(model);
@@ -40,7 +40,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                     ApplicantId = applicantId,
                     UnityApplicantId = "N/A",
                     ApplicantName = "Applicant Not Found",
-                    Status = "Unknown"
+                    Status = null
                 };
 
                 return View(errorModel);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewModel.cs
index 9e9951a7af..d2758a0678 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/ApplicantBreadcrumbWidgetViewModel.cs
@@ -7,6 +7,6 @@ public class ApplicantBreadcrumbWidgetViewModel
         public Guid ApplicantId { get; set; }
         public string UnityApplicantId { get; set; } = string.Empty;
         public string ApplicantName { get; set; } = string.Empty;
-        public string Status { get; set; } = string.Empty;
+        public string? Status { get; set; }
     }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/Default.cshtml
index 2faecd9e67..67be1e96d3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantBreadcrumbWidget/Default.cshtml
@@ -7,6 +7,9 @@
     <div class="applicant-details-breadcrumb">
         <div class="unity-applicant-id">@Model.UnityApplicantId</div>
         <div class="applicant-name">@Model.ApplicantName</div>
-        <div class="applicant-status">@Model.Status</div>    
+        @if (Model.Status == "Active" || Model.Status == "Inactive")
+        {
+            <div class="applicant-status">@Model.Status</div>
+        }
     </div>
 </div>
\ No newline at end of file

From 2f15dc01c91d0c24c25d2f12bcf98f64e2f5bcad Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 26 May 2026 14:28:54 -0700
Subject: [PATCH 12/14] AB#32881 sonarQ cleanup

---
 .../Views/Shared/Components/ReportingConfiguration/Default.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index 532d8e0b3c..7985f2ed8d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -2245,6 +2245,7 @@ function tryParseJson(text) {
     try {
         return JSON.parse(text);
     } catch (e) {
+        console.log(e);
         return null;
     }
 }
@@ -2252,8 +2253,7 @@ function tryParseJson(text) {
 // Extract error handling logic to reduce cognitive complexity.
 // `fallbackMessage` is shown when no structured error detail is available; callers
 // should pass a short operation-specific string (e.g. 'Failed to generate view').
-function getReportingErrorMessage(xhr, error, fallbackMessage) {
-    fallbackMessage = fallbackMessage || 'An error occurred. Please try again';
+function getReportingErrorMessage(xhr, error, fallbackMessage = 'An error occurred. Please try again') {
     if (xhr.status === 0) {
         return 'Network error: Could not connect to the server';
     }

From 9098487b7eece365ebc74ea6e24c525b1640e5a5 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Tue, 26 May 2026 15:39:15 -0700
Subject: [PATCH 13/14] feature/AB#32841-AddQRandPaymentDescription-Fixes

---
 .../Integrations/Cas/InvoiceService.cs        | 374 ++++++++++++------
 .../FinancialNotificationSummaryWorker.cs     |  68 ++--
 .../Unity.SharedKernel.csproj                 |   1 +
 .../Utilities/AbpUserTenantAccessor.cs        |  29 +-
 .../TenantRepository_Tests.cs                 |   1 -
 .../Middleware/AbpUserTenantAccessor.cs       |  50 +--
 6 files changed, 316 insertions(+), 207 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
index 01a02afc5a..03ed621231 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
@@ -20,6 +20,7 @@
 using System.Linq;
 using Volo.Abp.Domain.Repositories;
 using Unity.SharedKernel.Utilities;
+using Volo.Abp.Identity;
 
 namespace Unity.Payments.Integrations.Cas
 {
@@ -31,10 +32,14 @@ public class InvoiceService(
                     IEndpointManagementAppService endpointManagementAppService,
                     ICasTokenService iTokenService,
                     IResilientHttpRequest resilientHttpRequest,
-                    IInvoiceManager invoiceManager) : ApplicationService, IInvoiceService
+                    IInvoiceManager invoiceManager,
+                    IRepository<ExpenseApproval, Guid> expenseApprovalRepository,
+                    IRepository<IdentityUser, Guid> identityUserRepository) : ApplicationService, IInvoiceService
     {
         private const string CFS_APINVOICE = "cfs/apinvoice";
-        protected new ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
+
+        protected new ICurrentTenant CurrentTenant =>
+            LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
 
         private readonly Dictionary<int, string> CASPaymentGroup = new()
         {
@@ -42,127 +47,192 @@ public class InvoiceService(
             [(int)PaymentGroup.Cheque] = "GEN CHQ"
         };
 
-        protected virtual async Task<Invoice?> InitializeCASInvoice(PaymentRequest paymentRequest,
-                                                                  string? accountDistributionCode)
+        protected virtual async Task<Invoice?> InitializeCASInvoice(
+            PaymentRequest paymentRequest,
+            string? accountDistributionCode)
         {
-            Invoice? casInvoice = new();
             Site? site = await invoiceManager.GetSiteByPaymentRequestAsync(paymentRequest);
 
-            if (site != null && site.Supplier != null && site.Supplier.Number != null && accountDistributionCode != null)
+            if (site == null ||
+                site.Supplier == null ||
+                string.IsNullOrWhiteSpace(site.Supplier.Number) ||
+                string.IsNullOrWhiteSpace(accountDistributionCode))
+            {
+                return null;
+            }
+
+
+            // This can not be UTC Now it is sent to cas and can not be in the future - this is not being stored in Unity as a date
+            var vancouverTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+            var localDateTime = TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, vancouverTimeZone);
+            var currentMonth = localDateTime.ToString("MMM").Trim('.');
+            var currentDay = localDateTime.ToString("dd");
+            var currentYear = localDateTime.ToString("yyyy");
+            var dateStringDayMonYear = $"{currentDay}-{currentMonth}-{currentYear}";
+
+            if (!CASPaymentGroup.TryGetValue((int)site.PaymentGroup, out var payGroup))
             {
-                // This can not be UTC Now it is sent to cas and can not be in the future - this is not being stored in Unity as a date
-                var vancouverTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
-                var localDateTime = TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, vancouverTimeZone);
-                var currentMonth = localDateTime.ToString("MMM").Trim('.');
-                var currentDay = localDateTime.ToString("dd");
-                var currentYear = localDateTime.ToString("yyyy");
-                var dateStringDayMonYear = $"{currentDay}-{currentMonth}-{currentYear}";
-
-                casInvoice.SupplierNumber = site.Supplier.Number; // This is from each Applicant
-                casInvoice.SupplierName = site.Supplier.Name;
-                casInvoice.SupplierSiteNumber = site.Number;
-                casInvoice.PayGroup = CASPaymentGroup[(int)site.PaymentGroup]; // GEN CHQ - other options
-                casInvoice.InvoiceNumber = paymentRequest.InvoiceNumber;
-                casInvoice.InvoiceDate = dateStringDayMonYear; //DD-MMM-YYYY
-                casInvoice.DateInvoiceReceived = dateStringDayMonYear;
-                casInvoice.GlDate = dateStringDayMonYear;
-                casInvoice.InvoiceAmount = paymentRequest.Amount;
-                casInvoice.InvoiceBatchName = paymentRequest.BatchName;
+                throw new UserFriendlyException(
+                    $"Unsupported payment group: {site.PaymentGroup}");
+            }
+
+            var casInvoice = new Invoice
+            {
+                SupplierNumber = site.Supplier.Number,
+                SupplierName = site.Supplier.Name,
+                SupplierSiteNumber = site.Number,
+                PayGroup = payGroup,
+                InvoiceNumber = paymentRequest.InvoiceNumber,
+                InvoiceDate = dateStringDayMonYear,
+                DateInvoiceReceived = dateStringDayMonYear,
+                GlDate = dateStringDayMonYear,
+                InvoiceAmount = paymentRequest.Amount,
+                InvoiceBatchName = paymentRequest.BatchName,
+
                 // Payment description: build or use existing
-                casInvoice.PaymentAdviceComments = await BuildPaymentDescriptionAsync(paymentRequest.Description);                
+                PaymentAdviceComments =
+                await BuildPaymentDescriptionAsync(paymentRequest.Description),
 
-                // Set QualifiedReceiver to the Level1 approver's user name (lookup by DecisionUserId when possible)
-                casInvoice.QualifiedReceiver = await GetLevel1DecisionUserNameAsync(paymentRequest);
+                // Level1 approver username
+                QualifiedReceiver =
+                await GetLevel1DecisionUserNameAsync(paymentRequest),
 
-                InvoiceLineDetail invoiceLineDetail = new()
+                InvoiceLineDetails = new List<InvoiceLineDetail>
                 {
-                    InvoiceLineNumber = 1,
-                    InvoiceLineAmount = paymentRequest.Amount,
-                    DefaultDistributionAccount = accountDistributionCode // This will be at the tenant level
-                };
-                casInvoice.InvoiceLineDetails = new List<InvoiceLineDetail> { invoiceLineDetail };
-            }
+                    new()
+                    {
+                        InvoiceLineNumber = 1,
+                        InvoiceLineAmount = paymentRequest.Amount,
+                        DefaultDistributionAccount = accountDistributionCode
+                    }
+                }
+            };
 
             return casInvoice;
         }
 
-        private async Task<string> GetLevel1DecisionUserNameAsync(PaymentRequest paymentRequest)
+        private async Task<string> GetLevel1DecisionUserNameAsync(
+            PaymentRequest? paymentRequest)
         {
-            if (paymentRequest?.ExpenseApprovals == null)
+            if (paymentRequest == null)
+            {
                 return string.Empty;
+            }
 
-            var decisionUserId = paymentRequest.ExpenseApprovals.FirstOrDefault(x => x.Type == ExpenseApprovalType.Level1)?.DecisionUserId;
-            if (decisionUserId == null || decisionUserId == Guid.Empty)
-                return string.Empty;
+            Guid? decisionUserId = null;
 
             try
             {
-                // Try to resolve a repository for IdentityUser: IRepository<IdentityUser, Guid>
-                var repoType = typeof(IRepository<,>).MakeGenericType(typeof(Volo.Abp.Identity.IdentityUser), typeof(Guid));
-                var repoObj = LazyServiceProvider.LazyGetService(repoType);
-                if (repoObj != null)
+                if (paymentRequest.ExpenseApprovals == null ||
+                    paymentRequest.ExpenseApprovals.Count == 0)
                 {
-                    // Use dynamic to call FindAsync
-                    dynamic repo = repoObj;
-                    var user = await repo.FindAsync((Guid)decisionUserId);
-                    if (user != null)
-                    {
-                        // Prefer UserName, then full name (Name + Surname), then fallback to id
-                        string? userName = user.UserName as string;
-                        if (!string.IsNullOrWhiteSpace(userName))
-                            return userName;
-
-                        var givenName = user.Name as string;
-                        var surname = user.Surname as string;
-                        if (!string.IsNullOrWhiteSpace(givenName) || !string.IsNullOrWhiteSpace(surname))
-                            return $"{givenName} {surname}".Trim();
-                    }
+                    var approvals = await expenseApprovalRepository.GetListAsync(
+                        a => a.PaymentRequestId == paymentRequest.Id &&
+                             a.Type == ExpenseApprovalType.Level1);
+
+                    decisionUserId = approvals
+                        .FirstOrDefault()?
+                        .DecisionUserId;
+                }
+                else
+                {
+                    decisionUserId = paymentRequest.ExpenseApprovals
+                        .FirstOrDefault(x => x.Type == ExpenseApprovalType.Level1)?
+                        .DecisionUserId;
+                }
+
+                if (decisionUserId == null || decisionUserId == Guid.Empty)
+                {
+                    return string.Empty;
+                }
+
+                var user = await identityUserRepository.FindAsync(
+                    (Guid)decisionUserId);
+
+                if (user == null)
+                {
+                    return string.Empty;
+                }
+
+                if (!string.IsNullOrWhiteSpace(user.UserName))
+                {
+                    return user.UserName;
                 }
+
+                var fullName = $"{user.Name} {user.Surname}".Trim();
+
+                return string.IsNullOrWhiteSpace(fullName)
+                    ? string.Empty
+                    : fullName;
             }
-            catch
+            catch (Exception ex)
             {
-                // ignore and fallback
-            }
+                Logger.LogWarning(
+                    ex,
+                    "Failed resolving Level1 approver for payment request {PaymentRequestId}",
+                    paymentRequest.Id);
 
-            return string.Empty;
+                return string.Empty;
+            }
         }
 
-        // Tenant/CurrentUser lookups: resolve from IServiceProvider (no dependency on Web project utilities)
-        private async Task<string> BuildPaymentDescriptionAsync(string? existingDescription)
+        private async Task<string> BuildPaymentDescriptionAsync(
+            string? existingDescription)
         {
             if (!string.IsNullOrWhiteSpace(existingDescription))
             {
                 var trimmed = existingDescription.Trim();
-                return trimmed.Length > 50 ? trimmed.Substring(0, 50) : trimmed;
+
+                return trimmed.Length > 50
+                    ? trimmed[..50]
+                    : trimmed;
             }
-            // Resolve tenant name via shared helper
-            var serviceProvider = LazyServiceProvider.LazyGetRequiredService<IServiceProvider>();
-            var tenantDesc = await AbpUserTenantAccessor.GetCurrentTenantNameAsync(serviceProvider) ?? string.Empty;
+
+            var serviceProvider =
+                LazyServiceProvider.LazyGetRequiredService<IServiceProvider>();
+
+            var tenantDesc =
+                await AbpUserTenantAccessor.GetCurrentTenantNameAsync(serviceProvider)
+                ?? string.Empty;
+
             var generated = string.IsNullOrWhiteSpace(tenantDesc)
                 ? "Grant Payment"
                 : $"{tenantDesc} – Grant Payment";
+
             if (generated.Length > 50)
-                generated = generated.Substring(0, 50);
+            {
+                generated = generated[..50];
+            }
+
             return generated;
         }
 
-        public async Task<InvoiceResponse?> CreateInvoiceByPaymentRequestAsync(string invoiceNumber)
+        public async Task<InvoiceResponse?> CreateInvoiceByPaymentRequestAsync(
+            string invoiceNumber)
         {
             InvoiceResponse invoiceResponse = new();
+
             try
             {
-                var paymentRequestData = await invoiceManager.GetPaymentRequestDataAsync(invoiceNumber);
+                var paymentRequestData =
+                    await invoiceManager.GetPaymentRequestDataAsync(invoiceNumber);
 
-                if (!string.IsNullOrEmpty(paymentRequestData.AccountDistributionCode))
+                if (!string.IsNullOrWhiteSpace(
+                        paymentRequestData.AccountDistributionCode))
                 {
-                    Invoice? invoice = await InitializeCASInvoice(paymentRequestData.PaymentRequest, paymentRequestData.AccountDistributionCode);
+                    var invoice = await InitializeCASInvoice(
+                        paymentRequestData.PaymentRequest,
+                        paymentRequestData.AccountDistributionCode);
 
-                    if (invoice is not null)
+                    if (invoice != null)
                     {
                         invoiceResponse = await CreateInvoiceAsync(invoice);
-                        if (invoiceResponse is not null)
+
+                        if (invoiceResponse != null)
                         {
-                            await invoiceManager.UpdatePaymentRequestWithInvoiceAsync(paymentRequestData.PaymentRequest.Id, invoiceResponse);
+                            await invoiceManager.UpdatePaymentRequestWithInvoiceAsync(
+                                paymentRequestData.PaymentRequest.Id,
+                                invoiceResponse);
                         }
                     }
                 }
@@ -178,59 +248,90 @@ private async Task<string> BuildPaymentDescriptionAsync(string? existingDescript
 
         public async Task<InvoiceResponse> CreateInvoiceAsync(Invoice casAPInvoice)
         {
-            string jsonString = JsonSerializer.Serialize(casAPInvoice);            
+            string jsonString = JsonSerializer.Serialize(casAPInvoice);
             var authToken = await iTokenService.GetAuthTokenAsync(CurrentTenant.Id ?? Guid.Empty);
             string casBaseUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.PAYMENT_API_BASE);
             var resource = $"{casBaseUrl}/{CFS_APINVOICE}/";
             var response = await resilientHttpRequest.HttpAsync(HttpMethod.Post, resource, jsonString, authToken);
 
-            if (response != null)
+            if (response == null)
             {
-                if (response.Content != null && response.StatusCode != HttpStatusCode.NotFound)
-                {
-                    var contentString = await ResilientHttpRequest.ContentToStringAsync(response.Content);
-                    var result = JsonSerializer.Deserialize<InvoiceResponse>(contentString)
-                        ?? throw new UserFriendlyException("CAS InvoiceService CreateInvoiceAsync Exception: " + response);
-                    result.CASHttpStatusCode = response.StatusCode;
-                    return result;
-                }
-                else if (response.RequestMessage != null)
-                {
-                    throw new UserFriendlyException("CAS InvoiceService CreateInvoiceAsync Exception: " + response.RequestMessage);
-                }
-                else
-                {
-                    throw new UserFriendlyException("CAS InvoiceService CreateInvoiceAsync Exception: " + response);
-                }
+                throw new UserFriendlyException(
+                    "CAS InvoiceService CreateInvoiceAsync: Null response");
             }
-            else
+
+            if (response.Content != null &&
+                response.StatusCode != HttpStatusCode.NotFound)
             {
-                throw new UserFriendlyException("CAS InvoiceService CreateInvoiceAsync: Null response");
+                var contentString =
+                    await ResilientHttpRequest.ContentToStringAsync(
+                        response.Content);
+
+                var result =
+                    JsonSerializer.Deserialize<InvoiceResponse>(contentString)
+                    ?? throw new UserFriendlyException(
+                        $"CAS InvoiceService CreateInvoiceAsync Exception: {response}");
+
+                result.CASHttpStatusCode = response.StatusCode;
+
+                return result;
             }
+
+            if (response.RequestMessage != null)
+            {
+                throw new UserFriendlyException(
+                    $"CAS InvoiceService CreateInvoiceAsync Exception: {response.RequestMessage}");
+            }
+
+            throw new UserFriendlyException(
+                $"CAS InvoiceService CreateInvoiceAsync Exception: {response}");
         }
 
-        public async Task<CasPaymentSearchResult> GetCasInvoiceAsync(string invoiceNumber, string supplierNumber, string supplierSiteCode)
+        public async Task<CasPaymentSearchResult> GetCasInvoiceAsync(
+            string invoiceNumber,
+            string supplierNumber,
+            string supplierSiteCode)
         {
-            var authToken = await iTokenService.GetAuthTokenAsync(CurrentTenant.Id ?? Guid.Empty);
-            var casBaseUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.PAYMENT_API_BASE);
-            var resource = $"{casBaseUrl}/{CFS_APINVOICE}/{invoiceNumber}/{supplierNumber}/{supplierSiteCode}";
-            var response = await resilientHttpRequest.HttpAsync(HttpMethod.Get, resource, body: null, authToken);
+            var authToken =
+                await iTokenService.GetAuthTokenAsync(
+                    CurrentTenant.Id ?? Guid.Empty);
+
+            var casBaseUrl =
+                await endpointManagementAppService.GetUgmUrlByKeyNameAsync(
+                    DynamicUrlKeyNames.PAYMENT_API_BASE);
 
-            if (response != null
-                && response.Content != null
-                && response.IsSuccessStatusCode)
+            var resource =
+                $"{casBaseUrl}/{CFS_APINVOICE}/{invoiceNumber}/{supplierNumber}/{supplierSiteCode}";
+
+            var response = await resilientHttpRequest.HttpAsync(
+                HttpMethod.Get,
+                resource,
+                body: null,
+                authToken);
+
+            if (response != null &&
+                response.Content != null &&
+                response.IsSuccessStatusCode)
             {
-                string contentString = await ResilientHttpRequest.ContentToStringAsync(response.Content);
-                var result = JsonSerializer.Deserialize<CasPaymentSearchResult>(contentString);
+                string contentString =
+                    await ResilientHttpRequest.ContentToStringAsync(
+                        response.Content);
+
+                var result =
+                    JsonSerializer.Deserialize<CasPaymentSearchResult>(
+                        contentString);
+
                 return result ?? new CasPaymentSearchResult();
             }
-            else
-            {
-                return new CasPaymentSearchResult() { };
-            }
+
+            return new CasPaymentSearchResult();
         }
 
-        public async Task<CasPaymentSearchResult> GetCasPaymentAsync(Guid tenantId, string invoiceNumber, string supplierNumber, string siteNumber)
+        public async Task<CasPaymentSearchResult> GetCasPaymentAsync(
+            Guid tenantId,
+            string invoiceNumber,
+            string supplierNumber,
+            string siteNumber)
         {
             Logger.LogInformation("GetCasPaymentAsync for Invoice: {InvoiceNumber}, SupplierNumber: {SupplierNumber}, SiteNumber: {SiteNumber}, TenantId: {TenantId}", invoiceNumber, supplierNumber, siteNumber, tenantId);
             var authToken = await iTokenService.GetAuthTokenAsync(tenantId);
@@ -239,15 +340,20 @@ public async Task<CasPaymentSearchResult> GetCasPaymentAsync(Guid tenantId, stri
             var response = await resilientHttpRequest.HttpAsync(HttpMethod.Get, resource, body: null, authToken);
             CasPaymentSearchResult casPaymentSearchResult = new();
 
-            if (response != null
-                && response.Content != null
-                && response.IsSuccessStatusCode)
+            if (response != null &&
+                response.Content != null &&
+                response.IsSuccessStatusCode)
             {
-                var content = response.Content.ReadAsStringAsync();
-                var result = JsonSerializer.Deserialize<CasPaymentSearchResult>(content.Result);
+                var content =
+                    await response.Content.ReadAsStringAsync();
+
+                var result =
+                    JsonSerializer.Deserialize<CasPaymentSearchResult>(content);
+
                 return result ?? casPaymentSearchResult;
             }
-            else if (response != null)
+
+            if (response != null)
             {
                 casPaymentSearchResult.InvoiceStatus = response.StatusCode.ToString();
             }
@@ -256,22 +362,27 @@ public async Task<CasPaymentSearchResult> GetCasPaymentAsync(Guid tenantId, stri
         }
     }
 
-#pragma warning disable S125 // Sections of code should not be commented out
+#pragma warning disable S125
 
     /*
     <INVOICE NUMBER>/<SUPPLIER NUMBER>/<SUPPLIER SITE CODE>
-     Example Response for GET:
-     {
-     "invoice_number": "TESTINVOICE2",
-     "invoice_status": "Validated",
-     "payment_status": " Paid",
-     "payment_number": "009877676",
-     "payment_date": "25-Aug-2017"
-     }
+
+    Example Response for GET:
+
+    {
+        "invoice_number": "TESTINVOICE2",
+        "invoice_status": "Validated",
+        "payment_status": " Paid",
+        "payment_number": "009877676",
+        "payment_date": "25-Aug-2017"
+    }
 
     Void Payment Webservices Request Format, Type POST
+
     https://<server>:<port>/ords/cas/cfs/apinvoice/
-    Sample JSON File – Regular Standard Invoice -  Web Service
+
+    Sample JSON File – Regular Standard Invoice - Web Service
+
     {
         "invoiceType": "Standard",
         "supplierNumber": "3125635",
@@ -296,8 +407,8 @@ Sample JSON File – Regular Standard Invoice -  Web Service
         "glDate": "06-MAR-2023",
         "invoiceBatchName": "CASAPWEB1",
         "currencyCode": "CAD",
-        "invoiceLineDetails": 
-            [{
+        "invoiceLineDetails":
+        [{
             "invoiceLineNumber": 1,
             "invoiceLineType": "Item",
             "lineCode": "DR",
@@ -309,8 +420,9 @@ Sample JSON File – Regular Standard Invoice -  Web Service
             "info1": "",
             "info2": "",
             "info3": ""
-            }]
+        }]
     }
     */
-#pragma warning restore S125 // Sections of code should not be commented out
+
+#pragma warning restore S125
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/BackgroundJobWorkers/FinancialNotificationSummaryWorker.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/BackgroundJobWorkers/FinancialNotificationSummaryWorker.cs
index f8ada042ec..84e5e516d0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/BackgroundJobWorkers/FinancialNotificationSummaryWorker.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/BackgroundJobWorkers/FinancialNotificationSummaryWorker.cs
@@ -18,6 +18,8 @@ public class FinancialNotificationSummaryWorker : QuartzBackgroundWorkerBase
     private readonly FinancialSummaryNotifier _financialSummaryNotifier;
     private readonly IEnumerable<IEmailRecipientStrategy> _strategies;
 
+    private const string FallbackCron = "0 0 9 1/1 * ? *";
+
     public FinancialNotificationSummaryWorker(
         ISettingManager settingManager,
         FinancialSummaryNotifier financialSummaryNotifier,
@@ -27,40 +29,52 @@ public FinancialNotificationSummaryWorker(
         _financialSummaryNotifier = financialSummaryNotifier;
         _strategies = strategies;
 
-        logger.LogInformation("FinancialNotificationSummary Constructor: Email strategies registered.");
+        var cronExpression = ResolveCronExpression(settingManager, logger);
 
-        string casFinancialNotificationExpression = "";
+        JobDetail = JobBuilder
+            .Create<FinancialNotificationSummaryWorker>()
+            .WithIdentity(nameof(FinancialNotificationSummaryWorker))
+            .Build();
 
-        try
-        {
-            casFinancialNotificationExpression = SettingDefinitions
-                .GetSettingsValue(settingManager,
-                    PaymentSettingsConstants.BackgroundJobs.CasFinancialNotificationSummary_ProducerExpression);
-        }
-        catch
-        {
-            casFinancialNotificationExpression = "0 0 9 1/1 * ? *";
-        }
-
-        if (!casFinancialNotificationExpression.IsNullOrEmpty())
-        {
-
-            JobDetail = JobBuilder
-                .Create<FinancialNotificationSummaryWorker>()
-                .WithIdentity(nameof(FinancialNotificationSummaryWorker))
-                .Build();
-
-            Trigger = TriggerBuilder
-                .Create()
-                .WithIdentity(nameof(FinancialNotificationSummaryWorker))
-                .WithSchedule(CronScheduleBuilder.CronSchedule(casFinancialNotificationExpression)
+        Trigger = TriggerBuilder
+            .Create()
+            .WithIdentity(nameof(FinancialNotificationSummaryWorker))
+            .WithSchedule(CronScheduleBuilder
+                .CronSchedule(cronExpression)
                 .WithMisfireHandlingInstructionIgnoreMisfires())
-                .Build();
-        }
+            .Build();
     }
 
     public override async Task Execute(IJobExecutionContext context)
     {
+        Logger.LogInformation("FinancialNotificationSummary Execute");
         await _financialSummaryNotifier.NotifyFailedPayments(_strategies);
     }
+
+    private static string ResolveCronExpression(ISettingManager settingManager, ILogger logger)
+    {
+        try
+        {
+            var expression = SettingDefinitions.GetSettingsValue(
+                settingManager,
+                PaymentSettingsConstants.BackgroundJobs.CasFinancialNotificationSummary_ProducerExpression);
+
+            if (!expression.IsNullOrEmpty())
+            {
+                return expression;
+            }
+
+            logger.LogWarning(
+                "FinancialNotificationSummary: Cron expression setting was empty. Using fallback: {Fallback}",
+                FallbackCron);
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(ex,
+                "FinancialNotificationSummary: Failed to read cron expression setting. Using fallback: {Fallback}",
+                FallbackCron);
+        }
+
+        return FallbackCron;
+    }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Unity.SharedKernel.csproj b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Unity.SharedKernel.csproj
index ef4d1c6ff8..9a51a4f477 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Unity.SharedKernel.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Unity.SharedKernel.csproj
@@ -20,6 +20,7 @@
 		<PackageReference Include="Volo.Abp.Autofac" Version="10.3.0" />
 		<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.3.0" />
 		<PackageReference Include="Volo.Abp.Ddd.Application" Version="10.3.0" />
+		<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.3.0" />
 		<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
 		<PackageReference Include="Volo.Abp.Http.Client" Version="10.3.0" />
 		<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.3.0" />
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/src/Unity.SharedKernel/Utilities/AbpUserTenantAccessor.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/src/Unity.SharedKernel/Utilities/AbpUserTenantAccessor.cs
index b607d27b37..ac60ae4cee 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/src/Unity.SharedKernel/Utilities/AbpUserTenantAccessor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/src/Unity.SharedKernel/Utilities/AbpUserTenantAccessor.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Users;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.TenantManagement;
 
 namespace Unity.SharedKernel.Utilities
 {
@@ -25,7 +26,9 @@ public static class AbpUserTenantAccessor
 
         public static async Task<string?> GetCurrentTenantNameAsync(IServiceProvider serviceProvider)
         {
+            // Try resolving ICurrentTenant first
             var currentTenant = serviceProvider.GetService<ICurrentTenant>();
+
             if (currentTenant != null)
             {
                 var nameProp = currentTenant.GetType().GetProperty("Name");
@@ -39,11 +42,31 @@ public static class AbpUserTenantAccessor
                 }
             }
 
+            // Fall back to current user tenant id if available
             var currentUser = serviceProvider.GetService<ICurrentUser>();
-            if (currentUser?.TenantId != null && currentUser.TenantId != Guid.Empty)
+            if (currentUser?.TenantId != null)
             {
-                // If a tenant repository is not available in this project, return the tenant id string as fallback.
-                return currentUser.TenantId.ToString();
+                try
+                {
+                    // Get the current tenant id (returns Guid.Empty when not set)
+                    if (currentUser.TenantId != Guid.Empty)
+                    {
+                        // Try tenant repository (may not be registered in some host contexts)
+                        var tenantRepo = serviceProvider.GetService<ITenantRepository?>();
+                        if (tenantRepo != null)
+                        {
+                            var tenant = await tenantRepo.FindAsync(currentUser.TenantId.Value);
+                            if (tenant != null)
+                            {
+                                return tenant.Name;
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                    // Swallow any errors and fall back to other methods
+                }
             }
 
             return null;
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.TestBase/TenantRepository_Tests.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.TestBase/TenantRepository_Tests.cs
index 077dc81c5e..f4bddd0351 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.TestBase/TenantRepository_Tests.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.TestBase/TenantRepository_Tests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Modularity;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/AbpUserTenantAccessor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/AbpUserTenantAccessor.cs
index 91ac3e43f7..09131c0257 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/AbpUserTenantAccessor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/AbpUserTenantAccessor.cs
@@ -1,65 +1,25 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Users;
-using Volo.Abp.MultiTenancy;
+  
 
 namespace Unity.GrantManager.Web.Middleware
 {
-    // Lightweight, local shim that mirrors the shared helper implementation
-    // without introducing a project reference to Unity.SharedKernel.
+    // Accessor used by middleware to resolve current user/tenant information from a service provider.
     internal static class AbpUserTenantAccessor
     {
         public static string? GetCurrentUserName(IServiceProvider serviceProvider)
         {
-            var currentUser = serviceProvider.GetService<ICurrentUser>();
-            if (currentUser == null) return null;
-
-            var given = currentUser.Name;
-            var surname = currentUser.SurName;
-            if (!string.IsNullOrWhiteSpace(given) || !string.IsNullOrWhiteSpace(surname))
-            {
-                return $"{given} {surname}".Trim();
-            }
-
-            return currentUser.UserName;
+            return SharedKernel.Utilities.AbpUserTenantAccessor.GetCurrentUserName(serviceProvider);
         }
 
         public static async Task<string?> GetCurrentTenantNameAsync(IServiceProvider serviceProvider)
         {
-            var currentTenant = serviceProvider.GetService<ICurrentTenant>();
-            if (currentTenant != null)
-            {
-                var nameProp = currentTenant.GetType().GetProperty("Name");
-                if (nameProp != null)
-                {
-                    var value = nameProp.GetValue(currentTenant) as string;
-                    if (!string.IsNullOrWhiteSpace(value))
-                    {
-                        return value;
-                    }
-                }
-            }
-
-            var currentUser = serviceProvider.GetService<ICurrentUser>();
-            if (currentUser?.TenantId != null && currentUser.TenantId != Guid.Empty)
-            {
-                // If a tenant repository is not available in this project, return the tenant id string as fallback.
-                return currentUser.TenantId.ToString();
-            }
-
-            return null;
+            return await SharedKernel.Utilities.AbpUserTenantAccessor.GetCurrentTenantNameAsync(serviceProvider);
         }
 
         public static string? GetCurrentTenantId(IServiceProvider serviceProvider)
         {
-            var currentUser = serviceProvider.GetService<ICurrentUser>();
-            if (currentUser?.TenantId != null)
-            {
-                return currentUser.TenantId.ToString();
-            }
-
-            return null;
+            return SharedKernel.Utilities.AbpUserTenantAccessor.GetCurrentTenantId(serviceProvider);
         }
     }
 }
\ No newline at end of file

From 99e21026a2bb3c3fb0e7be991e57321d7e4360e8 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Tue, 26 May 2026 15:45:36 -0700
Subject: [PATCH 14/14] feature/AB#32841-AddQRandPaymentDescription-Fixes

---
 .../Domain/Services/InvoiceManager.cs         | 76 +++++++++----------
 .../Repositories/PaymentRequestRepository.cs  |  4 +-
 .../Integrations/Cas/InvoiceService.cs        | 16 ++--
 3 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/InvoiceManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/InvoiceManager.cs
index 599a96d37a..197b75a943 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/InvoiceManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/InvoiceManager.cs
@@ -63,50 +63,48 @@ public async Task UpdatePaymentRequestWithInvoiceAsync(Guid paymentRequestId, In
                 try
                 {
                     // Each attempt must have a fresh UoW
-                    using (var uow = unitOfWorkManager.Begin())
-                    {
-                        // Load with tracking
-                        var paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestId);
-
-                        if (paymentRequest == null)
-                        {
-                            Logger.LogWarning("PaymentRequest {Id} not found. Skipping update.", paymentRequestId);
-                            return;
-                        }
-
-                        // Idempotency: do not re-process
-                        if (paymentRequest.InvoiceStatus == CasPaymentRequestStatus.SentToCas)
-                        {
-                            Logger.LogInformation(
-                                "PaymentRequest {Id} already invoiced. Skipping update.",
-                                paymentRequestId
-                            );
-                            return;
-                        }
-
-                        // Apply CAS response info
-                        paymentRequest.SetCasHttpStatusCode((int)invoiceResponse.CASHttpStatusCode);
-                        paymentRequest.SetCasResponse(invoiceResponse.CASReturnedMessages);
-
-                        // Set status
-                        paymentRequest.SetInvoiceStatus(
-                            invoiceResponse.IsSuccess()
-                                ? CasPaymentRequestStatus.SentToCas
-                                : CasPaymentRequestStatus.ErrorFromCas
-                        );
+                    using var uow = unitOfWorkManager.Begin();
+                    // Load with tracking
+                    var paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestId);
 
-                        await paymentRequestRepository.UpdateAsync(paymentRequest, autoSave: false);
-
-                        // Commit this attempt
-                        await uow.CompleteAsync();
+                    if (paymentRequest == null)
+                    {
+                        Logger.LogWarning("PaymentRequest {Id} not found. Skipping update.", paymentRequestId);
+                        return;
+                    }
 
+                    // Idempotency: do not re-process
+                    if (paymentRequest.InvoiceStatus == CasPaymentRequestStatus.SentToCas)
+                    {
                         Logger.LogInformation(
-                            "PaymentRequest {Id} updated successfully on attempt {Attempt}.",
-                            paymentRequestId,
-                            attempt
+                            "PaymentRequest {Id} already invoiced. Skipping update.",
+                            paymentRequestId
                         );
-                        return; // success
+                        return;
                     }
+
+                    // Apply CAS response info
+                    paymentRequest.SetCasHttpStatusCode((int)invoiceResponse.CASHttpStatusCode);
+                    paymentRequest.SetCasResponse(invoiceResponse.CASReturnedMessages);
+
+                    // Set status
+                    paymentRequest.SetInvoiceStatus(
+                        invoiceResponse.IsSuccess()
+                            ? CasPaymentRequestStatus.SentToCas
+                            : CasPaymentRequestStatus.ErrorFromCas
+                    );
+
+                    await paymentRequestRepository.UpdateAsync(paymentRequest, autoSave: false);
+
+                    // Commit this attempt
+                    await uow.CompleteAsync();
+
+                    Logger.LogInformation(
+                        "PaymentRequest {Id} updated successfully on attempt {Attempt}.",
+                        paymentRequestId,
+                        attempt
+                    );
+                    return; // success
                 }
                 catch (Exception ex) when (
                     ex is AbpDbConcurrencyException ||
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
index 2b2e2c831e..c46f71e5a3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs
@@ -15,8 +15,8 @@ namespace Unity.Payments.Repositories
 {
     public class PaymentRequestRepository : EfCoreRepository<PaymentsDbContext, PaymentRequest, Guid>, IPaymentRequestRepository
     {
-        private List<string> ReCheckStatusList { get; set; } = new List<string>();
-        private List<string> FailedStatusList { get; set; } = new List<string>();
+        private List<string> ReCheckStatusList { get; set; } = [];
+        private List<string> FailedStatusList { get; set; } = [];
 
         public PaymentRequestRepository(IDbContextProvider<PaymentsDbContext> dbContextProvider) : base(dbContextProvider)
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
index 03ed621231..3cc3b643e4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
@@ -97,15 +97,15 @@ await BuildPaymentDescriptionAsync(paymentRequest.Description),
                 QualifiedReceiver =
                 await GetLevel1DecisionUserNameAsync(paymentRequest),
 
-                InvoiceLineDetails = new List<InvoiceLineDetail>
-                {
+                InvoiceLineDetails =
+                [
                     new()
                     {
                         InvoiceLineNumber = 1,
                         InvoiceLineAmount = paymentRequest.Amount,
                         DefaultDistributionAccount = accountDistributionCode
                     }
-                }
+                ]
             };
 
             return casInvoice;
@@ -252,14 +252,8 @@ public async Task<InvoiceResponse> CreateInvoiceAsync(Invoice casAPInvoice)
             var authToken = await iTokenService.GetAuthTokenAsync(CurrentTenant.Id ?? Guid.Empty);
             string casBaseUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.PAYMENT_API_BASE);
             var resource = $"{casBaseUrl}/{CFS_APINVOICE}/";
-            var response = await resilientHttpRequest.HttpAsync(HttpMethod.Post, resource, jsonString, authToken);
-
-            if (response == null)
-            {
-                throw new UserFriendlyException(
-                    "CAS InvoiceService CreateInvoiceAsync: Null response");
-            }
-
+            var response = await resilientHttpRequest.HttpAsync(HttpMethod.Post, resource, jsonString, authToken) 
+                                    ?? throw new UserFriendlyException("CAS InvoiceService CreateInvoiceAsync: Null response");
             if (response.Content != null &&
                 response.StatusCode != HttpStatusCode.NotFound)
             {