Skip to content

Commit a106ec2

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #143 from TransactionProcessing/bug/#142_txnidnotreturnedfromprocesstxn
Added Transaction Id to responses
2 parents 73b9c55 + ed4198b commit a106ec2

10 files changed

Lines changed: 78 additions & 13 deletions

File tree

‎TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,9 @@ await this.TransactionAggregateManager.StartTransaction(transactionId,
148148
ResponseMessage = transactionAggregate.ResponseMessage,
149149
ResponseCode = transactionAggregate.ResponseCode,
150150
EstateId = estateId,
151-
MerchantId = merchantId
152-
};
151+
MerchantId = merchantId,
152+
TransactionId = transactionId
153+
};
153154
}
154155

155156
/// <summary>
@@ -298,8 +299,9 @@ await this.TransactionAggregateManager.RecordAdditionalResponseData(estateId,
298299
ResponseCode = transaction.ResponseCode,
299300
EstateId = estateId,
300301
MerchantId = merchantId,
301-
AdditionalTransactionMetadata = transaction.AdditionalResponseMetadata
302-
};
302+
AdditionalTransactionMetadata = transaction.AdditionalResponseMetadata,
303+
TransactionId = transactionId
304+
};
303305
}
304306

305307
private async Task<OperatorResponse> ProcessMessageWithOperator(MerchantResponse merchant,
@@ -382,7 +384,8 @@ public async Task<ProcessReconciliationTransactionResponse> ProcessReconciliatio
382384
EstateId = reconciliationAggregate.EstateId,
383385
MerchantId = reconciliationAggregate.MerchantId,
384386
ResponseCode = reconciliationAggregate.ResponseCode,
385-
ResponseMessage = reconciliationAggregate.ResponseMessage
387+
ResponseMessage = reconciliationAggregate.ResponseMessage,
388+
TransactionId = transactionId
386389
};
387390
}
388391

‎TransactionProcessor.DataTransferObjects/LogonTransactionResponse.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ public class LogonTransactionResponse
4848
[JsonProperty("response_message")]
4949
public String ResponseMessage { get; set; }
5050

51+
/// <summary>
52+
/// Gets or sets the transaction identifier.
53+
/// </summary>
54+
/// <value>
55+
/// The transaction identifier.
56+
/// </value>
57+
[JsonProperty("transaction_id")]
58+
public Guid TransactionId { get; set; }
59+
5160
#endregion
5261
}
5362
}

‎TransactionProcessor.DataTransferObjects/ReconciliationResponse.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ public class ReconciliationResponse
4545
[JsonProperty("response_message")]
4646
public String ResponseMessage { get; set; }
4747

48+
/// <summary>
49+
/// Gets or sets the transaction identifier.
50+
/// </summary>
51+
/// <value>
52+
/// The transaction identifier.
53+
/// </value>
54+
[JsonProperty("transaction_id")]
55+
public Guid TransactionId { get; set; }
56+
4857
#endregion
4958
}
5059
}

‎TransactionProcessor.DataTransferObjects/SaleTransactionResponse.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ public class SaleTransactionResponse
5555
[JsonProperty("additional_transaction_metadata")]
5656
public Dictionary<String, String> AdditionalTransactionMetadata { get; set; }
5757

58+
/// <summary>
59+
/// Gets or sets the transaction identifier.
60+
/// </summary>
61+
/// <value>
62+
/// The transaction identifier.
63+
/// </value>
64+
[JsonProperty("transaction_id")]
65+
public Guid TransactionId { get; set; }
66+
5867
#endregion
5968
}
6069
}

‎TransactionProcessor.Models/ProcessLogonTransactionResponse.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ public class ProcessLogonTransactionResponse
4343
/// </value>
4444
public Guid MerchantId { get; set; }
4545

46+
/// <summary>
47+
/// Gets or sets the transaction identifier.
48+
/// </summary>
49+
/// <value>
50+
/// The transaction identifier.
51+
/// </value>
52+
public Guid TransactionId { get; set; }
53+
4654
#endregion
4755
}
4856
}

‎TransactionProcessor.Models/ProcessReconciliationResponse.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ public class ProcessReconciliationTransactionResponse
4040
/// </value>
4141
public Guid MerchantId { get; set; }
4242

43+
/// <summary>
44+
/// Gets or sets the transaction identifier.
45+
/// </summary>
46+
/// <value>
47+
/// The transaction identifier.
48+
/// </value>
49+
public Guid TransactionId { get; set; }
50+
4351
#endregion
4452
}
4553
}

