Skip to content

Commit 5702f7d

Browse files
ggmalevaggmaleva
authored
Ft/swag (#73)
* bump swag * remove redundant
1 parent 8af9daa commit 5702f7d

14 files changed

Lines changed: 66 additions & 63 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>dev.vality</groupId>
108108
<artifactId>swag-webhook-events</artifactId>
109-
<version>1.135-3fd8162-client</version>
109+
<version>1.144-b02d9b2-client</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>dev.vality</groupId>

‎src/main/java/dev/vality/hooker/converter/PaymentConverter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private void setResourcePaymentTool(dev.vality.damsel.domain.InvoicePayment sour
111111
.fingerprint(resourceOrigin.isSetClientInfo()
112112
? resourceOrigin.getClientInfo().getFingerprint() : null))
113113
.paymentToolDetails(PaymentToolUtils.getPaymentToolDetails(paymentTool))
114-
.payerType(Payer.PayerTypeEnum.PAYMENTRESOURCEPAYER));
114+
.payerType(Payer.PayerTypeEnum.PAYMENT_RESOURCE_PAYER));
115115
}
116116

117117
private void setRecurrentPaymentTool(dev.vality.damsel.domain.InvoicePayment source, Payment target) {
@@ -126,7 +126,7 @@ private void setRecurrentPaymentTool(dev.vality.damsel.domain.InvoicePayment sou
126126
.contactInfo(new ContactInfo()
127127
.email(recurrentParentOrigin.getContactInfo().getEmail())
128128
.phoneNumber(recurrentParentOrigin.getContactInfo().getPhoneNumber()))
129-
.payerType(Payer.PayerTypeEnum.RECURRENTPAYER))
129+
.payerType(Payer.PayerTypeEnum.RECURRENT_PAYER))
130130
.contactInfo(new PaymentContactInfo()
131131
.email(recurrentParentOrigin.getContactInfo().getEmail())
132132
.phoneNumber(recurrentParentOrigin.getContactInfo().getPhoneNumber()));
@@ -140,7 +140,7 @@ private void setCustomerPaymentTool(dev.vality.damsel.domain.InvoicePayment sour
140140
.phoneNumber(customerPayerOrigin.getContactInfo().getPhoneNumber()))
141141
.payer(new CustomerPayer()
142142
.customerID(source.getPayer().getCustomer().getCustomerId())
143-
.payerType(Payer.PayerTypeEnum.CUSTOMERPAYER));
143+
.payerType(Payer.PayerTypeEnum.CUSTOMER_PAYER));
144144
}
145145

146146
private boolean isSetAdditionalInfo(InvoicePayment sourceWrapper) {

‎src/main/java/dev/vality/hooker/converter/UserInteractionConverter.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static QrCodeDisplayRequest createQrCodeDisplayRequest(QrCodeDisplay qrC
3737
qrCodeDisplayInfo.setQrCode(new String(qrCodeDisplay.getQrCode()));
3838
qrCodeDisplayRequest.setQrCodeDisplayInfo(qrCodeDisplayInfo);
3939
qrCodeDisplayRequest.setUserInteractionType(
40-
UserInteractionDetails.UserInteractionTypeEnum.QRCODEDISPLAYREQUEST);
40+
UserInteractionDetails.UserInteractionTypeEnum.QR_CODE_DISPLAY_REQUEST);
4141
return qrCodeDisplayRequest;
4242
}
4343

@@ -49,7 +49,7 @@ private static dev.vality.swag_webhook_events.model.PaymentTerminalReceipt creat
4949
paymentTerminalReceiptInfo.setDue(TimeUtils.toOffsetDateTime(paymentTerminalReceipt.getDue()));
5050
paymentTerminalReceiptRequest.setPaymentTerminalReceiptInfo(paymentTerminalReceiptInfo);
5151
paymentTerminalReceiptRequest.setUserInteractionType(
52-
UserInteractionDetails.UserInteractionTypeEnum.PAYMENTTERMINALRECEIPT);
52+
UserInteractionDetails.UserInteractionTypeEnum.PAYMENT_TERMINAL_RECEIPT);
5353
return paymentTerminalReceiptRequest;
5454
}
5555

