Merge branch 'main' into ADM-574

au-heartbeat · Sep 11, 2023 · d99a8cb · d99a8cb
2 parents 5faa433 + cb64d2c
commit d99a8cb
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 15,467 deletions.
diff --git a/backend/src/main/java/heartbeat/client/JiraFeignClient.java b/backend/src/main/java/heartbeat/client/JiraFeignClient.java
@@ -4,16 +4,15 @@
 import heartbeat.client.dto.board.jira.FieldResponseDTO;
 import heartbeat.client.dto.board.jira.JiraBoardConfigDTO;
 import heartbeat.client.dto.board.jira.StatusSelfDTO;
-
-import java.net.URI;
-
 import heartbeat.decoder.JiraFeignClientDecoder;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import java.net.URI;
+
 @FeignClient(value = "jiraFeignClient", url = "${jira.url}", configuration = JiraFeignClientDecoder.class)
 public interface JiraFeignClient {
 

diff --git a/backend/src/main/java/heartbeat/config/CacheConfig.java b/backend/src/main/java/heartbeat/config/CacheConfig.java
@@ -26,6 +26,7 @@ public class CacheConfig {
 	public CacheManager ehCacheManager() {
 		CachingProvider provider = Caching.getCachingProvider();
 		CacheManager cacheManager = provider.getCacheManager();
+		cacheManager.createCache("sprintInfo", getCacheConfiguration(String.class));
 		cacheManager.createCache("jiraConfig", getCacheConfiguration(JiraBoardConfigDTO.class));
 		cacheManager.createCache("jiraStatusCategory", getCacheConfiguration(StatusSelfDTO.class));
 		cacheManager.createCache("jiraActivityfeed", getCacheConfiguration(CardHistoryResponseDTO.class));

diff --git a/backend/src/main/java/heartbeat/service/board/jira/JiraService.java b/backend/src/main/java/heartbeat/service/board/jira/JiraService.java
@@ -1,5 +1,6 @@
 package heartbeat.service.board.jira;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -80,6 +81,8 @@ public class JiraService {
 	public static final List<String> FIELDS_IGNORE = List.of("summary", "description", "attachment", "duedate",
 			"issuelinks");
 
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
 	private static final String DONE_CARD_TAG = "done";
 
 	private final ThreadPoolTaskExecutor customTaskExecutor;
@@ -359,9 +362,8 @@ else if (customFieldValue.equals("Flagged") && !fieldValue.isJsonNull()
 
 	private String parseJiraJql(BoardType boardType, List<String> doneColumns, BoardRequestParam boardRequestParam) {
 		if (boardType == BoardType.JIRA) {
-			return String.format(
-					"status in ('%s') AND statusCategoryChangedDate >= %s AND statusCategoryChangedDate <= %s",
-					String.join("','", doneColumns), boardRequestParam.getStartTime(), boardRequestParam.getEndTime());
+			return String.format("status in ('%s') AND status changed during (%s, %s)", String.join("','", doneColumns),
+					boardRequestParam.getStartTime(), boardRequestParam.getEndTime());
 		}
 		else {
 			StringBuilder subJql = new StringBuilder();
@@ -470,20 +472,14 @@ private List<JiraCardDTO> getRealDoneCards(StoryPointsAndCycleTimeRequest reques
 
 	private boolean isRealDoneCardByHistory(CardHistoryResponseDTO jiraCardHistory,
 			StoryPointsAndCycleTimeRequest request) {
-		HistoryDetail detail = jiraCardHistory.getItems()
+		List<String> upperDoneStatuses = request.getStatus().stream().map(String::toUpperCase).toList();
+		long validStartTime = parseLong(request.getStartTime());
+
+		return jiraCardHistory.getItems()
 			.stream()
-			.filter(historyDetail -> STATUS_FIELD_ID.equals(historyDetail.getFieldId()))
-			.filter((historyDetail) -> historyDetail.getTimestamp() > parseLong(request.getStartTime()))
-			.reduce((pre, next) -> next)
-			.orElse(null);
-		if (detail == null) {
-			return false;
-		}
-		else {
-			String displayName = detail.getTo().getDisplayName();
-			return request.getStatus().contains(displayName.toUpperCase())
-					|| CardStepsEnum.CLOSED.getValue().equalsIgnoreCase(displayName);
-		}
+			.filter(history -> STATUS_FIELD_ID.equals(history.getFieldId()))
+			.filter(history -> upperDoneStatuses.contains(history.getTo().getDisplayValue().toUpperCase()))
+			.allMatch(history -> history.getTimestamp() > validStartTime);
 	}
 
 	private CycleTimeInfoDTO getCycleTime(URI baseUrl, String doneCardKey, String token, Boolean treatFlagCardAsBlock,

diff --git a/backend/src/test/java/heartbeat/service/jira/JiraBoardConfigDTOFixture.java b/backend/src/test/java/heartbeat/service/jira/JiraBoardConfigDTOFixture.java
@@ -160,7 +160,8 @@ public static CardHistoryResponseDTO.CardHistoryResponseDTOBuilder CARD_HISTORY_
 			.items(List.of(new HistoryDetail(2, "status", new Status("In Dev"), new Status("To do")),
 					new HistoryDetail(3, "status", new Status(REVIEW), new Status("In Dev")),
 					new HistoryDetail(4, "status", new Status(WAITING_FOR_TESTING), new Status(REVIEW)),
-					new HistoryDetail(5, "status", new Status(TESTING), new Status(WAITING_FOR_TESTING))));
+					new HistoryDetail(5, "status", new Status(TESTING), new Status(WAITING_FOR_TESTING)),
+					new HistoryDetail(1662642750003L, "status", new Status("Done"), new Status(TESTING))));
 	}
 
 	public static CardHistoryResponseDTO.CardHistoryResponseDTOBuilder CARD_HISTORY_RESPONSE_BUILDER_TO_DONE() {
@@ -185,9 +186,9 @@ public static CardHistoryResponseDTO.CardHistoryResponseDTOBuilder CARD_HISTORY_
 					new HistoryDetail(2, "assignee", new Status("In Dev"), new Status("To do")),
 					new HistoryDetail(3, "status", new Status(REVIEW), new Status("In Dev")),
 					new HistoryDetail(4, "status", new Status(WAITING_FOR_TESTING), new Status(REVIEW)),
-					new HistoryDetail(5, "status", new Status(TESTING), new Status(WAITING_FOR_TESTING)),
-					new HistoryDetail(6, "status", new Status(BLOCK), new Status(TESTING)),
-					new HistoryDetail(7, "status", new Status(FLAG), new Status(BLOCK)),
+					new HistoryDetail(1672642740000L, "status", new Status(TESTING), new Status(WAITING_FOR_TESTING)),
+					new HistoryDetail(1672642740001L, "status", new Status(BLOCK), new Status(TESTING)),
+					new HistoryDetail(1672642740002L, "status", new Status(FLAG), new Status(BLOCK)),
 					new HistoryDetail(1672642750001L, "customfield_10021", new Status("Impediment"), new Status(FLAG)),
 					new HistoryDetail(1672642750002L, "flagged", new Status("Impediment"), new Status("removeFlag")),
 					new HistoryDetail(1672642750003L, "status", new Status("Done"), new Status(TESTING)),
@@ -343,7 +344,7 @@ public static StoryPointsAndCycleTimeRequest.StoryPointsAndCycleTimeRequestBuild
 			.site(jiraBoardSetting.getSite())
 			.project(jiraBoardSetting.getProjectKey())
 			.boardId(jiraBoardSetting.getBoardId())
-			.status(jiraBoardSetting.getDoneColumn())
+			.status(List.of("Done", "Testing"))
 			.startTime("1672556350000")
 			.endTime("1676908799000")
 			.targetFields(jiraBoardSetting.getTargetFields())

diff --git a/backend/src/test/java/heartbeat/service/jira/JiraServiceTest.java b/backend/src/test/java/heartbeat/service/jira/JiraServiceTest.java
@@ -444,12 +444,9 @@ void shouldGetCardsWhenCallGetStoryPointsAndCycleTime() throws JsonProcessingExc
 		URI baseUrl = URI.create(SITE_ATLASSIAN_NET);
 		String token = "token";
 		BoardRequestParam boardRequestParam = BOARD_REQUEST_BUILDER().build();
-		String jql = String.format(
-				"status in ('%s') AND statusCategoryChangedDate >= %s AND statusCategoryChangedDate <= %s", "DONE",
+		String jql = String.format("status in ('%s') AND status changed during (%s, %s)", "DONE",
 				boardRequestParam.getStartTime(), boardRequestParam.getEndTime());
 
-		JiraBoardSetting jiraBoardSetting = JIRA_BOARD_SETTING_BUILD().build();
-		StoryPointsAndCycleTimeRequest storyPointsAndCycleTimeRequest = STORY_POINTS_FORM_ALL_DONE_CARD().build();
 		String allDoneCards = objectMapper.writeValueAsString(ALL_DONE_CARDS_RESPONSE_FOR_STORY_POINT_BUILDER().build())
 			.replaceAll("\"storyPoints\":0", "\"customfield_10016\":null")
 			.replaceAll("storyPoints", "customfield_10016");
@@ -463,6 +460,8 @@ void shouldGetCardsWhenCallGetStoryPointsAndCycleTime() throws JsonProcessingExc
 			.thenReturn(CARD_HISTORY_RESPONSE_BUILDER().build());
 		when(jiraFeignClient.getTargetField(baseUrl, "PLL", token)).thenReturn(ALL_FIELD_RESPONSE_BUILDER().build());
 
+		StoryPointsAndCycleTimeRequest storyPointsAndCycleTimeRequest = STORY_POINTS_FORM_ALL_DONE_CARD().build();
+		JiraBoardSetting jiraBoardSetting = JIRA_BOARD_SETTING_BUILD().build();
 		CardCollection cardCollection = jiraService.getStoryPointsAndCycleTimeForDoneCards(
 				storyPointsAndCycleTimeRequest, jiraBoardSetting.getBoardColumns(), List.of("Zhang San"));
 
@@ -475,7 +474,6 @@ void shouldGetCardsWhenCallGetStoryPointsAndCycleTimeWhenBoardTypeIsClassicJira(
 		// given
 		URI baseUrl = URI.create(SITE_ATLASSIAN_NET);
 		String token = "token";
-		List<String> user = List.of("Zhang San");
 
 		JiraBoardSetting jiraBoardSetting = CLASSIC_JIRA_BOARD_SETTING_BUILD().build();
 		StoryPointsAndCycleTimeRequest storyPointsAndCycleTimeRequest = CLASSIC_JIRA_STORY_POINTS_FORM_ALL_DONE_CARD()
@@ -497,9 +495,8 @@ void shouldGetCardsWhenCallGetStoryPointsAndCycleTimeWhenBoardTypeIsClassicJira(
 		// then
 
 		CardCollection cardCollection = jiraService.getStoryPointsAndCycleTimeForDoneCards(
-				storyPointsAndCycleTimeRequest, jiraBoardSetting.getBoardColumns(), user);
-		assertThat(cardCollection.getStoryPointSum()).isEqualTo(0);
-		assertThat(cardCollection.getCardsNumber()).isEqualTo(0);
+				storyPointsAndCycleTimeRequest, jiraBoardSetting.getBoardColumns(), List.of("Zhang San"));
+		assertThat(cardCollection.getCardsNumber()).isEqualTo(1);
 	}
 
 	@Test
@@ -563,8 +560,7 @@ void shouldReturnIllegalArgumentExceptionWhenHaveUnknownColumn() throws JsonProc
 		StoryPointsAndCycleTimeRequest storyPointsAndCycleTimeRequest = STORY_POINTS_FORM_ALL_DONE_CARD().startTime("5")
 			.build();
 		BoardRequestParam boardRequestParam = BOARD_REQUEST_BUILDER().startTime("5").build();
-		String jql = String.format(
-				"status in ('%s') AND statusCategoryChangedDate >= %s AND statusCategoryChangedDate <= %s", "DONE",
+		String jql = String.format("status in ('%s') AND status changed during (%s, %s)", "DONE",
 				boardRequestParam.getStartTime(), boardRequestParam.getEndTime());
 		URI baseUrl = URI.create(SITE_ATLASSIAN_NET);
 		String allDoneCards = objectMapper.writeValueAsString(ALL_DONE_CARDS_RESPONSE_FOR_STORY_POINT_BUILDER().build())

diff --git a/frontend/cypress/e2e/createANewProject.cy.ts b/frontend/cypress/e2e/createANewProject.cy.ts
@@ -6,24 +6,25 @@ import reportPage from '../pages/metrics/report'
 
 const cycleTimeData = [
   { label: 'Name', value: 'Value' },
-  { label: 'Average cycle time', value: '8.14(days/SP)' },
-  { label: '9.30(days/card)' },
-  { label: 'Total development time / Total cycle time', value: '0.64' },
+  { label: 'Average cycle time', value: '8.35(days/SP)' },
+  { label: '9.55(days/card)' },
+  { label: 'Total development time / Total cycle time', value: '0.62' },
   { label: 'Total waiting for testing time / Total cycle time', value: '0.02' },
-  { label: 'Total block time / Total cycle time', value: '0.28' },
+  { label: 'Total block time / Total cycle time', value: '0.3' },
   { label: 'Total review time / Total cycle time', value: '0.04' },
-  { label: 'Total testing time / Total cycle time', value: '0.02' },
+  { label: 'Total testing time / Total cycle time', value: '0.01' },
   { label: 'Average development time', value: '5.18(days/SP)' },
   { label: '5.92(days/card)' },
   { label: 'Average waiting for testing time', value: '0.20(days/SP)' },
   { label: '0.23(days/card)' },
-  { label: 'Average block time', value: '2.31(days/SP)' },
-  { label: '2.64(days/card)' },
+  { label: 'Average block time', value: '2.53(days/SP)' },
+  { label: '2.89(days/card)' },
   { label: 'Average review time', value: '0.32(days/SP)' },
   { label: '0.37(days/card)' },
   { label: 'Average testing time', value: '0.12(days/SP)' },
   { label: '0.14(days/card)' },
 ]
+
 const velocityData = [
   { label: 'Name', value: 'Value' },
   { label: 'Velocity(Story Point)', value: '16' },