2 Commits

Author SHA1 Message Date
01bf0193da ajout projet backend vide
All checks were successful
dotnet package / build (8.0.x) (push) Successful in 1m23s
2024-08-25 00:24:54 +02:00
bf41b9f2e4 temp
All checks were successful
dotnet package / build (8.0.x) (push) Successful in 1m29s
temp

fin de l'ajout de données au match
2024-06-18 23:02:49 +02:00
24 changed files with 40 additions and 388 deletions

View File

@@ -1,82 +0,0 @@
name: "Main Build Process"
# Runs on main branch commits,
# every commit in a pull request, any published release.
on:
push:
branches: ["main"]
pull_request:
branches: ["main"]
release:
types: [published]
env:
REGISTRY: gitea.borealian.ovh
IMAGE_NAME: ${{ github.repository }}
jobs:
build:
name: "Build & Test"
# Permissions this GitHub Action needs for other things in GitHub
permissions: write-all
runs-on: ubuntu-latest
steps:
- name: Check out the code
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
10.x
- name: "Restore/Build/Test"
run: |
dotnet test ./src/LittleTown.sln --configuration Release --verbosity normal --logger trx --collect:"XPlat Code Coverage" --logger:"trx;LogFileName=test_results.xml"
- name: Combine Coverage Reports # This is because one report is produced per project, and we want one result for all of them.
uses: danielpalme/ReportGenerator-GitHub-Action@v5.5.1
with:
reports: "**/*.cobertura.xml" # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
targetdir: "${{ github.workspace }}" # REQUIRED # The directory where the generated report should be saved.
reporttypes: "Cobertura" # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, Html_Dark, Html_Light, Html_BlueRed, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlInline_AzurePipelines_Light, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MarkdownSummary, MarkdownSummaryGithub, MarkdownDeltaSummary, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, TextDeltaSummary, Xml, XmlSummary
verbosity: "Info" # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off
title: "Code Coverage" # Optional title.
tag: "${{ github.run_number }}_${{ github.run_id }}" # Optional tag or build version.
customSettings: "" # Optional custom settings (separated by semicolon). See: https://github.com/danielpalme/ReportGenerator/wiki/Settings.
toolpath: "reportgeneratortool" # Default directory for installing the dotnet tool.
- name: Upload Combined Coverage XML
uses: actions/upload-artifact@v3
with:
name: coverage
path: ${{ github.workspace }}/Cobertura.xml
retention-days: 5
- name: Publish Code Coverage Report
uses: irongut/CodeCoverageSummary@v1.3.0
with:
filename: "Cobertura.xml"
badge: true
fail_below_min: false # just informative for now
format: markdown
hide_branch_rate: false
hide_complexity: false
indicators: true
output: both
thresholds: "10 30"
- name: Comment on Gitea PR
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
GITEA_URL: https://gitea.borealian.ovh
REPO_OWNER: mcmuzzle
REPO_NAME: LittleTown
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
COMMENT_CONTENT=$(cat code-coverage-results.md)
curl -X POST \
-H "Authorization: token ${GITEA_TOKEN}" \
-H "Content-Type: application/json" \
-d "{\"body\": \"${COMMENT_CONTENT}\"}" \
${GITEA_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/issues/${PR_NUMBER}/comments

View File

@@ -1,4 +1,4 @@
name: check main state name: dotnet package
on: [push] on: [push]
@@ -8,14 +8,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
dotnet-version: [ '10.0.x' ] dotnet-version: [ '8.0.x' ]
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v4
- name: Setup dotnet - name: Setup dotnet
uses: actions/setup-dotnet@v3 uses: actions/setup-dotnet@v3
with: with:
dotnet-version: '10.0.x' dotnet-version: '8.0.x'
- name: Install dependencies - name: Install dependencies
run: dotnet restore ./src/LittleTown.sln run: dotnet restore ./src/LittleTown.sln
- name: Build - name: Build

4
.gitignore vendored
View File

@@ -14,6 +14,4 @@
bin bin
obj obj
report
tools/
TestResults

View File

@@ -1,6 +0,0 @@
Pour générer la couverture en local il faut installer l'outil :
- dotnet tool install -g dotnet-reportgenerator-globaltool
- dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools
Pour le lancer
- reportgenerator "-reports:src/**/TestResults/**/coverage.cobertura.xml" "-targetdir:./report" "-reporttypes:Html"

View File

@@ -1,16 +0,0 @@
{
"extends": [
"config:base"
],
"packageRules": [
{
"updateTypes": [
"minor",
"patch",
"pin",
"digest"
],
"automerge": false
}
]
}

View File

@@ -1,13 +0,0 @@
#supprimer les dossiers de tests précédents
get-childitem -Include TestResults -Recurse -force | Remove-Item -Force -Recurse
#lancer les tests
dotnet test ./src/LittleTown.sln --configuration Release --verbosity normal --logger trx --collect:"XPlat Code Coverage" --logger:"trx;LogFileName=test_results.xml"
#générer le rapport html
reportgenerator "-reports:src/**/TestResults/**/coverage.cobertura.xml" "-targetdir:./report" "-reporttypes:Html"
#ouvrir le fichier html
report/index.html

View File

@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization> <InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,18 +0,0 @@
using System.Text.Json;
using LittleTown.StaticDataAcces;
namespace LittleTown.Core.Tests;
public class ExceptionTesting
{
[Fact]
public void ExceptionForStaticData()
{
StaticDataGetter getter = new StaticDataGetter("null", "null", "null");
Assert.Throws<JsonException>(() => getter.GetBoard(1));
Assert.Throws<JsonException>(() => getter.GetObjectives());
Assert.Throws<JsonException>(() => getter.GetBuildings());
}
}

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
@@ -10,16 +10,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="16.0.0" /> <PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.CodeCoverage" Version="17.14.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4"> <PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

View File

@@ -17,7 +17,6 @@ public class MatchTesting
Match match2 = new Match(getter); Match match2 = new Match(getter);
match2.AddPlayer("Player1"); match2.AddPlayer("Player1");
match2.AddPlayer("Player2"); match2.AddPlayer("Player2");
Assert.Throws<MatchConfigException>(() => match2.AddPlayer("Player2"));
match2.Init(); match2.Init();
Match match3 = new Match(getter); Match match3 = new Match(getter);
@@ -52,23 +51,10 @@ public class MatchTesting
PlayerZone player1 = match.GetPlayerZone("Player1"); PlayerZone player1 = match.GetPlayerZone("Player1");
PlayerZone player1_3 = match.GetPlayerZone("Player2"); PlayerZone player1_3 = match.GetPlayerZone("Player2");
Assert.Equal(3, player1.Ressources[Enums.ResourceType.Piece]); Assert.Equal(3, player1.Ressources[Enums.ResourceType.Piece]);
player1.AddRessources(ResourceType.Piece, 1); player1.AddRessources(ResourceType.Piece, 1);
Assert.Equal(3, player1_3.Ressources[Enums.ResourceType.Piece]); Assert.Equal(3, player1_3.Ressources[Enums.ResourceType.Piece]);
Assert.Equal(4, player1.Objectives.Count); Assert.Equal(4, player1.Objectives.Count);
} }
[Fact]
public void MatchGetters()
{
StaticDataGetter getter = new();
Match match = new Match(getter);
match.AddPlayer("Player1");
match.AddPlayer("Player2");
match.Init();
Assert.Throws<ArgumentException>(() => match.GetPlayerZone("UnknownPlayer"));
}
} }

