ADM-898[backend][frontend]: feat: block' in board mapping is mutually exclusive with 'flag as block'

backend/src/main/java/heartbeat/service/board/jira/JiraService.java

@@ -844,7 +844,8 @@ private CycleTimeInfoDTO getCycleTime(CardHistoryResponseDTO cardHistoryResponse
 				keyFlagged);
 		List<CycleTimeInfo> cycleTimeInfos = boardUtil.getCycleTimeInfos(statusChangedArray, realDoneStatus,
 				treatFlagCardAsBlock);
-		List<CycleTimeInfo> originCycleTimeInfos = boardUtil.getOriginCycleTimeInfos(statusChangedArray);
+		List<CycleTimeInfo> originCycleTimeInfos = boardUtil.getOriginCycleTimeInfos(statusChangedArray,
+				treatFlagCardAsBlock);
 
 		return CycleTimeInfoDTO.builder()
 			.cycleTimeInfos(cycleTimeInfos)

backend/src/main/java/heartbeat/util/BoardUtil.java

@@ -20,10 +20,12 @@ public class BoardUtil {
 
 	private final WorkDay workDay;
 
-	public List<CycleTimeInfo> getOriginCycleTimeInfos(List<StatusChangedItem> statusChangedArray) {
+	public List<CycleTimeInfo> getOriginCycleTimeInfos(List<StatusChangedItem> statusChangedArray,
+			Boolean treatFlagCardAsBlock) {
 		List<StatusTimeStamp> flagTimeStamp = getFlagTimeStamps(statusChangedArray);
 		List<StatusTimeStamp> columnTimeStamp = getColumnTimeStamps(statusChangedArray);
-		List<CycleTimeInfo> originCycleTimeInfos = calculateOriginCycleTime(flagTimeStamp, columnTimeStamp);
+		List<CycleTimeInfo> originCycleTimeInfos = calculateOriginCycleTime(flagTimeStamp, columnTimeStamp,
+				treatFlagCardAsBlock);
 		return getCollectRemovedDuplicates(originCycleTimeInfos);
 	}
 
@@ -50,7 +52,7 @@ public List<CycleTimeInfo> getCycleTimeInfos(List<StatusChangedItem> statusChang
 	}
 
 	private List<CycleTimeInfo> calculateOriginCycleTime(List<StatusTimeStamp> flagTimeStamp,
-			List<StatusTimeStamp> columnTimeStamp) {
+			List<StatusTimeStamp> columnTimeStamp, Boolean treatFlagCardAsBlock) {
 		List<CycleTimeInfo> originCycleTimeInfos = new ArrayList<>();
 
 		for (StatusTimeStamp columnTimeStampItem : columnTimeStamp) {
@@ -62,9 +64,11 @@ private List<CycleTimeInfo> calculateOriginCycleTime(List<StatusTimeStamp> flagT
 				.build());
 		}
 
-		double totalFlagTimeInDays = calculateTotalFlagCycleTime(flagTimeStamp);
-		originCycleTimeInfos
-			.add(CycleTimeInfo.builder().day(totalFlagTimeInDays).column(CardStepsEnum.FLAG.getValue()).build());
+		if (Boolean.TRUE.equals(treatFlagCardAsBlock)) {
+			double totalFlagTimeInDays = calculateTotalFlagCycleTime(flagTimeStamp);
+			originCycleTimeInfos
+				.add(CycleTimeInfo.builder().day(totalFlagTimeInDays).column(CardStepsEnum.FLAG.getValue()).build());
+		}
 
 		return originCycleTimeInfos;
 	}
@@ -101,10 +105,8 @@ private List<CycleTimeInfo> calculateCycleTime(List<String> realDoneStatus, List
 		}
 		if (!isBlockColumnExisted(columnTimeStamp) && totalFlagTimeInDays > 0) {
 			double blockDays = totalFlagTimeInDays - totalFlagAndRealDoneOverlapTime;
-			cycleTimeInfos.add(CycleTimeInfo.builder()
-				.day(blockDays)
-				.column(CardStepsEnum.BLOCK.getValue().toUpperCase())
-				.build());
+			cycleTimeInfos.add(
+					CycleTimeInfo.builder().day(blockDays).column(CardStepsEnum.FLAG.getValue().toUpperCase()).build());
 		}
 
 		return cycleTimeInfos;

backend/src/test/java/heartbeat/service/jira/JiraServiceTest.java

@@ -1166,7 +1166,7 @@ public void shouldProcessCustomFieldsForCardsWhenCallGetStoryPointsAndCycleTime(
 		when(jiraFeignClient.getJiraCardHistoryByCount(any(), any(), anyInt(), anyInt(), any()))
 			.thenReturn(CARD_HISTORY_MULTI_RESPONSE_BUILDER().build());
 		when(boardUtil.getCycleTimeInfos(any(), any(), any())).thenReturn(CYCLE_TIME_INFO_LIST());
-		when(boardUtil.getOriginCycleTimeInfos(any())).thenReturn(CYCLE_TIME_INFO_LIST());
+		when(boardUtil.getOriginCycleTimeInfos(any(), any())).thenReturn(CYCLE_TIME_INFO_LIST());
 
 		CardCollection doneCards = jiraService.getStoryPointsAndCycleTimeAndReworkInfoForDoneCards(
 				storyPointsAndCycleTimeRequest, jiraBoardSetting.getBoardColumns(), List.of("Zhang San"), "");

backend/src/test/java/heartbeat/util/BoardUtilTest.java

@@ -81,16 +81,30 @@ void calculateCycleTimeWhenTreatFlagCardAsBlockIsFalse() {
 	}
 
 	@Test
-	void calculateOriginCycleTimeOfColumn() {
+	void shouldCalculateOriginCycleTimeGivenTreatFlagCardAsBlockIsTrue() {
 		List<StatusChangedItem> statusChangedItems = StatusChangedItemsListAndCycleTimeInfosListFixture
 			.STATUS_CHANGED_ITEMS_LIST_OF_ORIGIN();
 		List<CycleTimeInfo> statusChangedItemsExpect = StatusChangedItemsListAndCycleTimeInfosListFixture
 			.CYCLE_TIME_INFOS_LIST_OF_ORIGIN();
 
 		when(workDay.calculateWorkDaysBy24Hours(anyLong(), anyLong()))
 			.thenReturn(StatusChangedItemsListAndCycleTimeInfosListFixture.EXPECT_DAYS);
-		List<CycleTimeInfo> result = boardUtil.getOriginCycleTimeInfos(statusChangedItems);
+
+		List<CycleTimeInfo> result = boardUtil.getOriginCycleTimeInfos(statusChangedItems, Boolean.TRUE);
 		Assertions.assertEquals(statusChangedItemsExpect, result);
 	}
 
+	@Test
+	void shouldCalculateOriginCycleTimeGivenTreatFlagCardAsBlockIsFalse() {
+		List<StatusChangedItem> statusChangedItems = StatusChangedItemsListAndCycleTimeInfosListFixture
+			.STATUS_CHANGED_ITEMS_LIST_OF_ORIGIN();
+		List<CycleTimeInfo> statusChangedItemsWithoutFlagExpect = StatusChangedItemsListAndCycleTimeInfosListFixture
+			.CYCLE_TIME_INFOS_LIST_OF_ORIGIN_WITHOUT_FLAG();
+
+		when(workDay.calculateWorkDaysBy24Hours(anyLong(), anyLong()))
+			.thenReturn(StatusChangedItemsListAndCycleTimeInfosListFixture.EXPECT_DAYS);
+		List<CycleTimeInfo> result = boardUtil.getOriginCycleTimeInfos(statusChangedItems, Boolean.FALSE);
+		Assertions.assertEquals(statusChangedItemsWithoutFlagExpect, result);
+	}
+
 }

backend/src/test/java/heartbeat/util/StatusChangedItemsListAndCycleTimeInfosListFixture.java

@@ -9,6 +9,14 @@ public class StatusChangedItemsListAndCycleTimeInfosListFixture {
 
 	public static double EXPECT_DAYS = 4.0;
 
+	public static final String DONE = "DONE";
+
+	public static final String BLOCK = "BLOCK";
+
+	public static final String IN_PROGRESS = "IN PROGRESS";
+
+	public static final String FLAG = "FLAG";
+
 	public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_REAL_DONE_COLUMN() {
 		return List.of(StatusChangedItem.builder().timestamp(1000000L).status("In Progress").build(),
 				StatusChangedItem.builder().timestamp(2000000L).status("DONE").build(),
@@ -17,9 +25,9 @@ public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_REAL_DONE_COL
 	}
 
 	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_OF_REAL_DONE_COLUMN() {
-		return List.of(CycleTimeInfo.builder().column("DONE").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("BLOCK").day(0.0).build(),
-				CycleTimeInfo.builder().column("IN PROGRESS").day(EXPECT_DAYS).build());
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(FLAG).day(0.0).build());
 	}
 
 	public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_BLOCK_COLUMN() {
@@ -31,9 +39,9 @@ public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_BLOCK_COLUMN(
 	}
 
 	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_OF_BLOCK_COLUMN() {
-		return List.of(CycleTimeInfo.builder().column("DONE").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("BLOCK").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("IN PROGRESS").day(EXPECT_DAYS).build());
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(BLOCK).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(EXPECT_DAYS).build());
 	}
 
 	public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_OTHER_COLUMN() {
@@ -45,9 +53,9 @@ public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_OTHER_COLUMN(
 	}
 
 	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_OF_OTHER_COLUMN() {
-		return List.of(CycleTimeInfo.builder().column("DONE").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("BLOCK").day(8.0).build(),
-				CycleTimeInfo.builder().column("IN PROGRESS").day(0.0).build());
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(BLOCK).day(8.0).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(0.0).build());
 	}
 
 	public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_WHEN_NOT_TREAT_FLAG_AS_BLOCK() {
@@ -59,9 +67,9 @@ public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_WHEN_NOT_TREAT_F
 	}
 
 	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_WHEN_NOT_TREAT_FLAG_AS_BLOCK() {
-		return List.of(CycleTimeInfo.builder().column("DONE").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("BLOCK").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("IN PROGRESS").day(EXPECT_DAYS).build());
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(BLOCK).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(EXPECT_DAYS).build());
 	}
 
 	public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_ORIGIN() {
@@ -73,10 +81,16 @@ public static List<StatusChangedItem> STATUS_CHANGED_ITEMS_LIST_OF_ORIGIN() {
 	}
 
 	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_OF_ORIGIN() {
-		return List.of(CycleTimeInfo.builder().column("DONE").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("BLOCK").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("IN PROGRESS").day(EXPECT_DAYS).build(),
-				CycleTimeInfo.builder().column("FLAG").day(EXPECT_DAYS).build());
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(BLOCK).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(FLAG).day(EXPECT_DAYS).build());
+	}
+
+	public static List<CycleTimeInfo> CYCLE_TIME_INFOS_LIST_OF_ORIGIN_WITHOUT_FLAG() {
+		return List.of(CycleTimeInfo.builder().column(DONE).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(BLOCK).day(EXPECT_DAYS).build(),
+				CycleTimeInfo.builder().column(IN_PROGRESS).day(EXPECT_DAYS).build());
 	}
 
 }

frontend/__tests__/containers/MetricsStep/CycleTime.test.tsx

@@ -6,7 +6,7 @@ import {
   updateTreatFlagCardAsBlock,
 } from '@src/context/Metrics/metricsSlice';
 import { BOARD_MAPPING, ERROR_MESSAGE_TIME_DURATION, LIST_OPEN, NO_RESULT_DASH } from '../../fixtures';
-import { CYCLE_TIME_SETTINGS_TYPES, METRICS_CONSTANTS } from '@src/constants/resources';
+import { CYCLE_TIME_SETTINGS_TYPES, MESSAGE, METRICS_CONSTANTS } from '@src/constants/resources';
 import { act, render, screen, waitFor, within } from '@testing-library/react';
 import { CycleTime } from '@src/containers/MetricsStep/CycleTime';
 import { setupStore } from '../../utils/setupStoreUtil';
@@ -406,4 +406,23 @@ describe('CycleTime', () => {
       expect(mockedUseAppDispatch).not.toHaveBeenCalledWith(saveDoneColumn([]));
     });
   });
