Lagt til klientMeldingId

KS.Fiks.IO.Client.Tests/FiksIOClientTests.cs

@@ -154,6 +154,7 @@ public async Task SendReturnsExpectedSentMessage()
         {
             var expectedMessage = new SendtMelding(
                 meldingId: Guid.NewGuid(),
+                Guid.NewGuid(),
                 meldingType: "msgType",
                 avsenderKontoId: Guid.NewGuid(),
                 mottakerKontoId: Guid.NewGuid(),

KS.Fiks.IO.Client.Tests/KS.Fiks.IO.Client.Tests.csproj

@@ -15,8 +15,8 @@
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="KS.Fiks.ASiC-E" Version="1.0.3" />
-        <PackageReference Include="KS.Fiks.IO.Send.Client" Version="1.0.7" />
-        <PackageReference Include="KS.Fiks.Maskinporten.Client" Version="1.0.7" />
+        <PackageReference Include="KS.Fiks.IO.Send.Client" Version="1.0.8-build.20220209104942277" />
+        <PackageReference Include="KS.Fiks.Maskinporten.Client" Version="1.1.1" />
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 13.0.1]" />
         <PackageReference Include="Newtonsoft.Json.Schema" Version="2.0.13" />

KS.Fiks.IO.Client.Tests/Send/SendHandlerFixture.cs

@@ -29,6 +29,11 @@ public SendHandlerFixture()
             Guid.NewGuid(),
             "defaultType");
 
+        public MeldingRequest DefaultRequest2 => new MeldingRequest(
+            Guid.NewGuid(),
+            Guid.NewGuid(),
+            "defaultType", TimeSpan.Zero, new Dictionary<string, string> {});
+
         public SendHandlerFixture WithPublicKey(X509Certificate publicKey)
         {
             _publicKey = publicKey;

KS.Fiks.IO.Client.Tests/Send/SendHandlerTests.cs

@@ -33,13 +33,14 @@ public async Task CallsFiksIOSenderSend()
         }
 
         [Fact]
-        public async Task CallsSendWithExpectedMessageSpecificationApiModel()
+        public async Task CallsSendWithExpectedMessageSpecificationApiModelWithKlientMeldingId()
         {
             var sut = _fixture.CreateSut();
 
             var request = new MeldingRequest(
                 avsenderKontoId: Guid.NewGuid(),
                 mottakerKontoId: Guid.NewGuid(),
+                klientMeldingId: Guid.NewGuid(),
                 meldingType: "Meldingsprotokoll",
                 ttl: TimeSpan.FromDays(2),
                 headere: null,
@@ -54,7 +55,35 @@ public async Task CallsSendWithExpectedMessageSpecificationApiModel()
                     model => model.Ttl == (long)request.Ttl.TotalMilliseconds &&
                              model.SvarPaMelding == request.SvarPaMelding &&
                              model.AvsenderKontoId == request.AvsenderKontoId &&
-                             model.MottakerKontoId == request.MottakerKontoId),
+                             model.MottakerKontoId == request.MottakerKontoId &&
+                             model.Headere["klientMeldingId"] == request.KlientMeldingId.ToString()),
+                It.IsAny<Stream>()));
+        }
+
+        [Fact]
+        public async Task CallsSendWithExpectedMessageSpecificationApiModelAndNullKlientMeldingId()
+        {
+            var sut = _fixture.CreateSut();
+
+            var request = new MeldingRequest(
+                avsenderKontoId: Guid.NewGuid(),
+                mottakerKontoId: Guid.NewGuid(),
+                meldingType: "Meldingsprotokoll",
+                ttl: TimeSpan.FromDays(2),
+                headere: null,
+                svarPaMelding: Guid.NewGuid());
+
+            var payload = new List<IPayload>();
+
+            await sut.Send(request, payload).ConfigureAwait(false);
+
+            _fixture.FiksIOSenderMock.Verify(_ => _.Send(
+                It.Is<MeldingSpesifikasjonApiModel>(
+                    model => model.Ttl == (long)request.Ttl.TotalMilliseconds &&
+                             model.SvarPaMelding == request.SvarPaMelding &&
+                             model.AvsenderKontoId == request.AvsenderKontoId &&
+                             model.MottakerKontoId == request.MottakerKontoId &&
+                             !model.Headere.ContainsKey("klientMeldingId")),
                 It.IsAny<Stream>()));
         }
 

