fix: CGD-468: Application starts with corrupted data in case of inval…

…id AES key
eclipse-tractusx · Sep 18, 2023 · c734946 · c734946
1 parent 83c6435
commit c734946
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java
@@ -55,11 +55,16 @@
 import org.eclipse.tractusx.ssi.lib.model.did.*;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredential;
 import org.eclipse.tractusx.ssi.lib.model.verifiable.credential.VerifiableCredentialType;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import java.io.StringWriter;
 import java.net.URI;
@@ -97,6 +102,9 @@ public class WalletService extends BaseService<Wallet, Long> {
 
     private final CommonService commonService;
 
+    @Qualifier("transactionManager")
+    private final PlatformTransactionManager transactionManager;
+
 
     @Override
     protected BaseRepository<Wallet, Long> getRepository() {
@@ -276,18 +284,23 @@ private Wallet createWallet(CreateWalletRequest request, boolean authority, Stri
      * Create authority wallet on application start up, skip if already created.
      */
     @PostConstruct
-    @Transactional(isolation = Isolation.READ_UNCOMMITTED, propagation = Propagation.REQUIRED)
     public void createAuthorityWallet() {
-        if (!walletRepository.existsByBpn(miwSettings.authorityWalletBpn())) {
-            CreateWalletRequest request = CreateWalletRequest.builder()
-                    .name(miwSettings.authorityWalletName())
-                    .bpn(miwSettings.authorityWalletBpn())
-                    .build();
-            createWallet(request, true, miwSettings.authorityWalletBpn());
-            log.info("Authority wallet created with bpn {}", StringEscapeUtils.escapeJava(miwSettings.authorityWalletBpn()));
-        } else {
-            log.info("Authority wallet exists with bpn {}", StringEscapeUtils.escapeJava(miwSettings.authorityWalletBpn()));
-        }
+        TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                if (!walletRepository.existsByBpn(miwSettings.authorityWalletBpn())) {
+                    CreateWalletRequest request = CreateWalletRequest.builder()
+                            .name(miwSettings.authorityWalletName())
+                            .bpn(miwSettings.authorityWalletBpn())
+                            .build();
+                    createWallet(request, true, miwSettings.authorityWalletBpn());
+                    log.info("Authority wallet created with bpn {}", StringEscapeUtils.escapeJava(miwSettings.authorityWalletBpn()));
+                } else {
+                    log.info("Authority wallet exists with bpn {}", StringEscapeUtils.escapeJava(miwSettings.authorityWalletBpn()));
+                }
+            }
+        });
     }
 
     private void validateCreateWallet(CreateWalletRequest request, String callerBpn) {