Skip to content
Closed
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
3 changes: 3 additions & 0 deletions example.env
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ ConnectivityCheckIntervalMinutes=15
# The time (hh:mm:ss) without contact from an aircraft before its connection times out (default: 3 times ConnectivityCheckIntervalMinutes)
# Use a value of more than 2 times ConnectivityCheckIntervalMinutes. If not, one failed check will cause connections to time out.
AircraftConnectionTimeout=00:45:00
# The time (hh:mm:ss) that an aircraft is not connected to the ACARS network or VATSIM, and sends no ADS-C messages, before its ADS-C contracts are cancelled (default: 02:00:00)
# Use a value of more than 2 times ConnectivityCheckIntervalMinutes. If not, one failed check will cause contracts to be cancelled.
AdscContractTimeout=02:00:00

# Handoff Configuration
# How many minutes before the expected transfer time to send the NEXT DATA AUTHORITY message (default: 20)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public async Task Handle_Rejection_LogsActivity()

static async Task<AdscContract> AddContract(TestAdscContractRepository contractRepository, string stationId)
{
var contract = new AdscContract("UAL123", stationId);
var contract = new AdscContract("UAL123", stationId, DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", stationId), contract, CancellationToken.None);
return contract;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public async Task Handle_WhenContractExists_SendsCancelAndRemovesContract()
// Arrange
var clientManager = new TestClientManager();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand Down Expand Up @@ -62,8 +62,8 @@ public async Task Handle_OnlyRemovesContractForStation()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var ybbbContract = new AdscContract("UAL123", "YBBB");
var ymmmContract = new AdscContract("UAL123", "YMMM");
var ybbbContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
var ymmmContract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), ybbbContract, CancellationToken.None);
await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), ymmmContract, CancellationToken.None);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public async Task Handle_ConnectionTerminated_CancelsContract()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -39,7 +39,7 @@ public async Task Handle_ConnectionLost_CancelsContractForStationOfAcarsClient()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YMMM");
var contract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand Down Expand Up @@ -79,7 +79,7 @@ public async Task Handle_WhenContractIsWithOtherStation_DoesNotCancel()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YMMM");
var contract = new AdscContract("UAL123", "YMMM", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -100,7 +100,7 @@ public async Task Handle_WhenCancelFails_DoesNotThrow()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ public async Task Handle_WhenSelectedContractHasEnded_RequestsDefaultContract()
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow());
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -43,9 +42,8 @@ public async Task Handle_WhenSelectedContractHasNotEnded_DoesNothing()
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow().AddSeconds(1));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -65,9 +63,8 @@ public async Task Handle_WhenNoSelectedContract_DoesNothing()
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestDefaultContract(TimeSpan.FromMinutes(10));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -89,9 +86,8 @@ public async Task Handle_WhenRequestFails_ContinuesWithOtherContracts()
var contractRepository = new TestAdscContractRepository();
foreach (var callsign in new[] { "UAL123", "QFA1" })
{
var contract = new AdscContract(callsign, "YBBB");
var contract = new AdscContract(callsign, "YBBB", clock.UtcNow());
contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow());
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey(callsign, "YBBB"), contract, CancellationToken.None);
}

Expand All @@ -118,9 +114,8 @@ public async Task Handle_WhenContractIsInactive_CancelsAndRemovesContract()
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestDefaultContract(TimeSpan.FromMinutes(10));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var clientManager = new TestClientManager();
Expand All @@ -147,9 +142,8 @@ public async Task Handle_WhenContractIsInactiveAndAcarsCancelFails_RemovesContra
// Arrange - TestClientManager has no ACARS client for YSSY, so the cancel fails
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YSSY");
var contract = new AdscContract("UAL123", "YSSY", clock.UtcNow());
contract.RequestDefaultContract(TimeSpan.FromMinutes(10));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YSSY"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -173,9 +167,8 @@ public async Task Handle_WhenContractHasRecentActivity_KeepsContract()
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestDefaultContract(TimeSpan.FromMinutes(10));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand All @@ -197,9 +190,8 @@ public async Task Handle_WhenSelectedContractIsInactive_CancelsInsteadOfRequesti
// Arrange
var clock = new TestClock();
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", clock.UtcNow());
contract.RequestSelectedContract(TimeSpan.FromMinutes(2), clock.UtcNow().AddMinutes(60));
contract.LogActivity(clock.UtcNow());
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var mediator = Substitute.For<IMediator>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public async Task Handle_WhenPilotIsNotInVatsimData_PublishesNothing()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("QFA1", "YBBB");
var contract = new AdscContract("QFA1", "YBBB", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), contract, CancellationToken.None);
contract.RequestDefaultContract(DefaultInterval);

Expand All @@ -254,6 +254,44 @@ public async Task Handle_WhenPilotIsNotInVatsimData_PublishesNothing()
await mediator.DidNotReceive().Publish(Arg.Any<AdscReportReceivedNotification>(), Arg.Any<CancellationToken>());
}

[Fact]
public async Task Handle_WhenAircraftIsInVatsimData_LogsActivity()
{
// Arrange - a rejected contract gets no VATSIM report, but the aircraft is still connected to VATSIM
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB", Now.AddHours(-1));
contract.RequestDefaultContract(DefaultInterval);
contract.Reject();
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

var handler = await CreateHandler(contractRepository, new TestAdscReportRepository(), Substitute.For<IMediator>());

// Act
await handler.Handle(new ProduceVatsimAdscReportsRequest(), CancellationToken.None);

// Assert
Assert.Equal(Now, contract.LastActivity);
}

