Ft/bump damsel ff

pom.xml

@@ -124,17 +124,16 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
-            <version>1.652-ecf4977</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>fistful-proto</artifactId>
-            <version>1.179-54f1d58</version>
+            <version>1.180-8b04c7f</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>swag-wallets-webhook-events</artifactId>
-            <version>1.38-719220c-server</version>
+            <version>1.50-5299faf-epic-BG-165-server</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

src/main/java/dev/vality/wallets/hooker/converter/DestinationToDestinationMessageConverter.java

@@ -17,6 +17,7 @@ public dev.vality.swag.wallets.webhook.events.model.Destination convert(Destinat
         var destination = new dev.vality.swag.wallets.webhook.events.model.Destination();
         destination.setExternalID(event.getExternalId());
         destination.setName(event.getName());
+        destination.setParty(event.getPartyId());
         // todo metadata null?
         destination.setMetadata(null);
         log.info("destinationDamsel has been converted, destination={}", destination);

src/main/java/dev/vality/wallets/hooker/converter/ResourceToJsonStringDestinationConverter.java

@@ -24,7 +24,7 @@ public String convert(Resource resource) {
             case BANK_CARD:
                 BankCard bankCard = new BankCard();
                 ResourceBankCard resourceBankCard = resource.getBankCard();
-                bankCard.setType(DestinationResource.TypeEnum.BANKCARD);
+                bankCard.setType(DestinationResource.TypeEnum.BANK_CARD);
                 bankCard.bin(resourceBankCard.getBankCard().getBin());
                 bankCard.cardNumberMask(resourceBankCard.getBankCard().getMaskedPan());
                 if (resourceBankCard.getBankCard().getPaymentSystem() != null) {
@@ -33,7 +33,7 @@ public String convert(Resource resource) {
                 return JsonUtil.toString(bankCard);
             case CRYPTO_WALLET:
                 CryptoWallet cryptoWallet = new CryptoWallet();
-                cryptoWallet.setType(DestinationResource.TypeEnum.CRYPTOWALLET);
+                cryptoWallet.setType(DestinationResource.TypeEnum.CRYPTO_WALLET);
                 ResourceCryptoWallet resourceCryptoWallet = resource.getCryptoWallet();
                 cryptoWallet.setCryptoWalletId(resourceCryptoWallet.getCryptoWallet().getId());
                 cryptoWallet.setCurrency(
@@ -47,7 +47,7 @@ public String convert(Resource resource) {
                 var swagDigitalWallet = resource.getDigitalWallet().getDigitalWallet();
                 digitalWallet.setDigitalWalletId(swagDigitalWallet.getId());
                 digitalWallet.setDigitalWalletProvider(swagDigitalWallet.getPaymentService().getId());
-                digitalWallet.setType(DestinationResource.TypeEnum.DIGITALWALLET);
+                digitalWallet.setType(DestinationResource.TypeEnum.DIGITAL_WALLET);
                 return JsonUtil.toString(digitalWallet);
             case GENERIC:
                 return initGenericType(resource);

src/main/java/dev/vality/wallets/hooker/converter/WebHookConverter.java

@@ -1,12 +1,11 @@
 package dev.vality.wallets.hooker.converter;
 
-import dev.vality.wallets.hooker.dao.identity.IdentityKeyDao;
+import dev.vality.wallets.hooker.dao.party.PartyKeyDao;
 import dev.vality.wallets.hooker.dao.webhook.WebHookToEventsDao;
-import dev.vality.wallets.hooker.utils.WebHookConverterUtils;
 import dev.vality.wallets.hooker.domain.enums.EventType;
-import dev.vality.wallets.hooker.domain.tables.pojos.IdentityKey;
 import dev.vality.wallets.hooker.domain.tables.pojos.Webhook;
 import dev.vality.wallets.hooker.domain.tables.pojos.WebhookToEvents;
+import dev.vality.wallets.hooker.utils.WebHookConverterUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.convert.converter.Converter;
@@ -20,22 +19,22 @@
 @Slf4j
 public class WebHookConverter implements Converter<Webhook, dev.vality.fistful.webhooker.Webhook> {
 
-    private final IdentityKeyDao identityKeyDao;
+    private final PartyKeyDao partyKeyDao;
     private final WebHookToEventsDao webHookToEventsDao;
 
     @Override
     public dev.vality.fistful.webhooker.Webhook convert(Webhook webhook) {
-        IdentityKey identityKey = identityKeyDao.getByIdentity(webhook.getIdentityId());
+        var partyKey = partyKeyDao.getByParty(webhook.getPartyId());
         Set<EventType> eventTypes = webHookToEventsDao.get(webhook.getId()).stream()
                 .map(WebhookToEvents::getEventType)
                 .collect(Collectors.toSet());
 
         var webhookDamsel = new dev.vality.fistful.webhooker.Webhook();
         webhookDamsel.setId(webhook.getId());
         webhookDamsel.setEnabled(webhook.getEnabled());
-        webhookDamsel.setIdentityId(webhook.getIdentityId());
+        webhookDamsel.setPartyId(webhook.getPartyId());
         webhookDamsel.setWalletId(webhook.getWalletId());
-        webhookDamsel.setPubKey(identityKey.getPubKey());
+        webhookDamsel.setPubKey(partyKey.getPubKey());
         webhookDamsel.setUrl(webhook.getUrl());
         webhookDamsel.setEventFilter(WebHookConverterUtils.generateEventFilter(eventTypes));
 

src/main/java/dev/vality/wallets/hooker/converter/WebHookModelToWebHookConverter.java

@@ -18,7 +18,7 @@ public Webhook convert(WebHookModel event) {
         Webhook webhook = new Webhook();
         webhook.setId(event.getId());
         webhook.setEnabled(event.getEnabled());
-        webhook.setIdentityId(event.getIdentityId());
+        webhook.setPartyId(event.getPartyId());
         webhook.setWalletId(event.getWalletId());
         webhook.setPubKey(event.getPubKey());
         webhook.setEventFilter(WebHookConverterUtils.generateEventFilter(event.getEventTypes()));

src/main/java/dev/vality/wallets/hooker/converter/WebHookParamsToWebHookConverter.java

@@ -16,7 +16,7 @@ public class WebHookParamsToWebHookConverter implements Converter<WebhookParams,
     @Override
     public WebHookModel convert(WebhookParams event) {
         WebHookModel webHookModel = WebHookModel.builder()
-                .identityId(event.getIdentityId())
+                .partyId(event.getPartyId())
                 .url(event.getUrl())
                 .walletId(event.getWalletId())
                 .eventTypes(EventTypeUtils.convertEventTypes(event))

src/main/java/dev/vality/wallets/hooker/dao/party/PartyKeyDao.java

@@ -0,0 +1,13 @@
+package dev.vality.wallets.hooker.dao.party;
+
+import dev.vality.wallets.hooker.domain.tables.pojos.PartyKey;
+
+public interface PartyKeyDao {
+
+    void create(PartyKey partyKey);
+
+    PartyKey get(Long id);
+
+    PartyKey getByParty(String partyId);
+
+}

src/main/java/dev/vality/wallets/hooker/dao/party/PartyKeyDaoImpl.java

@@ -0,0 +1,51 @@
+package dev.vality.wallets.hooker.dao.party;
+
+import dev.vality.mapper.RecordRowMapper;
+import dev.vality.wallets.hooker.dao.AbstractDao;
+import dev.vality.wallets.hooker.domain.tables.pojos.PartyKey;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+
+import static dev.vality.wallets.hooker.domain.tables.PartyKey.PARTY_KEY;
+
+@Component
+public class PartyKeyDaoImpl extends AbstractDao implements PartyKeyDao {
+
+    private final RowMapper<PartyKey> listRecordRowMapper;
+
+    public PartyKeyDaoImpl(DataSource dataSource) {
+        super(dataSource);
+        this.listRecordRowMapper = new RecordRowMapper<>(PARTY_KEY, PartyKey.class);
+    }
+
+    @Override
+    public void create(PartyKey partyKey) {
+        var insertPartyKey = getDslContext()
+                .insertInto(PARTY_KEY)
+                .set(getDslContext()
+                        .newRecord(PARTY_KEY, partyKey))
+                .onConflict(PARTY_KEY.PARTY_ID)
+                .doNothing();
+        execute(insertPartyKey);
+    }
+
+    @Override
+    public PartyKey get(Long id) {
+        return fetchOne(getDslContext()
+                        .select(PARTY_KEY.ID, PARTY_KEY.PARTY_ID, PARTY_KEY.PUB_KEY, PARTY_KEY.PRIV_KEY)
+                        .from(PARTY_KEY)
+                        .where(PARTY_KEY.ID.eq(id)),
+                listRecordRowMapper);
+    }
+
+    @Override
+    public PartyKey getByParty(String partyId) {
+        return fetchOne(getDslContext()
+                        .select(PARTY_KEY.ID, PARTY_KEY.PARTY_ID, PARTY_KEY.PUB_KEY, PARTY_KEY.PRIV_KEY)
+                        .from(PARTY_KEY)
+                        .where(PARTY_KEY.PARTY_ID.eq(partyId)),
+                listRecordRowMapper);
+    }
+}