Merge pull request #3697 from cisagov/feature/CSET-2481

Refactor "discovery" and "finding" usage to "observations" for consistency
cisagov · Jan 11, 2024 · 5f30608 · 5f30608
2 parents 3d3c4e1 + f9fc579
commit 5f30608
Show file tree

Hide file tree

Showing 66 changed files with 831 additions and 947 deletions.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Export/ExportAssessmentManager.cs
@@ -219,7 +219,9 @@ private UploadAssessmentModel CopyForExport(int assessmentId)
 
                 foreach (var f in item.FINDING)
                 {
-                    model.jFINDING.Add(TinyMapper.Map<FINDING,jFINDING>(f));
+                    var obs = TinyMapper.Map<FINDING, jFINDING>(f);
+                    model.jFINDING.Add(obs);
+
                     foreach (var fc in f.FINDING_CONTACT)
                     {
                         model.jFINDING_CONTACT.Add(TinyMapper.Map<FINDING_CONTACT,jFINDING_CONTACT>(fc));

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/AssessmentIO/Import/Importer.cs
@@ -79,17 +79,6 @@ public Importer(UploadAssessmentModel model,
              {
                  config.Ignore(x => x.Finding_Id);
              });
-            //copy the incoming information to an intermediary
-            //then copy from the intermediary to destination
-            //and permit updates.
-
-            // RKW 22-MAR-19 - this was crashing with a StackOverflowException.  
-            //TinyMapper.Bind<INFORMATION, INFORMATION>(config =>
-            //{
-            //    config.Ignore(x => x.Id);
-            //    config.Ignore(x => x.IdNavigation);
-            //    config.Ignore(x => x.ASSESSMENT);
-            //});
         }
 
 

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Findings/FindingData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Findings/FindingData.cs