/*
 * Copyright 2019 EPAM Systems
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.epam.ta.reportportal.core.item.impl;

import com.epam.ta.reportportal.dao.TestItemRepository;
import com.epam.ta.reportportal.entity.item.issue.IssueType;
import com.epam.ta.reportportal.exception.ReportPortalException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
import static com.epam.ta.reportportal.ws.model.ErrorType.FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toList;

/**
 * @author Pavel Bortnik
 */
@Service
public class IssueTypeHandler {

	private TestItemRepository testItemRepository;

	@Autowired
	public void setTestItemRepository(TestItemRepository testItemRepository) {
		this.testItemRepository = testItemRepository;
	}

	/**
	 * Verifies that provided test item issue type is valid, and test item
	 * domain object could be processed correctly
	 *
	 * @param locator   Issue locator
	 * @param projectId Project id
	 * @return verified issue type
	 */
	public IssueType defineIssueType(Long projectId, String locator) {
		return testItemRepository.selectIssueTypeByLocator(projectId,
				ofNullable(locator).orElseThrow(() -> new ReportPortalException("Locator should not be null"))
		)
				.orElseThrow(() -> new ReportPortalException(FAILED_TEST_ITEM_ISSUE_TYPE_DEFINITION, formattedSupplier(
						"Invalid test item issue type definition '{}' is requested. Valid issue types' locators are: {}",
						locator,
						testItemRepository.selectIssueLocatorsByProject(projectId).stream().map(IssueType::getLocator).collect(toList())
				)));
	}

}

@@ -929,16 +929,88 @@
 rvice;%0A%0A
+import static com.epam.ta.reportportal.commons.EntityUtils.normalizeId;%0A
 import s
@@ -1190,53 +1190,8 @@
 ON;%0A
-import static java.util.Optional.ofNullable;%0A
 impo
@@ -1868,110 +1868,29 @@
 tId,
-%0A%09%09%09%09ofNullable(locator).orElseThrow(() -%3E new ReportPortalException(%22Locator should not be null%22))%0A%09%09
+ normalizeId(locator)
 )%0A%09%09

define issue types in case insensitive way