View File

@@ -1,34 +0,0 @@
using LittleTown.Core.Actions;
using LittleTown.Core.Exceptions;
using LittleTown.StaticDataAcces;
namespace LittleTown.Core.Tests;
public class MatchWorkflowTesting
{
[Fact]
public void Simple2PlayerGame()
{
StaticDataGetter getter = new StaticDataGetter();
Match match = new Match(getter);
match.AddPlayer("Player1");
match.AddPlayer("Player2");
match.Init();
int count = 0;
while (!match.IsDone)
{
EmptyAction action = new EmptyAction();
match.ExecuteAction(action);
count++;
if (count > 40)
{
Assert.Fail("Trop d'action pour une partie vide");
}
}
Assert.Throws<MatchFinishedException>(() => match.ExecuteAction(new EmptyAction()));
}
}

View File

@@ -1,21 +0,0 @@
namespace LittleTown.Core.Exceptions;
/// <summary>
/// Exception levee quand on essais d'executer une actin dans un match terminé
/// </summary>
public class MatchFinishedException : Exception
{
/// <summary> constructeur de base </summary>
public MatchFinishedException() : base() { }
/// <summary> Constructeur avec un message d'erreur </summary>
/// <param name="message">le message decrivant l'exception en detail</param>
public MatchFinishedException(string message) : base(message) { }
/// <summary>
/// Constructeur avec un message et une exception interne
/// </summary>
/// <param name="message">Le message de l'erreur</param>
/// <param name="innerException">l'exception encapsulée</param>
public MatchFinishedException(string message, Exception innerException) : base(message, innerException) { }
}

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

