[Tools] [JiraReporting] made it more flexible with JQL input as a par…

…ameter

Tools/src/JiraReporting/JiraReporting.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Tools/src/JiraReporting/Model/Fields.cs

@@ -12,16 +12,14 @@ public class Fields
         public IssueType IssueType { get; set; }
         public Assignee Assignee { get; set; }
 
-        [JsonPropertyName("customfield_10263")]
-        public Severity Severity { get; set; }
-
-        [JsonPropertyName("customfield_10018")]
+        public Priority Priority { get; set; }
+
+        //TODO: Make this customizable
+        [JsonPropertyName("customfield_10020")]
         public List<Sprint> Sprints { get; set; }
 
-        [JsonPropertyName("customfield_10281")]
-        public Points Points { get; set; }
+        [JsonPropertyName("customfield_10026")]
+        public double? Points { get; set; }
 
-        [JsonPropertyName("customfield_10283")]
-        public RaidType RaidType { get; set; }
     }
 }

Tools/src/JiraReporting/Model/Points.cs → Tools/src/JiraReporting/Model/Priority.cs

@@ -1,6 +1,6 @@
 namespace JiraReporting.Model
 {
-    public class Points
+    public class Priority
     {
         public string Value { get; set; }
     }

Tools/src/JiraReporting/Options.cs

@@ -7,17 +7,13 @@ public class Options
         [Option("JiraEndpoint", Required = true, HelpText = "JIRA Endpoint")]
         public string JiraEndpoint { get; set; }
 
-        [Option("JiraProject", Required = true, HelpText = "JIRA Project")]
-        public string JiraProject { get; set; }
+        [Option("JQL", Required = true, HelpText = "JIRA Query Language (https://support.atlassian.com/jira-software-cloud/docs/use-advanced-search-with-jira-query-language-jql/)")]
+        public string JQL { get; set; }
 
         [Option("JiraUsername", Required = true, HelpText = "JIRA Username")]
         public string JiraUsername { get; set; }
 
-        [Option("JiraAuthenticationToken", Required = true, HelpText = "JIRA Authentication Token")]
+        [Option("JiraAuthenticationToken", Required = true, HelpText = "JIRA Authentication Token (https://id.atlassian.com/manage-profile/security/api-tokens)")]
         public string JiraAuthenticationToken { get; set; }
-
-        [Option("PowerBiDatasetEndpoint", Required = true, HelpText = "PowerBI Endpoint")]
-        public string PowerBiDatasetEndpoint { get; set; }
-
     }
 }

Tools/src/JiraReporting/Program.cs

