From 715c2eb9b348440f438446b4d1a6e2f8d6df5a19 Mon Sep 17 00:00:00 2001
From: Brett <43300357+MathesonBrett@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:38:13 -0700
Subject: [PATCH] Fixing ISE merit submits for Jon

---
 .../CSETWebCore.Business/Merit/JSONFileExport.cs            | 2 +-
 CSETWebNg/src/app/services/ncua.service.ts                  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs
index 80f9d3a45b..f5c77cacf6 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Merit/JSONFileExport.cs
@@ -37,7 +37,7 @@ public class JSONFileExport : IJSONFileExport
         public const string MeritExportPathName = "NCUAMeritExportPath";
         public void SendFileToMerit(string filename, string data, string uncPath)
         {
-            long minimumFileSize = 28000; // hardcoded value, change if file changes size (sorry)
+            long minimumFileSize = 25000; // hardcoded value, change if file changes size (sorry)
             if (!DoesDirectoryExist(uncPath))
             {
                 throw new ApplicationException("the directory Path is not available or does not exist");
diff --git a/CSETWebNg/src/app/services/ncua.service.ts b/CSETWebNg/src/app/services/ncua.service.ts
index 7a9de9ef2d..afad23ad8b 100644
--- a/CSETWebNg/src/app/services/ncua.service.ts
+++ b/CSETWebNg/src/app/services/ncua.service.ts
@@ -538,6 +538,12 @@ export class NCUAService {
             let questions = subcat?.questions?.sort(
               (a, b) => {
                 if (a.title.length == b.title.length) {
+
+                  // Core and Core+ both start at 1.1 now
+                  if (a.maturityLevel == "CORE" || a.maturityLevel == "CORE+") {
+                    return a.maturityLevel.length > b.maturityLevel.length ? 1 : ((b.maturityLevel.length > a.maturityLevel.length ? -1 : 0));
+                  }
+
                   return a.title > b.title ? 1 : ((b.title > a.title ? -1 : 0));
                 }
                 return a.title.length > b.title.length ? 1 : ((b.title.length > a.title.length ? -1 : 0));