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
4 changes: 2 additions & 2 deletions Configuration.UnitTests/ApplicationSettingsTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AwesomeAssertions;
using AwesomeAssertions;
using Microsoft.Extensions.Logging;
using Moq;

Expand All @@ -25,7 +25,7 @@ public void Constructor_ParsesConfigurationFile()

// Assert
settings.ConfigurationInstance.Should().NotBeNull();
settings.ConfigurationInstance.Settings.DataProviderPreference.Should().Be("COINGECKO,YAHOO");
settings.ConfigurationInstance.Settings.RawDataProviderPreference.Should().Be("COINGECKO,YAHOO");
}

[Fact]
Expand Down
15 changes: 11 additions & 4 deletions Configuration/Settings.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;

namespace GhostfolioSidekick.Configuration
Expand All @@ -11,9 +11,16 @@ public class Settings()
public bool DeleteUnusedSymbols { get; set; } = true;

[JsonPropertyName("dataprovider.preference.order")]
public required string DataProviderPreference { get; set; } = "YAHOO;COINGECKO";
public required string RawDataProviderPreference { get; set; } = "YAHOO;COINGECKO";

[JsonPropertyName("performance.primarycurrency")]
public required string PrimaryCurrency { get; set; } = "EUR";
[JsonPropertyName("performance.currencies")]
public required string RawCurrencies { get; set; } = "EUR;USD";

public string[] DataProviderPreference => SplitConfigurationValue(RawDataProviderPreference);

public string[] Currencies => SplitConfigurationValue(RawCurrencies);

private static string[] SplitConfigurationValue(string value) =>
[.. value.Split([';', ','], System.StringSplitOptions.RemoveEmptyEntries).Select(x => x.ToUpperInvariant())];
}
}
18 changes: 10 additions & 8 deletions Database.UnitTests/DatabaseContextTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ public async Task CanCreateDbContextWithCalculatedSnapshotConfiguration()
0, 0,
DateOnly.FromDateTime(DateTime.Today),
100m,
new Money(Currency.USD, 50m),
new Money(Currency.USD, 55m),
new Money(Currency.USD, 5000m),
new Money(Currency.USD, 5500m)
Currency.USD,
50m,
55m,
5000m,
5500m
)
}
};
Expand All @@ -81,10 +82,11 @@ public async Task CanCreateDbContextWithCalculatedSnapshotConfiguration()
var snapshot = retrieved.CalculatedSnapshots.First();
snapshot.Date.Should().Be(DateOnly.FromDateTime(DateTime.Today));
snapshot.Quantity.Should().Be(100m);
snapshot.AverageCostPrice.Amount.Should().Be(50m);
snapshot.CurrentUnitPrice.Amount.Should().Be(55m);
snapshot.TotalInvested.Amount.Should().Be(5000m);
snapshot.TotalValue.Amount.Should().Be(5500m);
snapshot.Currency.Should().Be(Currency.USD);
snapshot.AverageCostPrice.Should().Be(50m);
snapshot.CurrentUnitPrice.Should().Be(55m);
snapshot.TotalInvested.Should().Be(5000m);
snapshot.TotalValue.Should().Be(5500m);
}
}
}
6 changes: 1 addition & 5 deletions Database/DatabaseContext.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GhostfolioSidekick.Model;
using GhostfolioSidekick.Model;
using GhostfolioSidekick.Model.Accounts;
using GhostfolioSidekick.Model.Activities;
using GhostfolioSidekick.Model.Market;
Expand Down Expand Up @@ -37,10 +37,6 @@ public class DatabaseContext : DbContext

public virtual DbSet<CalculatedSnapshot> CalculatedSnapshots { get; set; }

public virtual DbSet<CalculatedSnapshotPrimaryCurrency> CalculatedSnapshotPrimaryCurrencies { get; set; }

public virtual DbSet<BalancePrimaryCurrency> BalancePrimaryCurrencies { get; set; }

public virtual DbSet<TaskRun> Tasks { get; set; }
public virtual DbSet<TaskRunLog> TaskRunLogs { get; set; }

Expand Down
Loading
Loading