Completed validate and confirm activity changes as well as integration test change to specify the different returns for the different save methods.

Author: AustinMRooke

core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/checkout/service/workflow/ValidateAndConfirmPaymentActivity.java

@@ -109,7 +109,7 @@ public ProcessContext<CheckoutSeed> execute(ProcessContext<CheckoutSeed> context
          * that transaction
          */
         Map<OrderPayment, PaymentTransaction> additionalTransactions = new HashMap<OrderPayment, PaymentTransaction>();
-        List<PaymentResponseDTO> failedTransactions = new ArrayList<PaymentResponseDTO>();
+        List<ResponseTransactionPair> failedTransactions = new ArrayList<ResponseTransactionPair>();
         // Used for the rollback handler; we want to make sure that we roll back transactions that have already been confirmed
         // as well as transctions that we are about to confirm here
         List<PaymentTransaction> confirmedTransactions = new ArrayList<PaymentTransaction>();
@@ -188,12 +188,13 @@ public ProcessContext<CheckoutSeed> execute(ProcessContext<CheckoutSeed> context
                         transaction.setParentTransaction(tx);
                         transaction.setOrderPayment(payment);
                         transaction.setAdditionalFields(responseDTO.getResponseMap());
+                        transaction = orderPaymentService.save(transaction);
                         additionalTransactions.put(payment, transaction);
 
                         if (responseDTO.isSuccessful()) {
                             additionalConfirmedTransactions.put(payment, transaction.getType());
                         } else {
-                            failedTransactions.add(responseDTO);
+                            failedTransactions.add(new ResponseTransactionPair(responseDTO, transaction.getId()));
                         }
 
                     } else if (PaymentTransactionType.AUTHORIZE.equals(tx.getType()) ||
@@ -275,16 +276,16 @@ public ProcessContext<CheckoutSeed> execute(ProcessContext<CheckoutSeed> context
      *
      * @param responseDTOs
      */
-    protected void handleUnsuccessfulTransactions(List<PaymentResponseDTO> responseDTOs, ProcessContext<CheckoutSeed> context) throws Exception {
+    protected void handleUnsuccessfulTransactions(List<ResponseTransactionPair> responseDTOs, ProcessContext<CheckoutSeed> context) throws Exception {
         //The Response DTO was not successful confirming/authorizing a transaction.
         String msg = "Attempting to confirm/authorize an UNCONFIRMED transaction on the order was unsuccessful.";
         if (LOG.isErrorEnabled()) {
             LOG.error(msg);
         }
 
         if (LOG.isTraceEnabled()) {
-            for (PaymentResponseDTO responseDTO : responseDTOs) {
-                LOG.trace(responseDTO.getRawResponse());
+            for (ResponseTransactionPair responseTransactionPair : responseDTOs) {
+                LOG.trace(responseTransactionPair.getResponseDTO().getRawResponse());
             }
         }
 
@@ -359,5 +360,26 @@ protected String getGatewayExpirationDateFormat(){
         }
         return format;
     }
+    
+    protected class ResponseTransactionPair {
+        PaymentResponseDTO responseDTO;
+        Long transactionId;
+        
+        ResponseTransactionPair() {
+            this(null, null);
+        }
+        ResponseTransactionPair(PaymentResponseDTO responseDTO, Long transactionId) {
+            this.responseDTO = responseDTO;
+            this.transactionId = transactionId;
+        }
+        
+        public PaymentResponseDTO getResponseDTO() {
+            return responseDTO;
+        }
+        
+        public Long getTransactionId() {
+            return transactionId;
+        }
+    }
 
 }

core/broadleaf-framework/src/test/groovy/org/broadleafcommerce/core/spec/checkout/service/workflow/ValidateAndConfirmPaymentActivitySpec.groovy

@@ -174,7 +174,8 @@ class ValidateAndConfirmPaymentActivitySpec extends BaseCheckoutActivitySpec {
         mockRequestService.translatePaymentTransaction(*_) >> new PaymentRequestDTO()
         OrderPaymentService mockOrderPaymentService = Mock()
         mockOrderPaymentService.createTransaction() >> new PaymentTransactionImpl()
-        mockOrderPaymentService.save(_) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as OrderPayment) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as PaymentTransaction) >> {PaymentTransaction transaction -> transaction}
 
         activity = new ValidateAndConfirmPaymentActivity().with {
             paymentConfigurationServiceProvider = mockProvider
@@ -218,7 +219,8 @@ class ValidateAndConfirmPaymentActivitySpec extends BaseCheckoutActivitySpec {
         mockRequestService.translatePaymentTransaction(*_) >> new PaymentRequestDTO()
         OrderPaymentService mockOrderPaymentService = Mock()
         mockOrderPaymentService.createTransaction() >> new PaymentTransactionImpl()
-        mockOrderPaymentService.save(_) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as OrderPayment) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as PaymentTransaction) >> {PaymentTransaction transaction -> transaction}
 
         activity = new ValidateAndConfirmPaymentActivity().with {
             paymentConfigurationServiceProvider = mockProvider
@@ -268,7 +270,8 @@ class ValidateAndConfirmPaymentActivitySpec extends BaseCheckoutActivitySpec {
         mockRequestService.translatePaymentTransaction(*_) >> new PaymentRequestDTO()
         OrderPaymentService mockOrderPaymentService = Mock()
         mockOrderPaymentService.createTransaction() >> new PaymentTransactionImpl()
-        mockOrderPaymentService.save(_) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as OrderPayment) >> {OrderPayment payment -> payment}
+        mockOrderPaymentService.save(_ as PaymentTransaction) >> {PaymentTransaction transaction -> transaction}
 
         activity = new ValidateAndConfirmPaymentActivity().with {
             paymentConfigurationServiceProvider = mockProvider