Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SoapSingleResultData uses PortalSoap enum + Changed Mapper to internal #26

Merged
merged 2 commits into from
Jul 16, 2024
Merged

SoapSingleResultData uses PortalSoap enum + Changed Mapper to internal #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfe5640
SoapSingleResultData uses PortalSoap enum + Changed Mapper to internal
cxbvilela Jul 16, 2024
d6f36c8
Merge branch 'portilha:master' into master
bmrvilela Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Checkmarx.API.Tests/ScanTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion Checkmarx.API/Connected Services/PortalSoap/Reference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
20 changes: 10 additions & 10 deletions Checkmarx.API/Mapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand All @@ -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.");
Expand All @@ -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));
Expand All @@ -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.");
Expand Down
9 changes: 1 addition & 8 deletions Checkmarx.API/Models/SoapSingleResultData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}