diff --git a/Apps.XTM/Actions/LqaActions.cs b/Apps.XTM/Actions/LqaActions.cs index 9d14384..7ec120e 100644 --- a/Apps.XTM/Actions/LqaActions.cs +++ b/Apps.XTM/Actions/LqaActions.cs @@ -36,7 +36,7 @@ public async Task> SearchLqa([ActionParameter] LQARequest inpu if (Params is not null && Params.Count > 0) { endpoint = endpoint + "?"+String.Join("&",Params); } - var response = await Client.ExecuteXtmWithJson>(endpoint, + var response = await Client.ExecuteXtmWithJson>(endpoint, Method.Get, null, Creds); @@ -44,7 +44,7 @@ public async Task> SearchLqa([ActionParameter] LQARequest inpu return FixDate(response); } - private List FixDate(List response) + private List FixDate(List response) { var updated = new List(); foreach (var item in response) @@ -53,15 +53,26 @@ private List FixDate(List response) updated.Add(new LqaResponse { id = item.id, - evaluator = item.evaluator, - project = item.project, - customer = item.customer, - language = item.language, - evaluee = item.evaluee, + completeDate = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(long.Parse(item.completeDate)).ToString("yyyy-MM-dd"), + severityMultiplierNeutral = item.severityMultipliers.Neutral, + severityMultiplierCritical = item.severityMultipliers.Critical, + severityMultiplierMajor = item.severityMultipliers.Major, + severityMultiplierMinor = item.severityMultipliers.Minor, + evaluee = item.evaluee.userName, + evaluator = item.evaluator.userName, + customer = item.customer.name, + projectId = item.project.id.ToString(), + projectName = item.project.name, + projectWordcount = item.project.wordCount, + projectTotal = item.project.Total, + projectErrors = item.project.Errors, + SubjectMatter = item.project.subjectMatter.Name, + languageCode = item.language.code, + languageWordcount = item.language.wordCount, + languageTotal = item.language.Total, + languageErrors = item.language.Errors, files = item.files, - severityMultipliers = item.severityMultipliers, - completeDate = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(long.Parse(item.completeDate)).ToString("yyyy-MM-dd") - }); + }); } return updated; diff --git a/Apps.XTM/Models/Response/LqaDto.cs b/Apps.XTM/Models/Response/LqaDto.cs new file mode 100644 index 0000000..39bc694 --- /dev/null +++ b/Apps.XTM/Models/Response/LqaDto.cs @@ -0,0 +1,179 @@ +using Blackbird.Applications.Sdk.Common; + +namespace Apps.XTM.Models.Response +{ + public class LqaDto + { + public string id { get; set; } + + [Display("Severity multipliers")] + public SeverityMultipliers severityMultipliers { get; set; } + + [Display("Completion date")] + public string completeDate { get; set; } + + [Display("Evaluee")] + public Evaluee evaluee { get; set; } + + [Display("Evaluator")] + public Evaluator evaluator { get; set; } + + [Display("Customer")] + public Customer customer { get; set; } + + [Display("Project")] + public Project project { get; set; } + + [Display("Language")] + public Language language { get; set; } + + [Display("Files")] + public List? files { get; set; } + } + public class Customer + { + [Display("Customer ID")] + public int id { get; set; } + + [Display("Customer name")] + public string name { get; set; } + } + + public class Error + { + [Display("Error ID")] + public string id { get; set; } + + [Display("Parent ID")] + public string parentId { get; set; } + + [Display("Parent Path")] + public string parentPath { get; set; } + + [Display("Key")] + public string key { get; set; } + + [Display("Weight")] + public string weight { get; set; } + + [Display("Issue count")] + public IssueCounts issueCounts { get; set; } + + [Display("Penalty")] + public Penalty penalty { get; set; } + + [Display("Target subscore")] + public string targetSubscore { get; set; } + } + + public class Evaluator + { + [Display("Evaluator ID")] + public int userId { get; set; } + + [Display("Evaluator Name")] + public string userName { get; set; } + } + + public class Evaluee + { + [Display("Evaluaee ID")] + public int userId { get; set; } + + [Display("Evaluaee name")] + public string userName { get; set; } + } + + public class File + { + public _File file { get; set; } + + [Display("Job ID")] + public int jobId { get; set; } + + [Display("Word count")] + public int wordCount { get; set; } + public Total total { get; set; } + public List errors { get; set; } + } + + public class _File + { + [Display("File ID")] + public int fileId { get; set; } + + [Display("File name")] + public string fileName { get; set; } + } + + public class IssueCounts + { + public int Neutral { get; set; } + public int Minor { get; set; } + public int Major { get; set; } + public int Critical { get; set; } + } + + public class Language + { + [Display("Language code")] + public string code { get; set; } + + [Display("Word count")] + public int wordCount { get; set; } + public Total Total { get; set; } + public List Errors { get; set; } + } + + public class Penalty + { + public string Raw { get; set; } + + [Display("Adjusted")] + public string adj { get; set; } + } + + public class Project + { + [Display("Project ID")] + public int id { get; set; } + + [Display("Project name")] + public string name { get; set; } + + [Display("Subject Matter")] + public SubjectMatter subjectMatter { get; set; } + + [Display("Word count")] + public int wordCount { get; set; } + public Total Total { get; set; } + public List Errors { get; set; } + } + + public class SeverityMultipliers + { + public string Neutral { get; set; } + public string Minor { get; set; } + public string Major { get; set; } + public string Critical { get; set; } + } + + public class SubjectMatter + { + [Display("Subject matter ID")] + public int id { get; set; } + public string Name { get; set; } + } + + public class Total + { + public string Weight { get; set; } + + [Display("Issue count")] + public IssueCounts issueCounts { get; set; } + public Penalty Penalty { get; set; } + + [Display("Target subscore")] + public string targetSubscore { get; set; } + } +} diff --git a/Apps.XTM/Models/Response/LqaResponse.cs b/Apps.XTM/Models/Response/LqaResponse.cs index 2948349..3827eb1 100644 --- a/Apps.XTM/Models/Response/LqaResponse.cs +++ b/Apps.XTM/Models/Response/LqaResponse.cs @@ -9,174 +9,62 @@ public class LqaResponse [Display("LQA report ID")] public string id { get; set; } - [Display("Severity multipliers")] - public SeverityMultipliers severityMultipliers { get; set; } + [Display("Severity multiplier neutral")] + public string severityMultiplierNeutral { get; set; } - [Display("Completion date")] - public string completeDate { get; set; } + [Display("Severity multiplier minor")] + public string severityMultiplierMinor { get; set; } - [Display("Evaluee")] - public Evaluee evaluee { get; set; } + [Display("Severity multiplier major")] + public string severityMultiplierMajor { get; set; } - [Display("Evaluator")] - public Evaluator evaluator { get; set; } + [Display("Severity multiplier critical")] + public string severityMultiplierCritical { get; set; } - [Display("Customer")] - public Customer customer { get; set; } + [Display("Completion date")] + public string completeDate { get; set; } - [Display("Project")] - public Project project { get; set; } + [Display("Evaluee name")] + public string evaluee { get; set; } - [Display("Language")] - public Language language { get; set; } - - [Display("Files")] - public List? files { get; set; } - } - public class Customer - { - [Display("Customer ID")] - public int id { get; set; } + [Display("Evaluator name")] + public string evaluator { get; set; } [Display("Customer name")] - public string name { get; set; } - } - - public class Error - { - [Display("Error ID")] - public string id { get; set; } - - [Display("Parent ID")] - public string parentId { get; set; } - - [Display("Parent Path")] - public string parentPath { get; set; } + public string customer { get; set; } - [Display("Key")] - public string key { get; set; } - - [Display("Weight")] - public string weight { get; set; } - - [Display("Issue count")] - public IssueCounts issueCounts { get; set; } - - [Display("Penalty")] - public Penalty penalty { get; set; } - - [Display("Target subscore")] - public string targetSubscore { get; set; } - } - - public class Evaluator - { - [Display("Evaluator ID")] - public int userId { get; set; } - - [Display("Evaluator Name")] - public string userName { get; set; } - } - - public class Evaluee - { - [Display("Evaluaee ID")] - public int userId { get; set; } - - [Display("Evaluaee name")] - public string userName { get; set; } - } - - public class File - { - public _File file { get; set; } + [Display("Project ID")] + public string projectId { get; set; } - [Display("Job ID")] - public int jobId { get; set; } + [Display("Project name")] + public string projectName { get; set; } - [Display("Word count")] - public int wordCount { get; set; } - public Total total { get; set; } - public List errors { get; set; } - } + [Display("Subject matter")] + public string SubjectMatter { get; set; } - public class _File - { - [Display("File ID")] - public int fileId { get; set; } + [Display("Project wordcount")] + public int projectWordcount { get; set; } - [Display("File name")] - public string fileName { get; set; } - } + [Display("Project total")] + public Total projectTotal { get; set; } - public class IssueCounts - { - public int Neutral { get; set; } - public int Minor { get; set; } - public int Major { get; set; } - public int Critical { get; set; } - } + [Display("Project errors")] + public List projectErrors { get; set; } - public class Language - { [Display("Language code")] - public string code { get; set; } - - [Display("Word count")] - public int wordCount { get; set; } - public Total Total { get; set; } - public List Errors { get; set; } - } - - public class Penalty - { - public string Raw { get; set; } - - [Display("Adjusted")] - public string adj { get; set; } - } - - public class Project - { - [Display("Project ID")] - public int id { get; set; } - - [Display("Project name")] - public string name { get; set; } + public string languageCode { get; set; } - [Display("Subject Matter")] - public SubjectMatter subjectMatter { get; set; } + [Display("Language wordcount")] + public int languageWordcount { get; set; } - [Display("Word count")] - public int wordCount { get; set; } - public Total Total { get; set; } - public List Errors { get; set; } - } + [Display("Language total")] + public Total languageTotal { get; set; } - public class SeverityMultipliers - { - public string Neutral { get; set; } - public string Minor { get; set; } - public string Major { get; set; } - public string Critical { get; set; } - } + [Display("Language errors")] + public List languageErrors { get; set; } - public class SubjectMatter - { - [Display("Subject matter ID")] - public int id { get; set; } - public string Name { get; set; } - } - - public class Total - { - public string Weight { get; set; } - - [Display("Issue count")] - public IssueCounts issueCounts { get; set; } - public Penalty Penalty { get; set; } - - [Display("Target subscore")] - public string targetSubscore { get; set; } + [Display("Files")] + public List? files { get; set; } } + }