Merge pull request #2220 from cisagov/upgrade-scripts

Upgrade script and Separate Log file
cisagov · Jan 7, 2022 · 4cd16ca · 4cd16ca
2 parents c23254b + 8e50ca9
commit 4cd16ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/Move_Child_Questions_Content_to_Parent.sql b/...CSETWebCore.UpgradeLibrary/VersionUpgrader/SQL/Move_Child_Questions_Content_to_Parent.sql
@@ -6,7 +6,7 @@ BEGIN TRAN;
 INSERT INTO ANSWER (Assessment_Id, Question_Or_Requirement_Id, Comment, Alternate_Justification, FeedBack, Question_Type)
 	SELECT Assessment_Id, Parent_Question_Id, STRING_AGG(Comment, ' / '), STRING_AGG(Alternate_Justification, ' / '), STRING_AGG(FeedBack, ' / '), Question_Type
 	FROM ANSWER
-	JOIN MATURITY_QUESTIONS ON Question_Or_Requirement_Id = Mat_Question_Id WHERE Parent_Question_Id IS NOT NULL
+	JOIN MATURITY_QUESTIONS ON Question_Or_Requirement_Id = Mat_Question_Id WHERE Parent_Question_Id IS NOT NULL AND (Comment IS NOT NULL OR Alternate_Justification IS NOT NULL OR FeedBack IS NOT NULL)
 	GROUP BY Parent_Question_Id, Assessment_Id, Question_Type;
 
 --Making sure Parent question is marked for review if any of child questions are marked

diff --git a/CSETWebNg/main-electron.js b/CSETWebNg/main-electron.js
@@ -321,7 +321,7 @@ process.on('uncaughtException', error => {
 
 app.on('ready', () => {
   // set log to output to local appdata folder
-  log.transports.file.resolvePath = () => path.join(app.getPath('home'), 'AppData/Local/DHS/CSET/cset11000.log');
+  log.transports.file.resolvePath = () => path.join(app.getPath('home'), 'AppData/Local/DHS/CSET/cset11000electron.log');
   log.catchErrors();
 
   if (mainWindow === null) {