ADM-1003: [frontend][backend][docs]: re-calculate the lead time for changes for source control data in the report page

backend/src/main/java/heartbeat/client/GitHubFeignClient.java

@@ -4,9 +4,8 @@
 import heartbeat.client.dto.codebase.github.BranchesInfoDTO;
 import heartbeat.client.dto.codebase.github.CommitInfo;
 import heartbeat.client.dto.codebase.github.OrganizationsInfoDTO;
-import heartbeat.client.dto.codebase.github.PullRequestInfo;
 
-import heartbeat.client.dto.codebase.github.PullRequestInfoDTO;
+import heartbeat.client.dto.codebase.github.PullRequestInfo;
 import heartbeat.client.dto.codebase.github.ReposInfoDTO;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -66,7 +65,7 @@ ResponseEntity<List<BranchesInfoDTO>> getAllBranches(@RequestHeader("Authorizati
 
 	@GetMapping(path = "/repos/{org}/{repo}/pulls")
 	@ResponseStatus(HttpStatus.OK)
-	ResponseEntity<List<PullRequestInfoDTO>> getAllPullRequests(@RequestHeader("Authorization") String token,
+	ResponseEntity<List<PullRequestInfo>> getAllPullRequests(@RequestHeader("Authorization") String token,
 			@PathVariable("org") String org, @PathVariable("repo") String repo, @RequestParam("per_page") int perPage,
 			@RequestParam("page") int page, @RequestParam("base") String base, @RequestParam("state") String state);
 

backend/src/main/java/heartbeat/client/dto/codebase/github/CommitInfo.java

@@ -1,5 +1,6 @@
 package heartbeat.client.dto.codebase.github;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,6 +14,9 @@
 @AllArgsConstructor
 public class CommitInfo implements Serializable {
 
+	@JsonProperty("sha")
+	private String commitId;
+
 	private Commit commit;
 
 }

backend/src/main/java/heartbeat/client/dto/codebase/github/LeadTime.java

@@ -14,6 +14,10 @@ public class LeadTime {
 
 	private String commitId;
 
+	private String committer;
+
+	private Integer pullNumber;
+
 	@Nullable
 	private Long prCreatedTime;
 
@@ -23,17 +27,17 @@ public class LeadTime {
 	@Nullable
 	private Long firstCommitTimeInPr;
 
-	private long jobFinishTime;
+	private Long jobFinishTime;
 
-	private long jobStartTime;
+	private Long jobStartTime;
 
 	@Nullable
 	private Long noPRCommitTime;
 
 	@Nullable
 	private Long firstCommitTime;
 
-	private long pipelineCreateTime;
+	private Long pipelineCreateTime;
 
 	@Nullable
 	private Boolean isRevert;

backend/src/main/java/heartbeat/client/dto/codebase/github/PagePullRequestInfoDTO.java → backend/src/main/java/heartbeat/client/dto/codebase/github/PagePullRequestInfo.java

@@ -14,10 +14,10 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class PagePullRequestInfoDTO implements Serializable {
+public class PagePullRequestInfo implements Serializable {
 
 	private int totalPage;
 
-	private List<PullRequestInfoDTO> pageInfo;
+	private List<PullRequestInfo> pageInfo;
 
 }

backend/src/main/java/heartbeat/client/dto/codebase/github/PullRequestInfo.java

@@ -1,8 +1,10 @@
 package heartbeat.client.dto.codebase.github;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -14,6 +16,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PullRequestInfo implements Serializable {
 
 	private Integer number;
@@ -29,4 +32,17 @@ public class PullRequestInfo implements Serializable {
 	@JsonProperty("merge_commit_sha")
 	private String mergeCommitSha;
 
+	private PullRequestUser user;
+
+	@AllArgsConstructor
+	@NoArgsConstructor
+	@Builder
+	@Data
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public static class PullRequestUser implements Serializable {
+
+		private String login;
+
+	}
+
 }

backend/src/main/java/heartbeat/client/dto/codebase/github/SourceControlLeadTime.java

@@ -0,0 +1,24 @@
+package heartbeat.client.dto.codebase.github;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SourceControlLeadTime {
+
+	private String organization;
+
+	private String repo;
+
+	private String branch;
+
+	private List<LeadTime> leadTimes;
+
+}

backend/src/main/java/heartbeat/config/CacheConfig.java

@@ -1,7 +1,6 @@
 package heartbeat.config;
 
 import heartbeat.client.dto.board.jira.CardHistoryResponseDTO;
-import heartbeat.client.dto.board.jira.CalendarificHolidayResponseDTO;
 import heartbeat.client.dto.board.jira.FieldResponseDTO;
 import heartbeat.client.dto.board.jira.HolidaysResponseDTO;
 import heartbeat.client.dto.board.jira.JiraBoardConfigDTO;
@@ -11,7 +10,7 @@
 import heartbeat.client.dto.codebase.github.CommitInfo;
 import heartbeat.client.dto.codebase.github.PageBranchesInfoDTO;
 import heartbeat.client.dto.codebase.github.PageOrganizationsInfoDTO;
-import heartbeat.client.dto.codebase.github.PagePullRequestInfoDTO;
+import heartbeat.client.dto.codebase.github.PagePullRequestInfo;
 import heartbeat.client.dto.codebase.github.PageReposInfoDTO;
 import heartbeat.client.dto.pipeline.buildkite.BuildKiteTokenInfo;
 import heartbeat.client.dto.pipeline.buildkite.PageBuildKitePipelineInfoDTO;
@@ -64,7 +63,7 @@ public CacheManager ehCacheManager() {
 		cacheManager.createCache("pageOrganization", getCacheConfiguration(PageOrganizationsInfoDTO.class));
 		cacheManager.createCache("pageRepo", getCacheConfiguration(PageReposInfoDTO.class));
 		cacheManager.createCache("pageBranch", getCacheConfiguration(PageBranchesInfoDTO.class));
-		cacheManager.createCache("pagePullRequest", getCacheConfiguration(PagePullRequestInfoDTO.class));
+		cacheManager.createCache("pagePullRequest", getCacheConfiguration(PagePullRequestInfo.class));
 		return cacheManager;
 	}
 

backend/src/main/java/heartbeat/controller/report/dto/request/CodeBase.java

@@ -0,0 +1,22 @@
+package heartbeat.controller.report.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CodeBase {
+
+	private List<String> branches;
+
+	private String repo;
+
+	private String organization;
+
+}

backend/src/main/java/heartbeat/controller/report/dto/request/CodebaseSetting.java

@@ -20,4 +20,8 @@ public class CodebaseSetting {
 
 	private List<DeploymentEnvironment> leadTime;
 
+	private List<String> crews;
+
+	private List<CodeBase> codebases;
+
 }

backend/src/main/java/heartbeat/controller/report/dto/response/AvgLeadTimeForChanges.java

@@ -1,10 +1,17 @@
 package heartbeat.controller.report.dto.response;
 
+import heartbeat.util.DecimalUtil;
+import io.micrometer.core.instrument.util.TimeUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -20,4 +27,15 @@ public class AvgLeadTimeForChanges {
 
 	private Double totalDelayTime;
 
+	public List<String[]> getMetricsCsvRowData(String leadTimeForChangesTitle) {
+		List<String[]> rows = new ArrayList<>();
+		rows.add(new String[] { leadTimeForChangesTitle, name + " / PR Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(prLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, name + " / Pipeline Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(pipelineLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, name + " / Total Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(totalDelayTime, HOURS)) });
+		return rows;
+	}
+
 }

backend/src/main/java/heartbeat/controller/report/dto/response/LeadTimeForChanges.java

@@ -15,6 +15,8 @@ public class LeadTimeForChanges {
 
 	private List<LeadTimeForChangesOfPipelines> leadTimeForChangesOfPipelines;
 
+	private List<LeadTimeForChangesOfSourceControl> leadTimeForChangesOfSourceControls;
+
 	private AvgLeadTimeForChanges avgLeadTimeForChanges;
 
 }

backend/src/main/java/heartbeat/controller/report/dto/response/LeadTimeForChangesOfPipelines.java

@@ -1,10 +1,17 @@
 package heartbeat.controller.report.dto.response;
 
+import heartbeat.util.DecimalUtil;
+import io.micrometer.core.instrument.util.TimeUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,4 +28,20 @@ public class LeadTimeForChangesOfPipelines {
 
 	private Double totalDelayTime;
 
+	private String extractPipelineStep(String step) {
+		return step.replaceAll(":\\w+: ", "");
+	}
+
+	public List<String[]> getMetricsCsvRowData(String leadTimeForChangesTitle) {
+		List<String[]> rows = new ArrayList<>();
+		String pipelineStep = extractPipelineStep(this.step);
+		rows.add(new String[] { leadTimeForChangesTitle, this.name + " / " + pipelineStep + " / PR Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(prLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, this.name + " / " + pipelineStep + " / Pipeline Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(pipelineLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, this.name + " / " + pipelineStep + " / Total Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(totalDelayTime, HOURS)) });
+		return rows;
+	}
+
 }

backend/src/main/java/heartbeat/controller/report/dto/response/LeadTimeForChangesOfSourceControl.java

@@ -0,0 +1,42 @@
+package heartbeat.controller.report.dto.response;
+
+import heartbeat.util.DecimalUtil;
+import io.micrometer.core.instrument.util.TimeUtils;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+
+@AllArgsConstructor
+@Builder
+@NoArgsConstructor
+@Data
+public class LeadTimeForChangesOfSourceControl {
+
+	private String organization;
+
+	private String repo;
+
+	private Double prLeadTime;
+
+	private Double pipelineLeadTime;
+
+	private Double totalDelayTime;
+
+	public List<String[]> getMetricsCsvRowData(String leadTimeForChangesTitle) {
+		List<String[]> rows = new ArrayList<>();
+		rows.add(new String[] { leadTimeForChangesTitle, organization + " / " + repo + " / PR Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(prLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, organization + " / " + repo + " / Pipeline Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(pipelineLeadTime, HOURS)) });
+		rows.add(new String[] { leadTimeForChangesTitle, organization + " / " + repo + " / Total Lead Time",
+				DecimalUtil.formatDecimalTwo(TimeUtils.minutesToUnit(totalDelayTime, HOURS)) });
+		return rows;
+	}
+
+}

backend/src/main/java/heartbeat/controller/report/dto/response/LeadTimeInfo.java

@@ -14,6 +14,8 @@
 @AllArgsConstructor
 public class LeadTimeInfo {
 
+	private Integer pullNumber;
+
 	@Nullable
 	private String prCreatedTime;
 
@@ -43,17 +45,21 @@ public class LeadTimeInfo {
 
 	private long nonWorkdays;
 
+	private String committer;
+
 	public LeadTimeInfo(LeadTime leadTime) {
 		if (leadTime == null) {
 			return;
 		}
+		this.pullNumber = leadTime.getPullNumber();
 		this.firstCommitTimeInPr = convertToISOFormat(leadTime.getFirstCommitTimeInPr());
 		this.prCreatedTime = convertToISOFormat(leadTime.getPrCreatedTime());
 		this.prMergedTime = convertToISOFormat(leadTime.getPrMergedTime());
 		this.jobFinishTime = convertToISOFormat(leadTime.getJobFinishTime());
 		this.jobStartTime = convertToISOFormat(leadTime.getJobStartTime());
 		this.firstCommitTime = convertToISOFormat(leadTime.getFirstCommitTime());
 		this.noPRCommitTime = convertToISOFormat(leadTime.getNoPRCommitTime());
+		this.committer = leadTime.getCommitter();
 
 		this.pipelineLeadTime = TimeUtil.msToHMS(leadTime.getPipelineLeadTime());
 		this.isRevert = leadTime.getIsRevert();