@@ -65,7 +65,7 @@ private static CryptoCurrencyTransferRequest createCryptoCurrencyTransferRequest
6565
CryptoCurrencyTransferRequest cryptoCurrencyTransferRequest = new CryptoCurrencyTransferRequest();
6666
cryptoCurrencyTransferRequest.setCryptoCurrencyTransferInfo(cryptoCurrencyTransferInfo);
6767
cryptoCurrencyTransferRequest.setUserInteractionType(
68-
UserInteractionDetails.UserInteractionTypeEnum.CRYPTOCURRENCYTRANSFERREQUEST);
68+
UserInteractionDetails.UserInteractionTypeEnum.CRYPTO_CURRENCY_TRANSFER_REQUEST);
6969
return cryptoCurrencyTransferRequest;
7070
}
7171

@@ -74,7 +74,8 @@ private static ApiExtensionRequest createApiExtensionRequest(ApiExtension apiExt
7474
ApiExtensionInfo apiExtensionInfo = new ApiExtensionInfo();
7575
apiExtensionInfo.setApiType(apiExtension.getApiType());
7676
apiExtensionRequest.setApiExtensionInfo(apiExtensionInfo);
77-
apiExtensionRequest.setUserInteractionType(UserInteractionDetails.UserInteractionTypeEnum.APIEXTENSIONREQUEST);
77+
apiExtensionRequest.setUserInteractionType(
78+
UserInteractionDetails.UserInteractionTypeEnum.API_EXTENSION_REQUEST);
7879
return apiExtensionRequest;
7980
}
8081

@@ -86,7 +87,7 @@ private static BrowserHTTPRequest createBrowserHttpRequest(BrowserHttpInteractio
8687
browserHttpInfo.setForm(browserHttpInteraction.getForm());
8788
BrowserHTTPRequest browserHttpRequest = new BrowserHTTPRequest();
8889
browserHttpRequest.setBrowserHTTPInfo(browserHttpInfo);
89-
browserHttpRequest.setUserInteractionType(UserInteractionDetails.UserInteractionTypeEnum.BROWSERHTTPREQUEST);
90+
browserHttpRequest.setUserInteractionType(UserInteractionDetails.UserInteractionTypeEnum.BROWSER_HTTP_REQUEST);
9091
return browserHttpRequest;
9192
}
9293
}

‎src/main/java/dev/vality/hooker/dao/impl/CustomerDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public List<WebhookMessageModel<CustomerMessage>> getWebhookModels(Long messageI
9898
" and (m.customer_shop_id = wte.invoice_shop_id or wte.invoice_shop_id is null) ";
9999
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource()
100100
.addValue("id", messageId)
101-
.addValue("message_type", Event.TopicEnum.CUSTOMERSTOPIC.getValue());
101+
.addValue("message_type", Event.TopicEnum.CUSTOMERS_TOPIC.getValue());
102102
return jdbcTemplate.query(sql, mapSqlParameterSource, webhookMessageModelRowMapper);
103103
}
104104

‎src/main/java/dev/vality/hooker/dao/impl/InvoicingDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public List<WebhookMessageModel<InvoicingMessage>> getWebhookModels(Long message
105105
" and (m.refund_status = wte.invoice_payment_refund_status " +
106106
" or wte.invoice_payment_refund_status is null)";
107107
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource().addValue("id", messageId)
108-
.addValue("message_type", Event.TopicEnum.INVOICESTOPIC.getValue());
108+
.addValue("message_type", Event.TopicEnum.INVOICES_TOPIC.getValue());
109109
return jdbcTemplate.query(sql, mapSqlParameterSource, webhookMessageModelRowMapper);
110110
}
111111

