Skip to content

method refactoring #337

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
StuartFerguson merged 1 commit into from
Oct 14, 2025
Merged

method refactoring #337

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
103 changes: 34 additions & 69 deletions MessagingService.BusinessLogic/Services/EmailServices/Smtp2Go/Smtp2GoProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,34 +51,22 @@ public async Task<EmailServiceProxyResponse> SendEmail(Guid messageId,
List<EmailAttachment> attachments,
CancellationToken cancellationToken) {
// Translate the request message
Smtp2GoSendEmailRequest apiRequest = new()
{
ApiKey = ConfigurationReader.GetValue("SMTP2GoAPIKey"),
HTMLBody = isHtml ? body : string.Empty,
TextBody = isHtml ? string.Empty : body,
Sender = fromAddress,
Subject = subject,
TestMode = false,
To = toAddresses.ToArray()
};
if (attachments != null && attachments.Any())
{
Smtp2GoSendEmailRequest apiRequest = new() {
ApiKey = ConfigurationReader.GetValue("SMTP2GoAPIKey"),
HTMLBody = isHtml ? body : string.Empty,
TextBody = isHtml ? string.Empty : body,
Sender = fromAddress,
Subject = subject,
TestMode = false,
To = toAddresses.ToArray()
};

if (attachments != null && attachments.Any()) {
apiRequest.Attachments = new List<Smtp2GoAttachment>();
foreach (EmailAttachment emailAttachment in attachments)
{
apiRequest.Attachments.Add(new Smtp2GoAttachment
{
FileBlob = emailAttachment.FileData,
FileName = emailAttachment.Filename,
MimeType = this.ConvertFileType(emailAttachment.FileType)
});
}
attachments.ForEach(a => apiRequest.Attachments.Add(new Smtp2GoAttachment { FileBlob = a.FileData, FileName = a.Filename, MimeType = this.ConvertFileType(a.FileType) }));
}

String requestSerialised = JsonConvert.SerializeObject(apiRequest, Formatting.Indented, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.None
});
String requestSerialised = JsonConvert.SerializeObject(apiRequest, Formatting.Indented, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.None });

Logger.LogDebug($"Request Message Sent to Email Provider [SMTP2Go] {requestSerialised}");

Expand All @@ -90,31 +78,25 @@ public async Task<EmailServiceProxyResponse> SendEmail(Guid messageId,

HttpResponseMessage httpResponse = await this.HttpClient.SendAsync(requestMessage, cancellationToken);

Smtp2GoSendEmailResponse apiResponse = new() { Data = new Smtp2GoSendEmailResponseData() };
if (httpResponse.IsSuccessStatusCode){
apiResponse = JsonConvert.DeserializeObject<Smtp2GoSendEmailResponse>(await httpResponse.Content.ReadAsStringAsync(cancellationToken));
}
else {
apiResponse = new Smtp2GoSendEmailResponse { Data = new Smtp2GoSendEmailResponseData { Error = httpResponse.StatusCode.ToString(), ErrorCode = ((Int32)httpResponse.StatusCode).ToString() } };
}
Smtp2GoSendEmailResponse apiResponse = httpResponse.IsSuccessStatusCode switch {
true => JsonConvert.DeserializeObject<Smtp2GoSendEmailResponse>(await httpResponse.Content.ReadAsStringAsync(cancellationToken)),
_ => new Smtp2GoSendEmailResponse { Data = new Smtp2GoSendEmailResponseData { Error = httpResponse.StatusCode.ToString(), ErrorCode = ((Int32)httpResponse.StatusCode).ToString() } }
};

Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");

// Translate the Response
return new EmailServiceProxyResponse
{
ApiCallSuccessful = httpResponse.IsSuccessStatusCode && String.IsNullOrEmpty(apiResponse.Data.ErrorCode),
EmailIdentifier = apiResponse.Data.EmailId,
Error = apiResponse.Data.Error,
ErrorCode = apiResponse.Data.ErrorCode,
RequestIdentifier = apiResponse.RequestId
};
return new EmailServiceProxyResponse {
ApiCallSuccessful = httpResponse.IsSuccessStatusCode && String.IsNullOrEmpty(apiResponse.Data.ErrorCode),
EmailIdentifier = apiResponse.Data.EmailId,
Error = apiResponse.Data.Error,
ErrorCode = apiResponse.Data.ErrorCode,
RequestIdentifier = apiResponse.RequestId
};
}

private String ConvertFileType(FileType emailAttachmentFileType)
{
switch(emailAttachmentFileType)
{

private String ConvertFileType(FileType emailAttachmentFileType) {
switch (emailAttachmentFileType) {
case FileType.PDF:
return "application/pdf";
default:
Expand All @@ -125,23 +107,12 @@ private String ConvertFileType(FileType emailAttachmentFileType)
public async Task<MessageStatusResponse> GetMessageStatus(String providerReference,
DateTime startDate,
DateTime endDate,
CancellationToken cancellationToken)
{
Smtp2GoEmailSearchRequest apiRequest = new()
{
ApiKey = ConfigurationReader.GetValue("SMTP2GoAPIKey"),
EmailId = new List<String>
{
providerReference
},
StartDate = startDate.ToString("yyyy-MM-dd"),
EndDate = endDate.ToString("yyyy-MM-dd"),
};

String requestSerialised = JsonConvert.SerializeObject(apiRequest, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.None
});
CancellationToken cancellationToken) {
Smtp2GoEmailSearchRequest apiRequest = new() {
ApiKey = ConfigurationReader.GetValue("SMTP2GoAPIKey"), EmailId = new List<String> { providerReference }, StartDate = startDate.ToString("yyyy-MM-dd"), EndDate = endDate.ToString("yyyy-MM-dd"),
};

String requestSerialised = JsonConvert.SerializeObject(apiRequest, new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.None });

Logger.LogDebug($"Request Message Sent to Email Provider [SMTP2Go] {requestSerialised}");

Expand All @@ -158,13 +129,7 @@ public async Task<MessageStatusResponse> GetMessageStatus(String providerReferen
Logger.LogDebug($"Response Message Received from Email Provider [SMTP2Go] {JsonConvert.SerializeObject(apiResponse)}");

// Translate the Response
return new MessageStatusResponse
{
ApiStatusCode = httpResponse.StatusCode,
MessageStatus = this.TranslateMessageStatus(apiResponse.Data.EmailDetails.Single().Status),
ProviderStatusDescription = apiResponse.Data.EmailDetails.Single().Status,
Timestamp = apiResponse.Data.EmailDetails.Single().EmailStatusDate
};
return new MessageStatusResponse { ApiStatusCode = httpResponse.StatusCode, MessageStatus = this.TranslateMessageStatus(apiResponse.Data.EmailDetails.Single().Status), ProviderStatusDescription = apiResponse.Data.EmailDetails.Single().Status, Timestamp = apiResponse.Data.EmailDetails.Single().EmailStatusDate };
}

private MessageStatus TranslateMessageStatus(String status) {
Expand Down
Loading