Skip to content

Commit 4a7c4bc

Browse files
eivinhbeivinhb
authored
Merge pull request #211 from digipost/kazen
Kaizen
2 parents 0686de7 + 087f969 commit 4a7c4bc

File tree

24 files changed

+148
-189
lines changed

24 files changed

+148
-189
lines changed

‎Digipost.Api.Client.Archive.Tests/DataTransferObjectConverterTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void Archive()
2323

2424
var expected = new Archive(new Sender(1010), "per");
2525

26-
var actual = ArchiveDataTransferObjectConverter.FromDataTransferObject(source);
26+
var actual = source.FromDataTransferObject();
2727

2828
Comparator.AssertEqual(expected, actual);
2929
}
@@ -45,7 +45,7 @@ public void ArchiveDocumentBasicState()
4545
var expected = new ArchiveDocument(newGuid, "per.txt", "txt", "text/plain");
4646
expected.Links.Add("get_something", new Common.Entrypoint.Link($"{BaseUri}/something") {MediaType = "text/plain", Rel = $"{BaseUri}/relations/get_something"});
4747

48-
var actual = ArchiveDataTransferObjectConverter.FromDataTransferObject(source);
48+
var actual = source.FromDataTransferObject();
4949

5050
Comparator.AssertEqual(expected, actual);
5151
}
@@ -65,7 +65,7 @@ public void ArchiveDocumentToDto()
6565
Attributes = { new Archive_Document_Attribute(){Key = "test", Value = "val"} },
6666
};
6767

68-
Comparator.AssertEqual(expected, ArchiveDataTransferObjectConverter.ToDataTransferObject(source));
68+
Comparator.AssertEqual(expected, source.ToDataTransferObject());
6969
}
7070
}
7171
}

