Skip to content

fix/DTS-43882_fieldmapping_SC #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Chittauri wants to merge 3 commits into from
Closed

fix/DTS-43882_fieldmapping_SC #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dd61d0
fix/DTS-43882_fieldmapping_SC
Chittauri Jul 2, 2025
d7fc7c9
Merge branch 'develop' into fix/DTS-43882_fieldmapping_SC
Chittauri Jul 2, 2025
ae13adb
Merge branch 'develop' of https://github.com/PublicisSapient/knowhow-…
Chittauri Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...main/java/com/publicissapient/kpidashboard/jira/config/FetchProjectConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,14 @@ public ProjectConfFieldMapping fetchConfigurationBasedOnSprintId(String sprintId
ProjectBasicConfig projectBasicConfig = projectConfigRepository.findById(sprintDetails.getBasicProjectConfigId())
.orElse(new ProjectBasicConfig());

FieldMapping fieldMapping = fieldMappingRepository
.findByBasicProjectConfigId(sprintDetails.getBasicProjectConfigId());
List<ProjectToolConfig> projectToolConfigs = toolRepository
.findByBasicProjectConfigId(sprintDetails.getBasicProjectConfigId());
.findByToolNameAndBasicProjectConfigId(ProcessorConstants.JIRA, projectBasicConfig.getId());
if (CollectionUtils.isNotEmpty(projectToolConfigs)) {
ProjectToolConfig projectToolConfig = projectToolConfigs.get(0);
if (null != projectToolConfig.getConnectionId()) {
Optional<Connection> jiraConnOpt = connectionRepository.findById(projectToolConfig.getConnectionId());
JiraToolConfig jiraToolConfig = createJiraToolConfig(projectToolConfig, jiraConnOpt);
FieldMapping fieldMapping = fieldMappingRepository.findByBasicProjectConfigId(projectToolConfig.getBasicProjectConfigId());
projectConfFieldMapping = createProjectConfFieldMapping(fieldMapping, projectBasicConfig, projectToolConfig,
jiraToolConfig);
}
Expand All @@ -84,14 +83,14 @@ public ProjectConfFieldMapping fetchConfiguration(String projectId) {
ObjectId projectConfigId = new ObjectId(projectId);
ProjectConfFieldMapping projectConfFieldMapping = null;
ProjectBasicConfig projectBasicConfig = projectConfigRepository.findById(projectConfigId).orElse(null);
FieldMapping fieldMapping = fieldMappingRepository.findByBasicProjectConfigId(projectConfigId);
List<ProjectToolConfig> projectToolConfigs = toolRepository
.findByToolNameAndBasicProjectConfigId(ProcessorConstants.JIRA, projectConfigId);
if (CollectionUtils.isNotEmpty(projectToolConfigs)) {
ProjectToolConfig projectToolConfig = projectToolConfigs.get(0);
if (null != projectToolConfig.getConnectionId()) {
Optional<Connection> jiraConnOpt = connectionRepository.findById(projectToolConfig.getConnectionId());
JiraToolConfig jiraToolConfig = createJiraToolConfig(projectToolConfig, jiraConnOpt);
FieldMapping fieldMapping = fieldMappingRepository.findByBasicProjectConfigId(projectToolConfig.getBasicProjectConfigId());
projectConfFieldMapping = createProjectConfFieldMapping(fieldMapping, projectBasicConfig, projectToolConfig,
jiraToolConfig);
}
Expand Down
10 changes: 5 additions & 5 deletions ...ain/java/com/publicissapient/kpidashboard/rally/config/FetchProjectConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,15 @@ public ProjectConfFieldMapping fetchConfigurationBasedOnSprintId(String sprintId
SprintDetails sprintDetails = sprintRepository.findBySprintID(sprintId);
ProjectBasicConfig projectBasicConfig = projectConfigRepository.findById(sprintDetails.getBasicProjectConfigId())
.orElse(new ProjectBasicConfig());

FieldMapping fieldMapping = fieldMappingRepository
.findByBasicProjectConfigId(sprintDetails.getBasicProjectConfigId());
List<ProjectToolConfig> projectToolConfigs = toolRepository
.findByBasicProjectConfigId(sprintDetails.getBasicProjectConfigId());
.findByToolNameAndBasicProjectConfigId(RallyConstants.RALLY, projectBasicConfig.getId());
if (CollectionUtils.isNotEmpty(projectToolConfigs)) {
ProjectToolConfig projectToolConfig = projectToolConfigs.get(0);
if (null != projectToolConfig.getConnectionId()) {
Optional<Connection> jiraConnOpt = connectionRepository.findById(projectToolConfig.getConnectionId());
RallyToolConfig rallyToolConfig = createJiraToolConfig(projectToolConfig, jiraConnOpt);
FieldMapping fieldMapping = fieldMappingRepository
.findByBasicProjectConfigId(projectToolConfig.getBasicProjectConfigId());
projectConfFieldMapping = createProjectConfFieldMapping(fieldMapping, projectBasicConfig, projectToolConfig,
rallyToolConfig);
}
Expand All @@ -101,14 +100,15 @@ public ProjectConfFieldMapping fetchConfiguration(String projectId) {
ObjectId projectConfigId = new ObjectId(projectId);
ProjectConfFieldMapping projectConfFieldMapping = null;
ProjectBasicConfig projectBasicConfig = projectConfigRepository.findById(projectConfigId).orElse(null);
FieldMapping fieldMapping = fieldMappingRepository.findByBasicProjectConfigId(projectConfigId);
List<ProjectToolConfig> projectToolConfigs = toolRepository
.findByToolNameAndBasicProjectConfigId(RallyConstants.RALLY, projectConfigId);
if (CollectionUtils.isNotEmpty(projectToolConfigs)) {
ProjectToolConfig projectToolConfig = projectToolConfigs.get(0);
if (null != projectToolConfig.getConnectionId()) {
Optional<Connection> jiraConnOpt = connectionRepository.findById(projectToolConfig.getConnectionId());
RallyToolConfig rallyToolConfig = createJiraToolConfig(projectToolConfig, jiraConnOpt);
FieldMapping fieldMapping = fieldMappingRepository
.findByBasicProjectConfigId(projectToolConfig.getBasicProjectConfigId());
projectConfFieldMapping = createProjectConfFieldMapping(fieldMapping, projectBasicConfig, projectToolConfig,
rallyToolConfig);
}
Expand Down
5 changes: 2 additions & 3 deletions ...java/com/publicissapient/kpidashboard/rally/config/FetchProjectConfigurationImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void testFetchConfigurationBasedOnSprintId() {
when(sprintRepository.findBySprintID("SPRINT-1")).thenReturn(sprintDetails);
when(projectConfigRepository.findById(projectId)).thenReturn(Optional.of(projectBasicConfig));
when(fieldMappingRepository.findByBasicProjectConfigId(projectId)).thenReturn(fieldMapping);
when(toolRepository.findByBasicProjectConfigId(projectId)).thenReturn(Arrays.asList(projectToolConfig));
when(toolRepository.findByToolNameAndBasicProjectConfigId(RallyConstants.RALLY,projectId)).thenReturn(Arrays.asList(projectToolConfig));
when(connectionRepository.findById(connectionId)).thenReturn(Optional.of(connection));

// Call the method
Expand Down Expand Up @@ -179,7 +179,6 @@ void testFetchConfiguration() {
void testFetchConfigurationWithNoToolConfigs() {
// Mock repository calls with no tool configs
when(projectConfigRepository.findById(projectId)).thenReturn(Optional.of(projectBasicConfig));
when(fieldMappingRepository.findByBasicProjectConfigId(projectId)).thenReturn(fieldMapping);
when(toolRepository.findByToolNameAndBasicProjectConfigId(RallyConstants.RALLY, projectId))
.thenReturn(Collections.emptyList());

Expand All @@ -196,7 +195,7 @@ void testFetchConfigurationBasedOnSprintIdWithNoConnection() {
when(sprintRepository.findBySprintID("SPRINT-1")).thenReturn(sprintDetails);
when(projectConfigRepository.findById(projectId)).thenReturn(Optional.of(projectBasicConfig));
when(fieldMappingRepository.findByBasicProjectConfigId(projectId)).thenReturn(fieldMapping);
when(toolRepository.findByBasicProjectConfigId(projectId)).thenReturn(Arrays.asList(projectToolConfig));
when(toolRepository.findByToolNameAndBasicProjectConfigId(RallyConstants.RALLY,projectId)).thenReturn(Arrays.asList(projectToolConfig));
when(connectionRepository.findById(connectionId)).thenReturn(Optional.empty());

// Call the method
Expand Down
Loading