Skip to content

Commit

Permalink
Renaming and cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
zsrdjan committed May 11, 2024
1 parent 74a23f5 commit 0ccf35d
Show file tree
Hide file tree
Showing 29 changed files with 95 additions and 309 deletions.
2 changes: 2 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Features>strict</Features>
<AnalysisLevel>latest</AnalysisLevel>
<WarningLevel>9999</WarningLevel>
</PropertyGroup>

</Project>
6 changes: 3 additions & 3 deletions Fraktalio.Fmodel.sln → Fraktalio.Model.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF314C79-FDC8-4210-98D7-ED7AB13848D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio", "src\Fraktalio\Fraktalio.csproj", "{419C4D5B-DFB7-4387-90A0-97D5DBCDB04D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio.FModel", "src\Fraktalio.FModel\Fraktalio.FModel.csproj", "{419C4D5B-DFB7-4387-90A0-97D5DBCDB04D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio.Contracts", "src\Fraktalio.Contracts\Fraktalio.Contracts.csproj", "{262EE234-6FFF-4C7D-9D29-FE133D3BBF46}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio.FModel.Contracts", "src\Fraktalio.FModel.Contracts\Fraktalio.FModel.Contracts.csproj", "{262EE234-6FFF-4C7D-9D29-FE133D3BBF46}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B68360D-A2C7-416C-BFFA-D0C063E231FE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio.Tests", "test\Fraktalio.Tests\Fraktalio.Tests.csproj", "{445D6510-F66E-4805-B9C8-B03E3A3C0571}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fraktalio.FModel.Tests", "test\Fraktalio.FModel.Tests\Fraktalio.FModel.Tests.csproj", "{445D6510-F66E-4805-B9C8-B03E3A3C0571}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{57E3D8FE-526A-4BB0-BDB2-0E97CAEEC06A}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using JetBrains.Annotations;

namespace Fraktalio.Contracts;
namespace Fraktalio.FModel.Contracts;

using System.Collections.Generic;

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Fraktalio.Contracts\Fraktalio.Contracts.csproj" />
<ProjectReference Include="..\Fraktalio.FModel.Contracts\Fraktalio.FModel.Contracts.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Fraktalio/Saga.cs → src/Fraktalio.FModel/Saga.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Fraktalio.Contracts;
using Fraktalio.FModel.Contracts;

namespace Fraktalio;
namespace Fraktalio.FModel;

/// <summary>
/// Saga is a datatype that represents the central point of control deciding what to execute next ([A])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Fraktalio;
namespace Fraktalio.FModel;

public static class SagaExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Fraktalio;
namespace Fraktalio.FModel;

public static class SagaFactory
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 2,
"dependencies": {
"net8.0": {
"fraktalio.contracts": {
"fraktalio.fmodel.contracts": {
"type": "Project",
"dependencies": {
"JetBrains.Annotations": "[2023.3.0, )"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using FluentAssertions;

namespace Fraktalio.Tests;
namespace Fraktalio.FModel.Tests;

public static class EnumerableExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Fraktalio.Tests.Examples.Numbers;
using Fraktalio.FModel;
using Fraktalio.FModel.Tests.Examples.Numbers;

namespace Fraktalio.Tests.Examples;
namespace Fraktalio.FModel.Tests.Examples;

using EvenNumberEvent = NumberEvent.EvenNumberEvent;
using EvenNumberAdded = NumberEvent.EvenNumberEvent.EvenNumberAdded;
Expand Down Expand Up @@ -38,31 +39,31 @@ private static IEnumerable<NumberCommand> NumberSaga(NumberEvent numberEvent)
{
new OddNumberCommand.AddOddNumber(
new Description($"{evenNumberAdded.Value.Value - 1}"),
new NumberValue(evenNumberAdded.Value.Value - 1)
new Number(evenNumberAdded.Value.Value - 1)
)
},

EvenNumberEvent.EvenNumberSubtracted evenNumberSubtracted => new NumberCommand[]
{
new OddNumberCommand.SubtractOddNumber(
new Description($"{evenNumberSubtracted.Value.Value - 1}"),
new NumberValue(evenNumberSubtracted.Value.Value - 1)
new Number(evenNumberSubtracted.Value.Value - 1)
)
},

OddNumberEvent.OddNumberAdded oddNumberAdded => new NumberCommand[]
{
new EvenNumberCommand.AddEvenNumber(
new Description($"{oddNumberAdded.Value.Value + 1}"),
new NumberValue(oddNumberAdded.Value.Value + 1)
new Number(oddNumberAdded.Value.Value + 1)
)
},

OddNumberEvent.OddNumberSubtracted oddNumberSubtracted => new NumberCommand[]
{
new EvenNumberCommand.SubtractEvenNumber(
new Description($"{oddNumberSubtracted.Value.Value + 1}"),
new NumberValue(oddNumberSubtracted.Value.Value + 1)
new Number(oddNumberSubtracted.Value.Value + 1)
)
},

Expand All @@ -86,7 +87,7 @@ private static IEnumerable<OddNumberCommand> EvenNumberSaga(
{
new OddNumberCommand.AddOddNumber(
new Description($"{evenNumberAdded.Value.Value - 1}"),
new NumberValue(evenNumberAdded.Value.Value - 1)
new Number(evenNumberAdded.Value.Value - 1)
)
},

Expand All @@ -95,7 +96,7 @@ private static IEnumerable<OddNumberCommand> EvenNumberSaga(
{
new OddNumberCommand.SubtractOddNumber(
new Description($"{evenNumberSubtracted.Value.Value - 1}"),
new NumberValue(evenNumberSubtracted.Value.Value - 1)
new Number(evenNumberSubtracted.Value.Value - 1)
)
},

Expand All @@ -119,15 +120,15 @@ public static IEnumerable<EvenNumberCommand> OddNumberSaga(
{
new EvenNumberCommand.AddEvenNumber(
new Description($"{oddNumberAdded.Value.Value + 1}"),
new NumberValue(oddNumberAdded.Value.Value + 1)
new Number(oddNumberAdded.Value.Value + 1)
)
},

OddNumberEvent.OddNumberSubtracted oddNumberSubtracted => new EvenNumberCommand[]
{
new EvenNumberCommand.SubtractEvenNumber(
new Description($"{oddNumberSubtracted.Value.Value - 1}"),
new NumberValue(oddNumberSubtracted.Value.Value - 1)
new Number(oddNumberSubtracted.Value.Value - 1)
)
},

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Fraktalio.Tests.Examples.Numbers;
namespace Fraktalio.FModel.Tests.Examples.Numbers;

public record Description(string Value)
{
Expand All @@ -7,11 +7,7 @@ public record Description(string Value)

public static Description operator -(Description a, Description b) =>
new($"{a.Value} - {b.Value}");
public static Description Create(string value) => new(value);

public static implicit operator string(Description value) => value.Value;
}

public static class DescriptionFactory
{
public static Description Description(Func<string> block) => new(block());
}
14 changes: 14 additions & 0 deletions test/Fraktalio.FModel.Tests/Examples/Numbers/Number.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Fraktalio.FModel.Tests.Examples.Numbers;

public record Number(int Value)
{
public static Description operator +(Number a, Number b) =>
new($"{a.Value} + {b.Value}");

public static Description operator -(Number a, Number b) =>
new($"{a.Value} - {b.Value}");

public static Number Create(int value) => new Number(value);

public static implicit operator int(Number value) => value.Value;
}
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
namespace Fraktalio.Tests.Examples.Numbers;
namespace Fraktalio.FModel.Tests.Examples.Numbers;

public abstract class NumberCommand
{
public abstract Description Description { get; }
public abstract NumberValue Value { get; }
public abstract Number Value { get; }

public abstract class EvenNumberCommand : NumberCommand
{
public sealed class AddEvenNumber(Description description, NumberValue value) : EvenNumberCommand
public sealed class AddEvenNumber(Description description, Number value) : EvenNumberCommand
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}

public sealed class SubtractEvenNumber(Description description, NumberValue value) : EvenNumberCommand
public sealed class SubtractEvenNumber(Description description, Number value) : EvenNumberCommand
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}
}

public abstract class OddNumberCommand : NumberCommand
{
public sealed class AddOddNumber(Description description, NumberValue value) : OddNumberCommand
public sealed class AddOddNumber(Description description, Number value) : OddNumberCommand
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}

public sealed class SubtractOddNumber(Description description, NumberValue value) : OddNumberCommand
public sealed class SubtractOddNumber(Description description, Number value) : OddNumberCommand
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
namespace Fraktalio.Tests.Examples.Numbers;
namespace Fraktalio.FModel.Tests.Examples.Numbers;

public abstract class NumberEvent
{
public abstract Description Description { get; }
public abstract NumberValue Value { get; }
public abstract Number Value { get; }

public abstract class EvenNumberEvent : NumberEvent
{
public sealed class EvenNumberAdded(Description description, NumberValue value) : EvenNumberEvent
public sealed class EvenNumberAdded(Description description, Number value) : EvenNumberEvent
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}

public sealed class EvenNumberSubtracted(Description description, NumberValue value) : EvenNumberEvent
public sealed class EvenNumberSubtracted(Description description, Number value) : EvenNumberEvent
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}
}

public abstract class OddNumberEvent : NumberEvent
{
public sealed class OddNumberAdded(Description description, NumberValue value) : OddNumberEvent
public sealed class OddNumberAdded(Description description, Number value) : OddNumberEvent
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}

public sealed class OddNumberSubtracted(Description description, NumberValue value) : OddNumberEvent
public sealed class OddNumberSubtracted(Description description, Number value) : OddNumberEvent
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
namespace Fraktalio.Tests.Examples.Numbers;
namespace Fraktalio.FModel.Tests.Examples.Numbers.States;

public abstract class NumberState
{
public abstract Description Description { get; }
public abstract NumberValue Value { get; }
public abstract Number Value { get; }
}

public sealed class EvenNumberState(Description description, NumberValue value) : NumberState
public sealed class EvenNumberState(Description description, Number value) : NumberState
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}

public sealed class OddNumberState(Description description, NumberValue value) : NumberState
public sealed class OddNumberState(Description description, Number value) : NumberState
{
public override Description Description { get; } = description;
public override NumberValue Value { get; } = value;
public override Number Value { get; } = value;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Fraktalio.Contracts\Fraktalio.Contracts.csproj" />
<ProjectReference Include="..\..\src\Fraktalio\Fraktalio.csproj" />
<ProjectReference Include="..\..\src\Fraktalio.FModel.Contracts\Fraktalio.FModel.Contracts.csproj" />
<ProjectReference Include="..\..\src\Fraktalio.FModel\Fraktalio.FModel.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Fraktalio.Contracts;
using Fraktalio.FModel.Contracts;

namespace Fraktalio.Tests;
namespace Fraktalio.FModel.Tests;

public static class SagaExtensions
{
Expand Down
Loading

0 comments on commit 0ccf35d

Please sign in to comment.