Skip to content

Commit fb8e595

Browse files
committed
Refactor ProjectCreationCommandBuilder and ProjectsFacadeImpl: improve default value handling and streamline workflow parameter mapping
1 parent 50a916a commit fb8e595

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

api-project/src/main/java/org/opendevstack/apiservice/project/facade/impl/ProjectCreationCommandBuilder.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,20 @@ public ProjectCreationCommand build(CreateProjectRequest request, ClientAppEntit
3434
String projectFlavor = firstNonBlank(request.getProjectFlavor(), flavor.getName());
3535
String configurationItem = firstNonBlank(request.getConfigurationItem(), flavor.getConfigItem());
3636
String owner = firstNonBlank(request.getOwner(), flavor.getProjectOwner());
37+
String x2account = firstNonBlank(request.getX2OdsAccount(), flavor.getServiceAccount());
3738
String location = firstNonBlank(request.getLocation(), flavor.getLocation());
3839
String projectKey = resolveProjectKey(request.getProjectKey(), flavor);
40+
String projectName = firstNonBlank(request.getProjectName(), projectKey);
41+
String projectDescription = firstNonBlank(request.getProjectDescription(), "project " + projectFlavor);
3942

4043
return new ProjectCreationCommand(
4144
projectKey,
42-
request.getProjectName(),
43-
request.getProjectDescription(),
45+
projectName,
46+
projectDescription,
4447
projectFlavor,
4548
configurationItem,
4649
location,
47-
request.getX2OdsAccount(),
50+
x2account,
4851
owner,
4952
clientApp.getId());
5053
}

api-project/src/main/java/org/opendevstack/apiservice/project/facade/impl/ProjectsFacadeImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.springframework.beans.factory.annotation.Value;
2020
import org.springframework.stereotype.Component;
2121

22+
import java.util.Map;
2223
import java.util.UUID;
2324

2425
@Component("apiProjectFacadeImpl")
@@ -71,12 +72,11 @@ public CreateProjectResponse createProject(CreateProjectRequest request, UUID cl
7172

7273
ProjectResponse project = projectService.saveProject(projectRequest);
7374

75+
String projectId = project.getProjectId().toString();
76+
Map<String, Object> workflowParameters = automationParametersMapper.toWorkflowParameters(command, projectId);
77+
7478
AutomationExecutionResult automationExecutionResult = automationPlatformService
75-
.executeWorkflow(
76-
createProjectWorkflow,
77-
automationParametersMapper.toWorkflowParameters(
78-
command,
79-
project.getProjectId().toString()));
79+
.executeWorkflow(createProjectWorkflow, workflowParameters);
8080

8181
if (automationExecutionResult.isSuccessful()) {
8282
return projectCreationResponseMapper.toSuccessResponse(command, project);

0 commit comments

Comments
 (0)