Merge main

Author: Günther Cwioro

README.md

@@ -89,11 +89,12 @@ Your data will be stored in the `/data/db.json` file on the volume `/data`.
 
 ### Liveness & Readiness Probes
 
-Contexture provides HTTP based [Liveness & Readiness Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) to determine if the container is health & operational
+Contexture provides HTTP based [Liveness & Readiness Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) to determine if the container is healthy & operational
 
 #### Liveness
 
 A `GET` request to `$BASE_URL/meta/health` will return `200 OK` if the application is healthy and currently processing requests.
+It will return a `503 ServiceUnavailable` in case information about subscriptions can not be obtained or any of the subscriptions have Failed.
 
 #### Readiness
 

backend/Contexture.Api.Tests/Contexture.Api.Tests.fsproj

@@ -15,6 +15,7 @@
         <Compile Include="EventStore.Tests.fs" />
         <Compile Include="PositionStorage.Tests.fs" />
         <Compile Include="Security.Tests.fs" />
+        <Compile Include="ReadModels.Tests.fs" />
         <Compile Include="Tests.fs" />
         <Compile Include="Specs\Scenario.fs" />
         <Compile Include="Specs\Fixtures.fs" />
@@ -38,7 +39,8 @@
         </PackageReference>
         <PackageReference Update="FSharp.Core" Version="7.0.300" />
         <PackageReference Include="NStore.Persistence.MsSql" Version="0.14.0" />
-        <PackageReference Include="Testcontainers" Version="2.4.0" />
+        <PackageReference Include="Testcontainers" Version="4.0.0" />
+        <PackageReference Include="Testcontainers.MsSql" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>

backend/Contexture.Api.Tests/EventStore.Tests.fs

@@ -264,7 +264,7 @@ type MsSqlBackedEventStore(msSql: MsSqlFixture) =
             let config =
                 MsSqlPersistenceOptions(
                     loggerFactory,
-                    ConnectionString = msSql.Container.ConnectionString,
+                    ConnectionString = msSql.Container.GetConnectionString(),
                     StreamsTableName = $"streams_{Interlocked.Increment(counter)}_{this.GetType().Name}",
                     Serializer = NStoreBased.JsonMsSqlSerializer.Default
                 )

backend/Contexture.Api.Tests/PositionStorage.Tests.fs

@@ -81,10 +81,10 @@ type SqlServerPositionStorage(msSql: MsSqlFixture) =
     inherit PositionStorageBehavior()
 
     override this.EmptyStorage() =
-        SqlServer.PositionStorage(msSql.Container.ConnectionString)
+        SqlServer.PositionStorage(msSql.Container.GetConnectionString())
 
     override this.StorageWith items = task {
-        use client = new SqlConnection(msSql.Container.ConnectionString)
+        use client = new SqlConnection(msSql.Container.GetConnectionString())
         do! client.OpenAsync()
 
         // using string concatenation over parameters here is OK because it's just (unit) test code
@@ -98,15 +98,15 @@ type SqlServerPositionStorage(msSql: MsSqlFixture) =
         let! result = command.ExecuteNonQueryAsync()
         Assert.Equal(items |> List.length, result)
 
-        return SqlServer.PositionStorage(msSql.Container.ConnectionString) :> IStorePositions
+        return SqlServer.PositionStorage(msSql.Container.GetConnectionString()) :> IStorePositions
         }
 
     interface IAsyncLifetime with
         member this.DisposeAsync() =
-            SqlServer.PositionStorage.RemoveSchema(msSql.Container.ConnectionString)
+            SqlServer.PositionStorage.RemoveSchema(msSql.Container.GetConnectionString())
 
         member this.InitializeAsync() =
-            SqlServer.PositionStorage.CreateSchema(msSql.Container.ConnectionString)
+            SqlServer.PositionStorage.CreateSchema(msSql.Container.GetConnectionString())
 
     interface IClassFixture<MsSqlFixture> with
 

backend/Contexture.Api.Tests/ReadModels.Tests.fs

@@ -0,0 +1,21 @@
+module Contexture.Api.ReadModels.Tests
+
+open System
+open System.Threading.Tasks
+open Xunit
+
+open Contexture.Api.Infrastructure.ReadModels
+open Contexture.Api.Infrastructure
+
+module State =
+    let Initial = "initialstate"
+
+let timeoutms = (TimeSpan.FromSeconds 1).TotalMilliseconds |> int
+let testReadModel: ReadModel<string,string> = 
+    readModel (fun state _events -> state) State.Initial (Some timeoutms)
+
+[<Fact>]
+let ``fetching state when requested position is ahead of processed should throw after timeout``() = task{
+    let getState = fun () -> testReadModel.State(Some(Position.from 1)) :> Task
+    do! Assert.ThrowsAsync<TimeoutException>(fun () -> Task.Run(getState, (new Threading.CancellationTokenSource(TimeSpan.FromSeconds(2))).Token)) :> Task
+}

backend/Contexture.Api.Tests/Specs/PublicApiEndpoint.Tests.fs

@@ -12,6 +12,9 @@ open Xunit
 open Xunit.Sdk
 open Contexture.Api.Tests.EnvironmentSimulation
 open ValueObjects
+open Fixtures
+open Fixtures.Builders
+
 module Namespaces =
 
     [<Fact>]
