Skip to content

Kaizen #211

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.

Sign up for GitHub

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

Merged
eivinhb merged 1 commit into from
Nov 2, 2023
Merged

Kaizen #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Digipost.Api.Client.Archive.Tests/DataTransferObjectConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void Archive()

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

var actual = ArchiveDataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

var actual = ArchiveDataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

Comparator.AssertEqual(expected, ArchiveDataTransferObjectConverter.ToDataTransferObject(source));
Comparator.AssertEqual(expected, source.ToDataTransferObject());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Digipost.Api.Client.Archive.Tests/Smoke/ArchiveSmokeTestsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Digipost.Api.Client.Archive.Tests.Smoke
{
public class ArchiveSmokeTestsHelper
{
public static readonly string ArchiveName = "SmokeTestArchive";
internal static readonly string ArchiveName = "SmokeTestArchive";
private readonly TestSender _testSender;
private readonly IArchiveApi _archiveApi;
private Archive _archivesWithDocuments;
Expand Down
4 changes: 2 additions & 2 deletions Digipost.Api.Client.Archive/Actions/ArchiveAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ internal override HttpContent Content(Archive archive)

protected override string Serialize(Archive requestContent)
{
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject((Archive) requestContent);
var messageDataTransferObject = ((Archive) requestContent).ToDataTransferObject();
return SerializeUtil.Serialize(messageDataTransferObject);
}

private static void AddBodyToContent(Archive archive, MultipartContent content)
{
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject(archive);
var messageDataTransferObject = archive.ToDataTransferObject();
var xmlMessage = SerializeUtil.Serialize(messageDataTransferObject);

var messageContent = new StringContent(xmlMessage);
Expand Down
2 changes: 1 addition & 1 deletion Digipost.Api.Client.Archive/Actions/ArchiveDocumentAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal override HttpContent Content(ArchiveDocument requestContent)

protected override string Serialize(ArchiveDocument requestContent)
{
var messageDataTransferObject = ArchiveDataTransferObjectConverter.ToDataTransferObject(requestContent);
var messageDataTransferObject = requestContent.ToDataTransferObject();
return SerializeUtil.Serialize(messageDataTransferObject);
}
}
Expand Down
14 changes: 7 additions & 7 deletions Digipost.Api.Client.Archive/ArchiveApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public async Task<Archive> FetchArchiveDocuments(ArchiveNextDocumentsUri nextDoc
{
var result = await _requestHelper.Get<V8.Archive>(nextDocumentsUri).ConfigureAwait(false);

return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
return result.FromDataTransferObject();
}

public async Task<Archive> GetArchiveDocument(GetArchiveDocumentByUuidUri getArchiveDocumentUri)
{
var result = await _requestHelper.Get<V8.Archive>(getArchiveDocumentUri).ConfigureAwait(false);
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
return result.FromDataTransferObject();
}

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

return ArchiveDataTransferObjectConverter.FromDataTransferObject(await updatedArchiveDocument.ConfigureAwait(false));
return (await updatedArchiveDocument.ConfigureAwait(false)).FromDataTransferObject();
}

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

var result = ArchiveDataTransferObjectConverter.FromDataTransferObject(await task.ConfigureAwait(false));
var result = (await task.ConfigureAwait(false)).FromDataTransferObject();

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

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

public async Task<Archive> FetchDocumentFromExternalId(Guid externalIdGuid)
{
var result = await _requestHelper.Get<V8.Archive>(_root.GetGetArchiveDocumentsByUuidUri(externalIdGuid)).ConfigureAwait(false);
return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
return result.FromDataTransferObject();
}

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

return ArchiveDataTransferObjectConverter.FromDataTransferObject(result);
return result.FromDataTransferObject();
}
}
}
14 changes: 7 additions & 7 deletions Digipost.Api.Client.Archive/ArchiveDataTransferObjectConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Digipost.Api.Client.Archive
{
internal static class ArchiveDataTransferObjectConverter
{
public static V8.Archive ToDataTransferObject(Archive a)
internal static V8.Archive ToDataTransferObject(this Archive a)
{
var dto = new V8.Archive()
{
Expand All @@ -24,7 +24,7 @@ public static V8.Archive ToDataTransferObject(Archive a)
return dto;
}

public static Archive_Document ToDataTransferObject(ArchiveDocument ad)
internal static Archive_Document ToDataTransferObject(this ArchiveDocument ad)
{
var dto = new Archive_Document()
{
Expand Down Expand Up @@ -54,7 +54,7 @@ public static Archive_Document ToDataTransferObject(ArchiveDocument ad)
return dto;
}

public static ArchiveDocument FromDataTransferObject(Archive_Document ad)
internal static ArchiveDocument FromDataTransferObject(this Archive_Document ad)
{
return new ArchiveDocument(
new Guid(ad.Uuid),
Expand All @@ -68,20 +68,20 @@ public static ArchiveDocument FromDataTransferObject(Archive_Document ad)
ArchiveTime = ad.Archived_Time,
DeletionTime = ad.Deletion_Time,
Attributes = ad.Attributes.ToDictionary(ada => ada.Key, ada => ada.Value),
Links = DataTransferObjectConverter.FromDataTransferObject(ad.Link)
Links = ad.Link.FromDataTransferObject()
};
}

public static Archive FromDataTransferObject(V8.Archive a)
internal static Archive FromDataTransferObject(this V8.Archive a)
{
return new Archive(new Sender(a.Sender_Id), a.Name)
{
ArchiveDocuments = a.Documents.Select(FromDataTransferObject).ToList(),
Links =DataTransferObjectConverter.FromDataTransferObject(a.Link)
Links = a.Link.FromDataTransferObject()
};
}

public static ArchiveDocumentContent FromDataTransferObject(Archive_Document_Content result)
internal static ArchiveDocumentContent FromDataTransferObject(this Archive_Document_Content result)
{
return new ArchiveDocumentContent(result.Content_Type, new Uri(result.Uri, UriKind.Absolute));
}
Expand Down
48 changes: 24 additions & 24 deletions Digipost.Api.Client.Common.Tests/DataTransferObjectConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void ForeignAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down Expand Up @@ -119,7 +119,7 @@ public void IdentificationByAddressReturnsUnidentifiedResultWithUnidentifiedReas
var expected = new IdentificationResult(IdentificationResultType.UnidentifiedReason, reason.ToString());

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down Expand Up @@ -158,7 +158,7 @@ public void IdentificationByNameAndAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -195,7 +195,7 @@ public void IdentificationByNameAndAddressAcceptsNoBirthDate()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand All @@ -212,7 +212,7 @@ public void IdentificationByOrganizationNumber()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down Expand Up @@ -267,7 +267,7 @@ public void IdentificationByOrganizationNumberReturnsInvalidResultWithInvalidRea
var expected = new IdentificationResult(IdentificationResultType.InvalidReason, invalidValue.ToString());

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

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

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down Expand Up @@ -393,7 +393,7 @@ public void NorwegianAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -449,7 +449,7 @@ public void PrintDetails()


//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -509,7 +509,7 @@ public void PrintIfUnread()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -546,7 +546,7 @@ public void PrintRecipientFromForeignAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -574,7 +574,7 @@ public void PrintRecipientFromNorwegianAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -609,7 +609,7 @@ public void PrintReturnRecipientFromForeignAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -637,7 +637,7 @@ public void PrintReturnRecipientFromNorwegianAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand All @@ -659,7 +659,7 @@ public void RecipientById()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -696,7 +696,7 @@ public void RecipientByNameAndAddress()
};

//Act
var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
var actualDto = source.ToDataTransferObject();

//Assert
Comparator.AssertEqual(expectedDto, actualDto);
Expand Down Expand Up @@ -812,7 +812,7 @@ public void SearchResult()
}
};

var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down Expand Up @@ -840,7 +840,7 @@ public void Error()
};

//Act
var actual = DataTransferObjectConverter.FromDataTransferObject(source);
var actual = source.FromDataTransferObject();

//Assert
Comparator.AssertEqual(expected, actual);
Expand Down
Loading