Skip to content

Tags #150

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

Draft
nvsnkv wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Tags #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c043736
chore(analysis): moved setup classes to l1
nvsnkv Dec 13, 2023
40782a2
feat: TaggedTrasnsaction and IO around it
nvsnkv Dec 16, 2023
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
6 changes: 0 additions & 6 deletions src/l0/Flow.Domain.Analysis/Setup/CalendarConfig.cs
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions src/l0/Flow.Domain.Analysis/Tag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace Flow.Domain.Analysis;

public sealed record Tag(string Name)
{
public static Tag Invalid = new(string.Empty);

public override string ToString()
{
return Name;
}
}
14 changes: 14 additions & 0 deletions src/l0/Flow.Domain.Analysis/TaggedTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using Flow.Domain.Transactions;

namespace Flow.Domain.Analysis;

public class TaggedTransaction : RecordedTransaction
{
public TaggedTransaction(RecordedTransaction t, IEnumerable<Tag> tags) : base(t.Key, t, t.Revision)
{
Overrides = t.Overrides;
Tags = tags.ToList().AsReadOnly();
}

public IReadOnlyCollection<Tag> Tags { get; }
}
2 changes: 1 addition & 1 deletion src/l1/Flow.Application.Analysis/Aggregator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Linq.Expressions;
using Flow.Application.Analysis.Contract;
using Flow.Application.Analysis.Contract.Setup;
using Flow.Application.ExchangeRates.Contract;
using Flow.Application.Transactions.Contract;
using Flow.Domain.Analysis;
using Flow.Domain.Analysis.Setup;
using Flow.Domain.Patterns;
using Flow.Domain.Transactions;

Expand Down
4 changes: 2 additions & 2 deletions src/l1/Flow.Application.Analysis/CalendarBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Flow.Domain.Analysis;
using Flow.Domain.Analysis.Setup;
using Flow.Application.Analysis.Contract.Setup;
using Flow.Domain.Analysis;
using Flow.Domain.Transactions;

namespace Flow.Application.Analysis;
Expand Down
4 changes: 2 additions & 2 deletions src/l1/Flow.Application.Analysis/Contract/IAggregator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Flow.Domain.Analysis;
using Flow.Domain.Analysis.Setup;
using Flow.Application.Analysis.Contract.Setup;
using Flow.Domain.Analysis;
using Flow.Domain.Transactions;

namespace Flow.Application.Analysis.Contract;
Expand Down
8 changes: 8 additions & 0 deletions src/l1/Flow.Application.Analysis/Contract/Setup/CalendarConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Flow.Domain.Analysis;

namespace Flow.Application.Analysis.Contract.Setup;

public record CalendarConfig(
IReadOnlyList<SeriesConfig> Series,
Vector Dimensions,
int? Depth = null);
22 changes: 11 additions & 11 deletions .../Flow.Domain.Analysis/Setup/FlowConfig.cs → ...ion.Analysis/Contract/Setup/FlowConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Flow.Domain.Transactions;
using System.Linq.Expressions;
namespace Flow.Domain.Analysis.Setup;
public record FlowConfig(
DateTime From,
DateTime Till,
string Currency,
Expression<Func<RecordedTransaction, bool>>? Criteria = null
);
using System.Linq.Expressions;
using Flow.Domain.Transactions;

namespace Flow.Application.Analysis.Contract.Setup;

public record FlowConfig(
DateTime From,
DateTime Till,
string Currency,
Expression<Func<RecordedTransaction, bool>>? Criteria = null
);
101 changes: 51 additions & 50 deletions ...low.Domain.Analysis/Setup/SeriesConfig.cs → ...n.Analysis/Contract/Setup/SeriesConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
using Flow.Domain.Transactions;

namespace Flow.Domain.Analysis.Setup;

public class SeriesConfig
{
private static readonly IReadOnlyList<SeriesConfig> EmptySubSeriesList = new List<SeriesConfig>().AsReadOnly();

public SeriesConfig(Vector measurement, IReadOnlyList<Func<RecordedTransaction, bool>> rules, IReadOnlyList<SeriesConfig>? subSeries = null)
{
Measurement = measurement;
Rules = rules;

SubSeries = subSeries ?? EmptySubSeriesList;
}

public Vector Measurement { get; }

public IReadOnlyList<Func<RecordedTransaction, bool>> Rules { get; }

public IReadOnlyList<SeriesConfig> SubSeries { get; }

protected bool Equals(SeriesConfig other)
{
return Measurement.Equals(other.Measurement);
}

public override bool Equals(object? obj)
{
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != this.GetType()) return false;
return Equals((SeriesConfig)obj);
}

public override int GetHashCode()
{
return Measurement.GetHashCode();
}

public static bool operator ==(SeriesConfig? left, SeriesConfig? right)
{
return Equals(left, right);
}

public static bool operator !=(SeriesConfig? left, SeriesConfig? right)
{
return !Equals(left, right);
}
}
using Flow.Domain.Analysis;
using Flow.Domain.Transactions;