@@ -22,8 +25,7 @@ module Namespaces =
             let domainId = environment |> PseudoRandom.guid
             let contextId = environment |> PseudoRandom.guid
 
-            let given =
-                Fixtures.Builders.givenADomainWithOneBoundedContext domainId contextId
+            let given = givenADomainWithOneBoundedContext domainId contextId
 
             use! testEnvironment = Prepare.withGiven environment given
 
@@ -62,6 +64,56 @@ module Namespaces =
             | e -> raise (XunitException $"Unexpected event: %O{e}")
         }
 
+    [<Fact>]
+    let ``can edit namespace label``() = task {
+        // arrange
+        let environment = FixedTimeEnvironment.FromSystemClock()
+        let domainId = environment |> PseudoRandom.guid
+        let contextId = environment |> PseudoRandom.guid
+        let namespaceId = environment |> PseudoRandom.guid
+        let labelId = environment |> PseudoRandom.guid
+        let labelDefinition = { 
+            LabelId = labelId
+            Name = "initial name"
+            Value = Some "initial value"
+            Template = None 
+        }
+
+        let given = 
+            givenADomainWithOneBoundedContext domainId contextId
+            |> Given.andOneEvent (
+                Namespace.definition contextId namespaceId
+                |> Namespace.appendLabel (labelDefinition)
+                |> Namespace.namespaceAdded
+            )
+
+        use! testEnvironment = Prepare.withGiven environment given
+
+        let updateLabelBody = """
+            {
+                "name": "updated name",
+                "value": "updated value"
+            }
+        """
+        let! response = When.postingJson $"api/boundedcontexts/{contextId}/namespaces/{namespaceId}/labels/{labelId}" updateLabelBody testEnvironment
+        let! result = response |> WhenResult.asJsonResponse<Projections.Namespace list>
+
+        let namespaceLabels = 
+            result.Result 
+            |> List.find(fun n -> n.Id = namespaceId)
+            |> fun ns -> ns.Labels
+
+        let expectedLabel: Projections.Label = {
+            Id = labelId
+            Name = "updated name"
+            Value = "updated value"
+            Template = None
+        }
+
+        Then.Single namespaceLabels
+        |> fun label -> Then.Equal(expectedLabel, label)
+    }
+
 module BoundedContexts =
 
     [<Fact>]

backend/Contexture.Api.Tests/SqlServerFixture.fs

@@ -1,27 +1,20 @@
 namespace Contexture.Api.Tests
 
-#nowarn "44" // ContainerBuilder<MsSqlTestcontainer>() is deprecated but does not provide a clear guidance yet
-
 open System
 open System.Threading
-open DotNet.Testcontainers.Builders
-open DotNet.Testcontainers.Configurations
-open DotNet.Testcontainers.Containers
+open Testcontainers.MsSql
 open Xunit
 
 type MsSqlFixture() =
     static let mutable counter = ref 0
-    let container =
+    let container =   
         let containerConfiguration =
-            ContainerBuilder<MsSqlTestcontainer>()
-                .WithDatabase(new MsSqlTestcontainerConfiguration(Password = "localdevpassword#123"))
-                .WithImage("mcr.microsoft.com/mssql/server:2019-latest")
+            MsSqlBuilder()
                 .WithName($"MS-SQL-Integration-Tests-{Interlocked.Increment counter}")
                 .WithCleanUp(false)
                 .WithAutoRemove(true)
 
-        let instance = containerConfiguration.Build()
-        instance
+        containerConfiguration.Build()
 
     member _.Container = container
 

backend/Contexture.Api/Apis/Namespaces.fs

@@ -28,11 +28,11 @@ module Namespaces =
                     | Ok (updatedContext,version,position) ->
                         let! namespaceState = ctx.GetService<ReadModels.Namespace.AllNamespacesReadModel>().State(position)
                         // for namespaces we don't use redirects ATM
-                        let boundedContext =
+                        let namespaces =
                             updatedContext
                             |> ReadModels.Namespace.namespacesOf namespaceState
 
-                        return! json boundedContext next ctx
+                        return! json namespaces next ctx
                     | Error (DomainError error) ->
                         return! RequestErrors.BAD_REQUEST(sprintf "Domain Error %A" error) next ctx
                     | Error e -> return! ServerErrors.INTERNAL_ERROR e next ctx
@@ -47,6 +47,9 @@ module Namespaces =
         let removeLabel contextId (command: RemoveLabel) =
             updateAndReturnNamespaces (RemoveLabel(contextId, command))
 
+        let updateLabel contextId (command: UpdateLabel) =
+            updateAndReturnNamespaces (UpdateLabel(contextId, command))
+
         let newLabel contextId namespaceId (command: NewLabelDefinition) =
             updateAndReturnNamespaces (AddLabel(contextId, namespaceId, command))
 
@@ -143,6 +146,10 @@ module Namespaces =
                         boundedContextId
                         { Namespace = namespaceId
                           Label = labelId }
+                    POST >=> bindJson<{|Name:string; Value:string|}>(fun p ->
+                        {Label = labelId; Namespace = namespaceId; Name = p.Name; Value = p.Value}
+                        |> CommandEndpoints.updateLabel boundedContextId 
+                    )
                     RequestErrors.NOT_FOUND "Not found"
                 ]
         let routesForOneNamespace =