Ajout de commentaire automatique dans les PR
All checks were successful
Main Build Process / Build & Test (push) Successful in 1m37s

This commit is contained in:
2024-06-03 09:16:17 +02:00
parent 35e046a4bb
commit 1d4f373c8f
12 changed files with 350 additions and 27 deletions

View File

@@ -5,6 +5,7 @@ root = true
[*.cs] [*.cs]
dotnet_diagnostic.IDE1006.severity = warning dotnet_diagnostic.IDE1006.severity = warning
dotnet_diagnostic.IDE0005.severity = error dotnet_diagnostic.IDE0005.severity = error
dotnet_diagnostic.CA5394.severity = none
# Exclude generated code # Exclude generated code
[src/**/Migrations/*.cs] [src/**/Migrations/*.cs]

View File

@@ -0,0 +1,82 @@
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@v4
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.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@5.3.8
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,24 +0,0 @@
name: dotnet package
on: [push]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: [ '8.0.x' ]
steps:
- uses: actions/checkout@v4
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Install dependencies
run: dotnet restore ./src/LittleTown.sln
- name: Build
run: dotnet build ./src/LittleTown.sln
- name: Test with the dotnet CLI
run: dotnet test ./src/LittleTown.sln

View File

@@ -10,7 +10,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="xunit" Version="2.4.2" /> <PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@@ -1,3 +1,4 @@
using LittleTown.Core.Enums;
using LittleTown.StaticDataAcces; using LittleTown.StaticDataAcces;
namespace LittleTown.Core.Tests; namespace LittleTown.Core.Tests;
@@ -20,8 +21,17 @@ public class MatchTesting
} }
[Fact] [Fact]
public void CheckBoardBoundaries() public void TwoPlayerInitMatchTest()
{ {
StaticDataGetter getter = new();
Match match = new Match(2, getter);
PlayerZone player1 = match.GetPlayerZone(0);
PlayerZone player1_3 = match.GetPlayerZone(0);
Assert.Equal(3, player1.Ressources[Enums.ResourceType.Piece]);
player1.AddRessources(ResourceType.Piece, 1);
Assert.Equal(3, player1_3.Ressources[Enums.ResourceType.Piece]);
Assert.Equal(4, player1.Objectives.Count);
} }
} }

View File

@@ -1,3 +1,4 @@
using LittleTown.Core.Exceptions;
using LittleTown.Core.Ports; using LittleTown.Core.Ports;
namespace LittleTown.Core; namespace LittleTown.Core;
@@ -9,8 +10,23 @@ public class Match
{ {
private const int _minPlayerCount = 2; private const int _minPlayerCount = 2;
private const int _maxPlayerCount = 4; private const int _maxPlayerCount = 4;
private int _maxWorkerPerPlayer;
private int _maxBuidingPerPlayer;
private readonly Board _board; private readonly Board _board;
private ICollection<Building> _buildings; private ICollection<Building> _buildings;
private ICollection<Objective> _objectives;
private Random _random = new Random();
private Dictionary<int, PlayerZone> _playersZones = new Dictionary<int, PlayerZone>();
/// <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
@@ -24,7 +40,73 @@ public class Match
ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount); ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount);
_board = staticData.GetBoard(1); _board = staticData.GetBoard(1);
_buildings = staticData.GetBuildings(); _buildings = staticData.GetBuildings();
_objectives = staticData.GetObjectives();
List<int> freeObjectiveIndexs = Enumerable.Range(0, _objectives.Count).ToList();
for (int i = 0; i < nbPlayer; i++)
{
PlayerZone zone = new PlayerZone()
{
Objectives = GetRandomObjectives(nbPlayer switch
{
2 => 4,
3 => 3,
4 => 2,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors des objectifs")
}, freeObjectiveIndexs)
};
zone.AddRessources(Enums.ResourceType.Piece, 3);
_playersZones.Add(i, zone);
}
_maxWorkerPerPlayer = nbPlayer switch
{
2 => 5,
3 => 4,
4 => 3,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors Workers")
};
_maxBuidingPerPlayer = nbPlayer switch
{
2 => 7,
3 => 6,
4 => 6,
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors building")
};
// preparer l'ordre des joueurs
int index = _random.Next(nbPlayer);
for (int i = 0; i < nbPlayer; ++i)
{
_playerTurnsOrder.Add(index++);
if (index >= nbPlayer)
index = 0;
}
}
/// <summary> Permet de récuperer une player zone(une copie) </summary>
/// <param name="playerId"></param>
/// <returns></returns>
public PlayerZone GetPlayerZone(int playerId)
{
ArgumentOutOfRangeException.ThrowIfLessThan(playerId, 0);
ArgumentOutOfRangeException.ThrowIfGreaterThan(playerId, _playersZones.Count - 1);
return _playersZones[playerId].Clone() as PlayerZone ?? throw new ArgumentException("playerID is out of bound");
}
private List<Objective> GetRandomObjectives(int number, List<int> freeIndex)
{
List<Objective> result = new List<Objective>();
for (int i = 0; i < number; i++)
{
int randomIndex = _random.Next(freeIndex.Count);
int cardIndex = freeIndex[randomIndex];
freeIndex.RemoveAt(randomIndex);
result.Add(_objectives.ElementAt(randomIndex));
}
return result;
} }
} }

View File

@@ -0,0 +1,18 @@
namespace LittleTown.Core;
/// <summary>
/// Représente une carte objectif dans le jeu, les objectif sont des conditions qui une fois remplie accordent des points au joueur
/// </summary>
public class Objective
{
/// <summary> la description, une clé pour la traduction </summary>
public string Description { get; init; }
/// <summary> la condition de l'objectif sous forme de formule </summary>
public string Formula { get; init; } = string.Empty;
/// <summary> le nombre de points que procure cet objectif </summary>
public int Points { get; init; }
/// <summary> indique si l'objectif a deja été atteint ou non, un objectif ne peut etre atteint qu'une fois </summary>
public bool Filled { get; init; }
}

View File

@@ -0,0 +1,45 @@
using LittleTown.Core.Enums;
namespace LittleTown.Core;
/// <summary> Représente les données propre à un joueur </summary>
public class PlayerZone : ICloneable
{
/// <summary> Les ressources que possede le joueur </summary>
public IDictionary<ResourceType, int> Ressources { get; init; } = new Dictionary<ResourceType, int>();
/// <summary> La liste des objectifs que le joueur possede/// </summary>
public IReadOnlyCollection<Objective> Objectives { get; init; } = new List<Objective>();
/// <summary> Le marqueur de score pendant le match </summary>
public int ScoreMarker { get; init; }
/// <summary> Permet d'ajouter d'une type de ressources au stock du joueur </summary>
/// <param name="res">le type de ressources</param>
/// <param name="qte">la quantité non nulle non négative</param>
public void AddRessources(ResourceType res, int qte)
{
ArgumentOutOfRangeException.ThrowIfLessThan(qte, 1);
if (Ressources.ContainsKey(res))
{
Ressources[res] += qte;
}
else
{
Ressources.Add(res, qte);
}
}
/// <summary> Cloner ce playerZone </summary>
/// <returns>Une copie de l'objet</returns>
public object Clone()
{
PlayerZone result = new PlayerZone()
{
Ressources = new Dictionary<ResourceType, int>(Ressources),
Objectives = new List<Objective>(Objectives),
ScoreMarker = ScoreMarker
};
return result;
}
}

View File

@@ -13,4 +13,9 @@ public interface IStaticDataGetter
/// <summary> Recupérer la liste des batiments et leurs données statiques </summary> /// <summary> Recupérer la liste des batiments et leurs données statiques </summary>
/// <returns></returns> /// <returns></returns>
public ICollection<Building> GetBuildings(); public ICollection<Building> GetBuildings();
/// <summary> Récupérer la liste des objectifs du jeu </summary>
/// <returns></returns>
public ICollection<Objective> GetObjectives();
} }

View File

@@ -0,0 +1,92 @@
[
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
}
]

View File

@@ -29,4 +29,14 @@ public class StaticDataGetter : IStaticDataGetter
return buildings; return buildings;
} }
/// <inheritdoc/>
public ICollection<Objective> GetObjectives()
{
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;
}
} }