‎Digipost.Api.Client.Archive.Tests/Smoke/ArchiveSmokeTestsHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Digipost.Api.Client.Archive.Tests.Smoke
1414
{
1515
public class ArchiveSmokeTestsHelper
1616
{
17-
public static readonly string ArchiveName = "SmokeTestArchive";
17+
internal static readonly string ArchiveName = "SmokeTestArchive";
1818
private readonly TestSender _testSender;
1919
private readonly IArchiveApi _archiveApi;
2020
private Archive _archivesWithDocuments;

‎Digipost.Api.Client.Archive/Actions/ArchiveAction.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ internal override HttpContent Content(Archive archive)
3333

3434
protected override string Serialize(Archive requestContent)
3535
{
36-
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject((Archive) requestContent);
36+
var messageDataTransferObject = ((Archive) requestContent).ToDataTransferObject();
3737
return SerializeUtil.Serialize(messageDataTransferObject);
3838
}
3939

4040
private static void AddBodyToContent(Archive archive, MultipartContent content)
4141
{
42-
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject(archive);
42+
var messageDataTransferObject = archive.ToDataTransferObject();
4343
var xmlMessage = SerializeUtil.Serialize(messageDataTransferObject);
4444

4545
var messageContent = new StringContent(xmlMessage);

‎Digipost.Api.Client.Archive/Actions/ArchiveDocumentAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal override HttpContent Content(ArchiveDocument requestContent)
2929

3030
protected override string Serialize(ArchiveDocument requestContent)
3131
{
32-
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject(requestContent);
32+
var messageDataTransferObject = requestContent.ToDataTransferObject();
3333
return SerializeUtil.Serialize(messageDataTransferObject);
3434
}
3535
}

‎Digipost.Api.Client.Archive/ArchiveApi.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ public async Task<Archive> FetchArchiveDocuments(ArchiveNextDocumentsUri nextDoc
9090
{
9191
var result = await _requestHelper.Get<V8.Archive>(nextDocumentsUri).ConfigureAwait(false);
9292

93-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
93+
return result.FromDataTransferObject();
9494
}
9595

9696
public async Task<Archive> GetArchiveDocument(GetArchiveDocumentByUuidUri getArchiveDocumentUri)
9797
{
9898
var result = await _requestHelper.Get<V8.Archive>(getArchiveDocumentUri).ConfigureAwait(false);
99-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
99+
return result.FromDataTransferObject();
100100
}
101101

102102
public async Task<ArchiveDocument> UpdateDocument(ArchiveDocument archiveDocument, ArchiveDocumentUpdateUri updateUri)
@@ -109,7 +109,7 @@ public async Task<ArchiveDocument> UpdateDocument(ArchiveDocument archiveDocumen
109109
if (updatedArchiveDocument.IsFaulted && updatedArchiveDocument.Exception != null)
110110
throw updatedArchiveDocument.Exception?.InnerException;
111111

112-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(await updatedArchiveDocument.ConfigureAwait(false));
112+
return (await updatedArchiveDocument.ConfigureAwait(false)).FromDataTransferObject();
113113
}
114114

115115
public async Task DeleteDocument(ArchiveDocumentDeleteUri deleteUri)
@@ -141,7 +141,7 @@ public async Task<Archive> ArchiveDocumentsAsync(Archive archiveWithDocuments)
141141
if (task.IsFaulted && task.Exception != null)
142142
throw task.Exception?.InnerException;
143143

144-
var result = ArchiveDataTransferObjectConverter.FromDataTransferObject(await task.ConfigureAwait(false));
144+
var result = (await task.ConfigureAwait(false)).FromDataTransferObject();
145145

146146
_logger.LogDebug("Response received for archiving to '{name}'", archiveWithDocuments.Name ?? "default");
147147

@@ -151,13 +151,13 @@ public async Task<Archive> ArchiveDocumentsAsync(Archive archiveWithDocuments)
151151
public async Task<Archive> FetchDocumentFromExternalId(string externalId)
152152
{
153153
var result = await _requestHelper.Get<V8.Archive>(_root.GetGetArchiveDocumentsByUuidUri(externalId)).ConfigureAwait(false);
154-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
154+
return result.FromDataTransferObject();
155155
}
156156

157157
public async Task<Archive> FetchDocumentFromExternalId(Guid externalIdGuid)
158158
{
159159
var result = await _requestHelper.Get<V8.Archive>(_root.GetGetArchiveDocumentsByUuidUri(externalIdGuid)).ConfigureAwait(false);
160-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
160+
return result.FromDataTransferObject();
161161
}
162162

163163
public async Task<Stream> StreamDocumentFromExternalId(string externalId)
@@ -185,7 +185,7 @@ public async Task<ArchiveDocumentContent> GetDocumentContent(ArchiveDocumentCont
185185
{
186186
var result = await _requestHelper.Get<Archive_Document_Content>(archiveDocumentContentUri).ConfigureAwait(false);
187187

188-
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
188+
return result.FromDataTransferObject();
189189
}
190190
}
191191
}

‎Digipost.Api.Client.Archive/ArchiveDataTransferObjectConverter.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Digipost.Api.Client.Archive
77
{
88
internal static class ArchiveDataTransferObjectConverter
99
{
10-
public static V8.Archive ToDataTransferObject(Archive a)
10+
internal static V8.Archive ToDataTransferObject(this Archive a)
1111
{
1212
var dto = new V8.Archive()
1313
{
@@ -24,7 +24,7 @@ public static V8.Archive ToDataTransferObject(Archive a)
2424
return dto;
2525
}
2626

27-
public static Archive_Document ToDataTransferObject(ArchiveDocument ad)
27+
internal static Archive_Document ToDataTransferObject(this ArchiveDocument ad)
2828
{
2929
var dto = new Archive_Document()
3030
{
@@ -54,7 +54,7 @@ public static Archive_Document ToDataTransferObject(ArchiveDocument ad)
5454
return dto;
5555
}
5656

57-
public static ArchiveDocument FromDataTransferObject(Archive_Document ad)
57+
internal static ArchiveDocument FromDataTransferObject(this Archive_Document ad)
5858
{
5959
return new ArchiveDocument(
6060
new Guid(ad.Uuid),
@@ -68,20 +68,20 @@ public static ArchiveDocument FromDataTransferObject(Archive_Document ad)
6868
ArchiveTime = ad.Archived_Time,
6969
DeletionTime = ad.Deletion_Time,
7070
Attributes = ad.Attributes.ToDictionary(ada => ada.Key, ada => ada.Value),
71-
Links = DataTransferObjectConverter.FromDataTransferObject(ad.Link)
71+
Links = ad.Link.FromDataTransferObject()
7272
};
7373
}
7474

75-
public static Archive FromDataTransferObject(V8.Archive a)
75+
internal static Archive FromDataTransferObject(this V8.Archive a)
7676
{
7777
return new Archive(new Sender(a.Sender_Id), a.Name)
7878
{
7979
ArchiveDocuments = a.Documents.Select(FromDataTransferObject).ToList(),
80-
Links =DataTransferObjectConverter.FromDataTransferObject(a.Link)
80+
Links = a.Link.FromDataTransferObject()
8181
};
8282
}
8383

84-
public static ArchiveDocumentContent FromDataTransferObject(Archive_Document_Content result)
84+
internal static ArchiveDocumentContent FromDataTransferObject(this Archive_Document_Content result)
8585
{
8686
return new ArchiveDocumentContent(result.Content_Type, new Uri(result.Uri, UriKind.Absolute));
8787
}

‎Digipost.Api.Client.Common.Tests/DataTransferObjectConverterTests.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void ForeignAddress()
4040
};
4141

4242
//Act
43-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
43+
var actualDto = source.ToDataTransferObject();
4444

4545
//Assert
4646
Comparator.AssertEqual(expectedDto, actualDto);
@@ -64,7 +64,7 @@ public void IdentificationByAddressReturnsDigipostResultWithDigipostAddressResul
6464
var expected = new IdentificationResult(IdentificationResultType.DigipostAddress, digipostAddress);
6565

6666
//Act
67-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
67+
var actual = source.FromDataTransferObject();
6868

6969
//Assert
7070
Comparator.AssertEqual(expected, actual);
@@ -88,7 +88,7 @@ public void IdentificationByAddressReturnsIdentifiedResultWithPersonalAliasResul
8888
var expected = new IdentificationResult(IdentificationResultType.Personalias, personAlias);
8989

9090
//Act
91-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
91+
var actual = source.FromDataTransferObject();
9292

9393
//Assert
9494
Comparator.AssertEqual(expected, actual);
@@ -119,7 +119,7 @@ public void IdentificationByAddressReturnsUnidentifiedResultWithUnidentifiedReas
119119
var expected = new IdentificationResult(IdentificationResultType.UnidentifiedReason, reason.ToString());
120120

121121
//Act
122-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
122+
var actual = source.FromDataTransferObject();
123123

124124
//Assert
125125
Comparator.AssertEqual(expected, actual);
@@ -158,7 +158,7 @@ public void IdentificationByNameAndAddress()
158158
};
159159

160160
//Act
161-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
161+
var actualDto = source.ToDataTransferObject();
162162

163163
//Assert
164164
Comparator.AssertEqual(expectedDto, actualDto);
@@ -195,7 +195,7 @@ public void IdentificationByNameAndAddressAcceptsNoBirthDate()
195195
};
196196

197197
//Act
198-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
198+
var actualDto = source.ToDataTransferObject();
199199

200200
//Assert
201201
Comparator.AssertEqual(expectedDto, actualDto);
@@ -212,7 +212,7 @@ public void IdentificationByOrganizationNumber()
212212
};
213213

214214
//Act
215-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
215+
var actualDto = source.ToDataTransferObject();
216216

217217
//Assert
218218
Comparator.AssertEqual(expectedDto, actualDto);
@@ -236,7 +236,7 @@ public void IdentificationByOrganizationNumberReturnsDigipostResultWithDigipostA
236236
var expected = new IdentificationResult(IdentificationResultType.DigipostAddress, digipostAddress);
237237

238238
//Act
239-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
239+
var actual = source.FromDataTransferObject();
240240

241241
//Assert
242242
Comparator.AssertEqual(expected, actual);
@@ -267,7 +267,7 @@ public void IdentificationByOrganizationNumberReturnsInvalidResultWithInvalidRea
267267
var expected = new IdentificationResult(IdentificationResultType.InvalidReason, invalidValue.ToString());
268268

269269
//Act
270-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
270+
var actual = source.FromDataTransferObject();
271271

272272
//Assert
273273
Comparator.AssertEqual(expected, actual);
@@ -292,7 +292,7 @@ public void IdentificationByOrganizationNumberReturnsUnidentifiedResultWithUnide
292292
var expected = new IdentificationResult(IdentificationResultType.UnidentifiedReason, reason.ToString());
293293

294294
//Act
295-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
295+
var actual = source.FromDataTransferObject();
296296

297297
//Assert
298298
Comparator.AssertEqual(expected, actual);
@@ -315,7 +315,7 @@ public void IdentificationByPinReturnsDigipostResultWithNoneResultType()
315315
var expected = new IdentificationResult(IdentificationResultType.DigipostAddress, string.Empty);
316316

317317
//Act
318-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
318+
var actual = source.FromDataTransferObject();
319319

320320
//Assert
321321
Comparator.AssertEqual(expected, actual);
@@ -340,7 +340,7 @@ public void IdentificationByPinReturnsIdentifiedResultWithNoneResultType()
340340
var expected = new IdentificationResult(IdentificationResultType.Personalias, string.Empty);
341341

342342
//Act
343-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
343+
var actual = source.FromDataTransferObject();
344344

345345
//Assert
346346
Comparator.AssertEqual(expected, actual);
@@ -365,7 +365,7 @@ public void IdentificationByPinReturnsInvalidResultWithInvalidReason()
365365
var expected = new IdentificationResult(IdentificationResultType.InvalidReason, invalidValue.ToString());
366366

367367
//Act
368-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
368+
var actual = source.FromDataTransferObject();
369369

370370
//Assert
371371
Comparator.AssertEqual(expected, actual);
@@ -393,7 +393,7 @@ public void NorwegianAddress()
393393
};
394394

395395
//Act
396-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
396+
var actualDto = source.ToDataTransferObject();
397397

398398
//Assert
399399
Comparator.AssertEqual(expectedDto, actualDto);
@@ -449,7 +449,7 @@ public void PrintDetails()
449449

450450

451451
//Act
452-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
452+
var actualDto = source.ToDataTransferObject();
453453

454454
//Assert
455455
Comparator.AssertEqual(expectedDto, actualDto);
@@ -509,7 +509,7 @@ public void PrintIfUnread()
509509
};
510510

