-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Lagt til klientMeldingId #73
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d26f4fd
Lagt til klientMeldingId
jarleborsheim 51cca47
Lagt til optional klientMeldingId
jarleborsheim d0e12ed
Oppdatert etter fiks på send.client
jarleborsheim 4375ef4
Korrigert MeldingRequest til at KlientMeldingId skal ikke være requir…
jarleborsheim 9750b11
KlienMeldingId korrekt optional på SvarSender også
jarleborsheim e1321f8
Fikset interface
jarleborsheim 81e0422
Tatt bort using som ikke er i bruk
jarleborsheim 93e3b1a
Mapper klientMeldingId til header i stedet for å være egen property
jarleborsheim f3aa628
Erstattet med const
jarleborsheim 520e2d1
Bumpet til release av fiks-io-send-client
jarleborsheim 3a388a4
Unit tests for FromSentMessageApiModel
jarleborsheim 20b27af
Tatt bort auto generering av klientMeldingId på svar
jarleborsheim b77719f
Ny unit-test for MeldingRequest
jarleborsheim 9527467
Logger feilmelding hvis KlientMeldingId ikke var på Guid format
jarleborsheim fa9a80a
Endret til ilogger
jarleborsheim 5b3ba06
Merge branch 'master' into jb-klientMeldingId
jarleborsheim b0113c8
Tatt bort logging
jarleborsheim 8d6479e
Merge
jarleborsheim 533f616
TryParse guid
jarleborsheim e98bac0
Lagt til flere tester
jarleborsheim 50e3d7b
Returner null hvis klientMeldingId var null og guid.empty hvis parsin…
jarleborsheim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| using System; | ||
| using FluentAssertions; | ||
| using KS.Fiks.IO.Client.Models; | ||
| using Xunit; | ||
|
|
||
| namespace KS.Fiks.IO.Client.Tests.Models | ||
| { | ||
| public class MeldingRequestTests | ||
| { | ||
| [Fact] | ||
| public void FromMeldingRequestToApiModelNullKlientModelIdShouldBeEmptyHeadere() | ||
| { | ||
| var result = new MeldingRequest( | ||
| Guid.NewGuid(), | ||
| Guid.NewGuid(), | ||
| "meldingType").ToApiModel(); | ||
| result.Headere.Should().BeEmpty(); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void FromMeldingRequestToApiModelWithKlientModelIdShouldBeInHeadere() | ||
| { | ||
| var klientMeldingId = Guid.NewGuid(); | ||
| var result = new MeldingRequest( | ||
| Guid.NewGuid(), | ||
| Guid.NewGuid(), | ||
| "meldingType", | ||
| klientMeldingId: klientMeldingId).ToApiModel(); | ||
| result.Headere.Should().NotBeEmpty(); | ||
| result.Headere.ContainsKey(MeldingBase.headerKlientMeldingId).Should().BeTrue(); | ||
| result.Headere.ContainsValue(klientMeldingId.ToString()).Should().BeTrue(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using FluentAssertions; | ||
| using KS.Fiks.IO.Client.Models; | ||
| using KS.Fiks.IO.Send.Client.Models; | ||
| using Xunit; | ||
|
|
||
| namespace KS.Fiks.IO.Client.Tests.Models | ||
| { | ||
| public class MottattMeldingTests | ||
| { | ||
| [Fact] | ||
| public void TestKlientMeldingIdIsExtractedFromHeaderWhenGuid() | ||
| { | ||
| var klientMeldingId = Guid.NewGuid(); | ||
| var headere = new Dictionary<string, string>() {{ MeldingBase.headerKlientMeldingId, klientMeldingId.ToString() }}; | ||
| var mottattMelding = new MottattMelding(false, | ||
| new MottattMeldingMetadata(Guid.NewGuid(), "meldingtype", Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), | ||
| TimeSpan.Zero, headere), null, null, null); | ||
|
|
||
| mottattMelding.KlientMeldingId.Should().Be(klientMeldingId); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestKlientMeldingIdIsGuidEmptyWhenNotAGuid() | ||
| { | ||
| var klientMeldingId = "dette er ikke en guid"; | ||
| var headere = new Dictionary<string, string>() {{ MeldingBase.headerKlientMeldingId, klientMeldingId }}; | ||
| var mottattMelding = new MottattMelding(false, | ||
| new MottattMeldingMetadata(Guid.NewGuid(), "meldingtype", Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), | ||
| TimeSpan.Zero, headere), null, null, null); | ||
|
|
||
| mottattMelding.KlientMeldingId.Should().Be(Guid.Empty); | ||
| mottattMelding.Headere.Values.Should().Contain(klientMeldingId); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void TestKlientMeldingIdIsGuidEmptyWhenWithoutHeadere() | ||
| { | ||
| var mottattMelding = new MottattMelding(false, | ||
| new MottattMeldingMetadata(Guid.NewGuid(), "meldingtype", Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), | ||
| TimeSpan.Zero, null), null, null, null); | ||
|
|
||
| mottattMelding.KlientMeldingId.Should().BeNull(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using FluentAssertions; | ||
| using KS.Fiks.IO.Client.Models; | ||
| using KS.Fiks.IO.Send.Client.Models; | ||
| using Xunit; | ||
|
|
||
| namespace KS.Fiks.IO.Client.Tests.Models | ||
| { | ||
| public class SendtMeldingTests | ||
| { | ||
| [Fact] | ||
| public void FromSentMessageApiModelWithNullHeadere() | ||
| { | ||
| var result = SendtMelding.FromSentMessageApiModel( | ||
| new SendtMeldingApiModel() | ||
| { | ||
| SvarPaMelding = Guid.NewGuid(), | ||
| AvsenderKontoId = Guid.NewGuid(), | ||
| DokumentlagerId = Guid.NewGuid(), | ||
| Headere = null, | ||
| MeldingId = Guid.NewGuid(), | ||
| MeldingType = "EnMeldingType", | ||
| MottakerKontoId = Guid.NewGuid(), | ||
| Ttl = 1000L | ||
| }); | ||
|
|
||
| result.KlientMeldingId.Should().BeNull(); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void FromSentMessageApiModelWithEmptyHeadereDictionaryKlientMeldingShouldBeNull() | ||
| { | ||
| var result = SendtMelding.FromSentMessageApiModel( | ||
| new SendtMeldingApiModel() | ||
| { | ||
| SvarPaMelding = Guid.NewGuid(), | ||
| AvsenderKontoId = Guid.NewGuid(), | ||
| DokumentlagerId = Guid.NewGuid(), | ||
| Headere = new Dictionary<string, string>(), | ||
| MeldingId = Guid.NewGuid(), | ||
| MeldingType = "EnMeldingType", | ||
| MottakerKontoId = Guid.NewGuid(), | ||
| Ttl = 1000L | ||
| }); | ||
|
|
||
| result.KlientMeldingId.Should().BeNull(); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void FromSentMessageApiModelWithKlientMeldingId() | ||
| { | ||
| var klientMeldingId = Guid.NewGuid(); | ||
| var result = SendtMelding.FromSentMessageApiModel( | ||
| new SendtMeldingApiModel() | ||
| { | ||
| SvarPaMelding = Guid.NewGuid(), | ||
| AvsenderKontoId = Guid.NewGuid(), | ||
| DokumentlagerId = Guid.NewGuid(), | ||
| Headere = new Dictionary<string, string>() {{ MeldingBase.headerKlientMeldingId, klientMeldingId.ToString() }}, | ||
| MeldingId = Guid.NewGuid(), | ||
| MeldingType = "EnMeldingType", | ||
| MottakerKontoId = Guid.NewGuid(), | ||
| Ttl = 1000L | ||
| }); | ||
|
|
||
| result.KlientMeldingId.Should().NotBeNull(); | ||
| result.KlientMeldingId.Should().Be(klientMeldingId.ToString()); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bruk konstant i stedet for String litteral
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
damnit
Glemte den 1 sted ja. Good catch!