diff --git a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
index e0e9ed35..ca8ccc0a 100644
--- a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
+++ b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/TransactionProcessor.Client/TransactionProcessor.Client.csproj b/TransactionProcessor.Client/TransactionProcessor.Client.csproj
index 48340fbf..cfd28842 100644
--- a/TransactionProcessor.Client/TransactionProcessor.Client.csproj
+++ b/TransactionProcessor.Client/TransactionProcessor.Client.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
index 628fdc58..12643ad7 100644
--- a/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
+++ b/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs
@@ -297,10 +297,14 @@ await Retry.For(async () =>
"stuartferguson/testhosts",
new List
{
- testNetwork
+ testNetwork,
+ Setup.DatabaseServerNetwork
},
traceFolder,
dockerCredentials,
+ (Setup.SqlServerContainerName,
+ "sa",
+ "thisisalongpassword123!"),
true);
this.Containers.AddRange(new List
diff --git a/TransactionProcessor.IntegrationTests/Common/Setup.cs b/TransactionProcessor.IntegrationTests/Common/Setup.cs
index cf609d0e..e7ef2839 100644
--- a/TransactionProcessor.IntegrationTests/Common/Setup.cs
+++ b/TransactionProcessor.IntegrationTests/Common/Setup.cs
@@ -47,7 +47,7 @@ protected static void GlobalSetup()
// Start the Database Server here
DatabaseServerContainer = global::Shared.IntegrationTesting.DockerHelper.StartSqlContainerWithOpenConnection(Setup.SqlServerContainerName,
logger,
- "stuartferguson/subscriptionservicedatabasesqlserver",
+ "mcr.microsoft.com/mssql/server:2019-latest",
Setup.DatabaseServerNetwork,
"",
dockerCredentials,
diff --git a/TransactionProcessor.IntegrationTests/Settlement/Settlement.feature.cs b/TransactionProcessor.IntegrationTests/Settlement/Settlement.feature.cs
index c8e5ea31..3230dee0 100644
--- a/TransactionProcessor.IntegrationTests/Settlement/Settlement.feature.cs
+++ b/TransactionProcessor.IntegrationTests/Settlement/Settlement.feature.cs
@@ -247,12 +247,14 @@ void System.IDisposable.Dispose()
[Xunit.SkippableFactAttribute(DisplayName="Get Pending Settlement")]
[Xunit.TraitAttribute("FeatureTitle", "Settlement")]
[Xunit.TraitAttribute("Description", "Get Pending Settlement")]
+ [Xunit.TraitAttribute("Category", "PRTest")]
public virtual void GetPendingSettlement()
{
- string[] tagsOfScenario = ((string[])(null));
+ string[] tagsOfScenario = new string[] {
+ "PRTest"};
System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Get Pending Settlement", null, tagsOfScenario, argumentsOfScenario);
-#line 49
+#line 50
this.ScenarioInitialize(scenarioInfo);
#line hidden
bool isScenarioIgnored = default(bool);
@@ -315,7 +317,7 @@ public virtual void GetPendingSettlement()
"testcontact3@merchant2.co.uk",
"Test Estate 1",
"Monthly"});
-#line 50
+#line 51
testRunner.Given("I create the following merchants", ((string)(null)), table71, "Given ");
#line hidden
TechTalk.SpecFlow.Table table72 = new TechTalk.SpecFlow.Table(new string[] {
@@ -360,7 +362,7 @@ public virtual void GetPendingSettlement()
"00000003",
"10000003",
"Test Estate 1"});
-#line 56
+#line 57
testRunner.Given("I have assigned the following operator to the merchants", ((string)(null)), table72, "Given ");
#line hidden
TechTalk.SpecFlow.Table table73 = new TechTalk.SpecFlow.Table(new string[] {
@@ -379,7 +381,7 @@ public virtual void GetPendingSettlement()
"123456782",
"Test Merchant 3",
"Test Estate 1"});
-#line 65
+#line 66
testRunner.Given("I have assigned the following devices to the merchants", ((string)(null)), table73, "Given ");
#line hidden
TechTalk.SpecFlow.Table table74 = new TechTalk.SpecFlow.Table(new string[] {
@@ -406,7 +408,7 @@ public virtual void GetPendingSettlement()
"Today",
"Test Merchant 3",
"Test Estate 1"});
-#line 71
+#line 72
testRunner.Given("I make the following manual merchant deposits", ((string)(null)), table74, "Given ");
#line hidden
TechTalk.SpecFlow.Table table75 = new TechTalk.SpecFlow.Table(new string[] {
@@ -544,7 +546,7 @@ public virtual void GetPendingSettlement()
"10 KES",
"test@recipient.co.uk",
""});
-#line 77
+#line 78
testRunner.When("I perform the following transactions", ((string)(null)), table75, "When ");
#line hidden
TechTalk.SpecFlow.Table table76 = new TechTalk.SpecFlow.Table(new string[] {
@@ -601,7 +603,7 @@ public virtual void GetPendingSettlement()
"8",
"0000",
"SUCCESS"});
-#line 88
+#line 89
testRunner.Then("transaction response should contain the following information", ((string)(null)), table76, "Then ");
#line hidden
TechTalk.SpecFlow.Table table77 = new TechTalk.SpecFlow.Table(new string[] {
@@ -616,7 +618,7 @@ public virtual void GetPendingSettlement()
"NextMonth",
"Test Estate 1",
"1"});
-#line 99
+#line 100
testRunner.When("I get the pending settlements the following information should be returned", ((string)(null)), table77, "When ");
#line hidden
}
@@ -633,7 +635,7 @@ public virtual void ProcessSettlement()
"PRTest"};
System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Process Settlement", null, tagsOfScenario, argumentsOfScenario);
-#line 105
+#line 106
this.ScenarioInitialize(scenarioInfo);
#line hidden
bool isScenarioIgnored = default(bool);
@@ -686,7 +688,7 @@ public virtual void ProcessSettlement()
"testcontact2@merchant2.co.uk",
"Test Estate 1",
"Weekly"});
-#line 106
+#line 107
testRunner.Given("I create the following merchants", ((string)(null)), table78, "Given ");
#line hidden
TechTalk.SpecFlow.Table table79 = new TechTalk.SpecFlow.Table(new string[] {
@@ -719,7 +721,7 @@ public virtual void ProcessSettlement()
"00000002",
"10000002",
"Test Estate 1"});
-#line 111
+#line 112
testRunner.Given("I have assigned the following operator to the merchants", ((string)(null)), table79, "Given ");
#line hidden
TechTalk.SpecFlow.Table table80 = new TechTalk.SpecFlow.Table(new string[] {
@@ -734,7 +736,7 @@ public virtual void ProcessSettlement()
"123456781",
"Test Merchant 2",
"Test Estate 1"});
-#line 118
+#line 119
testRunner.Given("I have assigned the following devices to the merchants", ((string)(null)), table80, "Given ");
#line hidden
TechTalk.SpecFlow.Table table81 = new TechTalk.SpecFlow.Table(new string[] {
@@ -755,7 +757,7 @@ public virtual void ProcessSettlement()
"Today",
"Test Merchant 2",
"Test Estate 1"});
-#line 123
+#line 124
testRunner.Given("I make the following manual merchant deposits", ((string)(null)), table81, "Given ");
#line hidden
TechTalk.SpecFlow.Table table82 = new TechTalk.SpecFlow.Table(new string[] {
@@ -848,7 +850,7 @@ public virtual void ProcessSettlement()
"10 KES",
"",
"123456789"});
-#line 128
+#line 129
testRunner.When("I perform the following transactions", ((string)(null)), table82, "When ");
#line hidden
TechTalk.SpecFlow.Table table83 = new TechTalk.SpecFlow.Table(new string[] {
@@ -887,7 +889,7 @@ public virtual void ProcessSettlement()
"6",
"0000",
"SUCCESS"});
-#line 136
+#line 137
testRunner.Then("transaction response should contain the following information", ((string)(null)), table83, "Then ");
#line hidden
TechTalk.SpecFlow.Table table84 = new TechTalk.SpecFlow.Table(new string[] {
@@ -898,10 +900,10 @@ public virtual void ProcessSettlement()
"Yesterday",
"Test Estate 1",
"1"});
-#line 144
+#line 145
testRunner.When("I get the pending settlements the following information should be returned", ((string)(null)), table84, "When ");
#line hidden
-#line 148
+#line 149
testRunner.When("I process the settlement for \'Yesterday\' on Estate \'Test Estate 1\' then 1 fees ar" +
"e marked as settled and the settlement is completed", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line hidden
diff --git a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
index 1071db15..d0720753 100644
--- a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
+++ b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
@@ -7,7 +7,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
diff --git a/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj b/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
index 30825962..cda72881 100644
--- a/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
+++ b/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
@@ -5,6 +5,6 @@
-
+
diff --git a/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj b/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
index bf376d08..ab8a81f6 100644
--- a/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
+++ b/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj b/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
index 0cccad20..6da5d437 100644
--- a/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
+++ b/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj b/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
index 2e5079d9..c28eaf6d 100644
--- a/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
+++ b/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj b/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
index d80302ef..caff460d 100644
--- a/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
+++ b/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj b/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
index 307fc243..b46c122a 100644
--- a/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
+++ b/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/TransactionProcessor/TransactionProcessor.csproj b/TransactionProcessor/TransactionProcessor.csproj
index 5b933293..b55bce28 100644
--- a/TransactionProcessor/TransactionProcessor.csproj
+++ b/TransactionProcessor/TransactionProcessor.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/TransactionProcessor/appsettings.json b/TransactionProcessor/appsettings.json
index 826158a6..083414b4 100644
--- a/TransactionProcessor/appsettings.json
+++ b/TransactionProcessor/appsettings.json
@@ -1,6 +1,7 @@
{
"AppSettings": {
"SubscriptionFilter": "Transaction Processor",
+ "UseInternalSubscriptionService": "true",
"ClientId": "serviceClient",
"ClientSecret": "d192cbc46d834d0da90e8a9d50ded543",
"EventHandlerConfiguration": {