Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 36 additions & 32 deletions FIleProcessor.Models/FileDetails.cs
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
using System;

namespace FIleProcessor.Models
namespace FIleProcessor.Models
{
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;

/// <summary>
///
/// </summary>
public class FileDetails
{
#region Properties

/// <summary>
/// Gets or sets the file identifier.
/// Gets or sets the estate identifier.
/// </summary>
/// <value>
/// The file identifier.
/// The estate identifier.
/// </value>
public Guid FileId { get; set; }
public Guid EstateId { get; set; }

/// <summary>
/// Gets or sets a value indicating whether [processing completed].
/// Gets or sets the file identifier.
/// </summary>
/// <value>
/// <c>true</c> if [processing completed]; otherwise, <c>false</c>.
/// The file identifier.
/// </value>
public Boolean ProcessingCompleted { get; set; }
public Guid FileId { get; set; }

/// <summary>
/// Gets or sets the estate identifier.
/// Gets or sets the file import log identifier.
/// </summary>
/// <value>
/// The estate identifier.
/// The file import log identifier.
/// </value>
public Guid EstateId { get; set; }
public Guid FileImportLogId { get; set; }

/// <summary>
/// Gets or sets the user identifier.
/// Gets or sets the file lines.
/// </summary>
/// <value>
/// The user identifier.
/// The file lines.
/// </value>
public Guid UserId { get; set; }
public List<FileLine> FileLines { get; set; }

/// <summary>
/// Gets or sets the merchant identifier.
/// Gets or sets the file location.
/// </summary>
/// <value>
/// The merchant identifier.
/// The file location.
/// </value>
public Guid MerchantId { get; set; }
public String FileLocation { get; set; }

/// <summary>
/// Gets or sets the file profile identifier.
Expand All @@ -58,36 +58,40 @@ public class FileDetails
/// </value>
public Guid FileProfileId { get; set; }

public DateTime FileReceivedDateTime { get; set; }

/// <summary>
/// Gets or sets the file import log identifier.
/// Gets or sets the merchant identifier.
/// </summary>
/// <value>
/// The file import log identifier.
/// The merchant identifier.
/// </value>
public Guid FileImportLogId { get; set; }
public Guid MerchantId { get; set; }

/// <summary>
/// Gets or sets the file location.
/// Gets or sets a value indicating whether [processing completed].
/// </summary>
/// <value>
/// The file location.
/// <c>true</c> if [processing completed]; otherwise, <c>false</c>.
/// </value>
public String FileLocation { get; set; }
public Boolean ProcessingCompleted { get; set; }

/// <summary>
/// Gets or sets the file lines.
/// Gets or sets the processing summary.
/// </summary>
/// <value>
/// The file lines.
/// The processing summary.
/// </value>
public List<FileLine> FileLines { get; set; }
public ProcessingSummary ProcessingSummary { get; set; }

/// <summary>
/// Gets or sets the processing summary.
/// Gets or sets the user identifier.
/// </summary>
/// <value>
/// The processing summary.
/// The user identifier.
/// </value>
public ProcessingSummary ProcessingSummary { get; set; }
public Guid UserId { get; set; }

#endregion
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,14 @@ public async Task<Unit> Handle(ProcessTransactionForFileLineRequest request,
{
throw new NotFoundException($"No variable value product found on the merchant contract for operator Id {fileProfile.OperatorName} and Merchant Id {merchant.MerchantId}");
}

// Build a transaction request message
SaleTransactionRequest saleTransactionRequest = new SaleTransactionRequest
{

EstateId = fileDetails.EstateId,
MerchantId = fileDetails.MerchantId,
TransactionDateTime = DateTime.Now,
TransactionDateTime = fileDetails.FileReceivedDateTime,
TransactionNumber = FileRequestHandler.TransactionNumber.ToString(),
TransactionType = "Sale",
ContractId = contract.ContractId,
Expand Down
1 change: 1 addition & 0 deletions FileProcessor.FileAggregate/FileAggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public FileDetails GetFile()
{
return new FileDetails
{
FileReceivedDateTime = this.FileReceivedDateTime,
ProcessingCompleted = this.IsCompleted,
FileLines = this.FileLines,
EstateId = this.EstateId,
Expand Down