KS.Fiks.IO.Client.Tests/Send/SvarSenderFixture.cs

@@ -64,14 +64,13 @@ public SvarSenderFixture WithNackRequeue(Action nackRequeue)
         internal SvarSender CreateSut()
         {
             SetupMocks();
-            return new SvarSender(SendHandlerMock.Object, _mottattMelding,
-                new AmqpAcknowledgeManager(_ack, _nack, _nackWithRequeue));
+            return new SvarSender(SendHandlerMock.Object, _mottattMelding, new AmqpAcknowledgeManager(_ack, _nack, _nackWithRequeue));
         }
 
         private void SetupMocks()
         {
             SendHandlerMock.Setup(_ => _.Send(It.IsAny<MeldingRequest>(), It.IsAny<IPayload[]>()))
-                .ReturnsAsync(new SendtMelding(Guid.NewGuid(), "sendtMelding", Guid.NewGuid(), Guid.NewGuid(),
+                .ReturnsAsync(new SendtMelding(Guid.NewGuid(), Guid.NewGuid(), "sendtMelding", Guid.NewGuid(), Guid.NewGuid(),
                     TimeSpan.Zero, null));
         }
     }

KS.Fiks.IO.Client.Tests/Send/SvarSenderTests.cs

@@ -17,7 +17,7 @@ public SvarSenderTests()
         }
 
         [Fact]
-        public async Task SendsToAvsenderWithMotakerAsAvsender()
+        public async Task SendsToAvsenderWithMottakerAsAvsender()
         {
             var meldingId = Guid.NewGuid();
             var mottakerKonto = Guid.NewGuid();
@@ -30,7 +30,39 @@ public async Task SendsToAvsenderWithMotakerAsAvsender()
             await sut.Svar("testType").ConfigureAwait(false);
 
             _fixture.SendHandlerMock.Verify(_ => _.Send(It.Is<MeldingRequest>(a => a.MottakerKontoId == avsenderKonto && a.AvsenderKontoId == mottakerKonto), It.IsAny<IList<IPayload>>()));
+        }
+
+        [Fact]
+        public async Task SendsToAvsenderWithMottakerAsAvsenderAndWithKlientMeldingId()
+        {
+            var meldingId = Guid.NewGuid();
+            var mottakerKonto = Guid.NewGuid();
+            var avsenderKonto = Guid.NewGuid();
+            var klientMeldingId = Guid.NewGuid();
+
+            var motattMelding = new MottattMelding(hasPayload: true, metadata: new MottattMeldingMetadata(meldingId, "testType", mottakerKonto, avsenderKonto, null, TimeSpan.FromDays(1), null), streamProvider: _fixture.DefaultStreamProvider, decrypter: _fixture.DefaultDecrypter, fileWriter: _fixture.DefaultFileWriter);
+
+            var sut = _fixture.WithMottattMelding(motattMelding).CreateSut();
+
+            await sut.Svar("testType", "my message", "message.txt", klientMeldingId).ConfigureAwait(false);
+
+            _fixture.SendHandlerMock.Verify(_ => _.Send(It.Is<MeldingRequest>(a => a.MottakerKontoId == avsenderKonto && a.AvsenderKontoId == mottakerKonto && a.KlientMeldingId == klientMeldingId), It.IsAny<IList<IPayload>>()));
+        }
+
+        [Fact]
+        public async Task SendsToAvsenderWithMottakerAsAvsenderAndWithOptionalNullKlientMeldingId()
+        {
+            var meldingId = Guid.NewGuid();
+            var mottakerKonto = Guid.NewGuid();
+            var avsenderKonto = Guid.NewGuid();
+
+            var motattMelding = new MottattMelding(hasPayload: true, metadata: new MottattMeldingMetadata(meldingId, "testType", mottakerKonto, avsenderKonto, null, TimeSpan.FromDays(1), null), streamProvider: _fixture.DefaultStreamProvider, decrypter: _fixture.DefaultDecrypter, fileWriter: _fixture.DefaultFileWriter);
+
+            var sut = _fixture.WithMottattMelding(motattMelding).CreateSut();
+
+            await sut.Svar("testType", "my message", "message.txt").ConfigureAwait(false);
 
+            _fixture.SendHandlerMock.Verify(_ => _.Send(It.Is<MeldingRequest>(a => a.MottakerKontoId == avsenderKonto && a.AvsenderKontoId == mottakerKonto && a.KlientMeldingId == null), It.IsAny<IList<IPayload>>()));
         }
     }
 }

