Merge pull request #26 from bmrvilela/master

SoapSingleResultData uses PortalSoap enum + Changed Mapper to internal
portilha · Jul 16, 2024 · 7b924ad · 7b924ad
2 parents de56ef3 + d6f36c8
commit 7b924ad
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/Checkmarx.API.Tests/ScanTests.cs b/Checkmarx.API.Tests/ScanTests.cs
@@ -396,9 +396,9 @@ public void GetResultsForScan()
                     // New, Fixed, Recorrence
                     var resultByType = severity.GroupBy(x => x.ResultStatus).ToDictionary(x => x.Key);
 
-                    csvFields.Add(!resultByType.ContainsKey(ResultStatus.New) ? 0 : resultByType[ResultStatus.New].Count());
-                    csvFields.Add(!resultByType.ContainsKey(ResultStatus.Fixed) ? 0 : resultByType[ResultStatus.Fixed].Count());
-                    csvFields.Add(!resultByType.ContainsKey(ResultStatus.Reoccured) ? 0 : resultByType[ResultStatus.Reoccured].Count());
+                    csvFields.Add(!resultByType.ContainsKey(PortalSoap.CompareStatusType.New) ? 0 : resultByType[PortalSoap.CompareStatusType.New].Count());
+                    csvFields.Add(!resultByType.ContainsKey(PortalSoap.CompareStatusType.Fixed) ? 0 : resultByType[PortalSoap.CompareStatusType.Fixed].Count());
+                    csvFields.Add(!resultByType.ContainsKey(PortalSoap.CompareStatusType.Reoccured) ? 0 : resultByType[PortalSoap.CompareStatusType.Reoccured].Count());
 
                     csvFields.Add(query.Status.ToString());
 

diff --git a/Checkmarx.API/Connected Services/PortalSoap/Reference.cs b/Checkmarx.API/Connected Services/PortalSoap/Reference.cs
@@ -22181,7 +22181,7 @@ public PortalSoap.CxWSResponceScanResults GetResultsForScanByLanguage(string ses
             return base.Channel.GetResultsForScanByLanguageAsync(sessionID, scanId, Language);
         }
 
-        internal PortalSoap.CxWSResponceScanResults GetResultsForScan(string sessionID, long scanId)
+        public PortalSoap.CxWSResponceScanResults GetResultsForScan(string sessionID, long scanId)
         {
             return base.Channel.GetResultsForScan(sessionID, scanId);
         }

diff --git a/Checkmarx.API/Mapper.cs b/Checkmarx.API/Mapper.cs
@@ -8,9 +8,9 @@
 
 namespace Checkmarx.API
 {
-    public static class Mapper
+    internal static class Mapper
     {
-        public static T Map<T>(object oldObject) where T : new()
+        internal static T Map<T>(object oldObject) where T : new()
         {
             if (oldObject == null)
                 throw new ArgumentNullException(nameof(oldObject));
@@ -72,7 +72,7 @@ public static class Mapper
             return newObject;
         }
 
-        public static SoapSingleResultData MapSoapSingleResultData(PortalSoap.CxWSSingleResultData data)
+        internal static SoapSingleResultData MapSoapSingleResultData(PortalSoap.CxWSSingleResultData data)
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data));
@@ -82,13 +82,13 @@ public static SoapSingleResultData MapSoapSingleResultData(PortalSoap.CxWSSingle
             switch (data.ResultStatus)
             {
                 case PortalSoap.CompareStatusType.New:
-                    result.ResultStatus = ResultStatus.New;
+                    result.ResultStatus = PortalSoap.CompareStatusType.New;
                     break;
                 case PortalSoap.CompareStatusType.Reoccured:
-                    result.ResultStatus = ResultStatus.Reoccured;
+                    result.ResultStatus = PortalSoap.CompareStatusType.Reoccured;
                     break;
                 case PortalSoap.CompareStatusType.Fixed:
-                    result.ResultStatus = ResultStatus.Fixed;
+                    result.ResultStatus = PortalSoap.CompareStatusType.Fixed;
                     break;
                 default:
                     throw new NotSupportedException($"Priority API result status \"{data.ResultStatus.ToString()}\" not supported.");
@@ -97,7 +97,7 @@ public static SoapSingleResultData MapSoapSingleResultData(PortalSoap.CxWSSingle
             return result;
         }
 
-        public static PrioritySingleResultData MapPrioritySingleResultData(cxPriorityWebService.CxWSSingleResultDataPriority data)
+        internal static PrioritySingleResultData MapPrioritySingleResultData(cxPriorityWebService.CxWSSingleResultDataPriority data)
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data));
@@ -107,13 +107,13 @@ public static PrioritySingleResultData MapPrioritySingleResultData(cxPriorityWeb
             switch (data.ResultStatus)
             {
                 case cxPriorityWebService.CompareStatusType.New:
-                    result.ResultStatus = ResultStatus.New;
+                    result.ResultStatus = PortalSoap.CompareStatusType.New;
                     break;
                 case cxPriorityWebService.CompareStatusType.Reoccured:
-                    result.ResultStatus = ResultStatus.Reoccured;
+                    result.ResultStatus = PortalSoap.CompareStatusType.Reoccured;
                     break;
                 case cxPriorityWebService.CompareStatusType.Fixed:
-                    result.ResultStatus = ResultStatus.Fixed;
+                    result.ResultStatus = PortalSoap.CompareStatusType.Fixed;
                     break;
                 default:
                     throw new NotSupportedException($"Priority API result status \"{data.ResultStatus.ToString()}\" not supported.");

diff --git a/Checkmarx.API/Models/SoapSingleResultData.cs b/Checkmarx.API/Models/SoapSingleResultData.cs
@@ -44,17 +44,10 @@ public class SoapSingleResultData
 
         public System.Nullable<int> ConfidenceLevel { get; set; }
 
-        public ResultStatus ResultStatus { get; set; }
+        public PortalSoap.CompareStatusType ResultStatus { get; set; }
 
         public string IssueTicketID { get; set; }
 
         public long QueryVersionCode { get; set; }
     }
-
-    public enum ResultStatus
-    {
-        Fixed,
-        Reoccured,
-        New,
-    }
 }