Skip to content
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

concord-server: fix process card createOrUpdate #1039

Merged
merged 2 commits into from
Nov 19, 2024
Merged

concord-server: fix process card createOrUpdate #1039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e80d8
server: fix process card createOrUpdate
brig Nov 12, 2024
c068eaa
Merge branch 'master' into brig/process-cards-up
ibodrov Nov 18, 2024
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
12 changes: 9 additions & 3 deletions server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* 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.
Expand Down Expand Up @@ -95,14 +95,20 @@ public List<ProcessCardEntry> listUserCards(UUID userId) {
}

public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID repoId, String name, Optional<String> entryPoint, String description, InputStream icon, InputStream form, Map<String, Object> data) {
boolean exists;
if (id == null) {
if (projectId == null) {
throw new ConcordApplicationException("projectId or projectName is required");
}
if (name == null) {
throw new ConcordApplicationException("name is required");
}
id = dao.getIdByName(projectId, name).orElse(null);
exists = id != null;
} else {
exists = dao.get(id) != null;
}

boolean exists = id != null;
if (!exists) {
UUID resultId = dao.insert(id, projectId, repoId, name, entryPoint.orElse(Constants.Request.DEFAULT_ENTRY_POINT_NAME), description, icon, form, data);
return new ProcessCardOperationResponse(resultId, OperationResult.CREATED);
Expand Down
Loading