[Feat] extend assertion timeout for e2e local

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -6,6 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
+        ## Request Detail
+
         The issue list is reserved exclusively for bug reports and feature requests.
 
         For usage questions, please use the following resources:
@@ -54,8 +56,51 @@ body:
       description: What tools will support your request feature?
       multiple: true
       options:
-        - Board
-        - Pipeline Tool
-        - Source Control
+        - Board (like Jira)
+        - Pipeline Tool (like buildkite)
+        - Source Control (like github)
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ## Account Detail
+
+        Let's know more about you and your account. We will horizontally evaluate all received requests to adjust the priority.
+
+        **Below information are important in terms of prioritization.**
+
+  - type: input
+    id: account_info
+    attributes:
+      label: Account name
+      description: What's your account name?
+      placeholder: Make sure it could be found in jigsaw
+    validations:
+      required: true
+
+  - type: input
+    id: account_location
+    attributes:
+      label: Account location
+      description: Which country you account locate at?
+    validations:
+      required: true
+
+  - type: input
+    id: account_size
+    attributes:
+      label: Teams in Account
+      description: How many teams will adopt heartbeat after feature release?
+    validations:
+      required: true
+
+  - type: input
+    id: expected_date
+    attributes:
+      label: Expected launch date
+      description: What is the latest possible launch date you can accept?
+      placeholder: 2024-12
     validations:
-      required: true
+      required: false

backend/build.gradle

@@ -56,7 +56,7 @@ dependencies {
 tasks.named('test') {
   useJUnitPlatform()
   testLogging {
-    events "passed", "skipped", "failed"
+    events "skipped", "failed"
   }
   finalizedBy jacocoTestReport
 }
@@ -72,6 +72,7 @@ sonar {
     property "sonar.projectKey", "au-heartbeat-heartbeat-backend"
     property "sonar.organization", "au-heartbeat"
     property "sonar.host.url", "https://sonarcloud.io"
+    property "sonar.exclusions", "src/main/java/heartbeat/HeartbeatApplication.java,src/main/java/heartbeat/config/**,src/main/java/heartbeat/util/SystemUtil.java"
   }
 }
 