@@ -23,7 +23,8 @@ static void Main(string[] args)
             Parser.Default.ParseArguments<Options>(args)
                .WithParsed(o =>
                {
-                   ExecuteJob(o.JiraEndpoint, o.JiraProject, o.JiraUsername, o.JiraAuthenticationToken, o.PowerBiDatasetEndpoint);
+                   //ExecuteJob(o.JiraEndpoint, o.JiraProject, o.JiraUsername, o.JiraAuthenticationToken, o.PowerBiDatasetEndpoint);
+                   ExecuteJob(o.JiraEndpoint, o.JQL, o.JiraUsername, o.JiraAuthenticationToken);
                    //RecurringJob.AddOrUpdate("JiraReportJob",
                    //                        () => ExecuteJob(o.JiraEndpoint, o.JiraProject, o.JiraUsername, o.JiraAuthenticationToken, o.PowerBiDatasetEndpoint),
                    //                        Cron.Hourly);
@@ -33,7 +34,7 @@ static void Main(string[] args)
             Console.ReadLine();
         }
 
-        public static void ExecuteJob(string jiraEndpoint, string jiraProject, string jiraUsername, string jiraAuthenticationToken, string powerBiDatasetEndpoint)
+        public static void ExecuteJob(string jiraEndpoint, string jql, string jiraUsername, string jiraAuthenticationToken)
         {
             Console.WriteLine($"Jira Report started {DateTime.Now}");
 
@@ -73,24 +74,22 @@ public static void ExecuteJob(string jiraEndpoint, string jiraProject, string ji
             while (startAt <= finishAt)
             {
                 var query = $@"{{
-                                ""jql"": ""project={jiraProject}"",
+                                ""jql"": ""{jql}"",
                                 ""maxResults"": {increment},
                                 ""startAt"": {startAt}
                             }}";
-
+           
                 var response = httpConnector.PostAsync($"{jiraEndpoint}/rest/api/2/search", query).Result;
                 var jqlQueryResult = JsonSerializer.Deserialize<JqlQueryResult>(response, jsonSerializerOptions);
 
+                Console.WriteLine($"Processing {startAt} of {jqlQueryResult.Total} {DateTime.Now}");
+
                 startAt += increment;
                 finishAt = jqlQueryResult.Total - 1;
 
                 foreach (var issue in jqlQueryResult.Issues)
                 {
                     var issueType = issue.Fields.IssueType.Name;
-                    if (issueType.Equals("RAID") && !string.IsNullOrEmpty(issue.Fields.RaidType?.Value))
-                    {
-                        issueType = issue.Fields.RaidType?.Value;
-                    }
 
                     var row = new BacklogItem
                     {
@@ -101,9 +100,9 @@ public static void ExecuteJob(string jiraEndpoint, string jiraProject, string ji
                         EpicId = issue.Fields.Parent?.Key,
                         EpicTitle = issue.Fields.Parent?.Fields.Summary,
                         IssueType = issueType,
-                        Severity = issue.Fields.Severity?.Value,
+                        Priority = issue.Fields.Priority?.Value,
                         Status = issue.Fields.Status.Name,
-                        Points = issue.Fields.Points?.Value,
+                        Points = Convert.ToInt32(issue.Fields.Points),
                         AssignedTo = issue.Fields.Assignee == null ? "Unassigned" : issue.Fields.Assignee.DisplayName
                     };
 
@@ -137,13 +136,13 @@ public static void ExecuteJob(string jiraEndpoint, string jiraProject, string ji
             var outputFile = $"{Environment.CurrentDirectory}\\report_{DateTime.Now.Date.ToString(dateFormat)}";
 
             ExcelHelper.Export(latestBacklog, null, $"{outputFile}.xlsx", jiraEndpoint);
-            ExcelHelper.Export(changedStories, null, $"ChangedStories.xlsx", jiraEndpoint);
-            ExcelHelper.Export(changedBugs, null, $"ChangedBugs.xlsx", jiraEndpoint);
-            ExcelHelper.Export(changedRaids, null, $"ChangedRaids.xlsx", jiraEndpoint);
+            //ExcelHelper.Export(changedStories, null, $"ChangedStories.xlsx", jiraEndpoint);
+            //ExcelHelper.Export(changedBugs, null, $"ChangedBugs.xlsx", jiraEndpoint);
+            //ExcelHelper.Export(changedRaids, null, $"ChangedRaids.xlsx", jiraEndpoint);
 
             File.WriteAllText($"{outputFile}.json", JsonSerializer.Serialize(latestBacklog));
 
-            var result = httpConnector.PostAsync(powerBiDatasetEndpoint, JsonSerializer.Serialize(latestBacklog)).Result;
+            //var result = httpConnector.PostAsync(powerBiDatasetEndpoint, JsonSerializer.Serialize(latestBacklog)).Result;
 
             Console.WriteLine($"Jira Report stopped {DateTime.Now}");
         }

Tools/src/JiraReporting/Report/BacklogItem.cs

@@ -15,12 +15,12 @@ public BacklogItem()
         public string IssueType { get; set; }
         public string Sprint { get; set; }
         public string Status { get; set; }
-        public string Points { get; set; }
+        public int Points { get; set; }
         public string AssignedTo { get; set; }
         public DateTime Date { get; set; }
         public string IssueId { get; set; }
         public string IssueTitle { get; set; }
-        public string Severity { get; set; }
+        public string Priority { get; set; }
 
     }
 }

Tools/src/JiraReporting/Report/ExcelHelper.cs

@@ -70,7 +70,7 @@ public static void Export(List<BacklogItem> backlogItems, List<BacklogItem> newB
 
                     row.CreateCell(5).SetCellValue(backlogItem.IssueTitle);
                     row.CreateCell(6).SetCellValue(backlogItem.IssueType);
-                    row.CreateCell(7).SetCellValue(backlogItem.Severity);
+                    row.CreateCell(7).SetCellValue(backlogItem.Priority);
                     row.CreateCell(8).SetCellValue(backlogItem.Status);
                     row.CreateCell(9).SetCellValue(Convert.ToDouble(backlogItem.Points));
                     row.CreateCell(10).SetCellValue(backlogItem.AssignedTo);