+
+  [CYCLE_TIME_SETTINGS_TYPES.BY_STATUS, CYCLE_TIME_SETTINGS_TYPES.BY_COLUMN].forEach((cycleTimeSettingsType) => {
+    it('should show warning message given both mapping block column and add flag as block', () => {
+      (selectMetricsContent as jest.Mock).mockReturnValue({
+        cycleTimeSettingsType,
+        cycleTimeSettings: [
+          ...cycleTimeSettings,
+          {
+            column: 'Blocked',
+            status: 'BLOCKED',
+            value: 'Block',
+          },
+        ],
+      });
+      setup();
+
+      expect(screen.getByText(MESSAGE.FLAG_CARD_DROPPED_WARNING)).toBeVisible();
+    });
+  });
 });

frontend/__tests__/containers/MetricsStep/MetricsStep.test.tsx

@@ -217,7 +217,7 @@ describe('MetricsStep', () => {
 
       await userEvent.click(doneSelectTrigger as HTMLInputElement);
 
-      const noneOption = within(screen.getByRole('presentation')).getByText('----');
+      const noneOption = within(screen.getAllByRole('presentation')[1]).getByText('----');
       await userEvent.click(noneOption);
 
       expect(realDoneSettingSection).toHaveTextContent(SELECT_CONSIDER_AS_DONE_MESSAGE);

frontend/__tests__/context/metricsSlice.test.ts

@@ -61,6 +61,7 @@ const initState = {
   classification: [],
   treatFlagCardAsBlock: true,
   assigneeFilter: ASSIGNEE_FILTER_TYPES.LAST_ASSIGNEE,
+  displayFlagCardDropWarning: true,
   importedData: {
     importedCrews: [],
     importedAssigneeFilter: ASSIGNEE_FILTER_TYPES.LAST_ASSIGNEE,
@@ -304,6 +305,32 @@ describe('saveMetricsSetting reducer', () => {
     expect(savedMetricsSetting.doneColumn).toEqual(['DONE']);
   });
 
+  it('should not be able to show conflict warning and check the flag card as block', () => {
+    const mockUpdateMetricsStateArguments = {
+      ...mockJiraResponse,
+      isProjectCreated: true,
+    };
+    const savedMetricsSetting = saveMetricsSettingReducer(
+      {
+        ...initState,
+        cycleTimeSettingsType: CYCLE_TIME_SETTINGS_TYPES.BY_STATUS,
+        importedData: {
+          ...initState.importedData,
+          importedCrews: ['User B', 'User C'],
+          importedClassification: ['issuetype'],
+          importedCycleTime: {
+            importedCycleTimeSettings: [{ DOING: 'Doing' }, { TESTING: 'Testing' }, { DONE: 'Done' }],
+            importedTreatFlagCardAsBlock: false,
+          },
+          importedDoneStatus: ['DONE'],
+        },
+      },
+      updateMetricsState(mockUpdateMetricsStateArguments),
+    );
+    expect(savedMetricsSetting.displayFlagCardDropWarning).toEqual(false);
+    expect(savedMetricsSetting.treatFlagCardAsBlock).toEqual(true);
+  });
+
   it('should update metricsState given cycleTimeSettingsType is by status', () => {
     const mockUpdateMetricsStateArguments = {
       ...mockJiraResponse,
@@ -336,6 +363,7 @@ describe('saveMetricsSetting reducer', () => {
       { column: 'Testing', status: 'TESTING', value: 'Testing' },
     ]);
     expect(savedMetricsSetting.doneColumn).toEqual(['DONE']);
+    expect(savedMetricsSetting.displayFlagCardDropWarning).toEqual(true);
   });
 
   it('should update metricsState given its value changed given isProjectCreated is false and selectedDoneColumns and cycleTimeSettingsType is byStatus', () => {

frontend/__tests__/fixtures.ts

@@ -467,7 +467,6 @@ export const MOCK_REPORT_RESPONSE: ReportResponseDTO = {
     fromAnalysis: null,
     fromInDev: null,
     fromBlock: 111,
-    fromFlag: null,
     fromReview: 111,
     fromWaitingForTesting: 111,
     fromTesting: null,

frontend/__tests__/hooks/reportMapper/report.test.tsx

@@ -171,7 +171,7 @@ export const EXPECTED_REPORT_VALUES = {
       ],
     },
     {
-      id: 5,
+      id: 4,
       name: (
         <React.Fragment>
           From <BoldText>review</BoldText> to<BoldText> in dev</BoldText>
@@ -185,7 +185,7 @@ export const EXPECTED_REPORT_VALUES = {
       ],
     },
     {
-      id: 6,
+      id: 5,
       name: (
         <React.Fragment>
           From <BoldText>waiting for testing</BoldText> to<BoldText> in dev</BoldText>
@@ -199,7 +199,7 @@ export const EXPECTED_REPORT_VALUES = {
       ],
     },
     {
-      id: 8,
+      id: 7,
       name: (
         <React.Fragment>
           From <BoldText>done</BoldText> to<BoldText> in dev</BoldText>
@@ -213,7 +213,7 @@ export const EXPECTED_REPORT_VALUES = {
       ],
     },
     {
-      id: 9,
+      id: 8,
       name: <React.Fragment>Total rework cards</React.Fragment>,
       valueList: [
         {
@@ -223,7 +223,7 @@ export const EXPECTED_REPORT_VALUES = {
       ],
     },
     {
-      id: 10,
+      id: 9,
       name: <React.Fragment>Rework cards ratio</React.Fragment>,
       valueList: [
         {

frontend/e2e/fixtures/create-new/board-data-without-block-column.csv

@@ -0,0 +1,4 @@
+"Issue key","Summary","Issue Type","Status","Status Date","Story Points","assignee","Reporter","Project Key","Project Name","Priority","Parent Summary","Sprint","Labels","Cycle Time","Cycle Time / Story Points","Analysis Days","In Dev Days","Waiting Days","Testing Days","Block Days","Review Days","OriginCycleTime: TESTING","OriginCycleTime: WAITING FOR TESTING","OriginCycleTime: TO DO","OriginCycleTime: IN DEV","OriginCycleTime: REVIEW","OriginCycleTime: FLAG","Rework: total - In dev","Rework: from Block","Rework: from Waiting for testing","Rework: from Done"
+"TNB-1","ADM-898-card1","Task","Done","2024-04-08","0.0","Shiqi Yuan","heartbeat user","TNB","Test-no-block","Medium",,,"","0","","0","0","0","0","0","0","0","0","0","0.01","0","0.01","1","1","0","0"
+"TNB-2","ADM-898-card2","Task","Done","2024-04-08","0.0","Shiqi Yuan","heartbeat user","TNB","Test-no-block","Medium",,,"","0","","0","0","0","0","0","0","0","0","0","0.01","0","0.01","2","1","0","1"
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,