Skip to content

Bug/#783 statement date issues #787

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
merged 3 commits into from
Apr 26, 2025
Merged

Bug/#783 statement date issues #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46106cc
Add TransactionDateTime to DataTransferObject
StuartFerguson Apr 26, 2025
75c69fc
Merge branch 'bug/#783_statement_date_issues' of ssh://github.com/Tra…
StuartFerguson Apr 26, 2025
e8333f8
Merge branch 'master' into bug/#783_statement_date_issues
StuartFerguson Apr 26, 2025
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
9 changes: 9 additions & 0 deletions TransactionProcessor.DataTransferObjects/DataTransferObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ public class DataTransferObject
[JsonProperty("merchant_id")]
public Guid MerchantId { get; set; }

/// <summary>
/// Gets or sets the transaction date time.
/// </summary>
/// <value>
/// The transaction date time.
/// </value>
[JsonProperty("transaction_date_time")]
public DateTime TransactionDateTime { get; set; }

#endregion
}
}
11 changes: 1 addition & 10 deletions TransactionProcessor.DataTransferObjects/LogonTransactionRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,7 @@ public class LogonTransactionRequest : DataTransferObject
/// </value>
[JsonProperty("device_identifier")]
public String DeviceIdentifier { get; set; }

/// <summary>
/// Gets or sets the transaction date time.
/// </summary>
/// <value>
/// The transaction date time.
/// </value>
[JsonProperty("transaction_date_time")]
public DateTime TransactionDateTime { get; set; }


/// <summary>
/// Gets or sets the transaction number.
/// </summary>
Expand Down
9 changes: 0 additions & 9 deletions TransactionProcessor.DataTransferObjects/ReconciliationRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ public class ReconciliationRequest : DataTransferObject
[JsonProperty("transaction_count")]
public Int32 TransactionCount { get; set; }

/// <summary>
/// Gets or sets the transaction date time.
/// </summary>
/// <value>
/// The transaction date time.
/// </value>
[JsonProperty("transaction_date_time")]
public DateTime TransactionDateTime { get; set; }

/// <summary>
/// Gets or sets the transaction value.
/// </summary>
Expand Down
5 changes: 1 addition & 4 deletions TransactionProcessor.DataTransferObjects/SaleTransactionRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ public class SaleTransactionRequest : DataTransferObject

[JsonProperty("product_id")]
public Guid ProductId { get; set; }

[JsonProperty("transaction_date_time")]
public DateTime TransactionDateTime { get; set; }


[JsonProperty("transaction_number")]
public String TransactionNumber { get; set; }

Expand Down
18 changes: 12 additions & 6 deletions TransactionProcessor/Controllers/TransactionController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@

namespace TransactionProcessor.Controllers
{
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
using BusinessLogic.Requests;
using Common.Examples;
using DataTransferObjects;
using Factories;
using Humanizer;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
Expand All @@ -21,6 +17,11 @@ namespace TransactionProcessor.Controllers
using Shared.General;
using Swashbuckle.AspNetCore.Annotations;
using Swashbuckle.AspNetCore.Filters;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;

/// <summary>
///
Expand Down Expand Up @@ -81,8 +82,13 @@ public async Task<IActionResult> PerformTransaction([FromBody] SerialisedMessage
{
TypeNameHandling = TypeNameHandling.Auto
});

dto.MerchantId = merchantId;
dto.EstateId = estateId;
if (dto.TransactionDateTime.Kind == DateTimeKind.Utc)
{
dto.TransactionDateTime = new DateTime(dto.TransactionDateTime.Ticks, DateTimeKind.Unspecified);
}

Result<SerialisedMessage> transactionResult = dto switch {
LogonTransactionRequest ltr => await this.ProcessSpecificMessage(ltr, cancellationToken),
Expand Down Expand Up @@ -124,7 +130,7 @@ private async Task<Result<SerialisedMessage>> ProcessSpecificMessage(LogonTransa
CancellationToken cancellationToken)
{
Guid transactionId = Guid.NewGuid();

TransactionCommands.ProcessLogonTransactionCommand command = new(transactionId,
logonTransactionRequest.EstateId,
logonTransactionRequest.MerchantId,
Expand Down
Loading