‎src/main/java/dev/vality/hooker/service/CustomerEventService.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Event getEventByMessage(CustomerMessage message) {
3939
return resolveEvent(message, customer)
4040
.eventID(message.getId().intValue())
4141
.occuredAt(TimeUtils.toOffsetDateTime(message.getEventTime()))
42-
.topic(Event.TopicEnum.CUSTOMERSTOPIC);
42+
.topic(Event.TopicEnum.CUSTOMERS_TOPIC);
4343
} catch (CustomerNotFound e) {
4444
throw new NotFoundException("Customer not found, invoiceId=" + message.getSourceId());
4545
} catch (Exception e) {
@@ -60,25 +60,25 @@ private Event resolveEvent(CustomerMessage message, Customer customer) {
6060
return switch (message.getEventType()) {
6161
case CUSTOMER_CREATED -> new CustomerCreated()
6262
.customer(customerConverter.convert(customer))
63-
.eventType(Event.EventTypeEnum.CUSTOMERCREATED);
63+
.eventType(Event.EventTypeEnum.CUSTOMER_CREATED);
6464
case CUSTOMER_DELETED -> new CustomerDeleted()
6565
.customer(customerConverter.convert(customer))
66-
.eventType(Event.EventTypeEnum.CUSTOMERDELETED);
66+
.eventType(Event.EventTypeEnum.CUSTOMER_DELETED);
6767
case CUSTOMER_READY -> new CustomerReady()
6868
.customer(customerConverter.convert(customer))
69-
.eventType(Event.EventTypeEnum.CUSTOMERREADY);
69+
.eventType(Event.EventTypeEnum.CUSTOMER_READY);
7070
case CUSTOMER_BINDING_STARTED -> new CustomerBindingStarted()
7171
.customer(customerConverter.convert(customer))
7272
.binding(customerBindingConverter.convert(extractBinding(message, customer)))
73-
.eventType(Event.EventTypeEnum.CUSTOMERBINDINGSTARTED);
73+
.eventType(Event.EventTypeEnum.CUSTOMER_BINDING_STARTED);
7474
case CUSTOMER_BINDING_SUCCEEDED -> new CustomerBindingSucceeded()
7575
.customer(customerConverter.convert(customer))
7676
.binding(customerBindingConverter.convert(extractBinding(message, customer)))
77-
.eventType(Event.EventTypeEnum.CUSTOMERBINDINGSUCCEEDED);
77+
.eventType(Event.EventTypeEnum.CUSTOMER_BINDING_SUCCEEDED);
7878
case CUSTOMER_BINDING_FAILED -> new CustomerBindingFailed()
7979
.customer(customerConverter.convert(customer))
8080
.binding(customerBindingConverter.convert(extractBinding(message, customer)))
81-
.eventType(Event.EventTypeEnum.CUSTOMERBINDINGFAILED);
81+
.eventType(Event.EventTypeEnum.CUSTOMER_BINDING_FAILED);
8282
default -> throw new UnsupportedOperationException("Unknown event type " + message.getEventType());
8383
};
8484
}

‎src/main/java/dev/vality/hooker/service/InvoicingEventService.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Event getEventByMessage(InvoicingMessage message) {
3535
return resolveEvent(message, getInvoiceByMessage(message))
3636
.eventID(message.getId().intValue())
3737
.occuredAt(TimeUtils.toOffsetDateTime(message.getEventTime()))
38-
.topic(Event.TopicEnum.INVOICESTOPIC);
38+
.topic(Event.TopicEnum.INVOICES_TOPIC);
3939
}
4040

4141
@Override
@@ -67,24 +67,24 @@ private Event resolveEvent(InvoicingMessage m, dev.vality.damsel.payment_process
6767
return switch (m.getEventType()) {
6868
case INVOICE_CREATED -> new InvoiceCreated()
6969
.invoice(getSwagInvoice(invoiceInfo))
70-
.eventType(Event.EventTypeEnum.INVOICECREATED);
70+
.eventType(Event.EventTypeEnum.INVOICE_CREATED);
7171
case INVOICE_STATUS_CHANGED -> resolveInvoiceStatusChanged(m, invoiceInfo);
7272
case INVOICE_PAYMENT_STARTED -> new PaymentStarted()
7373
.invoice(getSwagInvoice(invoiceInfo))
7474
.payment(getSwagPayment(m, invoiceInfo))
75-
.eventType(Event.EventTypeEnum.PAYMENTSTARTED);
75+
.eventType(Event.EventTypeEnum.PAYMENT_STARTED);
7676
case INVOICE_PAYMENT_STATUS_CHANGED -> resolvePaymentStatusChanged(m, invoiceInfo);
7777
case INVOICE_PAYMENT_REFUND_STARTED -> new RefundCreated()
7878
.invoice(getSwagInvoice(invoiceInfo))
7979
.payment(getSwagPayment(m, invoiceInfo))
8080
.refund(getSwagRefund(m, invoiceInfo))
81-
.eventType(Event.EventTypeEnum.REFUNDCREATED);
81+
.eventType(Event.EventTypeEnum.REFUND_CREATED);
8282
case INVOICE_PAYMENT_REFUND_STATUS_CHANGED -> resolveRefundStatusChanged(m, invoiceInfo);
8383
case INVOICE_PAYMENT_CASH_CHANGED -> resolvePaymentCashChange(m, invoiceInfo);
8484
case INVOICE_PAYMENT_USER_INTERACTION_CHANGE_REQUESTED -> resolvePaymentInteractionRequested(m, invoiceInfo)
85-
.eventType(Event.EventTypeEnum.PAYMENTINTERACTIONREQUESTED);
85+
.eventType(Event.EventTypeEnum.PAYMENT_INTERACTION_REQUESTED);
8686
case INVOICE_PAYMENT_USER_INTERACTION_CHANGE_COMPLETED -> resolvePaymentInteractionCompleted(m, invoiceInfo)
87-
.eventType(Event.EventTypeEnum.PAYMENTINTERACTIONCOMPLETED);
87+
.eventType(Event.EventTypeEnum.PAYMENT_INTERACTION_COMPLETED);
8888
default -> throw new UnsupportedOperationException("Unknown event type " + m.getEventType());
8989
};
9090
}
@@ -99,16 +99,16 @@ private Event resolveInvoiceStatusChanged(InvoicingMessage message,
9999
return switch (message.getInvoiceStatus()) {
100100
case UNPAID -> new InvoiceCreated()
101101
.invoice(swagInvoice)
102-
.eventType(Event.EventTypeEnum.INVOICECREATED);
102+
.eventType(Event.EventTypeEnum.INVOICE_CREATED);
103103
case PAID -> new InvoicePaid()
104104
.invoice(swagInvoice)
105-
.eventType(Event.EventTypeEnum.INVOICEPAID);
105+
.eventType(Event.EventTypeEnum.INVOICE_PAID);
106106
case CANCELLED -> new InvoiceCancelled()
107107
.invoice(swagInvoice)
108-
.eventType(Event.EventTypeEnum.INVOICECANCELLED);
108+
.eventType(Event.EventTypeEnum.INVOICE_CANCELLED);
109109
case FULFILLED -> new InvoiceFulfilled()
110110
.invoice(swagInvoice)
111-
.eventType(Event.EventTypeEnum.INVOICEFULFILLED);
111+
.eventType(Event.EventTypeEnum.INVOICE_FULFILLED);
112112
default -> throw new UnsupportedOperationException("Unknown invoice status " + message.getInvoiceStatus());
113113
};
114114
}
@@ -175,31 +175,31 @@ private Event resolvePaymentStatusChanged(InvoicingMessage message,
175175
case PENDING -> new PaymentStarted()
176176
.invoice(swagInvoice)
177177
.payment(swagPayment)
178-
.eventType(Event.EventTypeEnum.PAYMENTSTARTED);
178+
.eventType(Event.EventTypeEnum.PAYMENT_STARTED);
179179
case PROCESSED -> new PaymentProcessed()
180180
.invoice(swagInvoice)
181181
.payment(swagPayment)
182-
.eventType(Event.EventTypeEnum.PAYMENTPROCESSED);
182+
.eventType(Event.EventTypeEnum.PAYMENT_PROCESSED);
183183
case CAPTURED -> new PaymentCaptured()
184184
.invoice(swagInvoice)
185185
.payment(swagPayment)
186-
.eventType(Event.EventTypeEnum.PAYMENTCAPTURED);
186+
.eventType(Event.EventTypeEnum.PAYMENT_CAPTURED);
187187
case CANCELLED -> new PaymentCancelled()
188188
.invoice(swagInvoice)
189189
.payment(swagPayment)
190-
.eventType(Event.EventTypeEnum.PAYMENTCANCELLED);
190+
.eventType(Event.EventTypeEnum.PAYMENT_CANCELLED);
191191
case REFUNDED -> new PaymentRefunded()
192192
.invoice(swagInvoice)
193193
.payment(swagPayment)
194-
.eventType(Event.EventTypeEnum.PAYMENTREFUNDED);
194+
.eventType(Event.EventTypeEnum.PAYMENT_REFUNDED);
195195
case FAILED -> new PaymentFailed()
196196
.invoice(swagInvoice)
197197
.payment(swagPayment)
198-
.eventType(Event.EventTypeEnum.PAYMENTFAILED);
198+
.eventType(Event.EventTypeEnum.PAYMENT_FAILED);
199199
case CHARGED_BACK -> new PaymentChargedBack()
200200
.invoice(swagInvoice)
201201
.payment(swagPayment)
202-
.eventType(Event.EventTypeEnum.PAYMENTCHARGEDBACK);
202+
.eventType(Event.EventTypeEnum.PAYMENT_CHARGED_BACK);
203203
default -> throw new UnsupportedOperationException("Unknown payment status " + message.getPaymentStatus());
204204
};
205205
}
@@ -241,17 +241,17 @@ private Event resolveRefundStatusChanged(InvoicingMessage message,
241241
.invoice(swagInvoice)
242242
.payment(swagPayment)
243243
.refund(swagRefund)
244-
.eventType(Event.EventTypeEnum.REFUNDPENDING);
244+
.eventType(Event.EventTypeEnum.REFUND_PENDING);
245245
case SUCCEEDED -> new RefundSucceeded()
246246
.invoice(swagInvoice)
247247
.payment(swagPayment)
248248
.refund(swagRefund)
249-
.eventType(Event.EventTypeEnum.REFUNDSUCCEEDED);
249+
.eventType(Event.EventTypeEnum.REFUND_SUCCEEDED);
250250
case FAILED -> new RefundFailed()
251251
.invoice(swagInvoice)
252252
.payment(swagPayment)
253253
.refund(swagRefund)
254-
.eventType(Event.EventTypeEnum.REFUNDFAILED);
254+
.eventType(Event.EventTypeEnum.REFUND_FAILED);
255255
default -> throw new UnsupportedOperationException("Unknown refund status " + message.getRefundStatus());
256256
};
257257
}
@@ -263,7 +263,7 @@ private Event resolvePaymentCashChange(InvoicingMessage message,
263263
return new PaymentCashChanged()
264264
.invoice(swagInvoice)
265265
.payment(swagPayment)
266-
.eventType(Event.EventTypeEnum.PAYMENTCASHCHANGED);
266+
.eventType(Event.EventTypeEnum.PAYMENT_CASH_CHANGED);
267267
}
268268

269269
private Event resolvePaymentInteractionRequested(InvoicingMessage message,

‎src/main/java/dev/vality/hooker/utils/EventFilterUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ public static Set<WebhookAdditionalFilter> getWebhookAdditionalFilter(EventFilte
256256

257257
public static String getTopic(EventFilter eventFilter) {
258258
if (eventFilter.isSetInvoice()) {
259-
return Event.TopicEnum.INVOICESTOPIC.getValue();
259+
return Event.TopicEnum.INVOICES_TOPIC.getValue();
260260
}
261261
if (eventFilter.isSetCustomer()) {
262-
return Event.TopicEnum.CUSTOMERSTOPIC.getValue();
262+
return Event.TopicEnum.CUSTOMERS_TOPIC.getValue();
263263
}
264264
throw new UnsupportedOperationException(
265265
"Unknown topic; must be one of these: " + Arrays.toString(Event.TopicEnum.values()));

0 commit comments

Comments
 (0)