‎TransactionProcessor.Models/ProcessSaleTransactionResponse.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ public class ProcessSaleTransactionResponse
5151
/// </value>
5252
public Dictionary<String, String> AdditionalTransactionMetadata { get; set; }
5353

54+
/// <summary>
55+
/// Gets or sets the transaction identifier.
56+
/// </summary>
57+
/// <value>
58+
/// The transaction identifier.
59+
/// </value>
60+
public Guid TransactionId { get; set; }
61+
5462
#endregion
5563
}
5664
}

‎TransactionProcessor/Common/Examples/ExampleData.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ internal static class ExampleData
114114
/// </summary>
115115
internal static Decimal TransactionValue = 10.00m;
116116

117+
/// <summary>
118+
/// The transaction identifier
119+
/// </summary>
120+
internal static Guid TransactionId = Guid.Parse("612970B8-FDF1-4CAA-998A-D84632BD4DE0");
121+
117122
#endregion
118123
}
119124
}

‎TransactionProcessor/Common/Examples/TransactionResponseExample.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ private SwaggerExample<SerialisedMessage> GetLogonExample()
2323
EstateId = ExampleData.EstateId,
2424
MerchantId = ExampleData.MerchantId,
2525
ResponseCode = ExampleData.LogonResponseCode,
26-
ResponseMessage = ExampleData.LogonResponseMessage
26+
ResponseMessage = ExampleData.LogonResponseMessage,
27+
TransactionId = ExampleData.TransactionId
2728
};
2829

2930
return new SwaggerExample<SerialisedMessage>
@@ -52,8 +53,9 @@ private SwaggerExample<SerialisedMessage> GetReconciliationExample()
5253
EstateId = ExampleData.EstateId,
5354
MerchantId = ExampleData.MerchantId,
5455
ResponseCode = ExampleData.ReconciliationResponseCode,
55-
ResponseMessage = ExampleData.ReconciliationResponseMessage
56-
};
56+
ResponseMessage = ExampleData.ReconciliationResponseMessage,
57+
TransactionId = ExampleData.TransactionId
58+
};
5759

5860
return new SwaggerExample<SerialisedMessage>
5961
{
@@ -82,8 +84,9 @@ private SwaggerExample<SerialisedMessage> GetSaleExample()
8284
MerchantId = ExampleData.MerchantId,
8385
AdditionalTransactionMetadata = new Dictionary<String, String>(),
8486
ResponseCode = ExampleData.SaleResponseCode,
85-
ResponseMessage = ExampleData.SaleResponseMessage
86-
};
87+
ResponseMessage = ExampleData.SaleResponseMessage,
88+
TransactionId = ExampleData.TransactionId
89+
};
8790

8891
return new SwaggerExample<SerialisedMessage>
8992
{

‎TransactionProcessor/Factories/ModelFactory.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public SerialisedMessage ConvertFrom(ProcessLogonTransactionResponse processLogo
3232
ResponseMessage = processLogonTransactionResponse.ResponseMessage,
3333
ResponseCode = processLogonTransactionResponse.ResponseCode,
3434
MerchantId = processLogonTransactionResponse.MerchantId,
35-
EstateId = processLogonTransactionResponse.EstateId
35+
EstateId = processLogonTransactionResponse.EstateId,
36+
TransactionId = processLogonTransactionResponse.TransactionId
3637
};
3738

3839
return new SerialisedMessage
@@ -67,7 +68,8 @@ public SerialisedMessage ConvertFrom(ProcessSaleTransactionResponse processSaleT
6768
ResponseCode = processSaleTransactionResponse.ResponseCode,
6869
MerchantId = processSaleTransactionResponse.MerchantId,
6970
EstateId = processSaleTransactionResponse.EstateId,
70-
AdditionalTransactionMetadata = processSaleTransactionResponse.AdditionalTransactionMetadata
71+
AdditionalTransactionMetadata = processSaleTransactionResponse.AdditionalTransactionMetadata,
72+
TransactionId = processSaleTransactionResponse.TransactionId
7173
};
7274

7375
return new SerialisedMessage
@@ -102,7 +104,8 @@ public SerialisedMessage ConvertFrom(ProcessReconciliationTransactionResponse pr
102104
ResponseMessage = processReconciliationTransactionResponse.ResponseMessage,
103105
ResponseCode = processReconciliationTransactionResponse.ResponseCode,
104106
MerchantId = processReconciliationTransactionResponse.MerchantId,
105-
EstateId = processReconciliationTransactionResponse.EstateId
107+
EstateId = processReconciliationTransactionResponse.EstateId,
108+
TransactionId = processReconciliationTransactionResponse.TransactionId
106109
};
107110

108111
return new SerialisedMessage

0 commit comments

Comments
 (0)