Skip to content

Commit

Permalink
Fix #223 : Markdown improvments
Browse files Browse the repository at this point in the history
  • Loading branch information
axel3rd committed Jan 7, 2022
1 parent 09e50d6 commit e2a7eb7
Show file tree
Hide file tree
Showing 8 changed files with 375 additions and 224 deletions.
45 changes: 23 additions & 22 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

name: Bug report
about: Create a report to help us improve
title: ''
Expand All @@ -15,36 +16,36 @@ A clear and concise description of what the bug is, with a copy/paste of Java ex

Depending your championship, join data files set in attachment.

1. The MPG Mobile App JSon *Response* of these *Request* on https://api.mpg.football (see wiki [Get MPG data for opening a bug](https://github.com/axel3rd/mpg-coach-bot/wiki/Get-MPG-data-for-opening-a-bug) for authentication and details):
1. The MPG Mobile App JSon *Response* of these *Request* on <https://api.mpg.football> (see wiki [Get MPG data for opening a bug](https://github.com/axel3rd/mpg-coach-bot/wiki/Get-MPG-data-for-opening-a-bug) for authentication and details):

| Feature | URL | Reason |
| --- | --- | --- |
| login | `GET /user/sign-in` | Retrieve **userId** |
| dashboard | `GET /dashboard/leagues` | Retrieve **divisionId** (~ `mpg_division_MLEXXXXX_3_1`) |
| division | `GET /division/mpg_division_MLEXXXXX_3_1` | Retrieve `mpg_team_MLEXXXXX_3_1_2` team for user league |
| team | `GET /team/mpg_team_MLEXXXXX_3_1_2` | Retrieve Team and Bonus for team |
| coach | `GET /division/mpg_division_MLEXXXXX_3_1/coach` | Retrieve formation |
| availablePlayers | `GET /division/mpg_division_MLEXXXXX_3_1/available-players` | Retrieves available players details for incoming mercato or trading |
| poolPlayer | `GET /championship-players-pool/X` | Retrieve league players details (With `X`: 1=Ligue-1 / 2=Premier-League / 3=Liga / 4=Ligue-2 / 5=Serie-A) |
| clubs | `GET /championship-clubs` | Retrieve club names |
| Feature | URL | Reason |
| ---------------- | ----------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
| login | `GET /user/sign-in` | Retrieve **userId** |
| dashboard | `GET /dashboard/leagues` | Retrieve **divisionId** (\~ `mpg_division_MLEXXXXX_3_1`) |
| division | `GET /division/mpg_division_MLEXXXXX_3_1` | Retrieve `mpg_team_MLEXXXXX_3_1_2` team for user league |
| team | `GET /team/mpg_team_MLEXXXXX_3_1_2` | Retrieve Team and Bonus for team |
| coach | `GET /division/mpg_division_MLEXXXXX_3_1/coach` | Retrieve formation |
| availablePlayers | `GET /division/mpg_division_MLEXXXXX_3_1/available-players` | Retrieves available players details for incoming mercato or trading |
| poolPlayer | `GET /championship-players-pool/X` | Retrieve league players details (With `X`: 1=Ligue-1 / 2=Premier-League / 3=Liga / 4=Ligue-2 / 5=Serie-A) |
| clubs | `GET /championship-clubs` | Retrieve club names |

2. The [Players statistics](https://www.mpgstats.fr/) data, one JSon from:

- https://api.mlnstats.com/leagues/Ligue-1
- https://api.mlnstats.com/leagues/Ligue-2
- https://api.mlnstats.com/leagues/Premier-League
- https://api.mlnstats.com/leagues/Liga
- https://api.mlnstats.com/leagues/Serie-A
* <https://api.mlnstats.com/leagues/Ligue-1>
* <https://api.mlnstats.com/leagues/Ligue-2>
* <https://api.mlnstats.com/leagues/Premier-League>
* <https://api.mlnstats.com/leagues/Liga>
* <https://api.mlnstats.com/leagues/Serie-A>

3. The [Players statistics](https://www.mpgstats.fr/) time update data : https://api.mlnstats.com/builds
3. The [Players statistics](https://www.mpgstats.fr/) time update data : <https://api.mlnstats.com/builds>

4. The [Injury / Suspended](https://www.sportsgambler.com/injuries/football/) data, one full HTML from:

- https://maligue2.fr/2020/08/20/joueurs-blesses-et-suspendus/
- https://www.sportsgambler.com/injuries/football/france-ligue-1/
- https://www.sportsgambler.com/injuries/football/england-premier-league/
- https://www.sportsgambler.com/injuries/football/spain-la-liga/
- https://www.sportsgambler.com/injuries/football/italy-serie-a/
* <https://maligue2.fr/2020/08/20/joueurs-blesses-et-suspendus/>
* <https://www.sportsgambler.com/injuries/football/france-ligue-1/>
* <https://www.sportsgambler.com/injuries/football/england-premier-league/>
* <https://www.sportsgambler.com/injuries/football/spain-la-liga/>
* <https://www.sportsgambler.com/injuries/football/italy-serie-a/>

**Expected behavior**

Expand Down
93 changes: 54 additions & 39 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,57 @@
name: Development Build
on:
push:
branches:
- master
push:
branches:
- master
jobs:
Build-Analyse-Publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build (with code coverage)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report
- name: Quality analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.organization=axel3rd-github -Dsonar.host.url=https://sonarcloud.io
- name: Deploy Snapshot (without test, already executed)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn -B deploy -DskipTests -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/axel3rd/mpg-coach-bot
Build-Analyse-Publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: SetUp Node/NPM
uses: actions/setup-node@v2
- name: NPM install
run: npm install
- name: Format toc
run: npm run format-toc
- name: Format main
run: npm run format-main
- name: Format bug
run: npm run format-bug
- name: Format tests
run: npm run format-tests
- name: Commit changes
uses: EndBug/add-and-commit@v7
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build (with code coverage)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report
- name: Quality analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.organization=axel3rd-github -Dsonar.host.url=https://sonarcloud.io
- name: Deploy Snapshot (without test, already executed)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: mvn -B deploy -DskipTests -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/axel3rd/mpg-coach-bot
89 changes: 52 additions & 37 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,55 @@
name: Pull Request
on:
pull_request:
types:
- opened
- synchronize
- reopened
pull_request:
types:
- opened
- synchronize
- reopened
jobs:
Build-Analyse:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build (with code coverage)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report
- name: Quality analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.organization=axel3rd-github -Dsonar.host.url=https://sonarcloud.io
Build-Analyse:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: SetUp Node/NPM
uses: actions/setup-node@v2
- name: NPM install
run: npm install
- name: Format toc
run: npm run format-toc
- name: Format main
run: npm run format-main
- name: Format bug
run: npm run format-bug
- name: Format tests
run: npm run format-tests
- name: Commit changes
uses: EndBug/add-and-commit@v7
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v2
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build (with code coverage)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report
- name: Quality analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.organization=axel3rd-github -Dsonar.host.url=https://sonarcloud.io
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@
/release.properties
/src/test/resources/mpg.properties
/src/test/resources/mpg.properties.save
/src/test/resources/mpg.properties.backup
/src/test/resources/mpg.properties.backup
/node_modules/
/package-lock.json
Loading

0 comments on commit e2a7eb7

Please sign in to comment.