KS.Fiks.IO.Client/KS.Fiks.IO.Client.csproj

@@ -53,8 +53,8 @@
     <ItemGroup>
         <PackageReference Include="KS.Fiks.ASiC-E" Version="1.0.3" />
         <PackageReference Include="KS.Fiks.Crypto" Version="1.0.4" />
-        <PackageReference Include="KS.Fiks.IO.Send.Client" Version="1.0.7" />
-        <PackageReference Include="KS.Fiks.Maskinporten.Client" Version="1.0.7" />
+        <PackageReference Include="KS.Fiks.IO.Send.Client" Version="1.0.8-build.20220209104942277" />
+        <PackageReference Include="KS.Fiks.Maskinporten.Client" Version="1.1.1" />
         <PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
         <PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 13.0.1]" />
         <PackageReference Include="KS.Fiks.QA" Version="1.0.0" PrivateAssets="All" />

KS.Fiks.IO.Client/Models/IMelding.cs

@@ -7,6 +7,8 @@ public interface IMelding
     {
         Guid MeldingId { get; }
 
+        Guid? KlientMeldingId { get; }
+
         string MeldingType { get; }
 
         Guid AvsenderKontoId { get; }

KS.Fiks.IO.Client/Models/MeldingBase.cs

@@ -6,12 +6,15 @@ namespace KS.Fiks.IO.Client.Models
 {
     public abstract class MeldingBase : IMelding
     {
+        public const string headerKlientMeldingId = "klientMeldingId";
+
         protected MeldingBase()
         {
         }
 
         protected MeldingBase(
             Guid meldingId,
+            Guid? klientMeldingId,
             string meldingType,
             Guid avsenderKontoId,
             Guid mottakerKontoId,
@@ -21,6 +24,7 @@ protected MeldingBase()
             Guid? svarPaMelding = null)
         {
             MeldingId = meldingId;
+            KlientMeldingId = klientMeldingId;
             MeldingType = meldingType;
             AvsenderKontoId = avsenderKontoId;
             MottakerKontoId = mottakerKontoId;
@@ -33,6 +37,7 @@ protected MeldingBase()
         protected MeldingBase(IMelding melding)
         {
             MeldingId = melding.MeldingId;
+            KlientMeldingId = melding.KlientMeldingId;
             MeldingType = melding.MeldingType;
             AvsenderKontoId = melding.AvsenderKontoId;
             MottakerKontoId = melding.MottakerKontoId;
@@ -43,6 +48,8 @@ protected MeldingBase(IMelding melding)
 
         public Guid MeldingId { get; protected set; }
 
+        public Guid? KlientMeldingId { get; protected set; }
+
         public string MeldingType { get; protected set; }
 
         public Guid AvsenderKontoId { get; protected set; }

KS.Fiks.IO.Client/Models/MeldingRequest.cs

@@ -14,10 +14,12 @@ public class MeldingRequest : MeldingBase
             string meldingType,
             TimeSpan? ttl = null,
             Dictionary<string, string> headere = null,
-            Guid? svarPaMelding = null)
+            Guid? svarPaMelding = null,
+            Guid? klientMeldingId = null)
         : base(
             meldingId: Guid.Empty,
             meldingType: meldingType,
+            klientMeldingId: klientMeldingId,
             avsenderKontoId: avsenderKontoId,
             mottakerKontoId: mottakerKontoId,
             ttl: ttl ?? TimeSpan.FromDays(DefaultTtlInDays),
@@ -28,6 +30,11 @@ public class MeldingRequest : MeldingBase
 
         public MeldingSpesifikasjonApiModel ToApiModel()
         {
+            if (KlientMeldingId != null && KlientMeldingId != Guid.Empty)
+            {
+                Headere.Add(headerKlientMeldingId, KlientMeldingId.ToString());
+            }
+
             return new MeldingSpesifikasjonApiModel(
                 avsenderKontoId: AvsenderKontoId,
                 mottakerKontoId: MottakerKontoId,

KS.Fiks.IO.Client/Models/SendtMelding.cs

@@ -8,8 +8,22 @@ public class SendtMelding : MeldingBase
     {
         public static SendtMelding FromSentMessageApiModel(SendtMeldingApiModel sendtMeldingApiModel)
         {
+            Guid? klientMeldingId = null;
+            if (sendtMeldingApiModel.Headere?[headerKlientMeldingId] != null)
+            {
+                try
+                {
+                    klientMeldingId = Guid.Parse(sendtMeldingApiModel.Headere[headerKlientMeldingId]);
+                }
+                catch (Exception e)
+                {
+                    klientMeldingId = null;
+                }
+            }
+
             return new SendtMelding(
                 sendtMeldingApiModel.MeldingId,
+                klientMeldingId,
                 sendtMeldingApiModel.MeldingType,
                 sendtMeldingApiModel.AvsenderKontoId,
                 sendtMeldingApiModel.MottakerKontoId,
@@ -20,13 +34,14 @@ public static SendtMelding FromSentMessageApiModel(SendtMeldingApiModel sendtMel
 
         internal SendtMelding(
             Guid meldingId,
+            Guid? klientMeldingId,
             string meldingType,
             Guid avsenderKontoId,
             Guid mottakerKontoId,
             TimeSpan ttl,
             Dictionary<string, string> headere,
             Guid? svarPaMelding=null)
-            : base(meldingId, meldingType, avsenderKontoId, mottakerKontoId, ttl, svarPaMelding: svarPaMelding)
+            : base(meldingId, klientMeldingId, meldingType, avsenderKontoId, mottakerKontoId, ttl, svarPaMelding: svarPaMelding)
         {
         }
     }

KS.Fiks.IO.Client/Send/ISvarSender.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -7,15 +8,15 @@ namespace KS.Fiks.IO.Client.Send
 {
     public interface ISvarSender
     {
-        Task<SendtMelding> Svar(string meldingType, IList<IPayload> payloads);
+        Task<SendtMelding> Svar(string meldingType, IList<IPayload> payloads, Guid? klientMeldingId = default);
 
-        Task<SendtMelding> Svar(string meldingType, Stream melding, string filnavn);
+        Task<SendtMelding> Svar(string meldingType, Stream melding, string filnavn, Guid? klientMeldingId = default);
 
-        Task<SendtMelding> Svar(string meldingType, string melding, string filnavn);
+        Task<SendtMelding> Svar(string meldingType, string melding, string filnavn, Guid? klientMeldingId = default);
 
-        Task<SendtMelding> Svar(string meldingType, string filLokasjon);
+        Task<SendtMelding> Svar(string meldingType, string filLokasjon, Guid? klientMeldingId = default);
 
-        Task<SendtMelding> Svar(string meldingType);
+        Task<SendtMelding> Svar(string meldingType, Guid? klientMeldingId);
 
         /**
          * Acknowledges that the message has been consumed

KS.Fiks.IO.Client/Send/SvarSender.cs

@@ -22,32 +22,32 @@ public SvarSender(ISendHandler sendHandler, MottattMelding mottattMelding, IAmqp
             _amqpAcknowledgeManager = amqpAcknowledgeManager;
         }
 
-        public async Task<SendtMelding> Svar(string meldingType, IList<IPayload> payloads)
+        public async Task<SendtMelding> Svar(string meldingType, IList<IPayload> payloads, Guid? klientMeldingId = default)
         {
-            return await _sendHandler.Send(CreateMessageRequest(meldingType), payloads).ConfigureAwait(false);
+            return await _sendHandler.Send(CreateMessageRequest(meldingType, klientMeldingId), payloads).ConfigureAwait(false);
         }
 
-        public async Task<SendtMelding> Svar(string meldingType, Stream melding, string filnavn)
+        public async Task<SendtMelding> Svar(string meldingType, Stream melding, string filnavn, Guid? klientMeldingId = default)
         {
-            return await Reply(meldingType, new StreamPayload(melding, filnavn))
+            return await Reply(meldingType, new StreamPayload(melding, filnavn), klientMeldingId)
                 .ConfigureAwait(false);
         }
 
-        public async Task<SendtMelding> Svar(string meldingType, string melding, string filnavn)
+        public async Task<SendtMelding> Svar(string meldingType, string melding, string filnavn, Guid? klientMeldingId = default)
         {
-            return await Reply(meldingType, new StringPayload(melding, filnavn))
+            return await Reply(meldingType, new StringPayload(melding, filnavn), klientMeldingId)
                 .ConfigureAwait(false);
         }
 
-        public async Task<SendtMelding> Svar(string meldingType, string filLokasjon)
+        public async Task<SendtMelding> Svar(string meldingType, string filLokasjon, Guid? klientMeldingId = default)
         {
-            return await Reply(meldingType, new FilePayload(filLokasjon))
+            return await Reply(meldingType, new FilePayload(filLokasjon), klientMeldingId)
                 .ConfigureAwait(false);
         }
 
-        public async Task<SendtMelding> Svar(string meldingType)
+        public async Task<SendtMelding> Svar(string meldingType, Guid? klientMeldingId = default)
         {
-            return await Svar(meldingType, new List<IPayload>())
+            return await Svar(meldingType, new List<IPayload>(), klientMeldingId)
                 .ConfigureAwait(false);
         }
 
@@ -66,16 +66,22 @@ public void NackWithRequeue()
             this._amqpAcknowledgeManager.NackWithRequeue().Invoke();
         }
 
-        private async Task<SendtMelding> Reply(string messageType, IPayload payload)
+        private async Task<SendtMelding> Reply(string messageType, IPayload payload, Guid? klientMeldingId)
         {
-            return await Svar(messageType, new List<IPayload> {payload}).ConfigureAwait(false);
+            return await Svar(messageType, new List<IPayload> {payload}, klientMeldingId).ConfigureAwait(false);
         }
 
-        private MeldingRequest CreateMessageRequest(string messageType)
+        private MeldingRequest CreateMessageRequest(string messageType, Guid? klientMeldingId)
         {
+            if (klientMeldingId == Guid.Empty)
+            {
+                klientMeldingId = Guid.NewGuid();
+            }
+
             return new MeldingRequest(
                 avsenderKontoId: _mottattMelding.MottakerKontoId,
                 mottakerKontoId: _mottattMelding.AvsenderKontoId,
+                klientMeldingId: klientMeldingId,
                 meldingType: messageType,
                 ttl: null,
                 headere: null,