View File

@@ -1,4 +1,3 @@
using LittleTown.Core.Actions;
using LittleTown.Core.Exceptions; using LittleTown.Core.Exceptions;
using LittleTown.Core.Ports; using LittleTown.Core.Ports;
@@ -9,18 +8,6 @@ namespace LittleTown.Core;
/// </summary> /// </summary>
public class Match public class Match
{ {
/// <summary> LE numero du tour en cours (Partant de 1) </summary>
public int CurrentTurn { get; private set; } = 1;
/// <summary> l'id du joueur a qui c'est le tour de jouer</summary>
public string CurrentPlayer { get => _players[_playerTurnsOrder[_currentPlayerIndex]].PlayerName; }
/// <summary> Indique si le match est terminé </summary>
public bool IsDone { get; private set; }
/// <summary>la liste indiquant l'ordre des joueurs, _playerTurnsOrder[0] donne l'index du 1er joueur, _playerTurnsOrder[1] du second..... </summary>
private List<int> _playerTurnsOrder = new List<int>();
private const int _minPlayerCount = 2; private const int _minPlayerCount = 2;
private const int _maxPlayerCount = 4; private const int _maxPlayerCount = 4;
@@ -33,12 +20,18 @@ public class Match
private Random _random = new Random(); private Random _random = new Random();
private List<PlayerZone> _players = new(); private Dictionary<string, PlayerZone> _players = new();
private int _currentPlayerIndex;
/// <summary> LE numero du tour en cours (Partant de 1) </summary>
public int CurrentTurn { get; private set; } = 1;
/// <summary>la liste indiquant l'ordre des joueurs, _playerTurnsOrder[0] donne l'index du 1er joueur, _playerTurnsOrder[1] du second..... </summary>
private List<int> _playerTurnsOrder = new List<int>();
/// <summary> /// <summary>
/// Constructeur d'une nouvelle partie avec un nombre de joueurs données en parametres /// Constructeur d'une nouvelle partie avec un nombre de joueurs données en parametres
/// </summary> /// </summary>
/// <param name="nbPlayer"></param>
/// <param name="staticData">un objet permettant de récupérer les données statiques du jeu</param> /// <param name="staticData">un objet permettant de récupérer les données statiques du jeu</param>
public Match(IStaticDataGetter staticData) public Match(IStaticDataGetter staticData)
{ {
@@ -55,14 +48,11 @@ public class Match
{ {
if (_players.Count < _maxPlayerCount) if (_players.Count < _maxPlayerCount)
{ {
if (_players.Any(p => p.PlayerName == playerName)) if (_players.ContainsKey(playerName))
{ {
throw new MatchConfigException("Un joueur existe déjà avec ce nom"); throw new MatchConfigException("Un joueur existe déjà avec ce nom");
} }
_players.Add(new PlayerZone() _players.Add(playerName, new PlayerZone());
{
PlayerName = playerName
});
} }
else else
{ {
@@ -70,25 +60,6 @@ public class Match
} }
} }
/// <summary>
/// Demander au match d'executer une action si elle est autorisée
/// </summary>
/// <param name="action">l'action a réaliser</param>
public void ExecuteAction(IAction action)
{
ArgumentNullException.ThrowIfNull(action);
//quelques vérification génériques pour savoir si l'action peut être jouée
if (IsDone)
{
throw new MatchFinishedException("Impossible d'effectuer une action sur un match terminé");
}
//autoriser l'action a s'executer en lui donner les getters dont elle a besoin
action.Execute(this);
}
/// <summary> Initialiser la partie, il faut avoir ajouté les joueurs au préalable </summary> /// <summary> Initialiser la partie, il faut avoir ajouté les joueurs au préalable </summary>
/// <exception cref="MatchConfigException"></exception> /// <exception cref="MatchConfigException"></exception>
public void Init() public void Init()
@@ -99,14 +70,13 @@ public class Match
ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount); ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount);
List<int> freeObjectiveIndexs = Enumerable.Range(0, _objectives.Count).ToList(); List<int> freeObjectiveIndexs = Enumerable.Range(0, _objectives.Count).ToList();
foreach (PlayerZone zone in _players) foreach (PlayerZone zone in _players.Values)
{ {
zone.AddObjectives(GetRandomObjectives(nbPlayer switch zone.AddObjectives(GetRandomObjectives(nbPlayer switch
{ {
2 => 4, 2 => 4,
3 => 3, 3 => 3,
4 => 2, 4 => 2,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors Workers")
}, freeObjectiveIndexs)); }, freeObjectiveIndexs));
zone.AddRessources(Enums.ResourceType.Piece, 3); zone.AddRessources(Enums.ResourceType.Piece, 3);
} }
@@ -136,8 +106,6 @@ public class Match
index = 0; index = 0;
} }
_currentPlayerIndex = 0;
} }
/// <summary> Permet de récuperer une player zone(une copie) </summary> /// <summary> Permet de récuperer une player zone(une copie) </summary>
@@ -145,10 +113,7 @@ public class Match
/// <returns></returns> /// <returns></returns>
public PlayerZone GetPlayerZone(string playerName) public PlayerZone GetPlayerZone(string playerName)
{ {
var value = _players.Where(p => p.PlayerName == playerName).FirstOrDefault(); if (!_players.TryGetValue(playerName, out PlayerZone? value))
if (null == value)
throw new ArgumentException("playerID is out of bound"); throw new ArgumentException("playerID is out of bound");
return value.Clone() as PlayerZone ?? throw new ArgumentException("Cast exception in GetPlayerZone"); ; return value.Clone() as PlayerZone ?? throw new ArgumentException("Cast exception in GetPlayerZone"); ;
@@ -166,18 +131,4 @@ public class Match
} }
return result; return result;
} }
/// <summary> Changer le joueur en cours pour passer au suivant </summary>
public void NextPlayer()
{
_currentPlayerIndex++;
if (_currentPlayerIndex >= _players.Count)
{
_currentPlayerIndex = 0;
CurrentTurn++;
}
if (CurrentTurn >= 4)
{
IsDone = true;
}
}
} }