@@ -100,6 +101,36 @@ jacocoTestCoverageVerification {
   violationRules {
     rule {
       limit {
+        counter = 'INSTRUCTION'
+        value = 'COVEREDRATIO'
+        minimum = 1.0
+      }
+    }
+    rule {
+      limit {
+        counter = 'LINE'
+        value = 'COVEREDRATIO'
+        minimum = 1.0
+      }
+    }
+    rule {
+      limit {
+        counter = 'METHOD'
+        value = 'COVEREDRATIO'
+        minimum = 1.0
+      }
+    }
+    rule {
+      limit {
+        counter = 'BRANCH'
+        value = 'COVEREDRATIO'
+        minimum = 0.90
+      }
+    }
+    rule {
+      limit {
+        counter = 'CLASS'
+        value = 'COVEREDRATIO'
         minimum = 1.0
       }
     }

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

@@ -18,6 +18,8 @@ public class PullRequestInfo implements Serializable {
 
 	private Integer number;
 
+	private String url;
+
 	@JsonProperty("created_at")
 	private String createdAt;
 

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

@@ -4,6 +4,8 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
+import org.springframework.beans.factory.annotation.Value;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -12,11 +14,14 @@
 @Configuration
 public class SwaggerConfig {
 
+	@Value("${heartbeat.swagger.host}")
+	private String swaggerHost;
+
 	@Bean
 	public OpenAPI customOpenAPI() {
 		return new OpenAPI().components(new Components())
 			.info(new Info().title("Backend API").version("1.0"))
-			.servers(List.of(new Server().url("http://13.214.14.43:4321/api/v1")));
+			.servers(List.of(new Server().url(String.format("%s/api/v1", this.swaggerHost))));
 	}
 
 }

backend/src/main/java/heartbeat/handler/AsyncExceptionHandler.java

@@ -16,14 +16,14 @@
 public class AsyncExceptionHandler extends AsyncDataBaseHandler {
 
 	public void put(String reportId, BaseException e) {
-		createFileByType(ERROR, reportId, new Gson().toJson(e));
+		createFileByType(ERROR, reportId, new Gson().toJson(new AsyncExceptionDTO(e)));
 	}
 
-	public BaseException get(String reportId) {
+	public AsyncExceptionDTO get(String reportId) {
 		return readFileByType(ERROR, reportId, AsyncExceptionDTO.class);
 	}
 
-	public BaseException remove(String reportId) {
+	public AsyncExceptionDTO remove(String reportId) {
 		return readAndRemoveFileByType(ERROR, reportId, AsyncExceptionDTO.class);
 	}
 

backend/src/main/java/heartbeat/handler/base/AsyncExceptionDTO.java

@@ -1,11 +1,20 @@
 package heartbeat.handler.base;
 
 import heartbeat.exception.BaseException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 
-public class AsyncExceptionDTO extends BaseException {
+@Data
+@AllArgsConstructor
+public class AsyncExceptionDTO {
 
-	public AsyncExceptionDTO(String message, int status) {
-		super(message, status);
+	private String message;
+
+	private int status;
+
+	public AsyncExceptionDTO(BaseException e) {
+		this.message = e.getMessage();
+		this.status = e.getStatus();
 	}
 
 }

backend/src/main/java/heartbeat/service/report/GenerateReporterService.java

@@ -1,6 +1,5 @@
 package heartbeat.service.report;
 
-import heartbeat.client.dto.codebase.github.PipelineLeadTime;
 import heartbeat.controller.report.dto.request.GenerateReportRequest;
 import heartbeat.controller.report.dto.request.JiraBoardSetting;
 import heartbeat.controller.report.dto.response.ErrorInfo;
@@ -15,6 +14,7 @@
 import heartbeat.handler.AsyncExceptionHandler;
 import heartbeat.handler.AsyncMetricsDataHandler;
 import heartbeat.handler.AsyncReportRequestHandler;
+import heartbeat.handler.base.AsyncExceptionDTO;
 import heartbeat.service.report.calculator.ChangeFailureRateCalculator;
 import heartbeat.service.report.calculator.ClassificationCalculator;
 import heartbeat.service.report.calculator.CycleTimeCalculator;
@@ -102,12 +102,10 @@ public void generateDoraReport(GenerateReportRequest request) {
 		FetchedData fetchedData = new FetchedData();
 		if (CollectionUtils.isNotEmpty(request.getPipelineMetrics())) {
 			GenerateReportRequest pipelineRequest = request.toPipelineRequest();
-			fetchOriginalData(pipelineRequest, fetchedData);
 			generatePipelineReport(pipelineRequest, fetchedData);
 		}
 		if (CollectionUtils.isNotEmpty(request.getSourceControlMetrics())) {
 			GenerateReportRequest sourceControlRequest = request.toSourceControlRequest();
-			fetchOriginalData(sourceControlRequest, fetchedData);
 			generateSourceControlReport(sourceControlRequest, fetchedData);
 		}
 		generateCSVForPipeline(request, fetchedData.getBuildKiteData());
@@ -121,6 +119,7 @@ private void generatePipelineReport(GenerateReportRequest request, FetchedData f
 				request.getPipelineMetrics(), request.getConsiderHoliday(), request.getStartTime(),
 				request.getEndTime(), pipelineReportId);
 		try {
+			fetchOriginalData(request, fetchedData);
 			saveReporterInHandler(generatePipelineReporter(request, fetchedData), pipelineReportId);
 			log.info(
 					"Successfully generate pipeline report, _metrics: {}, _considerHoliday: {}, _startTime: {}, _endTime: {}, _pipelineReportId: {}",
@@ -131,6 +130,9 @@ private void generatePipelineReport(GenerateReportRequest request, FetchedData f
 			asyncExceptionHandler.put(pipelineReportId, e);
 			if (List.of(401, 403, 404).contains(e.getStatus()))
 				asyncMetricsDataHandler.updateMetricsDataCompletedInHandler(request.getDoraReportId(), DORA);
+			if (Objects.equals(400, e.getStatus())) {
+				throw e;
+			}
 		}
 	}
 
@@ -141,6 +143,7 @@ private void generateSourceControlReport(GenerateReportRequest request, FetchedD
 				request.getSourceControlMetrics(), request.getConsiderHoliday(), request.getStartTime(),
 				request.getEndTime(), sourceControlReportId);
 		try {
+			fetchOriginalData(request, fetchedData);
 			saveReporterInHandler(generateSourceControlReporter(request, fetchedData), sourceControlReportId);
 			log.info(
 					"Successfully generate source control report, _metrics: {}, _considerHoliday: {}, _startTime: {}, _endTime: {}, _sourceControlReportId: {}",
@@ -151,6 +154,9 @@ private void generateSourceControlReport(GenerateReportRequest request, FetchedD
 			asyncExceptionHandler.put(sourceControlReportId, e);
 			if (List.of(401, 403, 404).contains(e.getStatus()))
 				asyncMetricsDataHandler.updateMetricsDataCompletedInHandler(request.getDoraReportId(), DORA);
+			if (Objects.equals(400, e.getStatus())) {
+				throw e;
+			}
 		}
 	}
 
@@ -265,7 +271,7 @@ private void saveReporterInHandler(ReportResponse reportContent, String reportId
 		asyncReportRequestHandler.putReport(reportId, reportContent);
 	}
 
-	private ErrorInfo handleAsyncExceptionAndGetErrorInfo(BaseException exception) {
+	private ErrorInfo handleAsyncExceptionAndGetErrorInfo(AsyncExceptionDTO exception) {
 		if (Objects.nonNull(exception)) {
 			int status = exception.getStatus();
 			final String errorMessage = exception.getMessage();
@@ -349,9 +355,9 @@ public ReportResponse getComposedReportResponse(String reportId) {
 	}
 
 	private ReportMetricsError getReportErrorAndHandleAsyncException(String reportId) {
-		BaseException boardException = asyncExceptionHandler.get(IdUtil.getBoardReportId(reportId));
-		BaseException pipelineException = asyncExceptionHandler.get(IdUtil.getPipelineReportId(reportId));
-		BaseException sourceControlException = asyncExceptionHandler.get(IdUtil.getSourceControlReportId(reportId));
+		AsyncExceptionDTO boardException = asyncExceptionHandler.get(IdUtil.getBoardReportId(reportId));
+		AsyncExceptionDTO pipelineException = asyncExceptionHandler.get(IdUtil.getPipelineReportId(reportId));
+		AsyncExceptionDTO sourceControlException = asyncExceptionHandler.get(IdUtil.getSourceControlReportId(reportId));
 		return ReportMetricsError.builder()
 			.boardMetricsError(handleAsyncExceptionAndGetErrorInfo(boardException))
 			.pipelineMetricsError(handleAsyncExceptionAndGetErrorInfo(pipelineException))

backend/src/main/java/heartbeat/service/report/WorkDay.java

@@ -21,7 +21,7 @@
 @RequiredArgsConstructor
 public class WorkDay {
 
-	private static final long ONE_DAY = 1000 * 60 * 60 * 24;
+	private static final long ONE_DAY = 1000L * 60 * 60 * 24;
 
 	private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 

backend/src/main/java/heartbeat/service/source/github/GitHubService.java

@@ -163,7 +163,8 @@ private LeadTime getLeadTimeByPullRequest(String realToken, PipelineInfoOfReposi
 		}
 
 		Optional<PullRequestInfo> mergedPull = pullRequestInfos.stream()
-			.filter(gitHubPull -> gitHubPull.getMergedAt() != null)
+			.filter(gitHubPull -> gitHubPull.getMergedAt() != null
+					&& gitHubPull.getUrl().contains(item.getRepository()))
 			.min(Comparator.comparing(PullRequestInfo::getNumber));
 
 		if (mergedPull.isEmpty()) {

backend/src/main/resources/application.yml

@@ -29,5 +29,7 @@ springdoc:
     path: /api-docs
 
 heartbeat:
+  swagger:
+    host: ${SWAGGER_HOST:http://localhost:4322}
   version: 1.1.5
 

backend/src/test/java/heartbeat/TestFixtures.java

@@ -2,7 +2,7 @@
 
 public class TestFixtures {
 
-	public static final String GITHUB_TOKEN = "ghp_12345jhgyui987654rdef43567yhu7654321"; // gitleaks:allow
+	public static final String GITHUB_TOKEN = "ghp_" + "12345j".repeat(6);
 
 	public static final String BUILDKITE_TOKEN = "bkua_6xxxafcc3bxxxxxxb8xxx8d8dxxxf7897cc8b2f1";
 

backend/src/test/java/heartbeat/handler/AsyncExceptionHandlerTest.java

@@ -1,8 +1,8 @@
 package heartbeat.handler;
 
-import heartbeat.exception.BaseException;
 import heartbeat.exception.GenerateReportException;
 import heartbeat.exception.UnauthorizedException;
+import heartbeat.handler.base.AsyncExceptionDTO;
 import heartbeat.util.IdUtil;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.AfterAll;
@@ -162,7 +162,7 @@ void shouldPutAndRemoveAsyncException() {
 		String boardReportId = IdUtil.getBoardReportId(currentTime);
 		asyncExceptionHandler.put(boardReportId, new UnauthorizedException("test"));
 
-		BaseException baseException = asyncExceptionHandler.remove(boardReportId);
+		AsyncExceptionDTO baseException = asyncExceptionHandler.remove(boardReportId);
 
 		assertEquals(HttpStatus.UNAUTHORIZED.value(), baseException.getStatus());
 		assertEquals("test", baseException.getMessage());

backend/src/test/java/heartbeat/handler/base/AsyncExceptionDTOTest.java → backend/src/test/java/heartbeat/handler/base/AsyncExceptionTest.java

@@ -1,6 +1,5 @@
 package heartbeat.handler.base;
 
-import heartbeat.exception.BaseException;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -12,7 +11,7 @@ void testAsyncExceptionDTOInheritance() {
 		String expectedMessage = "Test Message";
 		int expectedStatus = 404;
 
-		BaseException baseException = new AsyncExceptionDTO(expectedMessage, expectedStatus);
+		AsyncExceptionDTO baseException = new AsyncExceptionDTO(expectedMessage, expectedStatus);
 
 		assertEquals(expectedMessage, baseException.getMessage());
 		assertEquals(expectedStatus, baseException.getStatus());