namespace Flow.Application.Analysis.Contract.Setup;

public class SeriesConfig
{
private static readonly IReadOnlyList<SeriesConfig> EmptySubSeriesList = new List<SeriesConfig>().AsReadOnly();

public SeriesConfig(Vector measurement, IReadOnlyList<Func<RecordedTransaction, bool>> rules, IReadOnlyList<SeriesConfig>? subSeries = null)
{
Measurement = measurement;
Rules = rules;

SubSeries = subSeries ?? EmptySubSeriesList;
}

public Vector Measurement { get; }

public IReadOnlyList<Func<RecordedTransaction, bool>> Rules { get; }

public IReadOnlyList<SeriesConfig> SubSeries { get; }

protected bool Equals(SeriesConfig other)
{
return Measurement.Equals(other.Measurement);
}

public override bool Equals(object? obj)
{
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != this.GetType()) return false;
return Equals((SeriesConfig)obj);
}

public override int GetHashCode()
{
return Measurement.GetHashCode();
}

public static bool operator ==(SeriesConfig? left, SeriesConfig? right)
{
return Equals(left, right);
}

public static bool operator !=(SeriesConfig? left, SeriesConfig? right)
{
return !Equals(left, right);
}
}
4 changes: 4 additions & 0 deletions src/l1/Flow.Application.Analysis/Flow.Application.Analysis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@
<ProjectReference Include="..\Flow.Application.Transactions\Flow.Application.Transactions.csproj" />
</ItemGroup>

<ItemGroup>
<Folder Include="Infrastructure\" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/l1/Flow.Application.Analysis/SeriesBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Flow.Domain.Analysis;
using Flow.Domain.Analysis.Setup;
using Flow.Application.Analysis.Contract.Setup;
using Flow.Domain.Analysis;
using Flow.Domain.Transactions;
using Range = Flow.Domain.Analysis.Range;

Expand Down
3 changes: 3 additions & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Contract/CSVIO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ protected override void Load(ContainerBuilder builder)
builder.RegisterType<RecordedTransactionsReader>().AsImplementedInterfaces();
builder.RegisterType<RecordedTransactionsWriter>().AsImplementedInterfaces();

builder.RegisterType<TaggedTransactionsReader>().AsImplementedInterfaces();
builder.RegisterType<TaggedTransactionsWriter>().AsImplementedInterfaces();

builder.RegisterType<TransferKeyReader>().AsImplementedInterfaces();
builder.RegisterType<TransfersKeyWriter>().AsImplementedInterfaces();
builder.RegisterType<RejectedTransfersWriter>().AsImplementedInterfaces();
Expand Down
1 change: 1 addition & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Flow.Infrastructure.IO.CSV.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\l0\Flow.Domain.Analysis\Flow.Domain.Analysis.csproj" />
<ProjectReference Include="..\..\..\l0\Flow.Domain.ExchangeRates\Flow.Domain.ExchangeRates.csproj" />
<ProjectReference Include="..\..\..\l0\Flow.Domain.Transactions\Flow.Domain.Transactions.csproj" />
<ProjectReference Include="..\..\..\l1\Flow.Application.Transactions.Contract\Flow.Application.Transactions.Contract.csproj" />
Expand Down
41 changes: 41 additions & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Transactions/TaggedTransactionRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using System.Diagnostics.CodeAnalysis;
using System.Text;
using Flow.Domain.Analysis;
using Flow.Domain.Transactions;

namespace Flow.Infrastructure.IO.CSV.Transactions;

[SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
internal class TaggedTransactionRow : RecordedTransactionRow
{
public string? TAGS { get; set; }

public static explicit operator TaggedTransaction(TaggedTransactionRow row)
{
var recorded = (RecordedTransaction)(RecordedTransactionRow)row;
var tags = row.TAGS?.Split(',').Select(t => new Tag(t.Trim())) ?? Enumerable.Empty<Tag>();

return new TaggedTransaction(recorded, tags);
}

public static explicit operator TaggedTransactionRow(TaggedTransaction t)
{
return new TaggedTransactionRow()
{
TIMESTAMP = t.Timestamp.ToLocalTime(),
AMOUNT = t.Amount,
CURRENCY = t.Currency,
CATEGORY = t.Category,
TITLE = t.Title,
ACCOUNT = t.Account.Name,
BANK = t.Account.Bank,
KEY = t.Key,
CATEGORY_OVERRIDE = t.Overrides?.Category,
TITLE_OVERRIDE = t.Overrides?.Title,
COMMENT = t.Overrides?.Comment,
REVISION = t.Revision,
TAGS = t.Tags.Aggregate(new StringBuilder(), (b, t)=> b.Append(t.Name).Append(", ")).ToString()
};
}
}
26 changes: 26 additions & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Transactions/TaggedTransactionRowMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using CsvHelper.Configuration;
using JetBrains.Annotations;

namespace Flow.Infrastructure.IO.CSV.Transactions;

[UsedImplicitly]
internal sealed class TaggedTransactionRowMap : ClassMap<TaggedTransactionRow>
{
public TaggedTransactionRowMap()
{
Map(m => m.KEY).Index(0);
Map(m => m.TIMESTAMP).Index(1);
Map(m => m.AMOUNT).Index(2);
Map(m => m.CURRENCY).Index(3);
Map(m => m.CATEGORY).Index(4);
Map(m => m.TITLE).Index(5);
Map(m => m.ACCOUNT).Index(6);
Map(m => m.BANK).Index(7);
Map(m => m.COMMENT).Index(8);
Map(m => m.CATEGORY_OVERRIDE).Index(9);
Map(m => m.TITLE_OVERRIDE).Index(10);
Map(m => m.REVISION).Index(12);
Map(m => m.TAGS).Index(11);
}

}
11 changes: 11 additions & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Transactions/TaggedTransactionsReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using CsvHelper.Configuration;
using Flow.Domain.Analysis;

namespace Flow.Infrastructure.IO.CSV.Transactions;

internal class TaggedTransactionsReader : CsvReader<TaggedTransaction, TaggedTransactionRow>
{
public TaggedTransactionsReader(CsvConfiguration config) : base(config, r => (TaggedTransaction)r)
{
}
}
11 changes: 11 additions & 0 deletions src/l2/IO/Flow.Infrastructure.IO.CSV/Transactions/TaggedTransactionsWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using CsvHelper.Configuration;
using Flow.Domain.Analysis;

namespace Flow.Infrastructure.IO.CSV.Transactions;

internal class TaggedTransactionsWriter : CsvWriter<TaggedTransaction, TaggedTransactionRow, TaggedTransactionRowMap>
{
public TaggedTransactionsWriter(CsvConfiguration config) : base(config, t => (TaggedTransactionRow)t)
{
}
}
4 changes: 2 additions & 2 deletions src/l2/IO/Flow.Infrastructure.IO.Calendar/Contract/CalendarConfigParsingResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Flow.Domain.Analysis.Setup;
using Flow.Application.Analysis.Contract.Setup;

namespace Flow.Infrastructure.IO.Calendar.Contract;

Expand All @@ -25,4 +25,4 @@ public CalendarConfigParsingResult(params string[] errors)
public bool Successful => Config != null;

public IEnumerable<string> Errors { get; }
}
}
1 change: 1 addition & 0 deletions src/l2/IO/Flow.Infrastructure.IO.Calendar/Flow.Infrastructure.IO.Calendar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\l0\Flow.Domain.Analysis\Flow.Domain.Analysis.csproj" />
<ProjectReference Include="..\..\..\l1\Flow.Application.Analysis\Flow.Application.Analysis.csproj" />
<ProjectReference Include="..\..\Flow.Infrastructure.Configuration\Flow.Infrastructure.Configuration.csproj" />
<ProjectReference Include="..\Flow.Infrastructure.IO.Contract\Flow.Infrastructure.IO.Contract.csproj" />
<ProjectReference Include="..\Flow.Infrastructure.IO.Criteria\Flow.Infrastructure.IO.Criteria.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/l2/IO/Flow.Infrastructure.IO.Calendar/JsonCalendarConfigParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Linq.Expressions;
using Flow.Application.Analysis.Contract.Setup;
using Flow.Domain.Analysis;
using Flow.Domain.Analysis.Setup;
using Flow.Domain.Patterns;
using Flow.Domain.Transactions;
using Flow.Infrastructure.IO.Calendar.Contract;
Expand Down Expand Up @@ -133,4 +133,4 @@ private IEnumerable<Expression<Func<RecordedTransaction, bool>>> GetRules(IEnume


}
}
}
1 change: 1 addition & 0 deletions src/l2/IO/Flow.Infrastructure.IO.JSON/Contract/JSONIO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ protected override void Load(ContainerBuilder builder)

builder.RegisterType<TransactionsReader>().AsImplementedInterfaces();
builder.RegisterType<RecordedTransactionsReader>().AsImplementedInterfaces();
builder.RegisterType<TaggedTransactionsReader>().AsImplementedInterfaces();

builder.RegisterType<TransferKeyReader>().AsImplementedInterfaces();

Expand Down
1 change: 1 addition & 0 deletions src/l2/IO/Flow.Infrastructure.IO.JSON/Flow.Infrastructure.IO.JSON.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\l0\Flow.Domain.Analysis\Flow.Domain.Analysis.csproj" />
<ProjectReference Include="..\..\..\l0\Flow.Domain.ExchangeRates\Flow.Domain.ExchangeRates.csproj" />
<ProjectReference Include="..\..\..\l0\Flow.Domain.Transactions\Flow.Domain.Transactions.csproj" />
<ProjectReference Include="..\Flow.Infrastructure.IO.Contract\Flow.Infrastructure.IO.Contract.csproj" />
Expand Down
Loading