feat: B/P Detailed Errors, race condition fixes, and preliminary support for the Customer Account API

.github/workflows/openactive-test-suite.yml

@@ -83,7 +83,7 @@ jobs:
         connection_string: ${{ secrets.CONFORMANCE_CERTIFICATE_BLOB_STORAGE_CONNECTION_STRING }}
         sync: false
   framework:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:

Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj

@@ -11,7 +11,7 @@
       <Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
-    <PackageReference Include="OpenActive.NET" Version="15.2.6" />
+    <PackageReference Include="OpenActive.NET" Version="15.2.11" />
   </ItemGroup>
 
   <ItemGroup>

Examples/BookingSystem.AspNetCore/Controllers/OpenBookingController.cs

@@ -33,7 +33,7 @@ public async Task<ContentResult> OrderQuoteCreationC1([FromServices] IBookingEng
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessCheckpoint1(clientId, sellerId, uuid, orderQuote)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -52,7 +52,7 @@ public async Task<ContentResult> OrderQuoteCreationC2([FromServices] IBookingEng
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessCheckpoint2(clientId, sellerId, uuid, orderQuote)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -71,7 +71,7 @@ public async Task<ContentResult> OrderProposalCreationP([FromServices] IBookingE
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessOrderProposalCreationP(clientId, sellerId, uuid, orderProposal)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -90,7 +90,7 @@ public async Task<IActionResult> OrderQuoteDeletion([FromServices] IBookingEngin
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.DeleteOrderQuote(clientId, sellerId, uuid)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -109,7 +109,7 @@ public async Task<ContentResult> OrderCreationB([FromServices] IBookingEngine bo
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessOrderCreationB(clientId, sellerId, uuid, order)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -128,7 +128,7 @@ public async Task<IActionResult> OrderDeletion([FromServices] IBookingEngine boo
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.DeleteOrder(clientId, sellerId, uuid)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -147,7 +147,7 @@ public async Task<IActionResult> OrderUpdate([FromServices] IBookingEngine booki
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessOrderUpdate(clientId, sellerId, uuid, order)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -167,7 +167,7 @@ public async Task<IActionResult> OrderProposalUpdate([FromServices] IBookingEngi
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.ProcessOrderProposalUpdate(clientId, sellerId, uuid, order)).GetContentResult();
             }
             catch (OpenBookingException obe)
@@ -183,7 +183,7 @@ public async Task<IActionResult> GetOrderStatus([FromServices] IBookingEngine bo
         {
             try
             {
-                (string clientId, Uri sellerId) = User.GetAccessTokenOpenBookingClaims();
+                (string clientId, Uri sellerId, _) = User.GetAccessTokenOpenBookingClaims();
                 return (await bookingEngine.GetOrderStatus(clientId, sellerId, uuid)).GetContentResult();
             }
             catch (OpenBookingException obe)

Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs

@@ -72,7 +72,7 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                                 IsOpenBookingAllowed = true,
                             } : new Organization
                             {
-                                Id = RenderSellerId(new SellerIdComponents { SellerIdLong = result.Item2.Id }),
+                                Id = RenderSellerId(new SimpleIdComponents { IdLong = result.Item2.Id }),
                                 Name = result.Item2.Name,
                                 TaxMode = result.Item2.IsTaxGross ? TaxMode.TaxGross : TaxMode.TaxNet,
                                 TermsOfService = new List<Terms>

Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs

@@ -123,13 +123,13 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                                 IsOpenBookingAllowed = true,
                             } : result.Item2.IsIndividual ? (ILegalEntity)new Person
                             {
-                                Id = RenderSellerId(new SellerIdComponents { SellerIdLong = result.Item2.Id }),
+                                Id = RenderSellerId(new SimpleIdComponents { IdLong = result.Item2.Id }),
                                 Name = result.Item2.Name,
                                 TaxMode = result.Item2.IsTaxGross ? TaxMode.TaxGross : TaxMode.TaxNet,
                                 IsOpenBookingAllowed = true,
                             } : (ILegalEntity)new Organization
                             {
-                                Id = RenderSellerId(new SellerIdComponents { SellerIdLong = result.Item2.Id }),
+                                Id = RenderSellerId(new SimpleIdComponents { IdLong = result.Item2.Id }),
                                 Name = result.Item2.Name,
                                 TaxMode = result.Item2.IsTaxGross ? TaxMode.TaxGross : TaxMode.TaxNet,
                                 TermsOfService = new List<Terms>

Examples/BookingSystem.AspNetCore/Settings/EngineConfig.cs

@@ -111,15 +111,15 @@ public static StoreBookingEngine CreateStoreBookingEngine(AppSettings appSetting
                     /*
                     // Multiple Seller Mode
                     SellerStore = new AcmeSellerStore(),
-                    SellerIdTemplate = new SingleIdTemplate<SellerIdComponents>(
-                        "{+BaseUrl}/sellers/{SellerIdLong}"
+                    SellerIdTemplate = new SingleIdTemplate<SimpleIdComponents>(
+                        "{+BaseUrl}/sellers/{IdLong}"
                         ),
                     */
 
                     /*
                     // Single Seller Mode
                     SellerStore = new AcmeSellerStore(),
-                    SellerIdTemplate = new SingleIdTemplate<SellerIdComponents>(
+                    SellerIdTemplate = new SingleIdTemplate<SimpleIdComponents>(
                         "{+BaseUrl}/seller"
                         ),
                     HasSingleSeller = true,
@@ -128,11 +128,11 @@ public static StoreBookingEngine CreateStoreBookingEngine(AppSettings appSetting
                     // Reference implementation is configurable to allow both modes to be tested
                     SellerStore = new AcmeSellerStore(appSettings.FeatureFlags.SingleSeller),
                     SellerIdTemplate = appSettings.FeatureFlags.SingleSeller ?
-                        new SingleIdTemplate<SellerIdComponents>(
+                        new SingleIdTemplate<SimpleIdComponents>(
                             "{+BaseUrl}/seller"
                         ) :
-                        new SingleIdTemplate<SellerIdComponents>(
-                            "{+BaseUrl}/sellers/{SellerIdLong}"
+                        new SingleIdTemplate<SimpleIdComponents>(
+                            "{+BaseUrl}/sellers/{IdLong}"
                         ),
                     HasSingleSeller = appSettings.FeatureFlags.SingleSeller,
 

Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs

@@ -28,12 +28,12 @@ protected override async Task<FacilityOpportunity> CreateOpportunityWithinTestDa
             OpportunityType opportunityType,
             TestOpportunityCriteriaEnumeration criteria,
             TestOpenBookingFlowEnumeration openBookingFlow,
-            SellerIdComponents seller)
+            SimpleIdComponents seller)
         {
-            if (!_appSettings.FeatureFlags.SingleSeller && !seller.SellerIdLong.HasValue)
+            if (!_appSettings.FeatureFlags.SingleSeller && !seller.IdLong.HasValue)
                 throw new OpenBookingException(new OpenBookingError(), "Seller must have an ID in Multiple Seller Mode");
 
-            long? sellerId = _appSettings.FeatureFlags.SingleSeller ? null : seller.SellerIdLong;
+            long? sellerId = _appSettings.FeatureFlags.SingleSeller ? null : seller.IdLong;
             var requiresApproval = openBookingFlow == TestOpenBookingFlowEnumeration.OpenBookingApprovalFlow;
 
             switch (opportunityType)
@@ -286,7 +286,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
         protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
-            // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerIdComponents (this is not required if using a Single Seller)
+            // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)
 
             // Additionally this method must check that there are enough spaces in each entry
 
@@ -377,7 +377,7 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                      : null,
                         OrderItemIntakeFormResponse = orderItemContext.RequestOrderItem.OrderItemIntakeFormResponse,
                     },
-                    SellerId = _appSettings.FeatureFlags.SingleSeller ? new SellerIdComponents() : new SellerIdComponents { SellerIdLong = facility.SellerId },
+                    SellerId = _appSettings.FeatureFlags.SingleSeller ? new SimpleIdComponents() : new SimpleIdComponents { IdLong = facility.SellerId },
                     slot.RequiresApproval,
                     BookedOrderItemInfo = bookedOrderItemInfo,
                     slot.RemainingUses
@@ -433,7 +433,7 @@ protected override async ValueTask LeaseOrderItems(Lease lease, List<OrderItemCo
                 else
                 {
                     // Attempt to lease for those with the same IDs, which is atomic
-                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
+                    var (result, capacityErrors, capacityLeaseErrors) = await FakeDatabase.LeaseOrderItemsForFacilitySlot(databaseTransaction.FakeDatabaseTransaction, flowContext.OrderId.ClientId, flowContext.SellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */, flowContext.OrderId.uuid, ctxGroup.Key.SlotId.Value, ctxGroup.Count());
 
                     switch (result)
                     {
@@ -504,13 +504,25 @@ protected override async ValueTask BookOrderItems(List<OrderItemContext<Facility
                 var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
-                    flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
+                    flowContext.SellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     flowContext.OrderId.uuid,
                     ctxGroup.Key.SlotId.Value,
                     RenderOpportunityId(ctxGroup.Key),
                     RenderOfferId(ctxGroup.Key),
                     ctxGroup.Count(),
-                    false
+                    false,
+                    ctxGroup
+                        .Select(x =>
+                            x.RequestOrderItem.Attendee == null
+                            ? null
+                            : OpenActiveSerializer.Serialize(x.RequestOrderItem.Attendee))
+                        .ToList(),
+                    ctxGroup
+                        .Select(x =>
+                        x.RequestOrderItem.OrderItemIntakeFormResponse == null
+                        ? null
+                        : OpenActiveSerializer.SerializeList(x.RequestOrderItem.OrderItemIntakeFormResponse))
+                        .ToList()
                     );
 
                 switch (result)
@@ -555,13 +567,25 @@ protected override async ValueTask ProposeOrderItems(List<OrderItemContext<Facil
                 var (result, bookedOrderItemInfos) = await FakeDatabase.BookOrderItemsForFacilitySlot(
                     databaseTransaction.FakeDatabaseTransaction,
                     flowContext.OrderId.ClientId,
-                    flowContext.SellerId.SellerIdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
+                    flowContext.SellerId.IdLong ?? null /* Hack to allow this to work in Single Seller mode too */,
                     flowContext.OrderId.uuid,
                     ctxGroup.Key.SlotId.Value,
                     RenderOpportunityId(ctxGroup.Key),
                     RenderOfferId(ctxGroup.Key),
                     ctxGroup.Count(),
-                    true
+                    true,
+                    ctxGroup
+                        .Select(x =>
+                            x.RequestOrderItem.Attendee == null
+                            ? null
+                            : OpenActiveSerializer.Serialize(x.RequestOrderItem.Attendee))
+                        .ToList(),
+                    ctxGroup
+                        .Select(x =>
+                        x.RequestOrderItem.OrderItemIntakeFormResponse == null
+                        ? null
+                        : OpenActiveSerializer.SerializeList(x.RequestOrderItem.OrderItemIntakeFormResponse))
+                        .ToList()
                     );
 
                 switch (result)