Merge pull request #56 from blackducksoftware/dev/IALERT-3548-filter-project-name

IALERT-3548: The REST API returns all projects.

Author: psantos1113

src/main/java/com/synopsys/integration/jira/common/cloud/service/IssueService.java

@@ -66,13 +66,14 @@ public IssueService(IntJsonTransformer intJsonTransformer, JiraApiClient jiraClo
     }
 
     public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestModel) throws IntegrationException {
-        String issueTypeName = requestModel.getIssueTypeName();
-        String projectName = requestModel.getProjectName();
-        String reporterEmail = requestModel.getReporterEmail();
+        String issueTypeName = StringUtils.trim(requestModel.getIssueTypeName());
+        String projectName = StringUtils.trim(requestModel.getProjectName());
+        String reporterEmail = StringUtils.trim(requestModel.getReporterEmail());
 
         PageOfProjectsResponseModel pageOfProjects = projectService.getProjectsByName(projectName);
         String projectId = pageOfProjects.getProjects()
                                .stream()
+                               .filter(projectComponent -> projectComponent.getName().equals(projectName))
                                .findFirst()
                                .map(ProjectComponent::getId)
                                .orElseThrow(() -> new JiraPreconditionNotMetException(String.format("Project not found; project name: %s", projectName)));

src/main/java/com/synopsys/integration/jira/common/server/service/IssueService.java

@@ -62,9 +62,9 @@ public IssueService(IntJsonTransformer intJsonTransformer, JiraApiClient jiraApi
     }
 
     public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestModel) throws IntegrationException {
-        String issueTypeName = requestModel.getIssueTypeName();
-        String projectName = requestModel.getProjectName();
-        String reporter = requestModel.getReporterUsername();
+        String issueTypeName = StringUtils.trim(requestModel.getIssueTypeName());
+        String projectName = StringUtils.trim(requestModel.getProjectName());
+        String reporter = StringUtils.trim(requestModel.getReporterUsername());
 
         IssueTypeResponseModel foundIssueType = issueTypeService.getAllIssueTypes().stream()
                                                     .filter(issueType -> issueType.getName().equalsIgnoreCase(issueTypeName))
@@ -75,6 +75,7 @@ public IssueCreationResponseModel createIssue(IssueCreationRequestModel requestM
                               .orElse("");
         List<ProjectComponent> projects = projectService.getProjectsByName(projectName);
         ProjectComponent foundProject = projects.stream()
+                                            .filter(projectComponent -> projectComponent.getName().equals(projectName))
                                             .findFirst()
                                             .orElseThrow(() -> new JiraPreconditionNotMetException(String.format("Project not found; project name: %s", projectName)));
 

src/test/java/com/synopsys/integration/jira/common/cloud/service/ProjectServiceTestIT.java

@@ -19,13 +19,13 @@
 import com.synopsys.integration.jira.common.test.TestProperties;
 import com.synopsys.integration.jira.common.test.TestPropertyKey;
 
-public class ProjectServiceTestIT extends JiraCloudParameterizedTestIT {
+class ProjectServiceTestIT extends JiraCloudParameterizedTestIT {
     private final TestProperties testProperties = TestProperties.loadTestProperties();
     private final String testProjectName = testProperties.getProperty(TestPropertyKey.TEST_JIRA_CLOUD_TEST_PROJECT_NAME);
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void testGetPaginatedProjects(JiraHttpClient jiraHttpClient) throws Exception {
+    void testGetPaginatedProjects(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
 
@@ -42,7 +42,7 @@ public void testGetPaginatedProjects(JiraHttpClient jiraHttpClient) throws Excep
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void testGetManyPaginatedProjects(JiraHttpClient jiraHttpClient) throws Exception {
+    void testGetManyPaginatedProjects(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
 
@@ -58,7 +58,7 @@ public void testGetManyPaginatedProjects(JiraHttpClient jiraHttpClient) throws E
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void testGetAllProjects(JiraHttpClient jiraHttpClient) throws Exception {
+    void testGetAllProjects(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
 
@@ -72,7 +72,7 @@ public void testGetAllProjects(JiraHttpClient jiraHttpClient) throws Exception {
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void testGetProject(JiraHttpClient jiraHttpClient) throws Exception {
+    void testGetProject(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
 
@@ -92,7 +92,7 @@ public void testGetProject(JiraHttpClient jiraHttpClient) throws Exception {
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void testGetProjectVersions(JiraHttpClient jiraHttpClient) throws Exception {
+    void testGetProjectVersions(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
 

src/test/java/com/synopsys/integration/jira/common/server/ProjectServiceTestIT.java

@@ -50,7 +50,7 @@ public void testGetProject(JiraHttpClient jiraHttpClient) throws Exception {
         assertTrue(StringUtils.isNotBlank(projectKey));
 
         ProjectComponent project = projectService.getProject(projectKey);
-        assertTrue(projectName.equalsIgnoreCase(project.getName()));
+        assertTrue(projectName.contains(project.getName()));
     }
 
     @ParameterizedTest