[Fact]
public async Task Handle_WhenAircraftIsNotInVatsimData_DoesNotLogActivity()
{
// Arrange - CreateHandler adds only UAL123 to the VATSIM data
var created = Now.AddHours(-1);
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("QFA1", "YBBB", created);
contract.RequestDefaultContract(DefaultInterval);
await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), contract, CancellationToken.None);

var handler = await CreateHandler(contractRepository, new TestAdscReportRepository(), Substitute.For<IMediator>());

// Act
await handler.Handle(new ProduceVatsimAdscReportsRequest(), CancellationToken.None);

// Assert
Assert.Equal(created, contract.LastActivity);
}

static async Task<ProduceVatsimAdscReportsRequestHandler> CreateHandler(
IAdscContractRepository contractRepository,
IAdscReportRepository reportRepository,
Expand Down Expand Up @@ -281,7 +319,7 @@ [new VatsimPilot("UAL123", -33.9461, 151.1772, 37000, LastUpdated, isAdscEquippe

static async Task<AdscContract> AddContract(IAdscContractRepository contractRepository)
{
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);
return contract;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public async Task Handle_UpdatesLastSeenForConnectedAircraft()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -86,6 +87,7 @@ public async Task Handle_DoesNotUpdateLastSeenForDisconnectedAircraft()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -143,6 +145,7 @@ public async Task Handle_OnlyUpdatesAircraftForMatchingAcarsClient()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -191,6 +194,7 @@ public async Task Handle_UpdatesRepositoryWithConnectedCallsigns()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -230,6 +234,7 @@ public async Task Handle_PublishesNotificationWhenCallsignsChange()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -272,6 +277,7 @@ public async Task Handle_DoesNotPublishNotificationWhenCallsignsUnchanged()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -314,6 +320,7 @@ public async Task Handle_PublishesNotificationWhenCallsignAdded()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand Down Expand Up @@ -359,6 +366,7 @@ public async Task Handle_PublishesNotificationWhenCallsignRemoved()
clientManager,
aircraftRepository,
acarsConnectedCallsignsRepository,
new TestAdscContractRepository(),
mediator,
clock,
Logger.None);
Expand All @@ -374,4 +382,48 @@ await mediator.Received(1).Publish(
n.Callsigns.Length == 1 && n.Callsigns.Contains("UAL123")),
Arg.Any<CancellationToken>());
}

[Fact]
public async Task Handle_LogsActivityForContractsWithConnectedAircraftAtStation()
{
// Arrange
var clientManager = new TestClientManager();
var acarsClient = new TestAcarsClient("YBBB");
clientManager.AddClient("hoppies-ybbb", acarsClient);

var clock = new TestClock();
var initialTime = new DateTimeOffset(2026, 1, 1, 0, 0, 0, TimeSpan.Zero);
clock.SetUtcNow(initialTime);

var contractRepository = new TestAdscContractRepository();
var connectedContract = new AdscContract("UAL123", "YBBB", initialTime);
var disconnectedContract = new AdscContract("QFA1", "YBBB", initialTime);
var otherStationContract = new AdscContract("UAL123", "YMMM", initialTime);
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), connectedContract, CancellationToken.None);
await contractRepository.Add(new AdscContractKey("QFA1", "YBBB"), disconnectedContract, CancellationToken.None);
await contractRepository.Add(new AdscContractKey("UAL123", "YMMM"), otherStationContract, CancellationToken.None);

// Only UAL123 is connected to the ACARS network
acarsClient.Connections.Add("UAL123");

var handler = new RefreshAcarsCallsignsRequestHandler(
clientManager,
new TestAircraftRepository(),
new InMemoryAcarsStationRepository(),
contractRepository,
Substitute.For<IMediator>(),
clock,
Logger.None);

var now = initialTime.AddMinutes(10);
clock.SetUtcNow(now);

// Act
await handler.Handle(new RefreshAcarsCallsignsRequest("hoppies-ybbb"), CancellationToken.None);

// Assert
Assert.Equal(now, connectedContract.LastActivity);
Assert.Equal(initialTime, disconnectedContract.LastActivity);
Assert.Equal(initialTime, otherStationContract.LastActivity);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task Handle_WhenSelectedContractExists_DoesNotRequestContract()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
contract.RequestSelectedContract(TimeSpan.FromMinutes(5), DateTimeOffset.UtcNow.AddHours(1));
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

Expand All @@ -58,7 +58,7 @@ public async Task Handle_WhenOnlyDemandReportExists_RequestsDefaultContract()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
contract.RequestDemandReport();
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);

Expand All @@ -82,7 +82,7 @@ public async Task Handle_WhenDefaultContractIsRejected_RequestsDefaultContract()
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var contract = new AdscContract("UAL123", "YBBB");
var contract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
contract.RequestDefaultContract(TimeSpan.FromMinutes(10));
contract.Reject();
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), contract, CancellationToken.None);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public async Task Handle_WhenPeriodicContractExists_KeepsPeriodicContractAndSend
{
// Arrange
var contractRepository = new TestAdscContractRepository();
var existingContract = new AdscContract("UAL123", "YBBB");
var existingContract = new AdscContract("UAL123", "YBBB", DateTimeOffset.UtcNow);
existingContract.RequestDefaultContract(TimeSpan.FromMinutes(10));
existingContract.ReportReceived();
await contractRepository.Add(new AdscContractKey("UAL123", "YBBB"), existingContract, CancellationToken.None);
Expand Down
Loading
Loading