PR from 8.0.0 to 11.0.0

UI/src/app/dashboard/filter/filter.component.spec.ts

@@ -1065,6 +1065,7 @@ const completeHierarchyData = {
     component.filterForm = new UntypedFormGroup({
       sprint: new UntypedFormControl({})
     });
+    component.selectedTab = "value";
 
     const spy = spyOn(component, 'applyChanges');
     component.removeItem('sprint', '38994_DEMO_SONAR_63284960fdd20276d60e4df5');

common/src/main/java/com/publicissapient/kpidashboard/common/client/KerberosClient.java

@@ -71,7 +71,7 @@ public class KerberosClient {
 
 	/**
 	 * Kerberos client constructor
-	 * 
+	 *
 	 * @param jaasConfigFilePath
 	 *            path to a file that contains login information
 	 * @param krb5ConfigFilePath
@@ -97,7 +97,7 @@ public KerberosClient(String jaasConfigFilePath, String krb5ConfigFilePath, Stri
 
 	/**
 	 * Get cookie store
-	 * 
+	 *
 	 * @return basic cookie store.
 	 */
 	public BasicCookieStore getCookieStore() {
@@ -106,7 +106,7 @@ public BasicCookieStore getCookieStore() {
 
 	/**
 	 * Get jira host
-	 * 
+	 *
 	 * @return jira host string
 	 */
 	public String getJiraHost() {
@@ -115,7 +115,7 @@ public String getJiraHost() {
 
 	/**
 	 * This method build a Http client with SPNEGO scheme factory and cookie store
-	 * 
+	 *
 	 * @return http client
 	 */
 	private HttpClient buildLoginHttpClient() {
@@ -134,7 +134,7 @@ private HttpClient buildLoginHttpClient() {
 
 	/**
 	 * This method build simple Http client with cookie store
-	 * 
+	 *
 	 * @return http client
 	 */
 	private HttpClient buildHttpClient() {
@@ -166,7 +166,7 @@ private void clearKerberosProperties() {
 	/**
 	 * This method fetch login cookies necessary to establish connection with spnego
 	 * jira client
-	 * 
+	 *
 	 * @param samlTokenStartString
 	 * @param samlTokenEndString
 	 * @param samlUrlStartString
@@ -198,7 +198,7 @@ public String login(String samlTokenStartString, String samlTokenEndString, Stri
 
 	/**
 	 * This method execute login call with http client
-	 * 
+	 *
 	 * @param loginURL
 	 * @param samlTokenStartString
 	 * @param samlTokenEndString
@@ -226,7 +226,7 @@ private String loginCall(String loginURL, String samlTokenStartString, String sa
 
 	/**
 	 * This method generate the cookies required for connection
-	 * 
+	 *
 	 * @param loginResponse
 	 * @param samlTokenStartString
 	 * @param samlTokenEndString
@@ -249,7 +249,7 @@ public void generateSamlCookies(String loginResponse, String samlTokenStartStrin
 
 	/**
 	 * This method return the response of http request submitted
-	 * 
+	 *
 	 * @param httpUriRequest
 	 *            httpUriRequest
 	 * @return string response
@@ -263,7 +263,7 @@ public String getResponse(HttpUriRequest httpUriRequest) throws IOException {
 
 	/**
 	 * This method perform http request provided by user
-	 * 
+	 *
 	 * @param httpUriRequest
 	 *            httpUriRequest
 	 * @return string http response
@@ -276,7 +276,7 @@ public HttpResponse getHttpResponse(HttpUriRequest httpUriRequest) throws IOExce
 
 	/**
 	 * This is a utility method which fetch data from login response
-	 * 
+	 *
 	 * @param input
 	 *            input string
 	 * @param start
@@ -298,7 +298,7 @@ private String extractString(String input, String start, String end) {
 
 	/**
 	 * This method get Cookie object and convert it into string
-	 * 
+	 *
 	 * @return string containing cookie.
 	 */
 	public String getCookies() {

common/src/main/java/com/publicissapient/kpidashboard/common/repository/rbac/UserInfoRepository.java

@@ -42,6 +42,8 @@ public interface UserInfoRepository extends CrudRepository<UserInfo, ObjectId> {
 
 	UserInfo findByUsername(String username);
 
+
+	UserInfo findFirstByUsername(String username);
 	/**
 	 * Finds by username and auth type.
 	 *

customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/UserInfoService.java

@@ -63,6 +63,8 @@ public interface UserInfoService {
 
 	UserInfo getUserInfo(String username);
 
+	UserInfo getFistUserInfo(String username);
+
 	/**
 	 * Gets users.
 	 *

customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/ConfigDetailsServiceImpl.java

@@ -50,6 +50,7 @@ public ConfigDetails getConfigDetails() {
 		configDetails.setPercentile(customApiConfig.getPercentileValue());
 		configDetails.setHierarchySelectionCount(customApiConfig.getHierarchySelectionCount());
 		configDetails.setDateRangeFilter(dateRangeFilter);
+		configDetails.setGitlabToolFieldFlag(customApiConfig.getIsGitlabFieldEnable());
 		configDetails.setNoOfDataPoints(customApiConfig.getSprintCountForFilters());
 		configDetails.setGitlabToolFieldFlag(customApiConfig.getIsGitlabFieldEnable());
 		configDetails.setSprintCountForKpiCalculation(customApiConfig.getSprintCountForKpiCalculation());

customapi/src/main/java/com/publicissapient/kpidashboard/apis/common/service/impl/UserInfoServiceImpl.java

@@ -152,6 +152,11 @@ public UserInfo getUserInfo(String username) {
 		return userInfoRepository.findByUsername(username);
 	}
 
+
+	@Override
+	public UserInfo getFistUserInfo(String username) {
+		return userInfoRepository.findFirstByUsername(username);
+	}
 	@Override
 	public Collection<UserInfo> getUsers() {
 		List<UserInfo> userInfoList = userInfoRepository.findAll();

customapi/src/main/java/com/publicissapient/kpidashboard/apis/config/CustomApiConfig.java

@@ -217,6 +217,7 @@ public class CustomApiConfig {// NOPMD
 	private String samlTokenEndString;
 	private String samlUrlStartString;
 	private String samlUrlEndString;
+	private Boolean isGitlabFieldEnable;
 	// repo x axis count days rangeForCheckInsAndMergeRequests
 	private Integer repoXAxisCountForCheckInsAndMergeRequests;
 	private String repoToolAPIKey;
@@ -231,7 +232,6 @@ public void setRepoToolUpdateConnectionUrl(String repoToolUpdateConnectionUrl) {
 	}
 
 	private String repoToolUpdateConnectionUrl;
-	private Boolean isGitlabFieldEnable;
 	private String repoToolCodeCommmitsUrl;
 	private String repoToolDeleteProjectUrl;
 	private String repoToolDeleteRepoUrl;

customapi/src/main/java/com/publicissapient/kpidashboard/apis/constant/Constant.java

@@ -149,6 +149,7 @@ public final class Constant {
 	public static final String RELIABILITY_REMEDIATION = "reliability_remediation_effort";
 	public static final String DUPLICATED_LINES = "duplicated_lines";
 	public static final String N_CLOC = "ncloc";
+	public static final String FEATURE_BRANCH = "/feature/";
 	private Constant() {
 	}
 

customapi/src/main/java/com/publicissapient/kpidashboard/apis/jira/scrum/service/LeadTimeForChangeServiceImpl.java

@@ -310,7 +310,7 @@ private void findMergeRequestList(Map<String, String> toBranchForMRList,
 				String toBranchForMRKPI156 = toBranchForMRList.get(projectBasicConfigId);
 				List<MergeRequests> mergeRequestList = mergeRequestRepository
 						.findMergeRequestListBasedOnBasicProjectConfigId(new ObjectId(projectBasicConfigId),
-								CommonUtils.convertTestFolderToPatternList(new ArrayList<>(issueIdList)),
+								CommonUtils.convertIssuesListToBranchPattern(new ArrayList<>(issueIdList)),
 								toBranchForMRKPI156);
 				projectWiseMergeRequestList.put(projectBasicConfigId, mergeRequestList);
 			}

customapi/src/main/java/com/publicissapient/kpidashboard/apis/util/CommonUtils.java

@@ -343,18 +343,32 @@ public static List<Pattern> convertToPatternListForSubString(List<String> string
 	public static List<Pattern> convertTestFolderToPatternList(List<String> stringList) {
 		List<Pattern> regexList = new ArrayList<>();
 		for (String value : stringList) {
-			String pattern = new StringBuilder(value).toString();
-			if (pattern.contains(Constant.FORWARD_SLASH)) {
-				pattern = pattern.replace(Constant.FORWARD_SLASH, Constant.BACKWARD_FORWARD_SLASH);
-			}
-			regexList.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
-			if (!value.startsWith(Constant.FORWARD_SLASH)) {
-				value = Constant.FORWARD_SLASH.concat(value);
+			perpPatternList(value, regexList);
+		}
+		return regexList;
+	}
+	public static List<Pattern> convertIssuesListToBranchPattern(List<String> stringList) {
+		List<Pattern> regexList = new ArrayList<>();
+		for (String value : stringList) {
+			perpPatternList(value, regexList);
+			if (!value.startsWith(Constant.FEATURE_BRANCH)) {
+				value = Constant.FEATURE_BRANCH.concat(value);
+				regexList.add(CommonUtils.convertToPatternText(value));
 			}
-			regexList.add(CommonUtils.convertToPatternText(value));
 		}
 		return regexList;
 	}
+	private static void perpPatternList(String value, List<Pattern> regexList) {
+		String pattern = new StringBuilder(value).toString();
+		if (pattern.contains(Constant.FORWARD_SLASH)) {
+			pattern = pattern.replace(Constant.FORWARD_SLASH, Constant.BACKWARD_FORWARD_SLASH);
+		}
+		regexList.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE));
+		if (!value.startsWith(Constant.FORWARD_SLASH)) {
+			value = Constant.FORWARD_SLASH.concat(value);
+		}
+		regexList.add(CommonUtils.convertToPatternText(value));
+	}
 
 	/**
 	 * This method convert string to pattern to support ignore case

customapi/src/test/resources/json/default/kpi_master.json

@@ -2935,6 +2935,7 @@
     "isDeleted": "False",
     "defaultOrder": 2,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -2968,6 +2969,7 @@
     "isDeleted": "False",
     "defaultOrder": 3,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3014,6 +3016,7 @@
     "isDeleted": "False",
     "defaultOrder": 4,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3084,6 +3087,7 @@
     "isDeleted": "False",
     "defaultOrder": 5,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3122,6 +3126,7 @@
     "isDeleted": "False",
     "defaultOrder": 6,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3156,6 +3161,7 @@
     "isDeleted": "False",
     "defaultOrder": 7,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3202,6 +3208,7 @@
     "isDeleted": "False",
     "defaultOrder": 8,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3240,6 +3247,7 @@
     "isDeleted": "False",
     "defaultOrder": 9,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",
@@ -3278,6 +3286,7 @@
     "isDeleted": "False",
     "defaultOrder": 10,
     "kpiCategory": "Iteration",
+    "kpiSubCategory": "Iteration Review",
     "kpiSource": "Jira",
     "groupId": 8,
     "thresholdValue": "",

processors/jira-xray-zephyr-squad/src/main/java/com/publicissapient/kpidashboard/jiratest/adapter/helper/JiraRestClientFactory.java

@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import com.publicissapient.kpidashboard.common.client.KerberosClient;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -283,4 +284,13 @@ public ProcessorJiraRestClient getJiraOAuthClient(JiraInfo jiraInfo) {
 		return client;
 	}
 
+	public com.publicissapient.kpidashboard.jiratest.adapter.impl.async.ProcessorJiraRestClient getSpnegoSamlClient(
+			KerberosClient kerberosClient) {
+		com.publicissapient.kpidashboard.jiratest.adapter.impl.async.ProcessorJiraRestClient client = null;
+		kerberosClient.login(jiraTestProcessorConfig.getSamlTokenStartString(), jiraTestProcessorConfig.getSamlTokenEndString(),
+				jiraTestProcessorConfig.getSamlUrlStartString(), jiraTestProcessorConfig.getSamlUrlEndString());
+		client = new com.publicissapient.kpidashboard.jiratest.adapter.impl.async.factory.ProcessorAsynchJiraRestClientFactory().createWithAuthenticationCookies(
+				URI.create(kerberosClient.getJiraHost()), kerberosClient.getCookies(), jiraTestProcessorConfig);
+		return client;
+	}
 }

processors/jira-xray-zephyr-squad/src/main/java/com/publicissapient/kpidashboard/jiratest/adapter/impl/async/factory/ProcessorAsynchJiraRestClientFactory.java

@@ -27,6 +27,7 @@
 import com.publicissapient.kpidashboard.jiratest.adapter.impl.async.ProcessorJiraRestClient;
 import com.publicissapient.kpidashboard.jiratest.adapter.impl.async.impl.ProcessorAsynchJiraRestClient;
 import com.publicissapient.kpidashboard.jiratest.config.JiraTestProcessorConfig;
+import com.publicissapient.kpidashboard.jiratest.spnego.SpnegoAuthenticationHandler;
 
 public class ProcessorAsynchJiraRestClientFactory extends AsynchronousJiraRestClientFactory {
 
@@ -65,4 +66,8 @@ public ProcessorJiraRestClient createWithBasicHttpAuthentication(final URI serve
 			final String password, JiraTestProcessorConfig jiraTestProcessorConfig) {
 		return create(serverUri, new BasicHttpAuthenticationHandler(username, password), jiraTestProcessorConfig);
 	}
+	public ProcessorJiraRestClient createWithAuthenticationCookies(final URI serverUri, final String authCookies,
+			JiraTestProcessorConfig jiraTestProcessorConfig) {
+		return create(serverUri, new SpnegoAuthenticationHandler(authCookies), jiraTestProcessorConfig);
+	}
 }

processors/jira-xray-zephyr-squad/src/main/java/com/publicissapient/kpidashboard/jiratest/config/JiraTestProcessorConfig.java

@@ -30,5 +30,11 @@ public class JiraTestProcessorConfig {
 	private String jiraDirectTicketLinkKey;
 	private String jiraCloudDirectTicketLinkKey;
 	private boolean considerStartDate;
-
+	private String samlTokenStartString;
+	private String samlTokenEndString;
+	private String samlUrlStartString;
+	private String samlUrlEndString;
+	@Value("${jira.prevMonthCountToFetchData}")
+	private Integer prevMonthCountToFetchData;
+	private long subsequentApiCallDelayInMilli;
 }