View File

@@ -7,8 +7,7 @@ public class PlayerZone : ICloneable
/// <summary> Les ressources que possede le joueur </summary> /// <summary> Les ressources que possede le joueur </summary>
public IDictionary<ResourceType, int> Ressources { get; init; } = new Dictionary<ResourceType, int>(); public IDictionary<ResourceType, int> Ressources { get; init; } = new Dictionary<ResourceType, int>();
/// <summary> l'id du joueur a cette zone </summary>
public required string PlayerName { get; init; }
/// <summary> La liste des objectifs que le joueur possede/// </summary> /// <summary> La liste des objectifs que le joueur possede/// </summary>
public IReadOnlyCollection<Objective> Objectives { get => _objectives.AsReadOnly(); init => _objectives = new List<Objective>(value); } public IReadOnlyCollection<Objective> Objectives { get => _objectives.AsReadOnly(); init => _objectives = new List<Objective>(value); }
@@ -33,10 +32,6 @@ public class PlayerZone : ICloneable
} }
} }
/// <summary>
/// Assigner des objectifs au joueur
/// </summary>
/// <param name="objectives"></param>
public void AddObjectives(ICollection<Objective> objectives) public void AddObjectives(ICollection<Objective> objectives)
{ {
_objectives.AddRange(objectives); _objectives.AddRange(objectives);
@@ -50,8 +45,7 @@ public class PlayerZone : ICloneable
{ {
Ressources = new Dictionary<ResourceType, int>(Ressources), Ressources = new Dictionary<ResourceType, int>(Ressources),
Objectives = new List<Objective>(Objectives), Objectives = new List<Objective>(Objectives),
ScoreMarker = ScoreMarker, ScoreMarker = ScoreMarker
PlayerName = PlayerName
}; };
return result; return result;

View File

@@ -1,21 +0,0 @@
namespace LittleTown.Core.Actions;
/// <summary>
/// Un action de test qui permet de faire le déroulé d'une partie, cette action ne fait rien qu'utiliser un ouvrier du joueur et passer au suivant
/// </summary>
public class EmptyAction : IAction
{
/// <inheritdoc/>
public void Execute(Match match)
{
ArgumentNullException.ThrowIfNull(match);
match.NextPlayer();
}
/// <inheritdoc/>
public bool CanExecute(Match match)
{
return true;
}
}

View File

@@ -1,19 +0,0 @@
namespace LittleTown.Core.Actions;
/// <summary>
/// Action qui consiste a poser un pion sur le une case du plateau
/// </summary>
public class FieldAction : IAction
{
/// <inheritdoc/>>
public void Execute(Match match)
{
throw new NotImplementedException();
}
/// <inheritdoc/>>
public bool CanExecute(Match match)
{
return true;
}
}

View File

@@ -1,20 +0,0 @@
namespace LittleTown.Core.Actions;
/// <summary>
/// Interface qui représente ce que doivent implémenter les actions
/// </summary>
public interface IAction
{
/// <summary>
/// Methode demandant a l'action d'appliquer ses changement au match
/// </summary>
/// <param name="match">le match a modifier avec cette action</param>
public void Execute(Match match);
/// <summary>
/// Verifier si cette action peut être effectuée, si elle est légale
/// </summary>
/// <param name="match"></param>
/// <returns></returns>
public bool CanExecute(Match match);
}

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

View File

@@ -9,50 +9,23 @@ namespace LittleTown.StaticDataAcces;
/// </summary> /// </summary>
public class StaticDataGetter : IStaticDataGetter public class StaticDataGetter : IStaticDataGetter
{ {
string _boardData = "";
string _buildingData = "";
string _objectivesData = "";
/// <summary>
/// Constructeur avec les chemin des fichiers de données
/// </summary>
/// <param name="boardData">structure json definissant le plateau</param>
/// <param name="buildingData">structure json definissant les building</param>
/// <param name="objectivesData">structure json definissant les objectifs</param>
public StaticDataGetter(string boardData, string buildingData, string objectivesData)
{
_boardData = boardData;
_objectivesData = objectivesData;
_buildingData = buildingData;
}
/// <summary> Constructeur avec les chemins par défaut, à utiliser pour les tests seulement </summary>
public StaticDataGetter()
{
string boardPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Board1.json");
string buildingPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Buildings.json");
string objectivesPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
ReadFiles(boardPath, buildingPath, objectivesPath);
}
private void ReadFiles(string boardPath, string buildingPath, string objectivesPath)
{
_boardData = File.ReadAllText(boardPath);
_buildingData = File.ReadAllText(buildingPath);
_objectivesData = File.ReadAllText(objectivesPath);
}
/// <inheritdoc/> /// <inheritdoc/>
public Board GetBoard(int version) public Board GetBoard(int version)
{ {
Board board = JsonSerializer.Deserialize<Board>(_boardData) ?? throw new JsonException("Cannot deserialize Board");
string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Board1.json");
string data = File.ReadAllText(path);
Board board = JsonSerializer.Deserialize<Board>(data) ?? throw new JsonException("Cannot deserialize Board");
return board; return board;
} }
/// <inheritdoc/> /// <inheritdoc/>
public ICollection<Building> GetBuildings() public ICollection<Building> GetBuildings()
{ {
List<Building> buildings = JsonSerializer.Deserialize<List<Building>>(_buildingData) ?? throw new JsonException("Cannot deserialize Buildings"); string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Buildings.json");
string data = System.IO.File.ReadAllText(path);
List<Building> buildings = JsonSerializer.Deserialize<List<Building>>(data) ?? throw new JsonException("Cannot deserialize Buildings");
return buildings; return buildings;
} }
@@ -60,7 +33,9 @@ public class StaticDataGetter : IStaticDataGetter
/// <inheritdoc/> /// <inheritdoc/>
public ICollection<Objective> GetObjectives() public ICollection<Objective> GetObjectives()
{ {
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(_objectivesData) ?? throw new JsonException("Cannot deserialize Objectives"); string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
string data = System.IO.File.ReadAllText(path);
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(data) ?? throw new JsonException("Cannot deserialize Objectives");
return objectives; return objectives;
} }