511511
//Act
512-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
512+
var actualDto = source.ToDataTransferObject();
513513

514514
//Assert
515515
Comparator.AssertEqual(expectedDto, actualDto);
@@ -546,7 +546,7 @@ public void PrintRecipientFromForeignAddress()
546546
};
547547

548548
//Act
549-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
549+
var actualDto = source.ToDataTransferObject();
550550

551551
//Assert
552552
Comparator.AssertEqual(expectedDto, actualDto);
@@ -574,7 +574,7 @@ public void PrintRecipientFromNorwegianAddress()
574574
};
575575

576576
//Act
577-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
577+
var actualDto = source.ToDataTransferObject();
578578

579579
//Assert
580580
Comparator.AssertEqual(expectedDto, actualDto);
@@ -609,7 +609,7 @@ public void PrintReturnRecipientFromForeignAddress()
609609
};
610610

611611
//Act
612-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
612+
var actualDto = source.ToDataTransferObject();
613613

614614
//Assert
615615
Comparator.AssertEqual(expectedDto, actualDto);
@@ -637,7 +637,7 @@ public void PrintReturnRecipientFromNorwegianAddress()
637637
};
638638

639639
//Act
640-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
640+
var actualDto = source.ToDataTransferObject();
641641

642642
//Assert
643643
Comparator.AssertEqual(expectedDto, actualDto);
@@ -659,7 +659,7 @@ public void RecipientById()
659659
};
660660

661661
//Act
662-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
662+
var actualDto = source.ToDataTransferObject();
663663

664664
//Assert
665665
Comparator.AssertEqual(expectedDto, actualDto);
@@ -696,7 +696,7 @@ public void RecipientByNameAndAddress()
696696
};
697697

698698
//Act
699-
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
699+
var actualDto = source.ToDataTransferObject();
700700

701701
//Assert
702702
Comparator.AssertEqual(expectedDto, actualDto);
@@ -812,7 +812,7 @@ public void SearchResult()
812812
}
813813
};
814814

815-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
815+
var actual = source.FromDataTransferObject();
816816

817817
//Assert
818818
Comparator.AssertEqual(expected, actual);
@@ -840,7 +840,7 @@ public void Error()
840840
};
841841

842842
//Act
843-
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
843+
var actual = source.FromDataTransferObject();
844844

845845
//Assert
846846
Comparator.AssertEqual(expected, actual);

0 commit comments

Comments
 (0)