From 239a352db41ecfd49c8b44804dbce8f5e9a68949 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 18:06:21 +0100 Subject: [PATCH 01/10] Add order column --- .../walmartlabs/concord/server/db/liquibase.xml | 1 + .../com/walmartlabs/concord/server/db/v2.22.0.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/liquibase.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/liquibase.xml index 23dde8d830..579954483c 100644 --- a/server/db/src/main/resources/com/walmartlabs/concord/server/db/liquibase.xml +++ b/server/db/src/main/resources/com/walmartlabs/concord/server/db/liquibase.xml @@ -116,5 +116,6 @@ + diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml new file mode 100644 index 0000000000..b01e9da436 --- /dev/null +++ b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file From ecd9d5316f26ae4c545bdaf2d08452fff8c8c8e5 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 18:10:17 +0100 Subject: [PATCH 02/10] Add order_id in request --- sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java | 2 ++ .../concord/server/console/ProcessCardRequest.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java index bca994d61a..03404f17e4 100644 --- a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java +++ b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java @@ -615,6 +615,8 @@ public static class Multipart { public static final String SYNC = "sync"; public static final String META = "meta"; + + public static final String ORDER_ID = "order_id"; } public static class Headers { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java index 0f823eb001..2b9a1762af 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java @@ -105,4 +105,9 @@ public InputStream getIcon() { public InputStream getForm() { return MultipartUtils.getStream(input, "form"); } + + @Schema(name = Constants.Multipart.ORDER_ID) + public UUID getOrderId() { + return MultipartUtils.getUuid(input, Constants.Multipart.ORDER_ID); + } } From 3899e69c7939cd17babd3a4ab63cc506a00b3641 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 19:00:38 +0100 Subject: [PATCH 03/10] Add order_id to manager --- .../concord/server/console/ProcessCardEntry.java | 3 +++ .../concord/server/console/ProcessCardManager.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java index a4f1092772..ae26db6611 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java @@ -70,6 +70,9 @@ public interface ProcessCardEntry extends Serializable { boolean isCustomForm(); + @Nullable + UUID orderId(); + static ImmutableProcessCardEntry.Builder builder() { return ImmutableProcessCardEntry.builder(); } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java index 327260033d..8bb4276813 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java @@ -404,7 +404,7 @@ private static Optional getInputStream(DSLContext tx, String sql, UUID ca }); } - private static SelectOnConditionStep> buildSelect(DSLContext tx) { + private static SelectOnConditionStep> buildSelect(DSLContext tx) { Field isCustomForm = when(field(UI_PROCESS_CARDS.FORM).isNotNull(), true).otherwise(false); return tx.select( @@ -419,14 +419,15 @@ private static SelectOnConditionStep r) { + private ProcessCardEntry toEntry(Record13 r) { return ProcessCardEntry.builder() .id(r.get(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID)) .orgName(r.get(ORGANIZATIONS.ORG_NAME)) @@ -437,6 +438,7 @@ private ProcessCardEntry toEntry(Record12 Date: Wed, 5 Feb 2025 19:48:44 +0100 Subject: [PATCH 04/10] Put order_by under fields with name in Constants --- .../concord/server/console/ProcessCardRequest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java index 2b9a1762af..7e70e4f262 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java @@ -76,6 +76,10 @@ public String getEntryPoint() { return MultipartUtils.getString(input, Constants.Multipart.ENTRY_POINT); } + @Schema(name = Constants.Multipart.ORDER_ID) + public UUID getOrderId() { + return MultipartUtils.getUuid(input, Constants.Multipart.ORDER_ID); + } @Schema(name = "name") public String getName() { return MultipartUtils.getString(input, "name"); @@ -106,8 +110,4 @@ public InputStream getForm() { return MultipartUtils.getStream(input, "form"); } - @Schema(name = Constants.Multipart.ORDER_ID) - public UUID getOrderId() { - return MultipartUtils.getUuid(input, Constants.Multipart.ORDER_ID); - } } From 7008a3c5c557b1db35d0f50e816d8c34d2a16da6 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 20:03:08 +0100 Subject: [PATCH 05/10] Add or update order_id --- .../server/console/ProcessCardManager.java | 20 ++++++++++++------- .../server/console/ProcessCardResource.java | 3 ++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java index 8bb4276813..fb75580fda 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java @@ -94,7 +94,7 @@ public List listUserCards(UUID userId) { return dao.listCards(userId); } - public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID repoId, String name, Optional entryPoint, String description, InputStream icon, InputStream form, Map data) { + public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID repoId, String name, Optional entryPoint, String description, InputStream icon, InputStream form, Map data, UUID orderId) { boolean exists; if (id == null) { if (projectId == null) { @@ -110,12 +110,12 @@ public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID } if (!exists) { - UUID resultId = dao.insert(id, projectId, repoId, name, entryPoint.orElse(Constants.Request.DEFAULT_ENTRY_POINT_NAME), description, icon, form, data); + UUID resultId = dao.insert(id, projectId, repoId, name, entryPoint.orElse(Constants.Request.DEFAULT_ENTRY_POINT_NAME), description, icon, form, data, orderId); return new ProcessCardOperationResponse(resultId, OperationResult.CREATED); } else { assertAccess(id); - dao.update(id, projectId, repoId, name, entryPoint.orElse(null), description, icon, form, data); + dao.update(id, projectId, repoId, name, entryPoint.orElse(null), description, icon, form, data, orderId); return new ProcessCardOperationResponse(id, OperationResult.UPDATED); } } @@ -161,7 +161,7 @@ public Optional getIdByName(UUID projectId, String name) { .fetchOptional(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID); } - public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data) { + public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data, UUID objectId) { return txResult(tx -> { String sql = tx.insertInto(UI_PROCESS_CARDS) .columns(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID, @@ -173,8 +173,9 @@ public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String UI_PROCESS_CARDS.ICON, UI_PROCESS_CARDS.FORM, UI_PROCESS_CARDS.DATA, - UI_PROCESS_CARDS.OWNER_ID) - .values((UUID) null, null, null, null, null, null, null, null, null, null) + UI_PROCESS_CARDS.OWNER_ID, + UI_PROCESS_CARDS.ORDER_ID) + .values((UUID) null, null, null, null, null, null, null, null, null, null, null) .returning(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID) .getSQL(); @@ -205,7 +206,7 @@ public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String public void update(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, - Map data) { + Map data, UUID orderId) { tx(tx -> { List params = new ArrayList<>(); UpdateSetStep q = tx.update(UI_PROCESS_CARDS); @@ -254,6 +255,11 @@ public void update(UUID cardId, UUID projectId, UUID repoId, String name, return; } + if (orderId != null) { + q.set(UI_PROCESS_CARDS.ORDER_ID, (UUID) null); + params.add(orderId); + } + String sql = q.set(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID, cardId) .where(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID.eq(cardId)) .getSQL(); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java index d6a64ab701..3b76157b27 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java @@ -145,10 +145,11 @@ public ProcessCardOperationResponse createOrUpdate( String description = r.getDescription(); Map data = r.getData(); UUID id = r.getId(); + UUID orderId = r.getOrderId(); try (InputStream icon = r.getIcon(); InputStream form = r.getForm()) { - return processCardManager.createOrUpdate(id, projectId, repoId, name, entryPoint, description, icon, form, data); + return processCardManager.createOrUpdate(id, projectId, repoId, name, entryPoint, description, icon, form, data, orderId); } } From 7182a6c3e22414c48caccb0fcaeda9568d5f8a43 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 20:33:02 +0100 Subject: [PATCH 06/10] Fix order id in insert --- .../walmartlabs/concord/server/console/ProcessCardManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java index fb75580fda..d82d9a19cd 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java @@ -161,7 +161,7 @@ public Optional getIdByName(UUID projectId, String name) { .fetchOptional(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID); } - public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data, UUID objectId) { + public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data, UUID orderId) { return txResult(tx -> { String sql = tx.insertInto(UI_PROCESS_CARDS) .columns(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID, @@ -191,6 +191,7 @@ public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String ps.setBinaryStream(8, form); ps.setObject(9, data != null ? objectMapper.toJSONB(data).data() : null); ps.setObject(10, UserPrincipal.assertCurrent().getId()); + ps.setObject(11, orderId); try (ResultSet rs = ps.executeQuery()) { if (!rs.next()) { From aa3ce0f38b1ea4209fa64e74896ad5ea5268ba2d Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 20:39:35 +0100 Subject: [PATCH 07/10] Order by order id field --- .../walmartlabs/concord/server/console/ProcessCardManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java index d82d9a19cd..d0e2631d66 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java @@ -365,7 +365,7 @@ private List listCards(DSLContext tx, UUID userId) { .where(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID.in(userCardsFilter)); return query - .orderBy(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID) + .orderBy(UI_PROCESS_CARDS.ORDER_ID, UI_PROCESS_CARDS.UI_PROCESS_CARD_ID) .fetch(this::toEntry); } From 69dc7d6fdee3ba1efc18db75a3aa69d152aa5dc7 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 21:36:08 +0100 Subject: [PATCH 08/10] Use Integer instead of UUID --- .../com/walmartlabs/concord/server/db/v2.22.0.xml | 2 +- .../walmartlabs/concord/server/MultipartUtils.java | 8 ++++++++ .../concord/server/console/ProcessCardEntry.java | 2 +- .../concord/server/console/ProcessCardManager.java | 12 ++++++------ .../concord/server/console/ProcessCardRequest.java | 4 ++-- .../concord/server/console/ProcessCardResource.java | 2 +- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml index b01e9da436..538a7a352b 100644 --- a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml +++ b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml @@ -6,7 +6,7 @@ - + diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/MultipartUtils.java b/server/impl/src/main/java/com/walmartlabs/concord/server/MultipartUtils.java index 335cc86c5e..69301bd333 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/MultipartUtils.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/MultipartUtils.java @@ -174,6 +174,14 @@ public static UUID assertUuid(MultipartInput input, String key) { throw new ConcordApplicationException(key + " not specified", Response.Status.BAD_REQUEST); } + public static Integer getInt(MultipartInput input, String key) { + String s = getString(input, key); + if (s == null) { + return null; + } + return Integer.parseInt(s); + } + public static InputStream getStream(MultipartInput input, String key) { try { for (InputPart p : input.getParts()) { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java index ae26db6611..dc16593d76 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardEntry.java @@ -71,7 +71,7 @@ public interface ProcessCardEntry extends Serializable { boolean isCustomForm(); @Nullable - UUID orderId(); + Integer orderId(); static ImmutableProcessCardEntry.Builder builder() { return ImmutableProcessCardEntry.builder(); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java index d0e2631d66..bf39f6e122 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardManager.java @@ -94,7 +94,7 @@ public List listUserCards(UUID userId) { return dao.listCards(userId); } - public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID repoId, String name, Optional entryPoint, String description, InputStream icon, InputStream form, Map data, UUID orderId) { + public ProcessCardOperationResponse createOrUpdate(UUID id, UUID projectId, UUID repoId, String name, Optional entryPoint, String description, InputStream icon, InputStream form, Map data, Integer orderId) { boolean exists; if (id == null) { if (projectId == null) { @@ -161,7 +161,7 @@ public Optional getIdByName(UUID projectId, String name) { .fetchOptional(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID); } - public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data, UUID orderId) { + public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, Map data, Integer orderId) { return txResult(tx -> { String sql = tx.insertInto(UI_PROCESS_CARDS) .columns(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID, @@ -207,7 +207,7 @@ public UUID insert(UUID cardId, UUID projectId, UUID repoId, String name, String public void update(UUID cardId, UUID projectId, UUID repoId, String name, String entryPoint, String description, InputStream icon, InputStream form, - Map data, UUID orderId) { + Map data, Integer orderId) { tx(tx -> { List params = new ArrayList<>(); UpdateSetStep q = tx.update(UI_PROCESS_CARDS); @@ -257,7 +257,7 @@ public void update(UUID cardId, UUID projectId, UUID repoId, String name, } if (orderId != null) { - q.set(UI_PROCESS_CARDS.ORDER_ID, (UUID) null); + q.set(UI_PROCESS_CARDS.ORDER_ID, (Integer) null); params.add(orderId); } @@ -411,7 +411,7 @@ private static Optional getInputStream(DSLContext tx, String sql, UUID ca }); } - private static SelectOnConditionStep> buildSelect(DSLContext tx) { + private static SelectOnConditionStep> buildSelect(DSLContext tx) { Field isCustomForm = when(field(UI_PROCESS_CARDS.FORM).isNotNull(), true).otherwise(false); return tx.select( @@ -434,7 +434,7 @@ private static SelectOnConditionStep r) { + private ProcessCardEntry toEntry(Record13 r) { return ProcessCardEntry.builder() .id(r.get(UI_PROCESS_CARDS.UI_PROCESS_CARD_ID)) .orgName(r.get(ORGANIZATIONS.ORG_NAME)) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java index 7e70e4f262..bb86c1a13c 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java @@ -77,8 +77,8 @@ public String getEntryPoint() { } @Schema(name = Constants.Multipart.ORDER_ID) - public UUID getOrderId() { - return MultipartUtils.getUuid(input, Constants.Multipart.ORDER_ID); + public Integer getOrderId() { + return MultipartUtils.getInt(input, Constants.Multipart.ORDER_ID); } @Schema(name = "name") public String getName() { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java index 3b76157b27..f3c19641f9 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardResource.java @@ -145,7 +145,7 @@ public ProcessCardOperationResponse createOrUpdate( String description = r.getDescription(); Map data = r.getData(); UUID id = r.getId(); - UUID orderId = r.getOrderId(); + Integer orderId = r.getOrderId(); try (InputStream icon = r.getIcon(); InputStream form = r.getForm()) { From de141cd07de16fe28978eedba77be75336b77035 Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Wed, 5 Feb 2025 21:40:26 +0100 Subject: [PATCH 09/10] Set liquibase constraint null=true --- .../main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml index 538a7a352b..eef58c7715 100644 --- a/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml +++ b/server/db/src/main/resources/com/walmartlabs/concord/server/db/v2.22.0.xml @@ -7,6 +7,7 @@ + From 186e9073d7b77ba20be6340b9376a96f94c530ab Mon Sep 17 00:00:00 2001 From: Oriol Alfonso Date: Fri, 7 Feb 2025 09:44:00 +0100 Subject: [PATCH 10/10] Put constant ORDER_ID in camelCase + add blank line after getOrderId --- sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java | 2 +- .../walmartlabs/concord/server/console/ProcessCardRequest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java index 03404f17e4..d32e04b710 100644 --- a/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java +++ b/sdk/src/main/java/com/walmartlabs/concord/sdk/Constants.java @@ -616,7 +616,7 @@ public static class Multipart { public static final String META = "meta"; - public static final String ORDER_ID = "order_id"; + public static final String ORDER_ID = "orderId"; } public static class Headers { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java index bb86c1a13c..764337709d 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ProcessCardRequest.java @@ -80,6 +80,7 @@ public String getEntryPoint() { public Integer getOrderId() { return MultipartUtils.getInt(input, Constants.Multipart.ORDER_ID); } + @Schema(name = "name") public String getName() { return MultipartUtils.getString(input, "name");