From 2f7db9162881fb86c2f775e81f764261de35ce5a Mon Sep 17 00:00:00 2001 From: clemcle81500 Date: Fri, 11 Apr 2025 16:25:57 +0200 Subject: [PATCH 01/19] Ce que tu veux --- FencerJudgeBack/build.gradle.kts | 1 + .../fencerjudgeback/entities/MatchBean.kt | 18 ++++++++++++++++++ .../fencerjudgeback/entities/PlayerBean.kt | 14 ++++++++++++++ .../fencerjudgeback/entities/RefereeBean.kt | 13 +++++++++++++ .../repositories/MatchRepository.kt | 9 +++++++++ .../repositories/PlayerRepository.kt | 7 +++++++ .../restControllers/MatchRestController.kt | 7 +++++++ .../fencerjudgeback/services/MatchService.kt | 17 +++++++++++++++++ .../fencerjudgeback/services/PlayerService.kt | 11 +++++++++++ 9 files changed, 97 insertions(+) create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/MatchRepository.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt diff --git a/FencerJudgeBack/build.gradle.kts b/FencerJudgeBack/build.gradle.kts index 729b120..1f21aeb 100644 --- a/FencerJudgeBack/build.gradle.kts +++ b/FencerJudgeBack/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") developmentOnly("org.springframework.boot:spring-boot-devtools") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt new file mode 100644 index 0000000..a7b4e9b --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt @@ -0,0 +1,18 @@ +package fr.teamflash.fencerjudgeback.entities + +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name="match") +data class MatchBean( + @Id + val id:Long?=null, + val player1:PlayerBean?=null, + val player2:PlayerBean?=null, + val referee: RefereeBean?=null, + val score1:Int=0, + val score2:Int=0, + val date:String?=null +) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt new file mode 100644 index 0000000..baed789 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt @@ -0,0 +1,14 @@ +package fr.teamflash.fencerjudgeback.entities + +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name="player") +data class PlayerBean( + @Id + val id:Long?=null, + val name:String?="", + val firstName:String?="" +) \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt new file mode 100644 index 0000000..7e55ed9 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt @@ -0,0 +1,13 @@ +package fr.teamflash.fencerjudgeback.entities + +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name="referee") +data class RefereeBean( + @Id + val id:Long?=null, + val name:Long?=null, +) \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/MatchRepository.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/MatchRepository.kt new file mode 100644 index 0000000..728d059 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/MatchRepository.kt @@ -0,0 +1,9 @@ +package fr.teamflash.fencerjudgeback.repositories + +import fr.teamflash.fencerjudgeback.entities.MatchBean +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository + +@Repository +interface MatchRepository: JpaRepository { +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt new file mode 100644 index 0000000..5a2a2a0 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt @@ -0,0 +1,7 @@ +package fr.teamflash.fencerjudgeback.repositories + +import fr.teamflash.fencerjudgeback.entities.PlayerBean +import org.springframework.data.jpa.repository.JpaRepository + +interface PlayerRepository: JpaRepository { +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt new file mode 100644 index 0000000..1123f8d --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt @@ -0,0 +1,7 @@ +package fr.teamflash.fencerjudgeback.restControllers + +import org.springframework.web.bind.annotation.RestController + +@RestController +class MatchRestController { +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt new file mode 100644 index 0000000..688db67 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt @@ -0,0 +1,17 @@ +package fr.teamflash.fencerjudgeback.services + +import fr.teamflash.fencerjudgeback.entities.MatchBean +import fr.teamflash.fencerjudgeback.entities.PlayerBean +import fr.teamflash.fencerjudgeback.repositories.MatchRepository +import org.springframework.stereotype.Service + +@Service +class MatchService(matchRepository: MatchRepository) { + + fun getMatchById(id:Long){} + fun getMatchByPlayer(playerBean: PlayerBean) {} + fun getMatchs(){} + fun createMatch(match: MatchBean){} + fun updateMatchScore(score1:Int, score2:Int){} + fun delMatch(match:MatchBean){} +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt new file mode 100644 index 0000000..5a0c1ce --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt @@ -0,0 +1,11 @@ +package fr.teamflash.fencerjudgeback.services + +import fr.teamflash.fencerjudgeback.entities.PlayerBean +import org.springframework.stereotype.Service + +@Service +class PlayerService { + fun getPlayerById(id:Long){} + fun getPlayers(){} + fun getPlayerByName(name:String){} +} \ No newline at end of file From a4e188bff8ca058bceb79822dc4b5dfcdba81dad Mon Sep 17 00:00:00 2001 From: pedro Date: Wed, 21 May 2025 22:49:58 +0200 Subject: [PATCH 02/19] plan d'action pour le dev --- FencerJudgeBack/README.md | 75 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 FencerJudgeBack/README.md diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md new file mode 100644 index 0000000..905e02b --- /dev/null +++ b/FencerJudgeBack/README.md @@ -0,0 +1,75 @@ +## Entités +MATCHS -> MatchBean, MatchRepository +MatchBean: + - id:Long + - player1:PlayerBean + - player2:PlayerBean + - referee:RefereeBean + - score1:Int (score du player1) + - score2:Int (score du player2) + - date:String (date du match) + - state:String (état du match : terminé, en cours, pas commencé) + +REFEREES (arbitres) -> RefereeBean, RefereeRepository +RefereeBean: + - id:Long + - name:Long + +PLAYERS -> PlayerBean, PlayerRepository +PlayerBean: + - id:Long + - name:String (nom) + - firstName:String (prénom) + +## Services +MatchService: + -> + +RefereeService: +PlayerService: + +## RestControllers +MatchRestController: + -> Lister tous les matchs + -> Lister tous les matchs à partir d'une certaine date + -> Lister les matchs en cours (état : en cours) + -> Lister les matchs terminés (état : terminé) + -> Lister les matchs non commencés (état : non commencé) + + -> Afficher un match par id + -> Mettre à jour le score1 d'un match récupéré par id + -> Mettre à jour le score2 d'un match récupéré par id + + -> Ajouter un match (créer nouveau MatchBean dans MatchRepository) + + -> Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) + +RefereeRestController: + -> Lister tous les arbitres + -> Afficher un arbitre par id + -> Afficher un arbitre par nom + + -> Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) + + -> Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) + +PlayerRestController: + -> Lister tous les joueurs + -> Afficher un joueur par id + -> Afficher un joueur par nom + + -> Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) + + -> Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) + +## Pages +Page des matchs (publique) : + à définir (partie front sur Angular ?) + +Page de connexion à l'administration (publique) : + formulaire : + - nom d'utilisateur + - mot de passe + +Page d'administration (privée) : + à définir (partie front sur Angular ?) \ No newline at end of file From 1bfb3328f28bd018f974b252de9f98b62fc2c88a Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 27 May 2025 22:20:05 +0200 Subject: [PATCH 03/19] =?UTF-8?q?maj=20plan=20d'action,=20pr=C3=A9voir=20u?= =?UTF-8?q?pdate=20des=20entr=C3=A9es=20dans=20les=20repositories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FencerJudgeBack/README.md | 55 +++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index 905e02b..efcf604 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,3 +1,6 @@ +## Websocket +-> Ouvrir channel websocket sur port 8500 + ## Entités MATCHS -> MatchBean, MatchRepository MatchBean: @@ -20,14 +23,7 @@ PlayerBean: - id:Long - name:String (nom) - firstName:String (prénom) - -## Services -MatchService: - -> - -RefereeService: -PlayerService: - + ## RestControllers MatchRestController: -> Lister tous les matchs @@ -62,6 +58,49 @@ PlayerRestController: -> Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) + +## Services +MatchService: + -> Obtenir tous les matchs (public) + -> MatchRestController : Lister tous les matchs + -> Obtenir un match par id (public) + -> MatchRestController : Afficher un match par id + -> Ajouter un match (admin) + -> MatchRestController : Ajouter un match (créer nouveau MatchBean dans MatchRepository) + -> Modifier un match (admin) + -> PAS ENCORE PREVU + -> Supprimer un match (admin) + -> MatchRestController : Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) + +RefereeService: + -> Obtenir tous les arbitres (public) + -> RefereeRestController : Lister tous les arbitres + -> Obtenir un arbitre par id (public) + -> RefereeRestController : Afficher un arbitre par id + -> Obtenir un arbitre par nom (public) + -> RefereeRestController : Afficher un arbitre par nom + -> Ajouter un arbitre (admin) + -> RefereeRestController : Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) + -> Modifier un arbitre (admin) + -> PAS ENCORE PREVU + -> Supprimer un arbitre (admin) + -> RefereeRestController : Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) + +PlayerService: + -> Obtenir tous les joueurs (public) + -> PlayerRestController: Lister tous les joueurs + -> Obtenir un joueur par id (public) + -> PlayerRestController: Afficher un joueur par id + -> Obtenir un joueur par nom (public) + -> PlayerRestController: Afficher un joueur par nom + -> Ajouter un joueur (admin) + -> PlayerRestController: Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) + -> Modifier un joueur (admin) + -> PAS ENCORE PREVU + -> Supprimer un joueur (admin) + -> PlayerRestController: Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) + + ## Pages Page des matchs (publique) : à définir (partie front sur Angular ?) From 3e95cde4d016792511feabde07ad4584665b9ec6 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 30 May 2025 13:02:42 +0200 Subject: [PATCH 04/19] maj plan d'action, todo restants --- FencerJudgeBack/README.md | 272 ++++++++++++++++++++++++++++---------- 1 file changed, 199 insertions(+), 73 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index efcf604..3af72fa 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,5 +1,5 @@ ## Websocket --> Ouvrir channel websocket sur port 8500 +// Ouvrir channel websocket sur port 8500 ## Entités MATCHS -> MatchBean, MatchRepository @@ -24,82 +24,208 @@ PlayerBean: - name:String (nom) - firstName:String (prénom) -## RestControllers -MatchRestController: - -> Lister tous les matchs - -> Lister tous les matchs à partir d'une certaine date - -> Lister les matchs en cours (état : en cours) - -> Lister les matchs terminés (état : terminé) - -> Lister les matchs non commencés (état : non commencé) - - -> Afficher un match par id - -> Mettre à jour le score1 d'un match récupéré par id - -> Mettre à jour le score2 d'un match récupéré par id - - -> Ajouter un match (créer nouveau MatchBean dans MatchRepository) - - -> Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) - -RefereeRestController: - -> Lister tous les arbitres - -> Afficher un arbitre par id - -> Afficher un arbitre par nom - - -> Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) - - -> Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) - -PlayerRestController: - -> Lister tous les joueurs - -> Afficher un joueur par id - -> Afficher un joueur par nom - - -> Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) - - -> Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) - - ## Services -MatchService: - -> Obtenir tous les matchs (public) - -> MatchRestController : Lister tous les matchs - -> Obtenir un match par id (public) - -> MatchRestController : Afficher un match par id - -> Ajouter un match (admin) - -> MatchRestController : Ajouter un match (créer nouveau MatchBean dans MatchRepository) - -> Modifier un match (admin) - -> PAS ENCORE PREVU - -> Supprimer un match (admin) - -> MatchRestController : Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) +MatchService --> TODO: + // Obtenir tous les matchs (public) --> DONE + function getAll() -> array : + return MatchRepository.getAll() + + // Obtenir un match par id (public) --> DONE + function get(var long id) -> MatchBean : + return MatchRepository.findById(id) + + // Ajouter un match (admin) --> DONE + function add(var MatchBean newMatch) -> integer (success or failure) : + try: + MatchRepository.add(newMatch) + catch error: + return FAILED + + return SUCCESS + + + // Modifier un match (admin) --> TODO + function update(var long id, ...) -> integer (success or failure) : + try: + MatchRepository. + catch error: + return FAILED + + return SUCCESS + + // Supprimer un match (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + MatchRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS -RefereeService: - -> Obtenir tous les arbitres (public) - -> RefereeRestController : Lister tous les arbitres - -> Obtenir un arbitre par id (public) - -> RefereeRestController : Afficher un arbitre par id - -> Obtenir un arbitre par nom (public) - -> RefereeRestController : Afficher un arbitre par nom - -> Ajouter un arbitre (admin) - -> RefereeRestController : Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) - -> Modifier un arbitre (admin) - -> PAS ENCORE PREVU - -> Supprimer un arbitre (admin) - -> RefereeRestController : Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) +RefereeService --> TODO: + // Obtenir tous les arbitres (public) --> DONE + function getAll() -> array : + return RefereeRepository.getAll() + + // Obtenir un arbitre par id (public) --> DONE + function get(var long id) -> RefereeBean : + return RefereeRepository.findById(id) + + // Obtenir un arbitre par nom (public) --> DONE + function get(var string name) -> RefereeBean : + return RefereeRepository.findByName(name) + + // Ajouter un arbitre (admin) --> DONE + function add(var RefereeBean newReferee) -> integer (success or failure) : + try: + RefereeRepository.add(newReferee) + catch error: + return FAILED + + return SUCCESS + + // Modifier un arbitre (admin) --> TODO + function update(var long id, ...) -> integer (success or failure) : + try: + RefereeRepository. + catch error: + return FAILED + + return SUCCESS + + // Supprimer un arbitre (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + RefereeRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS -PlayerService: - -> Obtenir tous les joueurs (public) - -> PlayerRestController: Lister tous les joueurs - -> Obtenir un joueur par id (public) - -> PlayerRestController: Afficher un joueur par id - -> Obtenir un joueur par nom (public) - -> PlayerRestController: Afficher un joueur par nom - -> Ajouter un joueur (admin) - -> PlayerRestController: Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) - -> Modifier un joueur (admin) - -> PAS ENCORE PREVU - -> Supprimer un joueur (admin) - -> PlayerRestController: Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) +PlayerService --> TODO: + // Obtenir tous les joueurs (public) --> DONE + function getAll() -> array : + return PlayerRepository.getAll() + + // Obtenir un joueur par id (public) --> DONE + function get(var long id) -> PlayerBean : + return PlayerRepository.findById(id) + + // Obtenir un joueur par nom (public) --> DONE + function get(var string name) -> PlayerBean : + return PlayerRepository.findByName(name) + + // Ajouter un joueur (admin) --> DONE + function add(var PlayerBean newPlayer) -> integer (success or failure) : + try: + PlayerRepository.add(newPlayer) + catch error: + return FAILED + + return SUCCESS + + // Modifier un joueur (admin) --> TODO + function update(var long id, ...) -> integer (success or failure) : + try: + PlayerRepository. + catch error: + return FAILED + + return SUCCESS + // Supprimer un joueur (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + PlayerRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS + +## RestControllers +MatchRestController --> TODO: + // Lister tous les matchs --> DONE + function getAll() -> array : + return MatchService.getAll() + + // Lister tous les matchs à partir d'une certaine date + function getAllFromDate(var Date dateToFilter) -> array : + return MatchService.getAll().filter(date == dateToFilter) + + // Lister les matchs en cours (état : en cours) + function getAllActive() -> array : + return MatchService.getAll().filter(state == "ONGOING") + + // Lister les matchs terminés (état : terminé) + function getAllOver() -> array : + return MatchService.getAll().filter(state == "FINISHED") + + // Lister les matchs non commencés (état : non commencé) + function getAllNotStarted() -> array : + // MatchService : + return MatchService.getAll().filter(state == "NOT STARTED") + + // Afficher un match par id + function get(var long id) -> MatchBean : + return MatchService.get(id) + + // Mettre à jour le score1 d'un match récupéré par id --> TODO + function updateScore1Of(var long id, var integer newScore) -> integer (success or failure) : + return MatchService.update( + + // Mettre à jour le score2 d'un match récupéré par id --> TODO + function updateScore2Of(var long id, var integer newScore) -> integer (success or failure) : + return MatchService.update( + + // Ajouter un match (créer nouveau MatchBean dans MatchRepository) + function add(var MatchBean newMatch) -> integer (success or failure): + return MatchService.add(newMatch) + + // Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return MatchService.deleteById(id) + +RefereeRestController --> DONE: + // Lister tous les arbitres + function getAll() -> array : + return RefereeService.getAll() + + // Afficher un arbitre par id + function get(var long id) -> RefereeBean : + return RefereeService.get(id) + + // Afficher un arbitre par nom + function get(var string name) -> RefereeBean: + return RefereeService.get(name) + + // Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) + function add(var RefereeBean newReferee) -> integer (success or failure) : + return RefereeService.add(newReferee) + + // Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return RefereeService.deleteById(id) + +PlayerRestController --> DONE: + // Lister tous les joueurs + function getAll() -> array : + return PlayerService.getAll() + + // Afficher un joueur par id + function get(var long id) -> PlayerBean : + return PlayerService.get(id) + + // Afficher un joueur par nom + function get(var string name) -> PlayerBean : + return PlayerService.get(name) + + // Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) + function add(var PlayerBean newPlayer) -> integer (success or failure) : + return PlayerService.add(newPlayer) + + // Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return PlayerService.deleteById(id) ## Pages Page des matchs (publique) : From a248cdabdcfab4bc0f4003b69f173884ac91c0f8 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 30 May 2025 19:18:55 +0200 Subject: [PATCH 05/19] commit avant ajout messages dans websocket pour les restcontrollers --- FencerJudgeBack/README.md | 106 ++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index 3af72fa..4113eaa 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,5 +1,8 @@ ## Websocket -// Ouvrir channel websocket sur port 8500 +// Ouvrir channel websocket sur port 8500 --> DONE +function startWebsocket(var integer port) -> Websocket: + var Websocket websocket = start Websocket at port [port] + return websocket ## Entités MATCHS -> MatchBean, MatchRepository @@ -16,7 +19,8 @@ MatchBean: REFEREES (arbitres) -> RefereeBean, RefereeRepository RefereeBean: - id:Long - - name:Long + - name:Long (nom) + - firstName:String (prénom) PLAYERS -> PlayerBean, PlayerRepository PlayerBean: @@ -25,7 +29,7 @@ PlayerBean: - firstName:String (prénom) ## Services -MatchService --> TODO: +MatchService --> DONE: // Obtenir tous les matchs (public) --> DONE function getAll() -> array : return MatchRepository.getAll() @@ -35,23 +39,23 @@ MatchService --> TODO: return MatchRepository.findById(id) // Ajouter un match (admin) --> DONE - function add(var MatchBean newMatch) -> integer (success or failure) : - try: - MatchRepository.add(newMatch) - catch error: - return FAILED + function add(var MatchBean newMatch) -> MatchBean : + MatchRepository.add(newMatch) + return newMatch + + // Modifier un match (admin) --> DONE + function update(var long id, var PlayerBean player1, var PlayerBean player2, var RefereeBean referee, var integer score1, var integer score2, var Date date, var string state) -> MatchBean: + // Créer nouveau MatchBean + var MatchBean newMatch = new MatchBean(id, player1, player2, referee, score1, score2, date, state) - return SUCCESS - - - // Modifier un match (admin) --> TODO - function update(var long id, ...) -> integer (success or failure) : - try: - MatchRepository. - catch error: - return FAILED - - return SUCCESS + // Supprimer le MatchBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau MatchBean à l'id en paramètre + MatchRepository.add(newMatch) + + return newMatch + // Supprimer un match (admin) --> DONE function delete(var long id) -> integer (success or failure) : @@ -62,7 +66,7 @@ MatchService --> TODO: return SUCCESS -RefereeService --> TODO: +RefereeService --> DONE: // Obtenir tous les arbitres (public) --> DONE function getAll() -> array : return RefereeRepository.getAll() @@ -76,22 +80,22 @@ RefereeService --> TODO: return RefereeRepository.findByName(name) // Ajouter un arbitre (admin) --> DONE - function add(var RefereeBean newReferee) -> integer (success or failure) : - try: - RefereeRepository.add(newReferee) - catch error: - return FAILED - - return SUCCESS + function add(var RefereeBean newReferee) -> RefereeBean: + RefereeRepository.add(newReferee) + return newReferee - // Modifier un arbitre (admin) --> TODO - function update(var long id, ...) -> integer (success or failure) : - try: - RefereeRepository. - catch error: - return FAILED - - return SUCCESS + // Modifier un arbitre (admin) --> DONE + function update(var long id, var string name, var string firstName) -> RefereeBean: + // Créer nouveau RefereeBean + var RefereeBean newReferee = new RefereeBean(id, name, firstName) + + // Supprimer le RefereeBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau RefereeBean à l'id en paramètre + RefereeRepository.add(newReferee) + + return newReferee // Supprimer un arbitre (admin) --> DONE function delete(var long id) -> integer (success or failure) : @@ -102,7 +106,7 @@ RefereeService --> TODO: return SUCCESS -PlayerService --> TODO: +PlayerService --> DONE: // Obtenir tous les joueurs (public) --> DONE function getAll() -> array : return PlayerRepository.getAll() @@ -116,22 +120,22 @@ PlayerService --> TODO: return PlayerRepository.findByName(name) // Ajouter un joueur (admin) --> DONE - function add(var PlayerBean newPlayer) -> integer (success or failure) : - try: - PlayerRepository.add(newPlayer) - catch error: - return FAILED - - return SUCCESS + function add(var PlayerBean newPlayer) -> PlayerBean: + PlayerRepository.add(newPlayer) + return newPlayer - // Modifier un joueur (admin) --> TODO - function update(var long id, ...) -> integer (success or failure) : - try: - PlayerRepository. - catch error: - return FAILED - - return SUCCESS + // Modifier un joueur (admin) --> DONE + function update(var long id, var string name, var string firstName) -> PlayerBean : + // Créer nouveau PlayerBean + var PlayerBean newPlayer = new PlayerBean(id, name, firstName) + + // Supprimer le PlayerBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau PlayerBean à l'id en paramètre + PlayerRepository.add(newPlayer) + + return newPlayer // Supprimer un joueur (admin) --> DONE function delete(var long id) -> integer (success or failure) : From d797c43480244ea8e472d39b9ae62da27c7f5891 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 30 May 2025 19:44:50 +0200 Subject: [PATCH 06/19] =?UTF-8?q?maj=20README,=20fichier=20conception=20av?= =?UTF-8?q?ec=20pseudo-code=20(=C3=A0=20finir)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FencerJudgeBack/README.md | 283 ++++++--------------------------- FencerJudgeBack/conception.txt | 244 ++++++++++++++++++++++++++++ 2 files changed, 290 insertions(+), 237 deletions(-) create mode 100644 FencerJudgeBack/conception.txt diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index 4113eaa..0eaa707 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,244 +1,53 @@ -## Websocket -// Ouvrir channel websocket sur port 8500 --> DONE -function startWebsocket(var integer port) -> Websocket: - var Websocket websocket = start Websocket at port [port] - return websocket +# Entités +## MATCHS +- id +- player1 +- player2 +- referee (arbitre) +- score1 (score du joueur 1) +- score2 (score du joueur 2) +- date +- state (état du match : en cours, terminé, pas commencé) -## Entités -MATCHS -> MatchBean, MatchRepository -MatchBean: - - id:Long - - player1:PlayerBean - - player2:PlayerBean - - referee:RefereeBean - - score1:Int (score du player1) - - score2:Int (score du player2) - - date:String (date du match) - - state:String (état du match : terminé, en cours, pas commencé) +## ETATS D'UN MATCH +- ONGOING +- OVER +- NOT_STARTED -REFEREES (arbitres) -> RefereeBean, RefereeRepository -RefereeBean: - - id:Long - - name:Long (nom) - - firstName:String (prénom) +## ARBITRES +- id +- name (nom de famille) +- firstName (prénom) -PLAYERS -> PlayerBean, PlayerRepository -PlayerBean: - - id:Long - - name:String (nom) - - firstName:String (prénom) - -## Services -MatchService --> DONE: - // Obtenir tous les matchs (public) --> DONE - function getAll() -> array : - return MatchRepository.getAll() - - // Obtenir un match par id (public) --> DONE - function get(var long id) -> MatchBean : - return MatchRepository.findById(id) - - // Ajouter un match (admin) --> DONE - function add(var MatchBean newMatch) -> MatchBean : - MatchRepository.add(newMatch) - return newMatch - - // Modifier un match (admin) --> DONE - function update(var long id, var PlayerBean player1, var PlayerBean player2, var RefereeBean referee, var integer score1, var integer score2, var Date date, var string state) -> MatchBean: - // Créer nouveau MatchBean - var MatchBean newMatch = new MatchBean(id, player1, player2, referee, score1, score2, date, state) - - // Supprimer le MatchBean à l'id en paramètre - deleteById(id) - - // Insérer le nouveau MatchBean à l'id en paramètre - MatchRepository.add(newMatch) - - return newMatch +## JOUEURS +- id +- name (nom de famille) +- firstName (prénom) - - // Supprimer un match (admin) --> DONE - function delete(var long id) -> integer (success or failure) : - try: - MatchRepository.deleteById(id) - catch error: - return FAILED - - return SUCCESS +# Actions REST sur les entités +## MATCHS (MatchRestController) +- Lister tous les matchs -> MatchRestController.**getAll()** +- Lister tous les matchs à partir d'une certaine date -> MatchRestController.**getAllFromDate(Date date)** +- Lister les matchs en cours (état : en cours) -> MatchRestController.**getAllActive()** +- Lister les matchs terminés (état : terminé) -> MatchRestController.**getAllOver()** +- Lister les matchs non commencés (état : non commencé) -> MatchRestController.**getAllNotStarted()** +- Afficher un match par id -> MatchRestController.**get(Long matchID)** +- Mettre à jour le score1 d'un match récupéré par id -> MatchRestController.**updateScore1Of(Long matchID, String newScore1)** +- Mettre à jour le score2 d'un match récupéré par id -> MatchRestController.**updateScore2Of(Long matchID, String newScore2)** +- Ajouter un match -> MatchRestController.**add(Date date, Long refereeID, Long player1ID, Long player2ID)** +- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> MatchRestController.**delete(Long matchID)** -RefereeService --> DONE: - // Obtenir tous les arbitres (public) --> DONE - function getAll() -> array : - return RefereeRepository.getAll() - - // Obtenir un arbitre par id (public) --> DONE - function get(var long id) -> RefereeBean : - return RefereeRepository.findById(id) - - // Obtenir un arbitre par nom (public) --> DONE - function get(var string name) -> RefereeBean : - return RefereeRepository.findByName(name) - - // Ajouter un arbitre (admin) --> DONE - function add(var RefereeBean newReferee) -> RefereeBean: - RefereeRepository.add(newReferee) - return newReferee - - // Modifier un arbitre (admin) --> DONE - function update(var long id, var string name, var string firstName) -> RefereeBean: - // Créer nouveau RefereeBean - var RefereeBean newReferee = new RefereeBean(id, name, firstName) - - // Supprimer le RefereeBean à l'id en paramètre - deleteById(id) - - // Insérer le nouveau RefereeBean à l'id en paramètre - RefereeRepository.add(newReferee) - - return newReferee - - // Supprimer un arbitre (admin) --> DONE - function delete(var long id) -> integer (success or failure) : - try: - RefereeRepository.deleteById(id) - catch error: - return FAILED - - return SUCCESS +## ARBITRES (RefereeRestController) : +- Lister tous les arbitres -> RefereeRestController.**getAll()** +- Afficher un arbitre par id -> RefereeRestController.**get(Long refereeID)** +- Afficher un arbitre par nom -> RefereeRestController.**get(String refereeName)** +- Ajouter un arbitre -> RefereeRestController.**add(String name, String firstName)** +- Supprimer un arbitre -> RefereeRestController.**delete(Long refereeID)** -PlayerService --> DONE: - // Obtenir tous les joueurs (public) --> DONE - function getAll() -> array : - return PlayerRepository.getAll() - - // Obtenir un joueur par id (public) --> DONE - function get(var long id) -> PlayerBean : - return PlayerRepository.findById(id) - - // Obtenir un joueur par nom (public) --> DONE - function get(var string name) -> PlayerBean : - return PlayerRepository.findByName(name) - - // Ajouter un joueur (admin) --> DONE - function add(var PlayerBean newPlayer) -> PlayerBean: - PlayerRepository.add(newPlayer) - return newPlayer - - // Modifier un joueur (admin) --> DONE - function update(var long id, var string name, var string firstName) -> PlayerBean : - // Créer nouveau PlayerBean - var PlayerBean newPlayer = new PlayerBean(id, name, firstName) - - // Supprimer le PlayerBean à l'id en paramètre - deleteById(id) - - // Insérer le nouveau PlayerBean à l'id en paramètre - PlayerRepository.add(newPlayer) - - return newPlayer +## JOUEURS (PlayerRestController) : +- Lister tous les joueurs -> PlayerRestController.**getAll()** +- Afficher un joueur par id -> PlayerRestController.**get(Long playerID)** +- Afficher un joueur par nom -> PlayerRestController.**get(String playerName)** +- Ajouter un joueur -> PlayerRestController.**add(String name, String firstName) +- Supprimer un joueur -> PlayerRestController.**delete(String name, String firstName) - // Supprimer un joueur (admin) --> DONE - function delete(var long id) -> integer (success or failure) : - try: - PlayerRepository.deleteById(id) - catch error: - return FAILED - - return SUCCESS - -## RestControllers -MatchRestController --> TODO: - // Lister tous les matchs --> DONE - function getAll() -> array : - return MatchService.getAll() - - // Lister tous les matchs à partir d'une certaine date - function getAllFromDate(var Date dateToFilter) -> array : - return MatchService.getAll().filter(date == dateToFilter) - - // Lister les matchs en cours (état : en cours) - function getAllActive() -> array : - return MatchService.getAll().filter(state == "ONGOING") - - // Lister les matchs terminés (état : terminé) - function getAllOver() -> array : - return MatchService.getAll().filter(state == "FINISHED") - - // Lister les matchs non commencés (état : non commencé) - function getAllNotStarted() -> array : - // MatchService : - return MatchService.getAll().filter(state == "NOT STARTED") - - // Afficher un match par id - function get(var long id) -> MatchBean : - return MatchService.get(id) - - // Mettre à jour le score1 d'un match récupéré par id --> TODO - function updateScore1Of(var long id, var integer newScore) -> integer (success or failure) : - return MatchService.update( - - // Mettre à jour le score2 d'un match récupéré par id --> TODO - function updateScore2Of(var long id, var integer newScore) -> integer (success or failure) : - return MatchService.update( - - // Ajouter un match (créer nouveau MatchBean dans MatchRepository) - function add(var MatchBean newMatch) -> integer (success or failure): - return MatchService.add(newMatch) - - // Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) - function deleteById(var long id) -> integer (success or failure) : - return MatchService.deleteById(id) - -RefereeRestController --> DONE: - // Lister tous les arbitres - function getAll() -> array : - return RefereeService.getAll() - - // Afficher un arbitre par id - function get(var long id) -> RefereeBean : - return RefereeService.get(id) - - // Afficher un arbitre par nom - function get(var string name) -> RefereeBean: - return RefereeService.get(name) - - // Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) - function add(var RefereeBean newReferee) -> integer (success or failure) : - return RefereeService.add(newReferee) - - // Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) - function deleteById(var long id) -> integer (success or failure) : - return RefereeService.deleteById(id) - -PlayerRestController --> DONE: - // Lister tous les joueurs - function getAll() -> array : - return PlayerService.getAll() - - // Afficher un joueur par id - function get(var long id) -> PlayerBean : - return PlayerService.get(id) - - // Afficher un joueur par nom - function get(var string name) -> PlayerBean : - return PlayerService.get(name) - - // Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) - function add(var PlayerBean newPlayer) -> integer (success or failure) : - return PlayerService.add(newPlayer) - - // Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) - function deleteById(var long id) -> integer (success or failure) : - return PlayerService.deleteById(id) - -## Pages -Page des matchs (publique) : - à définir (partie front sur Angular ?) - -Page de connexion à l'administration (publique) : - formulaire : - - nom d'utilisateur - - mot de passe - -Page d'administration (privée) : - à définir (partie front sur Angular ?) \ No newline at end of file diff --git a/FencerJudgeBack/conception.txt b/FencerJudgeBack/conception.txt new file mode 100644 index 0000000..4113eaa --- /dev/null +++ b/FencerJudgeBack/conception.txt @@ -0,0 +1,244 @@ +## Websocket +// Ouvrir channel websocket sur port 8500 --> DONE +function startWebsocket(var integer port) -> Websocket: + var Websocket websocket = start Websocket at port [port] + return websocket + +## Entités +MATCHS -> MatchBean, MatchRepository +MatchBean: + - id:Long + - player1:PlayerBean + - player2:PlayerBean + - referee:RefereeBean + - score1:Int (score du player1) + - score2:Int (score du player2) + - date:String (date du match) + - state:String (état du match : terminé, en cours, pas commencé) + +REFEREES (arbitres) -> RefereeBean, RefereeRepository +RefereeBean: + - id:Long + - name:Long (nom) + - firstName:String (prénom) + +PLAYERS -> PlayerBean, PlayerRepository +PlayerBean: + - id:Long + - name:String (nom) + - firstName:String (prénom) + +## Services +MatchService --> DONE: + // Obtenir tous les matchs (public) --> DONE + function getAll() -> array : + return MatchRepository.getAll() + + // Obtenir un match par id (public) --> DONE + function get(var long id) -> MatchBean : + return MatchRepository.findById(id) + + // Ajouter un match (admin) --> DONE + function add(var MatchBean newMatch) -> MatchBean : + MatchRepository.add(newMatch) + return newMatch + + // Modifier un match (admin) --> DONE + function update(var long id, var PlayerBean player1, var PlayerBean player2, var RefereeBean referee, var integer score1, var integer score2, var Date date, var string state) -> MatchBean: + // Créer nouveau MatchBean + var MatchBean newMatch = new MatchBean(id, player1, player2, referee, score1, score2, date, state) + + // Supprimer le MatchBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau MatchBean à l'id en paramètre + MatchRepository.add(newMatch) + + return newMatch + + + // Supprimer un match (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + MatchRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS + +RefereeService --> DONE: + // Obtenir tous les arbitres (public) --> DONE + function getAll() -> array : + return RefereeRepository.getAll() + + // Obtenir un arbitre par id (public) --> DONE + function get(var long id) -> RefereeBean : + return RefereeRepository.findById(id) + + // Obtenir un arbitre par nom (public) --> DONE + function get(var string name) -> RefereeBean : + return RefereeRepository.findByName(name) + + // Ajouter un arbitre (admin) --> DONE + function add(var RefereeBean newReferee) -> RefereeBean: + RefereeRepository.add(newReferee) + return newReferee + + // Modifier un arbitre (admin) --> DONE + function update(var long id, var string name, var string firstName) -> RefereeBean: + // Créer nouveau RefereeBean + var RefereeBean newReferee = new RefereeBean(id, name, firstName) + + // Supprimer le RefereeBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau RefereeBean à l'id en paramètre + RefereeRepository.add(newReferee) + + return newReferee + + // Supprimer un arbitre (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + RefereeRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS + +PlayerService --> DONE: + // Obtenir tous les joueurs (public) --> DONE + function getAll() -> array : + return PlayerRepository.getAll() + + // Obtenir un joueur par id (public) --> DONE + function get(var long id) -> PlayerBean : + return PlayerRepository.findById(id) + + // Obtenir un joueur par nom (public) --> DONE + function get(var string name) -> PlayerBean : + return PlayerRepository.findByName(name) + + // Ajouter un joueur (admin) --> DONE + function add(var PlayerBean newPlayer) -> PlayerBean: + PlayerRepository.add(newPlayer) + return newPlayer + + // Modifier un joueur (admin) --> DONE + function update(var long id, var string name, var string firstName) -> PlayerBean : + // Créer nouveau PlayerBean + var PlayerBean newPlayer = new PlayerBean(id, name, firstName) + + // Supprimer le PlayerBean à l'id en paramètre + deleteById(id) + + // Insérer le nouveau PlayerBean à l'id en paramètre + PlayerRepository.add(newPlayer) + + return newPlayer + + // Supprimer un joueur (admin) --> DONE + function delete(var long id) -> integer (success or failure) : + try: + PlayerRepository.deleteById(id) + catch error: + return FAILED + + return SUCCESS + +## RestControllers +MatchRestController --> TODO: + // Lister tous les matchs --> DONE + function getAll() -> array : + return MatchService.getAll() + + // Lister tous les matchs à partir d'une certaine date + function getAllFromDate(var Date dateToFilter) -> array : + return MatchService.getAll().filter(date == dateToFilter) + + // Lister les matchs en cours (état : en cours) + function getAllActive() -> array : + return MatchService.getAll().filter(state == "ONGOING") + + // Lister les matchs terminés (état : terminé) + function getAllOver() -> array : + return MatchService.getAll().filter(state == "FINISHED") + + // Lister les matchs non commencés (état : non commencé) + function getAllNotStarted() -> array : + // MatchService : + return MatchService.getAll().filter(state == "NOT STARTED") + + // Afficher un match par id + function get(var long id) -> MatchBean : + return MatchService.get(id) + + // Mettre à jour le score1 d'un match récupéré par id --> TODO + function updateScore1Of(var long id, var integer newScore) -> integer (success or failure) : + return MatchService.update( + + // Mettre à jour le score2 d'un match récupéré par id --> TODO + function updateScore2Of(var long id, var integer newScore) -> integer (success or failure) : + return MatchService.update( + + // Ajouter un match (créer nouveau MatchBean dans MatchRepository) + function add(var MatchBean newMatch) -> integer (success or failure): + return MatchService.add(newMatch) + + // Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return MatchService.deleteById(id) + +RefereeRestController --> DONE: + // Lister tous les arbitres + function getAll() -> array : + return RefereeService.getAll() + + // Afficher un arbitre par id + function get(var long id) -> RefereeBean : + return RefereeService.get(id) + + // Afficher un arbitre par nom + function get(var string name) -> RefereeBean: + return RefereeService.get(name) + + // Ajouter un arbitre (créer nouveau RefereeBean dans RefereeRepository) + function add(var RefereeBean newReferee) -> integer (success or failure) : + return RefereeService.add(newReferee) + + // Supprimer un arbitre (supprimer élément de RefereeRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return RefereeService.deleteById(id) + +PlayerRestController --> DONE: + // Lister tous les joueurs + function getAll() -> array : + return PlayerService.getAll() + + // Afficher un joueur par id + function get(var long id) -> PlayerBean : + return PlayerService.get(id) + + // Afficher un joueur par nom + function get(var string name) -> PlayerBean : + return PlayerService.get(name) + + // Ajouter un joueur (créer nouveau PlayerBean dans PlayerRepository) + function add(var PlayerBean newPlayer) -> integer (success or failure) : + return PlayerService.add(newPlayer) + + // Supprimer un joueur (supprimer élément de PlayerRepository en récupérant l'id) + function deleteById(var long id) -> integer (success or failure) : + return PlayerService.deleteById(id) + +## Pages +Page des matchs (publique) : + à définir (partie front sur Angular ?) + +Page de connexion à l'administration (publique) : + formulaire : + - nom d'utilisateur + - mot de passe + +Page d'administration (privée) : + à définir (partie front sur Angular ?) \ No newline at end of file From ed879ed8c27e6f84b57b911fb85304504d03a10f Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 30 May 2025 19:46:29 +0200 Subject: [PATCH 07/19] maj affichage README --- FencerJudgeBack/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index 0eaa707..f056d1a 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -12,7 +12,7 @@ ## ETATS D'UN MATCH - ONGOING - OVER -- NOT_STARTED +- NOT STARTED ## ARBITRES - id @@ -48,6 +48,6 @@ - Lister tous les joueurs -> PlayerRestController.**getAll()** - Afficher un joueur par id -> PlayerRestController.**get(Long playerID)** - Afficher un joueur par nom -> PlayerRestController.**get(String playerName)** -- Ajouter un joueur -> PlayerRestController.**add(String name, String firstName) +- Ajouter un joueur -> PlayerRestController.**add(String name, String firstName)** - Supprimer un joueur -> PlayerRestController.**delete(String name, String firstName) From 33f8be706c37122823b9275d951f4f789cb9df48 Mon Sep 17 00:00:00 2001 From: pedro Date: Fri, 30 May 2025 19:47:27 +0200 Subject: [PATCH 08/19] re-maj affichage README --- FencerJudgeBack/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index f056d1a..2924780 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -49,5 +49,4 @@ - Afficher un joueur par id -> PlayerRestController.**get(Long playerID)** - Afficher un joueur par nom -> PlayerRestController.**get(String playerName)** - Ajouter un joueur -> PlayerRestController.**add(String name, String firstName)** -- Supprimer un joueur -> PlayerRestController.**delete(String name, String firstName) - +- Supprimer un joueur -> PlayerRestController.**delete(String name, String firstName)** From 7d26b9372ca68956e31abe93692aecf1c323b28b Mon Sep 17 00:00:00 2001 From: pedro Date: Sat, 31 May 2025 01:16:40 +0200 Subject: [PATCH 09/19] =?UTF-8?q?ajout=20premi=C3=A8res=20fonctions=20aux?= =?UTF-8?q?=20services?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 4 ++ .idea/modules.xml | 1 - FencerJudgeBack/README.md | 6 +-- FencerJudgeBack/build.gradle.kts | 7 ++++ .../fencerjudgeback/entities/MatchBean.kt | 8 ++-- .../fencerjudgeback/entities/RefereeBean.kt | 5 ++- .../repositories/PlayerRepository.kt | 2 + .../repositories/RefereeRepository.kt | 10 +++++ .../restControllers/MatchRestController.kt | 1 + .../restControllers/PlayerRestController.kt | 7 ++++ .../restControllers/RefereeRestController.kt | 8 ++++ .../fencerjudgeback/services/MatchService.kt | 37 +++++++++++++---- .../fencerjudgeback/services/PlayerService.kt | 33 +++++++++++++-- .../services/RefereeService.kt | 40 +++++++++++++++++++ 14 files changed, 148 insertions(+), 21 deletions(-) create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/RefereeRepository.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..a7e1300 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,9 @@ + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index 2db4f39..6ad2b6b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,6 @@ - diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index 2924780..ad94450 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -25,7 +25,7 @@ - firstName (prénom) # Actions REST sur les entités -## MATCHS (MatchRestController) +## MATCHS (MatchRestController, "/matchs") - Lister tous les matchs -> MatchRestController.**getAll()** - Lister tous les matchs à partir d'une certaine date -> MatchRestController.**getAllFromDate(Date date)** - Lister les matchs en cours (état : en cours) -> MatchRestController.**getAllActive()** @@ -37,14 +37,14 @@ - Ajouter un match -> MatchRestController.**add(Date date, Long refereeID, Long player1ID, Long player2ID)** - Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> MatchRestController.**delete(Long matchID)** -## ARBITRES (RefereeRestController) : +## ARBITRES (RefereeRestController, "/referees") : - Lister tous les arbitres -> RefereeRestController.**getAll()** - Afficher un arbitre par id -> RefereeRestController.**get(Long refereeID)** - Afficher un arbitre par nom -> RefereeRestController.**get(String refereeName)** - Ajouter un arbitre -> RefereeRestController.**add(String name, String firstName)** - Supprimer un arbitre -> RefereeRestController.**delete(Long refereeID)** -## JOUEURS (PlayerRestController) : +## JOUEURS (PlayerRestController, "/players") : - Lister tous les joueurs -> PlayerRestController.**getAll()** - Afficher un joueur par id -> PlayerRestController.**get(Long playerID)** - Afficher un joueur par nom -> PlayerRestController.**get(String playerName)** diff --git a/FencerJudgeBack/build.gradle.kts b/FencerJudgeBack/build.gradle.kts index 1f21aeb..4962b18 100644 --- a/FencerJudgeBack/build.gradle.kts +++ b/FencerJudgeBack/build.gradle.kts @@ -27,6 +27,13 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") testRuntimeOnly("org.junit.platform:junit-platform-launcher") + + // WEBSOCKET + implementation("org.springframework.boot:spring-boot-starter-websocket") + + // SECURITY + implementation("org.springframework.boot:spring-boot-starter-security") + } kotlin { diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt index a7b4e9b..4ebfee5 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt @@ -5,13 +5,13 @@ import jakarta.persistence.Id import jakarta.persistence.Table @Entity -@Table(name="match") +@Table(name="matchs") data class MatchBean( @Id val id:Long?=null, - val player1:PlayerBean?=null, - val player2:PlayerBean?=null, - val referee: RefereeBean?=null, + val player1ID:Long?=null, + val player2ID:Long?=null, + val refereeID: Long?=null, val score1:Int=0, val score2:Int=0, val date:String?=null diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt index 7e55ed9..ad94881 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt @@ -5,9 +5,10 @@ import jakarta.persistence.Id import jakarta.persistence.Table @Entity -@Table(name="referee") +@Table(name="referees") data class RefereeBean( @Id val id:Long?=null, - val name:Long?=null, + val name:String?=null, + val firstName:String?=null ) \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt index 5a2a2a0..ee1eefe 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/PlayerRepository.kt @@ -2,6 +2,8 @@ package fr.teamflash.fencerjudgeback.repositories import fr.teamflash.fencerjudgeback.entities.PlayerBean import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository +@Repository interface PlayerRepository: JpaRepository { } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/RefereeRepository.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/RefereeRepository.kt new file mode 100644 index 0000000..102c985 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/repositories/RefereeRepository.kt @@ -0,0 +1,10 @@ +package fr.teamflash.fencerjudgeback.repositories + +import fr.teamflash.fencerjudgeback.entities.RefereeBean +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.stereotype.Repository + +@Repository +interface RefereeRepository : JpaRepository { + +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt index 1123f8d..89b6779 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt @@ -4,4 +4,5 @@ import org.springframework.web.bind.annotation.RestController @RestController class MatchRestController { + } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt new file mode 100644 index 0000000..b6ea5c9 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt @@ -0,0 +1,7 @@ +package fr.teamflash.fencerjudgeback.restControllers + +import org.springframework.web.bind.annotation.RestController + +@RestController +class PlayerRestController { +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt new file mode 100644 index 0000000..99c20b9 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt @@ -0,0 +1,8 @@ +package fr.teamflash.fencerjudgeback.restControllers + +import org.springframework.web.bind.annotation.RestController + +@RestController +class RefereeRestController { + +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt index 688db67..3dd1adc 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt @@ -6,12 +6,35 @@ import fr.teamflash.fencerjudgeback.repositories.MatchRepository import org.springframework.stereotype.Service @Service -class MatchService(matchRepository: MatchRepository) { +class MatchService(private val matchRepository: MatchRepository) { - fun getMatchById(id:Long){} - fun getMatchByPlayer(playerBean: PlayerBean) {} - fun getMatchs(){} - fun createMatch(match: MatchBean){} - fun updateMatchScore(score1:Int, score2:Int){} - fun delMatch(match:MatchBean){} + fun getMatchById(id:Long): MatchBean { + println("MatchService.getMatchById : $id") + return matchRepository.findById(id).get() + } + fun getMatchByPlayer(playerBean: PlayerBean): List { + println("MatchService.getMatchByPlayer : $playerBean") + return matchRepository.findAll().filter { it.player1ID == playerBean.id || it.player2ID == playerBean.id } + } + fun getMatchs() : List { + println("MatchService.getMatchs") + return matchRepository.findAll() + } + fun createMatch(match: MatchBean) : MatchBean { + println("MatchService.createMatch : $match") + matchRepository.save(match) + return match + } + fun updateMatch(match: MatchBean) { + println("MatchService.updateMatch : $match") + matchRepository.save(match) + } + fun updateMatchScore(score1:Int, score2:Int) : MatchBean { + println("MatchService.updateMatchScore : $score1 - $score2") + return matchRepository.findAll().first() + } + fun delMatch(match:MatchBean){ + println("MatchService.delMatch : $match") + matchRepository.delete(match) + } } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt index 5a0c1ce..6415ddb 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt @@ -1,11 +1,36 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.PlayerBean +import fr.teamflash.fencerjudgeback.repositories.PlayerRepository import org.springframework.stereotype.Service +import java.util.Optional @Service -class PlayerService { - fun getPlayerById(id:Long){} - fun getPlayers(){} - fun getPlayerByName(name:String){} +class PlayerService(private val playerRepository: PlayerRepository) { + fun getPlayerById(id:Long): Optional { + println("PlayerService.getPlayerById : $id") + return playerRepository.findById(id) + } + fun getPlayers(): List { + println("PlayerService.getPlayers") + return playerRepository.findAll() + } + fun getPlayerByName(name:String) : List { + println("PlayerService.getPlayerByName : $name") + return playerRepository.findAll() + } + fun createPlayer(player: PlayerBean): PlayerBean { + println("PlayerService.createPlayer : $player") + playerRepository.save(player) + return player + } + fun updatePlayer(player: PlayerBean) : PlayerBean{ + println("PlayerService.updatePlayer : $player") + playerRepository.save(player) + return player + } + fun delPlayer(player: PlayerBean) { + println("PlayerService.delPlayer : $player") + playerRepository.delete(player) + } } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt new file mode 100644 index 0000000..5851b3c --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt @@ -0,0 +1,40 @@ +package fr.teamflash.fencerjudgeback.services + +import fr.teamflash.fencerjudgeback.entities.RefereeBean +import fr.teamflash.fencerjudgeback.repositories.RefereeRepository +import org.springframework.stereotype.Service +import java.util.Optional + +@Service +class RefereeService(private val refereeRepository: RefereeRepository) { + fun getRefereeById(id:Long) : Optional { + println("RefereeService.getRefereeById : $id") + return refereeRepository.findById(id) + } + fun getReferees(): List { + println("RefereeService.getReferees") + return refereeRepository.findAll() + } + fun getRefereeByName(name:String): RefereeBean { + println("RefereeService.getRefereeByName : $name") + return refereeRepository.findAll().first { it.name == name } + } + fun createReferee(referee: RefereeBean) : RefereeBean { + println("RefereeService.createReferee : $referee") + refereeRepository.save(referee) + return referee + } + fun updateRefereePassword(referee: RefereeBean) { + println("RefereeService.updateRefereePassword : $referee") + refereeRepository.save(referee) + } + fun updateReferee(referee: RefereeBean) : RefereeBean { + println("RefereeService.updateReferee : $referee") + refereeRepository.save(referee) + return referee + } + fun delReferee(referee: RefereeBean){ + println("RefereeService.delReferee : $referee") + refereeRepository.delete(referee) + } +} \ No newline at end of file From 5bf89dd68418eed382b873066b64ce72778f13fc Mon Sep 17 00:00:00 2001 From: pedro Date: Sat, 31 May 2025 01:17:53 +0200 Subject: [PATCH 10/19] modif nom table players --- .../kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt index baed789..6486e6b 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt @@ -5,7 +5,7 @@ import jakarta.persistence.Id import jakarta.persistence.Table @Entity -@Table(name="player") +@Table(name="players") data class PlayerBean( @Id val id:Long?=null, From 7224ba7d6f184b60b9f0915e136a806c2d506e94 Mon Sep 17 00:00:00 2001 From: pedro Date: Sun, 1 Jun 2025 22:52:58 +0200 Subject: [PATCH 11/19] maj des services --- FencerJudgeBack/README.md | 115 +++++++++++++++++++++------------ FencerJudgeBack/TODO.txt | 4 ++ FencerJudgeBack/conception.txt | 67 +++++++++++++------ 3 files changed, 123 insertions(+), 63 deletions(-) create mode 100644 FencerJudgeBack/TODO.txt diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index ad94450..b1fb3c6 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,52 +1,83 @@ # Entités -## MATCHS -- id -- player1 -- player2 -- referee (arbitre) -- score1 (score du joueur 1) -- score2 (score du joueur 2) -- date -- state (état du match : en cours, terminé, pas commencé) +## MATCHES (MatchBean) +- id -> Long +- player1ID -> Long +- player2ID -> Long +- refereeID (arbitre) -> Long +- score1 (score du joueur 1) -> Integer +- score2 (score du joueur 2) -> Integer +- date -> Date +- state (état du match : en cours, terminé, pas commencé) -> Integer (ENUM) -## ETATS D'UN MATCH -- ONGOING -- OVER -- NOT STARTED +## ETATS D'UN MATCH (MatchesStates) +- ONGOING -> Integer (1) +- OVER -> Integer (2) +- NOT STARTED -> Integer (3) -## ARBITRES -- id -- name (nom de famille) -- firstName (prénom) +## ARBITRES (RefereeBean) +- id -> Long +- name (nom de famille) -> String +- firstName (prénom) -> String -## JOUEURS -- id -- name (nom de famille) -- firstName (prénom) +## JOUEURS (PlayerBean) +- id -> Long +- name (nom de famille) -> String +- firstName (prénom) -> String # Actions REST sur les entités -## MATCHS (MatchRestController, "/matchs") -- Lister tous les matchs -> MatchRestController.**getAll()** -- Lister tous les matchs à partir d'une certaine date -> MatchRestController.**getAllFromDate(Date date)** -- Lister les matchs en cours (état : en cours) -> MatchRestController.**getAllActive()** -- Lister les matchs terminés (état : terminé) -> MatchRestController.**getAllOver()** -- Lister les matchs non commencés (état : non commencé) -> MatchRestController.**getAllNotStarted()** -- Afficher un match par id -> MatchRestController.**get(Long matchID)** -- Mettre à jour le score1 d'un match récupéré par id -> MatchRestController.**updateScore1Of(Long matchID, String newScore1)** -- Mettre à jour le score2 d'un match récupéré par id -> MatchRestController.**updateScore2Of(Long matchID, String newScore2)** -- Ajouter un match -> MatchRestController.**add(Date date, Long refereeID, Long player1ID, Long player2ID)** -- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> MatchRestController.**delete(Long matchID)** +## matches (MatchRestController, "/matches") +- Lister tous les matches -> **GET "/matches/"** -> List +- Lister tous les matches à partir d'une certaine date -> **GET "/matches/date=&date"** -> List +- Lister les matches en cours (état : en cours) -> **GET "/matches/active"** -> List +- Lister les matches terminés (état : terminé) -> **GET "/matches/over"** -> List +- Lister les matches non commencés (état : non commencé) -> **GET "/matches/not-started"** -> List +- Afficher un match par id -> **GET "/matches/id=&id"** -> MatchBean +- Mettre à jour les score d'un match récupéré par id -> **POST "/matches/update-match"** +{ + id=$id, + score1=$score1, + score2=$score2 +} +-> MatchBean +- Ajouter un match -> **POST "/matches/add-match"** +{ + date=$date, + refereeID=$refereeID, + player1ID=$player1ID, + player2ID=$player2ID +} +-> MatchBean +- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> **POST "/matches/delete-match"** +{ + id=$id +} ## ARBITRES (RefereeRestController, "/referees") : -- Lister tous les arbitres -> RefereeRestController.**getAll()** -- Afficher un arbitre par id -> RefereeRestController.**get(Long refereeID)** -- Afficher un arbitre par nom -> RefereeRestController.**get(String refereeName)** -- Ajouter un arbitre -> RefereeRestController.**add(String name, String firstName)** -- Supprimer un arbitre -> RefereeRestController.**delete(Long refereeID)** +- Lister tous les arbitres -> **GET "/referees/"** -> List +- Afficher un arbitre par id -> **GET "/referees/id=$id"** -> RefereeBean +- Afficher un arbitre par nom ->**GET "/referees/name=$name"** -> RefereeBean +- Ajouter un arbitre ->**POST "/referees/add-referee"** +{ + name=$name, + firstName=$firstName +} +-> RefereeBean +- Supprimer un arbitre ->**POST "/referees/delete-referee/"** +{ + id=$id +} ## JOUEURS (PlayerRestController, "/players") : -- Lister tous les joueurs -> PlayerRestController.**getAll()** -- Afficher un joueur par id -> PlayerRestController.**get(Long playerID)** -- Afficher un joueur par nom -> PlayerRestController.**get(String playerName)** -- Ajouter un joueur -> PlayerRestController.**add(String name, String firstName)** -- Supprimer un joueur -> PlayerRestController.**delete(String name, String firstName)** +- Lister tous les joueurs ->**GET "/players/"** -> List +- Afficher un joueur par id ->**GET "/players/id=$id"** -> PlayerBean +- Afficher un joueur par nom ->**GET "/players/name=$name"** -> PlayerBean +- Ajouter un joueur ->**POST "/players/add-player"** +{ + name=$name, + firstName=$firstName +} +-> PlayerBean +- Supprimer un joueur ->**POST "/players/delete-player"** +{ + id=$id +} diff --git a/FencerJudgeBack/TODO.txt b/FencerJudgeBack/TODO.txt new file mode 100644 index 0000000..d5b5baa --- /dev/null +++ b/FencerJudgeBack/TODO.txt @@ -0,0 +1,4 @@ +corriger les services - ~ +tester les restcontrollers via des requêtes http - ~ +créer la bdd avec toutes les tables (repositories) +tester le websocket \ No newline at end of file diff --git a/FencerJudgeBack/conception.txt b/FencerJudgeBack/conception.txt index 4113eaa..02a822b 100644 --- a/FencerJudgeBack/conception.txt +++ b/FencerJudgeBack/conception.txt @@ -35,30 +35,40 @@ MatchService --> DONE: return MatchRepository.getAll() // Obtenir un match par id (public) --> DONE - function get(var long id) -> MatchBean : + function getById(var long id) -> MatchBean : return MatchRepository.findById(id) + // Obtenir un ou plusieurs match(s) par joueurs (id) (public) --> DONE + function getByPlayers(var long player1ID, var long player2ID) -> array { + return MatchRepository.getAll().filterBy(player1ID or player2ID) + } + // Ajouter un match (admin) --> DONE - function add(var MatchBean newMatch) -> MatchBean : + function createMatch(var MatchBean newMatch) -> MatchBean : MatchRepository.add(newMatch) return newMatch // Modifier un match (admin) --> DONE - function update(var long id, var PlayerBean player1, var PlayerBean player2, var RefereeBean referee, var integer score1, var integer score2, var Date date, var string state) -> MatchBean: - // Créer nouveau MatchBean - var MatchBean newMatch = new MatchBean(id, player1, player2, referee, score1, score2, date, state) + function updateMatch(var long id, var Date date, var long refereeID, var long player1ID, var long player2ID, var integer scorePlayer1, var integer scorePlayer2, var Date date, var string matchState) -> integr (success or not): + // Vérifier si le match existe à l'id renseigné + if MatchRepository.getById(id) doesn't exist { + return FAILED + } + + // Créer nouveau MatchBean à l'id renseigné + var MatchBean newMatch = new MatchBean(id, player1ID, player2ID, refereeID, score1, score2, date, state) // Supprimer le MatchBean à l'id en paramètre - deleteById(id) + MatchRepository.deleteById(id) // Insérer le nouveau MatchBean à l'id en paramètre MatchRepository.add(newMatch) - return newMatch + return SUCCESS // Supprimer un match (admin) --> DONE - function delete(var long id) -> integer (success or failure) : + function deleteMatch(var long id) -> integer (success or failure) : try: MatchRepository.deleteById(id) catch error: @@ -72,30 +82,41 @@ RefereeService --> DONE: return RefereeRepository.getAll() // Obtenir un arbitre par id (public) --> DONE - function get(var long id) -> RefereeBean : + function getById(var long id) -> RefereeBean : return RefereeRepository.findById(id) - // Obtenir un arbitre par nom (public) --> DONE - function get(var string name) -> RefereeBean : - return RefereeRepository.findByName(name) + // Obtenir un ou plusieurs arbitre(s) par nom (public) --> DONE + function getByName(var string name) -> array : + return RefereeRepository.getAll().filterBy(name) + + // Obtenir un ou plusieurs arbitre(s) par prénom (public) + function getByFirstName(var string firstName) -> array : + return RefereeRepository.getAll().filterBy(firstName) // Ajouter un arbitre (admin) --> DONE - function add(var RefereeBean newReferee) -> RefereeBean: + function createReferee(var RefereeBean newReferee) -> RefereeBean: RefereeRepository.add(newReferee) return newReferee // Modifier un arbitre (admin) --> DONE - function update(var long id, var string name, var string firstName) -> RefereeBean: - // Créer nouveau RefereeBean + function updateReferee(var long id, var string name, var string firstName) -> integer (success or not): + + // Vérifier si l'arbitre existe à l'id renseigné + if RefereeRepository.getById(id) doesn't exist { + return FAILED + } + + // Créer nouveau RefereeBean à l'id renseigné var RefereeBean newReferee = new RefereeBean(id, name, firstName) // Supprimer le RefereeBean à l'id en paramètre - deleteById(id) + RefereeRepository.deleteById(id) // Insérer le nouveau RefereeBean à l'id en paramètre RefereeRepository.add(newReferee) - return newReferee + return SUCCESS + // Supprimer un arbitre (admin) --> DONE function delete(var long id) -> integer (success or failure) : @@ -112,12 +133,16 @@ PlayerService --> DONE: return PlayerRepository.getAll() // Obtenir un joueur par id (public) --> DONE - function get(var long id) -> PlayerBean : + function getById(var long id) -> PlayerBean : return PlayerRepository.findById(id) - // Obtenir un joueur par nom (public) --> DONE - function get(var string name) -> PlayerBean : - return PlayerRepository.findByName(name) + // Obtenir un ou plusieurs joueur(s) par nom (public) --> DONE + function getByName(var string name) -> array : + return PlayerRepository.getAll().filterBy(name) + + // Obtenir un ou plusieurs joueur(s) par prénom (public) --> DONE + function getByFirstName(var string firstName) -> array : + return PlayerRepository.getAll().filterBy(firstName) // Ajouter un joueur (admin) --> DONE function add(var PlayerBean newPlayer) -> PlayerBean: From f37b021c7c5f67325298efea10be3c2ed0c4ecfc Mon Sep 17 00:00:00 2001 From: pedro Date: Sun, 1 Jun 2025 22:57:03 +0200 Subject: [PATCH 12/19] code 0.0: entities & services --- .../fencerjudgeback/entities/MatchBean.kt | 5 +- .../fencerjudgeback/entities/PlayerBean.kt | 2 + .../fencerjudgeback/entities/RefereeBean.kt | 2 + .../fencerjudgeback/services/MatchService.kt | 114 ++++++++++++++---- .../fencerjudgeback/services/PlayerService.kt | 77 +++++++++--- .../services/RefereeService.kt | 78 ++++++++---- 6 files changed, 209 insertions(+), 69 deletions(-) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt index 4ebfee5..3955ef5 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt @@ -3,16 +3,17 @@ package fr.teamflash.fencerjudgeback.entities import jakarta.persistence.Entity import jakarta.persistence.Id import jakarta.persistence.Table +import java.util.Date @Entity @Table(name="matchs") data class MatchBean( @Id - val id:Long?=null, + val id:Long?=null, val player1ID:Long?=null, val player2ID:Long?=null, val refereeID: Long?=null, val score1:Int=0, val score2:Int=0, - val date:String?=null + val date: Date?=null ) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt index 6486e6b..f349348 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt @@ -1,6 +1,8 @@ package fr.teamflash.fencerjudgeback.entities import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.GenerationType import jakarta.persistence.Id import jakarta.persistence.Table diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt index ad94881..5511a69 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt @@ -1,6 +1,8 @@ package fr.teamflash.fencerjudgeback.entities import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.GenerationType import jakarta.persistence.Id import jakarta.persistence.Table diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt index 3dd1adc..0257fa7 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt @@ -3,38 +3,102 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.MatchBean import fr.teamflash.fencerjudgeback.entities.PlayerBean import fr.teamflash.fencerjudgeback.repositories.MatchRepository +import fr.teamflash.fencerjudgeback.websocket.controllers.MatchWebSocketController +import fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Lazy +import org.springframework.http.ResponseEntity import org.springframework.stereotype.Service +import java.util.Date @Service -class MatchService(private val matchRepository: MatchRepository) { - - fun getMatchById(id:Long): MatchBean { - println("MatchService.getMatchById : $id") - return matchRepository.findById(id).get() - } - fun getMatchByPlayer(playerBean: PlayerBean): List { - println("MatchService.getMatchByPlayer : $playerBean") - return matchRepository.findAll().filter { it.player1ID == playerBean.id || it.player2ID == playerBean.id } - } - fun getMatchs() : List { +class MatchService( + @Autowired private val matchRepository: MatchRepository, + @Lazy private val matchWebSocketController: MatchWebSocketController? = null +) { + // Obtenir tous les matchs (public) + fun getAll() : List { println("MatchService.getMatchs") return matchRepository.findAll() } - fun createMatch(match: MatchBean) : MatchBean { - println("MatchService.createMatch : $match") - matchRepository.save(match) - return match + + // Obtenir un match par id (public) + fun getById(id:Long): MatchBean? { + println("MatchService.getMatchById : $id") + return matchRepository.findById(id).get() } - fun updateMatch(match: MatchBean) { - println("MatchService.updateMatch : $match") - matchRepository.save(match) + + // Obtenir un ou plusieurs match(s) par joueurs (id) (public) + fun getByPlayers(player1ID: Long, player2ID: Long): List { + println("MatchService.getMatchByPlayers : $player1ID - $player2ID") + return matchRepository.findAll().filter { it.player1ID == player1ID && it.player2ID == player2ID } } - fun updateMatchScore(score1:Int, score2:Int) : MatchBean { - println("MatchService.updateMatchScore : $score1 - $score2") - return matchRepository.findAll().first() + + // Ajouter un match (admin) + fun createMatch(newMatch: MatchBean): MatchBean { + println("MatchService.createMatch : $newMatch") + // Broadcast the new match via WebSocket +// matchWebSocketController?.broadcastMatchUpdate(savedMatch, MatchUpdateMessage.UpdateType.MATCH_START) + + return matchRepository.save(newMatch) } - fun delMatch(match:MatchBean){ - println("MatchService.delMatch : $match") - matchRepository.delete(match) + + // Modifier un match (admin) + fun updateMatch(id: Long, date: Date, refereeID: Long, player1ID: Long, player2ID: Long, scorePlayer1:Int, scorePlayer2:Int) : Int { + println("MatchService.updateMatch : $id - $refereeID - $player1ID - $player2ID - $scorePlayer1 - $scorePlayer2") + + if (getById(id) == null) { + println("MatchService.updateMatch : Match not found") + return -1 + } + + // Broadcast the update via WebSocket +// matchWebSocketController?.broadcastMatchUpdate(savedMatch, MatchUpdateMessage.UpdateType.SCORE_UPDATE) + + // Créer nouveau MatchBean à l'id renseigné + val newMatch = MatchBean( + id = id, + date = date, + refereeID = refereeID, + player1ID = player1ID, + player2ID = player2ID, + score1 = scorePlayer1, + score2 = scorePlayer2 + ) + +// if ( +// // Supprimer le MatchBean à l'id en paramètre +// deleteMatch(id) == 1 +// && createMatch(newMatch) == 1) { +// +// // Insérer le nouveau MatchBean à l'id en paramètre +// +// +// return 1 +// } + + // Supprimer le MatchBean à l'id en paramètre + if (deleteMatch(id) == 1) { + // Insérer le nouveau MatchBean à l'id en paramètre + createMatch(newMatch) + } + + return 1 } -} \ No newline at end of file + + // Supprimer un match (admin) + fun deleteMatch(id:Long) : Int { + println("MatchService.deleteMatch : $id") + + try { + matchRepository.deleteById(id) + } catch (e: Exception) { + println("Error deleting match: ${e.message}") + return -1 + } + + // Broadcast the match cancellation via WebSocket before deleting +// matchWebSocketController?.broadcastMatchUpdate(matchID, MatchUpdateMessage.UpdateType.MATCH_CANCEL) + return 1 + } +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt index 6415ddb..2d5858a 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt @@ -2,35 +2,72 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.PlayerBean import fr.teamflash.fencerjudgeback.repositories.PlayerRepository +import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import java.util.Optional @Service -class PlayerService(private val playerRepository: PlayerRepository) { - fun getPlayerById(id:Long): Optional { - println("PlayerService.getPlayerById : $id") +class PlayerService(@Autowired private val playerRepository: PlayerRepository) { + // Obtenir tous les joueurs (public) + fun getAll(): List { + println("RefereeService.getReferees") + return playerRepository.findAll() + } + + // Obtenir un joueur par id (public) + fun getById(id:Long) : Optional { + println("RefereeService.getRefereeById : $id") return playerRepository.findById(id) } - fun getPlayers(): List { - println("PlayerService.getPlayers") - return playerRepository.findAll() + + // Obtenir un ou plusieurs joueur(s) par nom (public) + fun getByName(name:String): List? { + println("RefereeService.getRefereeByName : $name") + return playerRepository.findAll().filter{ it.name == name } } - fun getPlayerByName(name:String) : List { - println("PlayerService.getPlayerByName : $name") - return playerRepository.findAll() + + // Obtenir un ou plusieurs joueur(s) par prénom + fun getByFirstName(firstName:String): List? { + println("RefereeService.getRefereeByFirstName : $firstName") + return playerRepository.findAll().filter{ it.firstName == firstName } } - fun createPlayer(player: PlayerBean): PlayerBean { - println("PlayerService.createPlayer : $player") - playerRepository.save(player) - return player + + // Ajouter un joueur (admin) + fun createPlayer(referee: PlayerBean) : PlayerBean { + println("RefereeService.createReferee : $referee") + return playerRepository.save(referee) } - fun updatePlayer(player: PlayerBean) : PlayerBean{ - println("PlayerService.updatePlayer : $player") - playerRepository.save(player) - return player + + // Modifier un joueur (admin) + fun updatePlayer(id:Long, name:String, firstName: String) : Int { + // Vérifier si le joueur existe à l'id renseigné + if (getById(id) == null) { + println("RefereeService.updateReferee : Referee not found") + return -1 + } + + // Créer nouveau PlayerBean à l'id renseigné + val newPlayer = PlayerBean(id, name, firstName) + + // Supprimer le PlayerBean à l'id en paramètre + deletePlayer(id) + + // Insérer le nouveau PlayerBean + createPlayer(newPlayer) + + return 1 } - fun delPlayer(player: PlayerBean) { - println("PlayerService.delPlayer : $player") - playerRepository.delete(player) + + // Supprimer un joueur (admin) + fun deletePlayer(id:Long): Int { + println("RefereeService.deleteReferee : $id") + + if (getById(id) == null) { + println("RefereeService.deleteReferee : Referee not found") + return -1 + } + + playerRepository.deleteById(id) + return 1 } } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt index 5851b3c..8d169ad 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt @@ -2,39 +2,73 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.RefereeBean import fr.teamflash.fencerjudgeback.repositories.RefereeRepository +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.data.jpa.domain.AbstractPersistable_.id import org.springframework.stereotype.Service import java.util.Optional @Service -class RefereeService(private val refereeRepository: RefereeRepository) { - fun getRefereeById(id:Long) : Optional { - println("RefereeService.getRefereeById : $id") - return refereeRepository.findById(id) - } - fun getReferees(): List { +class RefereeService(@Autowired private val refereeRepository: RefereeRepository) { + // Obtenir tous les arbitres (public) + fun getAll(): List { println("RefereeService.getReferees") return refereeRepository.findAll() } - fun getRefereeByName(name:String): RefereeBean { - println("RefereeService.getRefereeByName : $name") - return refereeRepository.findAll().first { it.name == name } + + // Obtenir un arbitre par id (public) + fun getById(id:Long) : Optional { + println("RefereeService.getRefereeById : $id") + return refereeRepository.findById(id) } + + // Obtenir un ou plusieurs arbitre(s) par nom (public) + fun getByName(name:String): List? { + println("RefereeService.getRefereeByName : $name") + return refereeRepository.findAll().filter{ it.name == name } + } + + // Obtenir un ou plusieurs arbitre(s) par prénom + fun getByFirstName(firstName:String): List? { + println("RefereeService.getRefereeByFirstName : $firstName") + return refereeRepository.findAll().filter{ it.firstName == firstName } + } + + // Ajouter un arbitre (admin) fun createReferee(referee: RefereeBean) : RefereeBean { println("RefereeService.createReferee : $referee") - refereeRepository.save(referee) - return referee + return refereeRepository.save(referee) } - fun updateRefereePassword(referee: RefereeBean) { - println("RefereeService.updateRefereePassword : $referee") - refereeRepository.save(referee) + + // Modifier un arbitre (admin) + fun updateReferee(id:Long, name:String, firstName: String) : Int { + // Vérifier si l'arbitre existe à l'id renseigné + if (getById(id) == null) { + println("RefereeService.updateReferee : Referee not found") + return -1 + } + + // Créer nouveau RefereeBean à l'id renseigné + val newReferee = RefereeBean(id, name, firstName) + + // Supprimer le RefereeBean à l'id en paramètre + deleteReferee(id) + + // Insérer le nouveau RefereeBean à l'id en paramètre + createReferee(newReferee) + + return 1 } - fun updateReferee(referee: RefereeBean) : RefereeBean { - println("RefereeService.updateReferee : $referee") - refereeRepository.save(referee) - return referee - } - fun delReferee(referee: RefereeBean){ - println("RefereeService.delReferee : $referee") - refereeRepository.delete(referee) + + // Supprimer un arbitre (admin) + fun deleteReferee(id:Long): Int { + println("RefereeService.deleteReferee : $id") + + if (getById(id) == null) { + println("RefereeService.deleteReferee : Referee not found") + return -1 + } + + refereeRepository.deleteById(id) + return 1 } } \ No newline at end of file From cf9c196053152fbdb97ab7f99537417527c7a264 Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 2 Jun 2025 08:53:13 +0200 Subject: [PATCH 13/19] =?UTF-8?q?restcontrollers=20=C3=A0=20faire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restControllers/MatchRestController.kt | 65 ++++++++++++++++++- .../restControllers/PlayerRestController.kt | 56 +++++++++++++++- .../restControllers/RefereeRestController.kt | 57 +++++++++++++++- 3 files changed, 171 insertions(+), 7 deletions(-) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt index 89b6779..1775fc4 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt @@ -1,8 +1,67 @@ package fr.teamflash.fencerjudgeback.restControllers -import org.springframework.web.bind.annotation.RestController +import fr.teamflash.fencerjudgeback.entities.MatchBean +import fr.teamflash.fencerjudgeback.services.MatchService +import org.springframework.http.HttpStatus +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.* +import kotlin.random.Random @RestController -class MatchRestController { +@RequestMapping("/matches") +class MatchRestController(private val matchService: MatchService) { -} \ No newline at end of file + // Lister tous les matchs + @GetMapping("/") + fun getAll(): ResponseEntity> { + return ResponseEntity.ok(matchService.getAll()) + } + + // Lister tous les matchs à partir d'une certaine date + @GetMapping("/{date}") + fun getAllFromDate(date:Date): ResponseEntity?> { + return ResponseEntity.ok(matchService.getAll().filter { it.date == date }) + } + + // Lister les matchs en cours + @GetMapping("/active") + fun getAllActive(): ResponseEntity?> { + return ResponseEntity.ok(matchService.getAll().filter { it.state == ACTIVE }) + } + + // Lister les matchs terminés + @GetMapping("/over") + fun getAllFinished(): ResponseEntity?> { + return ResponseEntity.ok(matchService.getAll().filter { }) + } + + // Lister les matchs non commencés + @GetMapping("/not-started") + fun getAllNotStarted(): ResponseEntity?> { + + } + + // Afficher un match par id + @GetMapping("/{id}") + fun getMatchById(@PathVariable id: Long): ResponseEntity { + return ResponseEntity.ok(matchService.getById(id)) + } + + // Ajouter un match + @PostMapping("/create-match") + fun createMatch(@RequestBody match: MatchBean): ResponseEntity { + return ResponseEntity.status(HttpStatus.CREATED).body(matchService.createMatch(match)) + } + + // Mettre à jour un match + @PutMapping("/update-match/{id}") + fun updateMatch(@PathVariable id: Long, @RequestBody refereeID: Long, @RequestBody): ResponseEntity { + return ResponseEntity.ok(matchService.updateMatch(match)) + } + + // Supprimer un match + @DeleteMapping("/delete-match/{id}") + fun deleteMatch(@PathVariable id: Long): ResponseEntity { + return ResponseEntity.ok(matchService.deleteMatch(id)) + } +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt index b6ea5c9..a32d39b 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt @@ -1,7 +1,59 @@ package fr.teamflash.fencerjudgeback.restControllers +import fr.teamflash.fencerjudgeback.entities.PlayerBean +import fr.teamflash.fencerjudgeback.services.PlayerService +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController +import java.util.Optional @RestController -class PlayerRestController { -} \ No newline at end of file +@RequestMapping("/players") +class PlayerRestController(private val playerService: PlayerService) { + + // Lister tous les joueurs + @GetMapping + fun getAll(): ResponseEntity> { + return ResponseEntity.ok(playerService.getAll()) + } + + // Afficher un joueur par id + @GetMapping("/{id}") + fun getById(id: Long): ResponseEntity?> { + return ResponseEntity.ok(playerService.getById(id)) + } + + // Afficher un joueur par nom + @GetMapping("/{name}") + fun getByName(name: String): ResponseEntity?> { + return ResponseEntity.ok(playerService.getByName(name)) + } + + // Afficher un joueur par prénom + @GetMapping("/{firstName}") + fun getByFirstName(firstName: String): ResponseEntity?> { + return ResponseEntity.ok(playerService.getByFirstName(firstName)) + } + + // Ajouter un joueur + @PostMapping("/add-player") + fun createPlayer(player: PlayerBean): ResponseEntity { + return ResponseEntity.ok(playerService.createPlayer(player)) + } + + // Modifier un joueur + @PutMapping("/update-player") + fun updatePlayer(id: Long, name: String, firstName: String): ResponseEntity { + return ResponseEntity.ok(playerService.updatePlayer(id, name, firstName)) + } + + // Supprimer un joueur + @DeleteMapping("/delete-player") + fun deletePlayer(id: Long): ResponseEntity { + return ResponseEntity.ok(playerService.deletePlayer(id)) + } +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt index 99c20b9..01216cc 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt @@ -1,8 +1,61 @@ package fr.teamflash.fencerjudgeback.restControllers +import fr.teamflash.fencerjudgeback.entities.RefereeBean +import fr.teamflash.fencerjudgeback.services.RefereeService +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.DeleteMapping +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController +import java.util.Optional @RestController -class RefereeRestController { +@RequestMapping("/referees") +class RefereeRestController(private val refereeService: RefereeService) { -} \ No newline at end of file + // Lister tous les arbitres + @GetMapping("/") + fun getAll() : ResponseEntity> { + return ResponseEntity.ok(refereeService.getAll()) + } + + // Afficher un arbitre par id + @GetMapping("/{id}") + fun getById(id: Long): ResponseEntity?> { + return ResponseEntity.ok(refereeService.getById(id)) + } + + // Afficher un ou plusieurs arbitre(s) par nom + @GetMapping("/name/{name}") + fun getByName(name:String): ResponseEntity?> { + return ResponseEntity.ok(refereeService.getByName(name)) + } + + // Afficher ou plusieurs arbitre(s) par prénom + @GetMapping("/first-name/{firstName}") + fun getByFirstName(firstName:String): ResponseEntity?> { + return ResponseEntity.ok(refereeService.getByFirstName(firstName)) + } + + // Ajouter un arbitre + @PostMapping("/create-referee") + fun createReferee(referee: RefereeBean): ResponseEntity { + return ResponseEntity.ok(refereeService.createReferee(referee)) + } + + // Modifier un arbitre + @PutMapping("/update-referee/{id}") + fun updateReferee(@PathVariable id: Long, name: String, firstName: String) : ResponseEntity { + return ResponseEntity.ok(refereeService.updateReferee(id, name, firstName)) + } + + // Supprimer un arbitre + @DeleteMapping("/delete-referee/{id}") + fun deleteReferee(id:Long): ResponseEntity { + return ResponseEntity.ok(refereeService.deleteReferee(id)) + } + +} From 1d97283343fa894ce3c7d18018f2137980800c68 Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 2 Jun 2025 13:38:14 +0200 Subject: [PATCH 14/19] =?UTF-8?q?entit=C3=A9s,=20services=20et=20restcontr?= =?UTF-8?q?ollers=20fonctionnels;=20websocket=20=C3=A0=20int=C3=A9grer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FencerJudgeBack/TODO.txt | 4 +- FencerJudgeBack/build.gradle.kts | 5 +- .../fencerjudgeback/entities/MatchBean.kt | 20 ++- .../fencerjudgeback/entities/PlayerBean.kt | 6 +- .../fencerjudgeback/entities/RefereeBean.kt | 6 +- .../restControllers/MatchRestController.kt | 43 ++++-- .../restControllers/PlayerRestController.kt | 41 +++--- .../restControllers/RefereeRestController.kt | 28 ++-- .../fencerjudgeback/services/MatchService.kt | 80 ++++------ .../fencerjudgeback/services/PlayerService.kt | 48 +++--- .../services/RefereeService.kt | 33 +++-- .../src/main/resources/application.properties | 15 ++ FencerJudgeBack/test.http | 138 ++++++++++++++++++ 13 files changed, 332 insertions(+), 135 deletions(-) create mode 100644 FencerJudgeBack/test.http diff --git a/FencerJudgeBack/TODO.txt b/FencerJudgeBack/TODO.txt index d5b5baa..f214c4a 100644 --- a/FencerJudgeBack/TODO.txt +++ b/FencerJudgeBack/TODO.txt @@ -1,4 +1,6 @@ corriger les services - ~ tester les restcontrollers via des requêtes http - ~ créer la bdd avec toutes les tables (repositories) -tester le websocket \ No newline at end of file +tester le websocket +prévoir l'utilisation en admin uniquement (spring security) +faire le jackarta de l'api \ No newline at end of file diff --git a/FencerJudgeBack/build.gradle.kts b/FencerJudgeBack/build.gradle.kts index 4962b18..f64df6d 100644 --- a/FencerJudgeBack/build.gradle.kts +++ b/FencerJudgeBack/build.gradle.kts @@ -27,13 +27,16 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") testRuntimeOnly("org.junit.platform:junit-platform-launcher") + implementation("org.springframework.boot:spring-boot-starter-validation") // WEBSOCKET implementation("org.springframework.boot:spring-boot-starter-websocket") // SECURITY - implementation("org.springframework.boot:spring-boot-starter-security") +// implementation("org.springframework.boot:spring-boot-starter-security") + // H2 Database + runtimeOnly("com.h2database:h2") } kotlin { diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt index 3955ef5..f6d03e7 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt @@ -1,19 +1,33 @@ package fr.teamflash.fencerjudgeback.entities import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.GenerationType import jakarta.persistence.Id +import jakarta.persistence.SequenceGenerator import jakarta.persistence.Table -import java.util.Date +import jakarta.validation.constraints.* @Entity -@Table(name="matchs") +@Table(name="matches") data class MatchBean( + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "match_sequence") + @SequenceGenerator(name = "match_sequence", sequenceName = "match_seq", allocationSize = 1) val id:Long?=null, + val weapon:String?=null, + val country:String?=null, + val city:String?=null, + @field:NotNull(message = "Player 1 ID must not be null") val player1ID:Long?=null, + @field:NotNull(message = "Player 2 ID must not be null") val player2ID:Long?=null, val refereeID: Long?=null, + @field:Min(value = 0, message = "Score must be at least 0") val score1:Int=0, + @field:Min(value = 0, message = "Score must be at least 0") val score2:Int=0, - val date: Date?=null + val date: String?=null, + val state:String?=null ) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt index f349348..4033340 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/PlayerBean.kt @@ -4,13 +4,17 @@ import jakarta.persistence.Entity import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType import jakarta.persistence.Id +import jakarta.persistence.SequenceGenerator import jakarta.persistence.Table @Entity @Table(name="players") data class PlayerBean( @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "player_sequence") + @SequenceGenerator(name = "player_sequence", sequenceName = "player_seq", allocationSize = 1) val id:Long?=null, val name:String?="", - val firstName:String?="" + val firstName:String?="", + val club:String?="" ) \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt index 5511a69..4756fee 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/RefereeBean.kt @@ -4,13 +4,17 @@ import jakarta.persistence.Entity import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType import jakarta.persistence.Id +import jakarta.persistence.SequenceGenerator import jakarta.persistence.Table @Entity @Table(name="referees") data class RefereeBean( @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "referee_sequence") + @SequenceGenerator(name = "referee_sequence", sequenceName = "referee_seq", allocationSize = 1) val id:Long?=null, val name:String?=null, - val firstName:String?=null + val firstName:String?=null, + val qualification:String?=null ) \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt index 1775fc4..0957c00 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/MatchRestController.kt @@ -2,10 +2,8 @@ package fr.teamflash.fencerjudgeback.restControllers import fr.teamflash.fencerjudgeback.entities.MatchBean import fr.teamflash.fencerjudgeback.services.MatchService -import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.* -import kotlin.random.Random @RestController @RequestMapping("/matches") @@ -13,55 +11,74 @@ class MatchRestController(private val matchService: MatchService) { // Lister tous les matchs @GetMapping("/") - fun getAll(): ResponseEntity> { + fun getAll(): ResponseEntity?> { return ResponseEntity.ok(matchService.getAll()) } // Lister tous les matchs à partir d'une certaine date - @GetMapping("/{date}") - fun getAllFromDate(date:Date): ResponseEntity?> { + @GetMapping("/date/{date}") + fun getAllFromDate(@PathVariable date:String): ResponseEntity?> { return ResponseEntity.ok(matchService.getAll().filter { it.date == date }) } + // Lister tous les matchs par pays + @GetMapping("/country/{country}") + fun getAllFromCountry(@PathVariable country:String): ResponseEntity?> { + return ResponseEntity.ok(matchService.getAll().filter { it.country == country }) + } + + // Lister tous les matchs par ville + @GetMapping("/city/{city}") + fun getAllFromCity(@PathVariable city:String): ResponseEntity?> { + return ResponseEntity.ok(matchService.getAll().filter { it.city == city }) + } + + // Lister tous les matchs par joueurs + @GetMapping("/players/{player1ID}/{player2ID}") + fun getAllWithPlayers(@PathVariable player1ID: Long?, @PathVariable player2ID: Long?): ResponseEntity?> { + return ResponseEntity.ok(matchService.getByPlayers(player1ID, player2ID)) + } + // Lister les matchs en cours @GetMapping("/active") fun getAllActive(): ResponseEntity?> { - return ResponseEntity.ok(matchService.getAll().filter { it.state == ACTIVE }) + return ResponseEntity.ok(matchService.getAll().filter { it.state == "ACTIVE" }) } // Lister les matchs terminés @GetMapping("/over") fun getAllFinished(): ResponseEntity?> { - return ResponseEntity.ok(matchService.getAll().filter { }) + return ResponseEntity.ok(matchService.getAll().filter { it.state == "FINISHED" }) } // Lister les matchs non commencés @GetMapping("/not-started") fun getAllNotStarted(): ResponseEntity?> { - + return ResponseEntity.ok(matchService.getAll().filter { it.state == "NOT STARTED" }) } // Afficher un match par id @GetMapping("/{id}") - fun getMatchById(@PathVariable id: Long): ResponseEntity { + fun getById(@PathVariable id: Long): ResponseEntity { return ResponseEntity.ok(matchService.getById(id)) } // Ajouter un match @PostMapping("/create-match") fun createMatch(@RequestBody match: MatchBean): ResponseEntity { - return ResponseEntity.status(HttpStatus.CREATED).body(matchService.createMatch(match)) +// return ResponseEntity.status(HttpStatus.CREATED).body(matchService.createMatch(match)) + return ResponseEntity.ok(matchService.createMatch(match)) } // Mettre à jour un match @PutMapping("/update-match/{id}") - fun updateMatch(@PathVariable id: Long, @RequestBody refereeID: Long, @RequestBody): ResponseEntity { - return ResponseEntity.ok(matchService.updateMatch(match)) + fun updateMatch(@PathVariable id: Long, @RequestBody match: MatchBean): ResponseEntity { + return ResponseEntity.ok(matchService.updateMatch(id, match)) } // Supprimer un match @DeleteMapping("/delete-match/{id}") fun deleteMatch(@PathVariable id: Long): ResponseEntity { - return ResponseEntity.ok(matchService.deleteMatch(id)) + return ResponseEntity.ok(matchService.deleteMatchById(id)) } } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt index a32d39b..699c557 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/PlayerRestController.kt @@ -5,55 +5,62 @@ import fr.teamflash.fencerjudgeback.services.PlayerService import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.DeleteMapping import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController -import java.util.Optional @RestController @RequestMapping("/players") class PlayerRestController(private val playerService: PlayerService) { // Lister tous les joueurs - @GetMapping + @GetMapping("/") fun getAll(): ResponseEntity> { return ResponseEntity.ok(playerService.getAll()) } // Afficher un joueur par id @GetMapping("/{id}") - fun getById(id: Long): ResponseEntity?> { + fun getById(@PathVariable id: Long): ResponseEntity { return ResponseEntity.ok(playerService.getById(id)) } - // Afficher un joueur par nom - @GetMapping("/{name}") - fun getByName(name: String): ResponseEntity?> { + // Afficher un ou plusieurs joueur(s) par nom + @GetMapping("/name/{name}") + fun getByName(@PathVariable name: String): ResponseEntity?> { return ResponseEntity.ok(playerService.getByName(name)) } - // Afficher un joueur par prénom - @GetMapping("/{firstName}") - fun getByFirstName(firstName: String): ResponseEntity?> { + // Afficher un ou plusieurs joueur(s) par prénom + @GetMapping("/firstName/{firstName}") + fun getByFirstName(@PathVariable firstName: String): ResponseEntity?> { return ResponseEntity.ok(playerService.getByFirstName(firstName)) } + // Afficher un ou plusieurs joueur(s) par club + @GetMapping("/club/{club}") + fun getByClub(@PathVariable club: String): ResponseEntity?> { + return ResponseEntity.ok(playerService.getByClub(club)) + } + // Ajouter un joueur - @PostMapping("/add-player") - fun createPlayer(player: PlayerBean): ResponseEntity { + @PostMapping("/create-player") + fun createPlayer(@RequestBody player: PlayerBean): ResponseEntity { return ResponseEntity.ok(playerService.createPlayer(player)) } // Modifier un joueur - @PutMapping("/update-player") - fun updatePlayer(id: Long, name: String, firstName: String): ResponseEntity { - return ResponseEntity.ok(playerService.updatePlayer(id, name, firstName)) + @PutMapping("/update-player/{id}") + fun updatePlayer(@PathVariable id: Long, @RequestBody player: PlayerBean): ResponseEntity { + return ResponseEntity.ok(playerService.updatePlayer(id, player)) } // Supprimer un joueur - @DeleteMapping("/delete-player") - fun deletePlayer(id: Long): ResponseEntity { - return ResponseEntity.ok(playerService.deletePlayer(id)) + @DeleteMapping("/delete-player/{id}") + fun deletePlayer(@PathVariable id: Long): ResponseEntity { + return ResponseEntity.ok(playerService.deletePlayerById(id)) } } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt index 01216cc..e26e90f 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/restControllers/RefereeRestController.kt @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PutMapping +import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController -import java.util.Optional @RestController @RequestMapping("/referees") @@ -24,38 +24,44 @@ class RefereeRestController(private val refereeService: RefereeService) { // Afficher un arbitre par id @GetMapping("/{id}") - fun getById(id: Long): ResponseEntity?> { + fun getById(@PathVariable id: Long): ResponseEntity { return ResponseEntity.ok(refereeService.getById(id)) } // Afficher un ou plusieurs arbitre(s) par nom @GetMapping("/name/{name}") - fun getByName(name:String): ResponseEntity?> { + fun getByName(@PathVariable name:String): ResponseEntity?> { return ResponseEntity.ok(refereeService.getByName(name)) } - // Afficher ou plusieurs arbitre(s) par prénom - @GetMapping("/first-name/{firstName}") - fun getByFirstName(firstName:String): ResponseEntity?> { + // Afficher un ou plusieurs arbitre(s) par prénom + @GetMapping("/firstname/{firstName}") + fun getByFirstName(@PathVariable firstName:String): ResponseEntity?> { return ResponseEntity.ok(refereeService.getByFirstName(firstName)) } + // Afficher un ou plusieurs arbitre(s) par qualification + @GetMapping("/qualification/{qualification}") + fun getByQualification(@PathVariable qualification:String): ResponseEntity?> { + return ResponseEntity.ok(refereeService.getByQualification(qualification)) + } + // Ajouter un arbitre @PostMapping("/create-referee") - fun createReferee(referee: RefereeBean): ResponseEntity { + fun createReferee(@RequestBody referee: RefereeBean): ResponseEntity { return ResponseEntity.ok(refereeService.createReferee(referee)) } // Modifier un arbitre @PutMapping("/update-referee/{id}") - fun updateReferee(@PathVariable id: Long, name: String, firstName: String) : ResponseEntity { - return ResponseEntity.ok(refereeService.updateReferee(id, name, firstName)) + fun updateReferee(@PathVariable id: Long, @RequestBody referee: RefereeBean) : ResponseEntity { + return ResponseEntity.ok(refereeService.updateReferee(id, referee)) } // Supprimer un arbitre @DeleteMapping("/delete-referee/{id}") - fun deleteReferee(id:Long): ResponseEntity { - return ResponseEntity.ok(refereeService.deleteReferee(id)) + fun deleteReferee(@PathVariable id:Long): ResponseEntity { + return ResponseEntity.ok(refereeService.deleteRefereeById(id)) } } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt index 0257fa7..c7102a3 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt @@ -1,15 +1,11 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.MatchBean -import fr.teamflash.fencerjudgeback.entities.PlayerBean import fr.teamflash.fencerjudgeback.repositories.MatchRepository import fr.teamflash.fencerjudgeback.websocket.controllers.MatchWebSocketController -import fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Lazy -import org.springframework.http.ResponseEntity import org.springframework.stereotype.Service -import java.util.Date @Service class MatchService( @@ -23,13 +19,19 @@ class MatchService( } // Obtenir un match par id (public) - fun getById(id:Long): MatchBean? { + fun getById(id: Long?): MatchBean? { println("MatchService.getMatchById : $id") + + if (id == null) { + println("MatchService.getMatchById : Match not found") + return null + } + return matchRepository.findById(id).get() } // Obtenir un ou plusieurs match(s) par joueurs (id) (public) - fun getByPlayers(player1ID: Long, player2ID: Long): List { + fun getByPlayers(player1ID: Long?, player2ID: Long?): List { println("MatchService.getMatchByPlayers : $player1ID - $player2ID") return matchRepository.findAll().filter { it.player1ID == player1ID && it.player2ID == player2ID } } @@ -44,61 +46,41 @@ class MatchService( } // Modifier un match (admin) - fun updateMatch(id: Long, date: Date, refereeID: Long, player1ID: Long, player2ID: Long, scorePlayer1:Int, scorePlayer2:Int) : Int { - println("MatchService.updateMatch : $id - $refereeID - $player1ID - $player2ID - $scorePlayer1 - $scorePlayer2") + fun updateMatch(id: Long?, newMatch: MatchBean): Int { + println("MatchService.updateMatch : $newMatch") if (getById(id) == null) { - println("MatchService.updateMatch : Match not found") return -1 } - // Broadcast the update via WebSocket -// matchWebSocketController?.broadcastMatchUpdate(savedMatch, MatchUpdateMessage.UpdateType.SCORE_UPDATE) - - // Créer nouveau MatchBean à l'id renseigné - val newMatch = MatchBean( - id = id, - date = date, - refereeID = refereeID, - player1ID = player1ID, - player2ID = player2ID, - score1 = scorePlayer1, - score2 = scorePlayer2 - ) - -// if ( -// // Supprimer le MatchBean à l'id en paramètre -// deleteMatch(id) == 1 -// && createMatch(newMatch) == 1) { -// -// // Insérer le nouveau MatchBean à l'id en paramètre -// -// -// return 1 -// } - - // Supprimer le MatchBean à l'id en paramètre - if (deleteMatch(id) == 1) { - // Insérer le nouveau MatchBean à l'id en paramètre - createMatch(newMatch) - } - + val updatedMatch = newMatch.copy(id = id) + matchRepository.save(updatedMatch) return 1 } // Supprimer un match (admin) - fun deleteMatch(id:Long) : Int { - println("MatchService.deleteMatch : $id") + fun deleteMatchById(id: Long?) : Int? { + println("MatchService.deleteMatchById : $id") - try { - matchRepository.deleteById(id) - } catch (e: Exception) { - println("Error deleting match: ${e.message}") + if (getById(id) == null) { + println("MatchService.deleteMatchById : Match not found") return -1 } - - // Broadcast the match cancellation via WebSocket before deleting -// matchWebSocketController?.broadcastMatchUpdate(matchID, MatchUpdateMessage.UpdateType.MATCH_CANCEL) + matchRepository.deleteById(id!!) return 1 } + + fun getMatchesByCity(city: String): List? { + println("MatchService.getMatchesByCity : $city") + + return matchRepository.findAll() + .filter { it.city == city } + } + + fun getMatchesByCountry(country: String): List? { + println("MatchService.getMatchesByCountry : $country") + + return matchRepository.findAll() + .filter { it.country == country } + } } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt index 2d5858a..9be9a80 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt @@ -4,70 +4,74 @@ import fr.teamflash.fencerjudgeback.entities.PlayerBean import fr.teamflash.fencerjudgeback.repositories.PlayerRepository import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service -import java.util.Optional @Service class PlayerService(@Autowired private val playerRepository: PlayerRepository) { // Obtenir tous les joueurs (public) fun getAll(): List { - println("RefereeService.getReferees") + println("PlayerService.getAll") return playerRepository.findAll() } // Obtenir un joueur par id (public) - fun getById(id:Long) : Optional { - println("RefereeService.getRefereeById : $id") - return playerRepository.findById(id) + fun getById(id:Long?) : PlayerBean? { + println("PlayerService.getById : $id") + + if (id == null) { + return null + } + + return playerRepository.findById(id).get() } // Obtenir un ou plusieurs joueur(s) par nom (public) fun getByName(name:String): List? { - println("RefereeService.getRefereeByName : $name") + println("PlayerService.getByName : $name") return playerRepository.findAll().filter{ it.name == name } } // Obtenir un ou plusieurs joueur(s) par prénom fun getByFirstName(firstName:String): List? { - println("RefereeService.getRefereeByFirstName : $firstName") + println("PlayerService.getByFirstName : $firstName") return playerRepository.findAll().filter{ it.firstName == firstName } } + // Obtenir un ou plusieurs joueur(s) par club + fun getByClub(club:String): List? { + println("PlayerService.getByClub : $club") + return playerRepository.findAll().filter{ it.club == club } + } + // Ajouter un joueur (admin) fun createPlayer(referee: PlayerBean) : PlayerBean { - println("RefereeService.createReferee : $referee") + println("PlayerService.createPlayer : $referee") return playerRepository.save(referee) } // Modifier un joueur (admin) - fun updatePlayer(id:Long, name:String, firstName: String) : Int { + fun updatePlayer(id:Long, newPlayer: PlayerBean) : Int { // Vérifier si le joueur existe à l'id renseigné if (getById(id) == null) { - println("RefereeService.updateReferee : Referee not found") + println("PlayerService.updatePlayer : Player not found") return -1 } - // Créer nouveau PlayerBean à l'id renseigné - val newPlayer = PlayerBean(id, name, firstName) - - // Supprimer le PlayerBean à l'id en paramètre - deletePlayer(id) - - // Insérer le nouveau PlayerBean - createPlayer(newPlayer) + val updatedPlayer = newPlayer.copy(id = id) + playerRepository.save(updatedPlayer) return 1 } // Supprimer un joueur (admin) - fun deletePlayer(id:Long): Int { - println("RefereeService.deleteReferee : $id") + fun deletePlayerById(id:Long?): Int { + println("PlayerService.deletePlayer : $id") if (getById(id) == null) { - println("RefereeService.deleteReferee : Referee not found") + println("PlayerService.deletePlayer : Player not found") return -1 } - playerRepository.deleteById(id) + playerRepository.deleteById(id!!) return 1 } } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt index 8d169ad..2fbbee2 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt @@ -3,9 +3,7 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.RefereeBean import fr.teamflash.fencerjudgeback.repositories.RefereeRepository import org.springframework.beans.factory.annotation.Autowired -import org.springframework.data.jpa.domain.AbstractPersistable_.id import org.springframework.stereotype.Service -import java.util.Optional @Service class RefereeService(@Autowired private val refereeRepository: RefereeRepository) { @@ -16,9 +14,14 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository } // Obtenir un arbitre par id (public) - fun getById(id:Long) : Optional { + fun getById(id:Long?) : RefereeBean? { println("RefereeService.getRefereeById : $id") - return refereeRepository.findById(id) + + if (id == null) { + return null + } + + return refereeRepository.findById(id).get() } // Obtenir un ou plusieurs arbitre(s) par nom (public) @@ -33,6 +36,12 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository return refereeRepository.findAll().filter{ it.firstName == firstName } } + // Obtenir un ou plusieurs arbitre(s) par qualification + fun getByQualification(qualification:String): List? { + println("RefereeService.getRefereeByQualification : $qualification") + return refereeRepository.findAll().filter{ it.qualification == qualification } + } + // Ajouter un arbitre (admin) fun createReferee(referee: RefereeBean) : RefereeBean { println("RefereeService.createReferee : $referee") @@ -40,27 +49,19 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository } // Modifier un arbitre (admin) - fun updateReferee(id:Long, name:String, firstName: String) : Int { + fun updateReferee(id:Long, newReferee: RefereeBean) : Int? { // Vérifier si l'arbitre existe à l'id renseigné if (getById(id) == null) { - println("RefereeService.updateReferee : Referee not found") return -1 } - // Créer nouveau RefereeBean à l'id renseigné - val newReferee = RefereeBean(id, name, firstName) - - // Supprimer le RefereeBean à l'id en paramètre - deleteReferee(id) - - // Insérer le nouveau RefereeBean à l'id en paramètre - createReferee(newReferee) - + val updatedMatch = newReferee.copy(id = id) + refereeRepository.save(updatedMatch) return 1 } // Supprimer un arbitre (admin) - fun deleteReferee(id:Long): Int { + fun deleteRefereeById(id:Long): Int { println("RefereeService.deleteReferee : $id") if (getById(id) == null) { diff --git a/FencerJudgeBack/src/main/resources/application.properties b/FencerJudgeBack/src/main/resources/application.properties index 6ada312..0084aa4 100644 --- a/FencerJudgeBack/src/main/resources/application.properties +++ b/FencerJudgeBack/src/main/resources/application.properties @@ -1 +1,16 @@ spring.application.name=FencerJudgeBack + +# H2 Database Configuration +spring.datasource.url=jdbc:h2:file:./db;AUTO_SERVER=true +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect + +# Enable H2 Console +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console + +# Hibernate Configuration +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true \ No newline at end of file diff --git a/FencerJudgeBack/test.http b/FencerJudgeBack/test.http new file mode 100644 index 0000000..6a6444e --- /dev/null +++ b/FencerJudgeBack/test.http @@ -0,0 +1,138 @@ +### Get all matches +GET http://localhost:8080/matches/ + +### Get matches by players --> TODO +GET http://localhost:8080/matches/players/1/2 + +### Get matches by date +GET http://localhost:8080/matches/date/2025-06-02 + +### Get matches by country +GET http://localhost:8080/matches/country/France + +### Get matches by city +GET http://localhost:8080/matches/city/Paris + +### Get active matches +GET http://localhost:8080/matches/active + +### Get finished matches +GET http://localhost:8080/matches/over + +### Get not started matches +GET http://localhost:8080/matches/not-started + +### Get match by ID +GET http://localhost:8080/matches/2 + +### Create new match +POST http://localhost:8080/matches/create-match +Content-Type: application/json + +{ + "weapon": "Épée", + "country": "France", + "city": "Paris", + "player1ID": 1, + "player2ID": 2, + "refereeID": 1, + "score1": 0, + "score2": 0, + "date": "2025-06-02", + "state": "NOT STARTED" +} + +### Update match +PUT http://localhost:8080/matches/update-match/4 +Content-Type: application/json + +{ + + "weapon": "Épée", + "country": "France", + "city": "Paris", + "player1ID": 1, + "player2ID": 2, + "refereeID": 1, + "score1": 5, + "score2": 3, + "date": "2025-06-02", + "state": "OVER" +} + +### Delete match +DELETE http://localhost:8080/matches/delete-match/3 + +### Get all referees +GET http://localhost:8080/referees/ + +### Get referee by ID +GET http://localhost:8080/referees/1 + +### Get referees by name +GET http://localhost:8080/referees/name/Smith + +### Get referees by firstname +GET http://localhost:8080/referees/firstname/John + +### Get referees by qualification +GET http://localhost:8080/referees/qualification/NATIONAL + +### Create new referee +POST http://localhost:8080/referees/create-referee +Content-Type: application/json + +{ + "name": "Smith", + "firstName": "John", + "qualification": "NATIONAL" +} + +### Update referee +PUT http://localhost:8080/referees/update-referee/6 +Content-Type: application/json + +{ + "name": "Smith", + "firstName": "John", + "qualification": "INTERNATIONAL" +} + +### Delete referee +DELETE http://localhost:8080/referees/delete-referee/5 + +### Get all players +GET http://localhost:8080/players/ + +### Get player by ID +GET http://localhost:8080/players/10 + +### Get players by name +GET http://localhost:8080/players/name/Doe + +### Get players by firstname +GET http://localhost:8080/players/firstname/Jane + +### Create new player +POST http://localhost:8080/players/create-player +Content-Type: application/json + +{ + "name": "Doe", + "firstName": "Jane", + "club": "Paris Escrime Club" +} + +### Update player +PUT http://localhost:8080/players/update-player/10 +Content-Type: application/json + +{ + "name": "Doe", + "firstName": "Jane", + "club": "Un autre club" +} + +### Delete player +DELETE http://localhost:8080/players/delete-player/10 + From f6e1b6b4880569d0a836b4df33afbeb2536a2df5 Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 2 Jun 2025 13:40:04 +0200 Subject: [PATCH 15/19] maj README --- FencerJudgeBack/README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index b1fb3c6..c3d2692 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -1,6 +1,9 @@ # Entités ## MATCHES (MatchBean) - id -> Long +- country -> String +- city -> String +- weapon -> String - player1ID -> Long - player2ID -> Long - refereeID (arbitre) -> Long @@ -18,11 +21,13 @@ - id -> Long - name (nom de famille) -> String - firstName (prénom) -> String +- qualification -> String ## JOUEURS (PlayerBean) - id -> Long - name (nom de famille) -> String - firstName (prénom) -> String +- club -> String # Actions REST sur les entités ## matches (MatchRestController, "/matches") @@ -42,9 +47,13 @@ - Ajouter un match -> **POST "/matches/add-match"** { date=$date, + country=$country + city=$city, + weapon=$weapon, refereeID=$refereeID, player1ID=$player1ID, - player2ID=$player2ID + player2ID=$player2ID, + } -> MatchBean - Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> **POST "/matches/delete-match"** @@ -59,7 +68,8 @@ - Ajouter un arbitre ->**POST "/referees/add-referee"** { name=$name, - firstName=$firstName + firstName=$firstName, + qualification=$qualification } -> RefereeBean - Supprimer un arbitre ->**POST "/referees/delete-referee/"** @@ -74,7 +84,8 @@ - Ajouter un joueur ->**POST "/players/add-player"** { name=$name, - firstName=$firstName + firstName=$firstName, + club=$club } -> PlayerBean - Supprimer un joueur ->**POST "/players/delete-player"** From 4177bf8c5242d189e0f77d26dea6096b0581a56c Mon Sep 17 00:00:00 2001 From: pedro Date: Mon, 2 Jun 2025 14:36:54 +0200 Subject: [PATCH 16/19] travail sur websocket --- FencerJudgeBack/README.md | 43 +++++++ FencerJudgeBack/TODO.txt | 8 +- .../fencerjudgeback/config/WebSocketConfig.kt | 30 +++++ .../fencerjudgeback/entities/MatchBean.kt | 4 +- .../fencerjudgeback/services/MatchService.kt | 20 ++- .../fencerjudgeback/services/PlayerService.kt | 33 ++++- .../services/RefereeService.kt | 27 +++- .../views/testWebSocketHTML.html | 87 +++++++++++++ .../fencerjudgeback/websocket/README.md | 120 ++++++++++++++++++ .../websocket/WebsocketController.kt | 41 ++++++ .../controllers/MatchWebSocketController.kt | 101 +++++++++++++++ .../controllers/PlayerWebSocketController.kt | 71 +++++++++++ .../controllers/RefereeWebSocketController.kt | 66 ++++++++++ .../websocket/models/MatchUpdateMessage.kt | 43 +++++++ .../websocket/models/PlayerUpdateMessage.kt | 35 +++++ .../websocket/models/RefereeUpdateMessage.kt | 35 +++++ 16 files changed, 741 insertions(+), 23 deletions(-) create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/README.md create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/WebsocketController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/PlayerWebSocketController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/RefereeWebSocketController.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/MatchUpdateMessage.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/PlayerUpdateMessage.kt create mode 100644 FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/RefereeUpdateMessage.kt diff --git a/FencerJudgeBack/README.md b/FencerJudgeBack/README.md index c3d2692..e334d69 100644 --- a/FencerJudgeBack/README.md +++ b/FencerJudgeBack/README.md @@ -92,3 +92,46 @@ { id=$id } + +# Websocket (http://localhost:8080/ws) +- Vider le channel +- Insérer une donnée dans le channel +- Modifier une donnée dans le channel +- Supprimer une donnée du channel + +## MATCHES +## matches (MatchRestController, "/matches") +- Lister tous les matches -> dans le channel Websocket +- Lister tous les matches à partir d'une certaine date -> dans le channel Websocket +- Lister les matches en cours (état : en cours) -> **GET "/matches/active"** -> List +- Lister les matches terminés (état : terminé) -> **GET "/matches/over"** -> List +- Lister les matches non commencés (état : non commencé) -> **GET "/matches/not-started"** -> List +- Afficher un match par id -> **GET "/matches/id=&id"** -> MatchBean +- Mettre à jour les score d'un match récupéré par id -> **POST "/matches/update-match"** +{ + id=$id, + score1=$score1, + score2=$score2 +} +-> MatchBean +- Ajouter un match -> **POST "/matches/add-match"** +{ + date=$date, + country=$country + city=$city, + weapon=$weapon, + refereeID=$refereeID, + player1ID=$player1ID, + player2ID=$player2ID, + +} +-> MatchBean +- Supprimer un match (supprimer élément de MatchRepository en récupérant l'id) -> **POST "/matches/delete-match"** +{ + id=$id +} + +## REFEREES + + +## PLAYERS \ No newline at end of file diff --git a/FencerJudgeBack/TODO.txt b/FencerJudgeBack/TODO.txt index f214c4a..b3e8f97 100644 --- a/FencerJudgeBack/TODO.txt +++ b/FencerJudgeBack/TODO.txt @@ -1,6 +1,6 @@ -corriger les services - ~ -tester les restcontrollers via des requêtes http - ~ -créer la bdd avec toutes les tables (repositories) -tester le websocket +corriger les services - V +tester les restcontrollers via des requêtes http - V +créer la bdd avec toutes les tables (repositories) - V +tester le websocket - prévoir l'utilisation en admin uniquement (spring security) faire le jackarta de l'api \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt new file mode 100644 index 0000000..a0da6c2 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt @@ -0,0 +1,30 @@ +package fr.teamflash.fencerjudgeback.config + +import org.springframework.context.annotation.Configuration +import org.springframework.messaging.simp.config.MessageBrokerRegistry +import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker +import org.springframework.web.socket.config.annotation.StompEndpointRegistry +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer + +const val CHANNEL_NAME: String = "/ws/topic" + +@Configuration +@EnableWebSocketMessageBroker +open class WebSocketConfig : WebSocketMessageBrokerConfigurer { + + override fun configureMessageBroker(registry: MessageBrokerRegistry) { + // Enable a simple memory-based message broker to send messages to clients + // Prefix for messages FROM server TO client + registry.enableSimpleBroker(CHANNEL_NAME) + + // Prefix for messages FROM client TO server + registry.setApplicationDestinationPrefixes("/ws") + } + + override fun registerStompEndpoints(registry: StompEndpointRegistry) { + // Register the "/ws" endpoint, enabling SockJS fallback options + registry.addEndpoint("/ws") + .setAllowedOriginPatterns("*") // Allow connections from any origin (adjust for production) + .withSockJS() + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt index f6d03e7..0f95236 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/entities/MatchBean.kt @@ -25,9 +25,9 @@ data class MatchBean( val player2ID:Long?=null, val refereeID: Long?=null, @field:Min(value = 0, message = "Score must be at least 0") - val score1:Int=0, + var score1:Int=0, @field:Min(value = 0, message = "Score must be at least 0") - val score2:Int=0, + var score2:Int=0, val date: String?=null, val state:String?=null ) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt index c7102a3..1e5f24b 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/MatchService.kt @@ -39,10 +39,11 @@ class MatchService( // Ajouter un match (admin) fun createMatch(newMatch: MatchBean): MatchBean { println("MatchService.createMatch : $newMatch") + val savedMatch = matchRepository.save(newMatch) // Broadcast the new match via WebSocket -// matchWebSocketController?.broadcastMatchUpdate(savedMatch, MatchUpdateMessage.UpdateType.MATCH_START) + matchWebSocketController?.broadcastMatchUpdate(savedMatch, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.MATCH_START) - return matchRepository.save(newMatch) + return savedMatch } // Modifier un match (admin) @@ -54,7 +55,9 @@ class MatchService( } val updatedMatch = newMatch.copy(id = id) - matchRepository.save(updatedMatch) + val savedMatch = matchRepository.save(updatedMatch) + // Broadcast the updated match via WebSocket + matchWebSocketController?.broadcastMatchUpdate(savedMatch, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.SCORE_UPDATE) return 1 } @@ -62,10 +65,15 @@ class MatchService( fun deleteMatchById(id: Long?) : Int? { println("MatchService.deleteMatchById : $id") - if (getById(id) == null) { + val match = getById(id) + if (match == null) { println("MatchService.deleteMatchById : Match not found") return -1 } + + // Broadcast the match deletion via WebSocket before deleting + matchWebSocketController?.broadcastMatchUpdate(match, fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage.UpdateType.MATCH_CANCEL) + matchRepository.deleteById(id!!) return 1 } @@ -83,4 +91,8 @@ class MatchService( return matchRepository.findAll() .filter { it.country == country } } + + fun addMatch(match:MatchBean) { + matchRepository.save(match) + } } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt index 9be9a80..0443f0e 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/PlayerService.kt @@ -2,11 +2,17 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.PlayerBean import fr.teamflash.fencerjudgeback.repositories.PlayerRepository +import fr.teamflash.fencerjudgeback.websocket.controllers.PlayerWebSocketController +import fr.teamflash.fencerjudgeback.websocket.models.PlayerUpdateMessage import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Lazy import org.springframework.stereotype.Service @Service -class PlayerService(@Autowired private val playerRepository: PlayerRepository) { +class PlayerService( + @Autowired private val playerRepository: PlayerRepository, + @Lazy private val playerWebSocketController: PlayerWebSocketController? = null +) { // Obtenir tous les joueurs (public) fun getAll(): List { println("PlayerService.getAll") @@ -43,9 +49,12 @@ class PlayerService(@Autowired private val playerRepository: PlayerRepository) { } // Ajouter un joueur (admin) - fun createPlayer(referee: PlayerBean) : PlayerBean { - println("PlayerService.createPlayer : $referee") - return playerRepository.save(referee) + fun createPlayer(player: PlayerBean) : PlayerBean { + println("PlayerService.createPlayer : $player") + val savedPlayer = playerRepository.save(player) + // Broadcast the new player via WebSocket + playerWebSocketController?.broadcastPlayerUpdate(savedPlayer, PlayerUpdateMessage.UpdateType.PLAYER_CREATE) + return savedPlayer } // Modifier un joueur (admin) @@ -57,7 +66,9 @@ class PlayerService(@Autowired private val playerRepository: PlayerRepository) { } val updatedPlayer = newPlayer.copy(id = id) - playerRepository.save(updatedPlayer) + val savedPlayer = playerRepository.save(updatedPlayer) + // Broadcast the updated player via WebSocket + playerWebSocketController?.broadcastPlayerUpdate(savedPlayer, PlayerUpdateMessage.UpdateType.PLAYER_UPDATE) return 1 } @@ -66,12 +77,20 @@ class PlayerService(@Autowired private val playerRepository: PlayerRepository) { fun deletePlayerById(id:Long?): Int { println("PlayerService.deletePlayer : $id") - if (getById(id) == null) { + val player = getById(id) + if (player == null) { println("PlayerService.deletePlayer : Player not found") return -1 } + // Broadcast the player deletion via WebSocket before deleting + playerWebSocketController?.broadcastPlayerUpdate(player, PlayerUpdateMessage.UpdateType.PLAYER_DELETE) + playerRepository.deleteById(id!!) return 1 } -} \ No newline at end of file + + fun addPlayer(player:PlayerBean) { + playerRepository.save(player) + } +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt index 2fbbee2..218a1cb 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/services/RefereeService.kt @@ -2,11 +2,17 @@ package fr.teamflash.fencerjudgeback.services import fr.teamflash.fencerjudgeback.entities.RefereeBean import fr.teamflash.fencerjudgeback.repositories.RefereeRepository +import fr.teamflash.fencerjudgeback.websocket.controllers.RefereeWebSocketController +import fr.teamflash.fencerjudgeback.websocket.models.RefereeUpdateMessage import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.Lazy import org.springframework.stereotype.Service @Service -class RefereeService(@Autowired private val refereeRepository: RefereeRepository) { +class RefereeService( + @Autowired private val refereeRepository: RefereeRepository, + @Lazy private val refereeWebSocketController: RefereeWebSocketController? = null +) { // Obtenir tous les arbitres (public) fun getAll(): List { println("RefereeService.getReferees") @@ -45,7 +51,10 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository // Ajouter un arbitre (admin) fun createReferee(referee: RefereeBean) : RefereeBean { println("RefereeService.createReferee : $referee") - return refereeRepository.save(referee) + val savedReferee = refereeRepository.save(referee) + // Broadcast the new referee via WebSocket + refereeWebSocketController?.broadcastRefereeUpdate(savedReferee, RefereeUpdateMessage.UpdateType.REFEREE_CREATE) + return savedReferee } // Modifier un arbitre (admin) @@ -55,8 +64,10 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository return -1 } - val updatedMatch = newReferee.copy(id = id) - refereeRepository.save(updatedMatch) + val updatedReferee = newReferee.copy(id = id) + val savedReferee = refereeRepository.save(updatedReferee) + // Broadcast the updated referee via WebSocket + refereeWebSocketController?.broadcastRefereeUpdate(savedReferee, RefereeUpdateMessage.UpdateType.REFEREE_UPDATE) return 1 } @@ -64,12 +75,16 @@ class RefereeService(@Autowired private val refereeRepository: RefereeRepository fun deleteRefereeById(id:Long): Int { println("RefereeService.deleteReferee : $id") - if (getById(id) == null) { + val referee = getById(id) + if (referee == null) { println("RefereeService.deleteReferee : Referee not found") return -1 } + // Broadcast the referee deletion via WebSocket before deleting + refereeWebSocketController?.broadcastRefereeUpdate(referee, RefereeUpdateMessage.UpdateType.REFEREE_DELETE) + refereeRepository.deleteById(id) return 1 } -} \ No newline at end of file +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html new file mode 100644 index 0000000..cc5e435 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html @@ -0,0 +1,87 @@ + + + + + Test WebSocket Match + + + + +

Test WebSocket Match

+ +
Connexion...
+ +
+ + + + +
+ +
+ + + +
+ + + + + + + + + + diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/README.md b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/README.md new file mode 100644 index 0000000..ebd2037 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/README.md @@ -0,0 +1,120 @@ +# WebSocket Implementation for FencerJudge + +This document explains how to use the WebSocket functionality in the FencerJudge application for real-time match updates. + +## Overview + +The WebSocket implementation allows for real-time updates of match information, including: +- Match creation +- Score updates +- Match completion +- Match cancellation + +## WebSocket Endpoints + +### Connection Endpoint +``` +ws://localhost:8080/ws +``` + +The WebSocket endpoint supports SockJS for fallback in browsers that don't support WebSockets natively. + +## Message Topics + +### Subscribe to Match Updates +To receive real-time match updates, subscribe to: +``` +/topic/match.updates +``` + +### Send Match Updates +To send match updates from the client to the server: +``` +/app/match.update +``` + +## Message Format + +Match update messages use the following JSON format: + +```json +{ + "matchId": 1, + "player1Id": 101, + "player2Id": 102, + "refereeId": 201, + "score1": 5, + "score2": 3, + "date": "2023-06-01", + "type": "SCORE_UPDATE" +} +``` + +The `type` field can have the following values: +- `SCORE_UPDATE`: When a match score is updated +- `MATCH_START`: When a new match is created +- `MATCH_END`: When a match is completed +- `MATCH_CANCEL`: When a match is cancelled + +## Integration with REST API + +The WebSocket functionality is integrated with the REST API. Any changes made through the REST endpoints will automatically trigger WebSocket messages to all connected clients. + +REST endpoints: +- `GET /api/matches`: Get all matches +- `GET /api/matches/{id}`: Get a match by ID +- `POST /api/matches`: Create a new match (triggers MATCH_START WebSocket message) +- `PUT /api/matches/{id}`: Update a match (triggers SCORE_UPDATE WebSocket message) +- `PATCH /api/matches/{id}/score`: Update just the score (triggers SCORE_UPDATE WebSocket message) +- `DELETE /api/matches/{id}`: Delete a match (triggers MATCH_CANCEL WebSocket message) + +## Client-Side Example (JavaScript) + +```javascript +// Using SockJS and STOMP client +import SockJS from 'sockjs-client'; +import { Client } from '@stomp/stompjs'; + +// Create a new STOMP client +const socket = new SockJS('http://localhost:8080/ws'); +const stompClient = new Client({ + webSocketFactory: () => socket, + debug: (str) => console.log(str) +}); + +// Connect to the WebSocket server +stompClient.activate(); + +// Subscribe to match updates +stompClient.onConnect = (frame) => { + console.log('Connected to WebSocket'); + + // Subscribe to match updates + stompClient.subscribe('/topic/match.updates', (message) => { + const matchUpdate = JSON.parse(message.body); + console.log('Received match update:', matchUpdate); + + // Handle the update in your application + // e.g., update UI, play sound, etc. + }); +}; + +// Send a match update (e.g., when a referee updates a score) +function sendMatchUpdate(matchId, score1, score2) { + if (stompClient.connected) { + stompClient.publish({ + destination: '/app/match.update', + body: JSON.stringify({ + matchId: matchId, + score1: score1, + score2: score2, + type: 'SCORE_UPDATE' + }) + }); + } +} +``` + +## Security Considerations + +The WebSocket endpoint is currently configured to allow connections from any origin (`*`). For production environments, this should be restricted to specific allowed origins. \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/WebsocketController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/WebsocketController.kt new file mode 100644 index 0000000..af33708 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/WebsocketController.kt @@ -0,0 +1,41 @@ +package fr.teamflash.fencerjudgeback.websocket + +import org.springframework.messaging.handler.annotation.MessageMapping +import org.springframework.messaging.simp.SimpMessagingTemplate +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping + +data class Data(val id: String, val value: Any) + +@Controller +@RequestMapping("/ws") +class WebSocketController(private val messagingTemplate: SimpMessagingTemplate) { + + // Insérer une donnée dans le channel + @MessageMapping("/insert") + fun insertData(data: Data) { + // Logique d'insertion + messagingTemplate.convertAndSend("/topic/data", data) + } + + // Modifier une donnée existente dans le channel + @MessageMapping("/modify") + fun modifyData(data: Data) { + // Logique de modification + messagingTemplate.convertAndSend("/topic/data", data) + } + + // Supprimer une donnée existante dans le channel + @MessageMapping("/delete") + fun deleteData(id: String) { + // Logique de suppression + messagingTemplate.convertAndSend("/topic/data/delete", id) + } + + // Vider le channel + @MessageMapping("/clear") + fun clearChannel() { + // Logique pour vider le channel + messagingTemplate.convertAndSend("/topic/data/clear", null) + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt new file mode 100644 index 0000000..8bb3e06 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt @@ -0,0 +1,101 @@ +package fr.teamflash.fencerjudgeback.websocket.controllers + +import fr.teamflash.fencerjudgeback.config.CHANNEL_NAME +import fr.teamflash.fencerjudgeback.entities.MatchBean +import fr.teamflash.fencerjudgeback.services.MatchService +import fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage +import org.springframework.context.event.EventListener +import org.springframework.messaging.handler.annotation.MessageMapping +import org.springframework.messaging.handler.annotation.SendTo +import org.springframework.messaging.simp.SimpMessagingTemplate +import org.springframework.messaging.simp.stomp.StompHeaderAccessor +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.socket.messaging.SessionSubscribeEvent + +@Controller +@RequestMapping("/ws") +class MatchWebSocketController( + private val matchService: MatchService, + private val messagingTemplate: SimpMessagingTemplate +) { + + private val messageHistory = ArrayList() + + @MessageMapping("/matches") + fun receiveMessage(message: MatchBean) { + println("/ws/matches $message") + messageHistory.add(message) + + // Envoyer la liste des messages sur le channel + //Si la variable est dans le même package il faut enlever WebSocketConfig. + messagingTemplate.convertAndSend(CHANNEL_NAME, messageHistory) + } + + /** + * Handle match update requests from clients + * Client sends to: /app/match.update + * Server broadcasts to: /topic/match.updates + */ + @MessageMapping("/match.update") + @SendTo("/topic/match.updates") + fun handleMatchUpdate(matchUpdateMessage: MatchUpdateMessage): MatchUpdateMessage { + // Create a MatchBean from the update message + val matchBean = MatchBean( + id = matchUpdateMessage.matchId, + player1ID = matchUpdateMessage.player1Id, + player2ID = matchUpdateMessage.player2Id, + refereeID = matchUpdateMessage.refereeId, + score1 = matchUpdateMessage.score1, + score2 = matchUpdateMessage.score2, + date = matchUpdateMessage.date + ) + + // Update the match in the database + matchService.updateMatch(matchBean.id, matchBean) + + // Return the update message to be broadcast to all subscribers + return matchUpdateMessage + } + + /** + * Broadcast a match update to all connected clients + * This method can be called from other services + */ + fun broadcastMatchUpdate(matchBean: MatchBean, type: MatchUpdateMessage.UpdateType = MatchUpdateMessage.UpdateType.SCORE_UPDATE) { + val updateMessage = MatchUpdateMessage.fromMatchBean(matchBean, type) + messagingTemplate.convertAndSend("/topic/match.updates", updateMessage) + } + + //A mettre dans le controller + @EventListener + fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) { + val headerAccessor = StompHeaderAccessor.wrap(event.message) + if (CHANNEL_NAME == headerAccessor.destination) { + messagingTemplate.convertAndSend(CHANNEL_NAME, messageHistory) + } + } + + fun addPoint(match:MatchBean, playerId:Long) { + when (playerId) { + match.player1ID -> match.score1 += 1 + match.player2ID -> match.score2 += 1 + } + matchService.updateMatch(match.id, match) + broadcastMatchUpdate(match) + } + + fun minusPoint(match:MatchBean, playerId:Long) { + when (playerId) { + match.player1ID -> if (match.score1 > 0) match.score1 -= 1 + match.player2ID -> if (match.score2 > 0) match.score2 -= 1 + } + matchService.updateMatch(match.id, match) + broadcastMatchUpdate(match) + } + + fun addMatchtoMainList(match:MatchBean) { + matchService.addMatch(match) + broadcastMatchUpdate(match, MatchUpdateMessage.UpdateType.NEW_MATCH) + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/PlayerWebSocketController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/PlayerWebSocketController.kt new file mode 100644 index 0000000..258ff90 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/PlayerWebSocketController.kt @@ -0,0 +1,71 @@ +package fr.teamflash.fencerjudgeback.websocket.controllers + +import fr.teamflash.fencerjudgeback.config.CHANNEL_NAME +import fr.teamflash.fencerjudgeback.entities.PlayerBean +import fr.teamflash.fencerjudgeback.services.PlayerService +import fr.teamflash.fencerjudgeback.websocket.models.PlayerUpdateMessage +import org.springframework.context.event.EventListener +import org.springframework.messaging.handler.annotation.MessageMapping +import org.springframework.messaging.handler.annotation.SendTo +import org.springframework.messaging.simp.SimpMessagingTemplate +import org.springframework.messaging.simp.stomp.StompHeaderAccessor +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.socket.messaging.SessionSubscribeEvent + +@Controller +@RequestMapping("/ws") +class PlayerWebSocketController( + private val playerService: PlayerService, + private val messagingTemplate: SimpMessagingTemplate +) { + + private val messageHistory = ArrayList() + + @MessageMapping("/player.update") + @SendTo("/topic/player.updates") + fun handlePlayerUpdate(playerUpdateMessage: PlayerUpdateMessage): PlayerUpdateMessage { + // Create a PlayerBean from the update message + val playerBean = PlayerBean( + id = playerUpdateMessage.playerId, + name = playerUpdateMessage.name, + firstName = playerUpdateMessage.firstName, + club = playerUpdateMessage.club + ) + + // Update the player in the database + playerService.updatePlayer(playerBean.id ?: 0, playerBean) + + // Return the update message to be broadcast to all subscribers + return playerUpdateMessage + } + + /** + * Broadcast a player update to all connected clients + * This method can be called from other services + */ + fun broadcastPlayerUpdate(playerBean: PlayerBean, type: PlayerUpdateMessage.UpdateType = PlayerUpdateMessage.UpdateType.PLAYER_UPDATE) { + val updateMessage = PlayerUpdateMessage.fromPlayerBean(playerBean, type) + messagingTemplate.convertAndSend("/topic/player.updates", updateMessage) + } + + @EventListener + fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) { + val headerAccessor = StompHeaderAccessor.wrap(event.message) + if ("/topic/player.updates" == headerAccessor.destination) { + // When a client subscribes, send them the current players + val players = playerService.getAll() + players.forEach { player -> + messagingTemplate.convertAndSend( + "/topic/player.updates", + PlayerUpdateMessage.fromPlayerBean(player, PlayerUpdateMessage.UpdateType.PLAYER_UPDATE) + ) + } + } + } + + fun addPlayerToMainList(playerBean: PlayerBean) { + playerService.addPlayer(playerBean) + broadcastPlayerUpdate(playerBean, PlayerUpdateMessage.UpdateType.PLAYER_CREATE) + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/RefereeWebSocketController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/RefereeWebSocketController.kt new file mode 100644 index 0000000..2b21601 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/RefereeWebSocketController.kt @@ -0,0 +1,66 @@ +package fr.teamflash.fencerjudgeback.websocket.controllers + +import fr.teamflash.fencerjudgeback.config.CHANNEL_NAME +import fr.teamflash.fencerjudgeback.entities.RefereeBean +import fr.teamflash.fencerjudgeback.services.RefereeService +import fr.teamflash.fencerjudgeback.websocket.models.RefereeUpdateMessage +import org.springframework.context.event.EventListener +import org.springframework.messaging.handler.annotation.MessageMapping +import org.springframework.messaging.handler.annotation.SendTo +import org.springframework.messaging.simp.SimpMessagingTemplate +import org.springframework.messaging.simp.stomp.StompHeaderAccessor +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.socket.messaging.SessionSubscribeEvent + +@Controller +@RequestMapping("/ws") +class RefereeWebSocketController( + private val refereeService: RefereeService, + private val messagingTemplate: SimpMessagingTemplate +) { + + private val messageHistory = ArrayList() + + @MessageMapping("/referee.update") + @SendTo("/topic/referee.updates") + fun handleRefereeUpdate(refereeUpdateMessage: RefereeUpdateMessage): RefereeUpdateMessage { + // Create a RefereeBean from the update message + val refereeBean = RefereeBean( + id = refereeUpdateMessage.refereeId, + name = refereeUpdateMessage.name, + firstName = refereeUpdateMessage.firstName, + qualification = refereeUpdateMessage.qualification + ) + + // Update the referee in the database + refereeService.updateReferee(refereeBean.id ?: 0, refereeBean) + + // Return the update message to be broadcast to all subscribers + return refereeUpdateMessage + } + + /** + * Broadcast a referee update to all connected clients + * This method can be called from other services + */ + fun broadcastRefereeUpdate(refereeBean: RefereeBean, type: RefereeUpdateMessage.UpdateType = RefereeUpdateMessage.UpdateType.REFEREE_UPDATE) { + val updateMessage = RefereeUpdateMessage.fromRefereeBean(refereeBean, type) + messagingTemplate.convertAndSend("/topic/referee.updates", updateMessage) + } + + @EventListener + fun handleWebSocketSubscribeListener(event: SessionSubscribeEvent) { + val headerAccessor = StompHeaderAccessor.wrap(event.message) + if ("/topic/referee.updates" == headerAccessor.destination) { + // When a client subscribes, send them the current referees + val referees = refereeService.getAll() + referees.forEach { referee -> + messagingTemplate.convertAndSend( + "/topic/referee.updates", + RefereeUpdateMessage.fromRefereeBean(referee, RefereeUpdateMessage.UpdateType.REFEREE_UPDATE) + ) + } + } + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/MatchUpdateMessage.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/MatchUpdateMessage.kt new file mode 100644 index 0000000..028845f --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/MatchUpdateMessage.kt @@ -0,0 +1,43 @@ +package fr.teamflash.fencerjudgeback.websocket.models + +import fr.teamflash.fencerjudgeback.entities.MatchBean + +/** + * Message model for match updates sent through WebSocket + */ +data class MatchUpdateMessage( + val matchId: Long, + val player1Id: Long?, + val player2Id: Long?, + val refereeId: Long?, + val score1: Int, + val score2: Int, + val date: String?, + val type: UpdateType = UpdateType.SCORE_UPDATE +) { + enum class UpdateType { + SCORE_UPDATE, + MATCH_START, + MATCH_END, + MATCH_CANCEL, + NEW_MATCH, + } + + companion object { + /** + * Create a MatchUpdateMessage from a MatchBean + */ + fun fromMatchBean(matchBean: MatchBean, type: UpdateType = UpdateType.SCORE_UPDATE): MatchUpdateMessage { + return MatchUpdateMessage( + matchId = matchBean.id ?: 0, + player1Id = matchBean.player1ID, + player2Id = matchBean.player2ID, + refereeId = matchBean.refereeID, + score1 = matchBean.score1, + score2 = matchBean.score2, + date = matchBean.date, + type = type + ) + } + } +} \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/PlayerUpdateMessage.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/PlayerUpdateMessage.kt new file mode 100644 index 0000000..c45b1e5 --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/PlayerUpdateMessage.kt @@ -0,0 +1,35 @@ +package fr.teamflash.fencerjudgeback.websocket.models + +import fr.teamflash.fencerjudgeback.entities.PlayerBean + +/** + * Message model for player updates sent through WebSocket + */ +data class PlayerUpdateMessage( + val playerId: Long, + val name: String?, + val firstName: String?, + val club: String?, + val type: UpdateType = UpdateType.PLAYER_UPDATE +) { + enum class UpdateType { + PLAYER_UPDATE, + PLAYER_CREATE, + PLAYER_DELETE + } + + companion object { + /** + * Create a PlayerUpdateMessage from a PlayerBean + */ + fun fromPlayerBean(playerBean: PlayerBean, type: UpdateType = UpdateType.PLAYER_UPDATE): PlayerUpdateMessage { + return PlayerUpdateMessage( + playerId = playerBean.id ?: 0, + name = playerBean.name, + firstName = playerBean.firstName, + club = playerBean.club, + type = type + ) + } + } +} diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/RefereeUpdateMessage.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/RefereeUpdateMessage.kt new file mode 100644 index 0000000..cb9c1be --- /dev/null +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/models/RefereeUpdateMessage.kt @@ -0,0 +1,35 @@ +package fr.teamflash.fencerjudgeback.websocket.models + +import fr.teamflash.fencerjudgeback.entities.RefereeBean + +/** + * Message model for referee updates sent through WebSocket + */ +data class RefereeUpdateMessage( + val refereeId: Long, + val name: String?, + val firstName: String?, + val qualification: String?, + val type: UpdateType = UpdateType.REFEREE_UPDATE +) { + enum class UpdateType { + REFEREE_UPDATE, + REFEREE_CREATE, + REFEREE_DELETE + } + + companion object { + /** + * Create a RefereeUpdateMessage from a RefereeBean + */ + fun fromRefereeBean(refereeBean: RefereeBean, type: UpdateType = UpdateType.REFEREE_UPDATE): RefereeUpdateMessage { + return RefereeUpdateMessage( + refereeId = refereeBean.id ?: 0, + name = refereeBean.name, + firstName = refereeBean.firstName, + qualification = refereeBean.qualification, + type = type + ) + } + } +} \ No newline at end of file From eaefd42f1dfa366d0b5b871842d616681d75ea7e Mon Sep 17 00:00:00 2001 From: clemcle81500 Date: Mon, 2 Jun 2025 15:30:57 +0200 Subject: [PATCH 17/19] websocket fixing --- .../fencerjudgeback/config/WebSocketConfig.kt | 2 +- .../websocket/controllers/MatchWebSocketController.kt | 11 ++++++----- .../views => resources/static}/testWebSocketHTML.html | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) rename FencerJudgeBack/src/main/{kotlin/fr/teamflash/fencerjudgeback/views => resources/static}/testWebSocketHTML.html (93%) diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt index a0da6c2..341b6f1 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/config/WebSocketConfig.kt @@ -23,7 +23,7 @@ open class WebSocketConfig : WebSocketMessageBrokerConfigurer { override fun registerStompEndpoints(registry: StompEndpointRegistry) { // Register the "/ws" endpoint, enabling SockJS fallback options - registry.addEndpoint("/ws") + registry.addEndpoint("/ws/matches-app") .setAllowedOriginPatterns("*") // Allow connections from any origin (adjust for production) .withSockJS() } diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt index 8bb3e06..e75518d 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt +++ b/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/websocket/controllers/MatchWebSocketController.kt @@ -6,7 +6,6 @@ import fr.teamflash.fencerjudgeback.services.MatchService import fr.teamflash.fencerjudgeback.websocket.models.MatchUpdateMessage import org.springframework.context.event.EventListener import org.springframework.messaging.handler.annotation.MessageMapping -import org.springframework.messaging.handler.annotation.SendTo import org.springframework.messaging.simp.SimpMessagingTemplate import org.springframework.messaging.simp.stomp.StompHeaderAccessor import org.springframework.stereotype.Controller @@ -14,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.socket.messaging.SessionSubscribeEvent @Controller -@RequestMapping("/ws") +@RequestMapping("/ws/matches") class MatchWebSocketController( private val matchService: MatchService, private val messagingTemplate: SimpMessagingTemplate @@ -22,7 +21,7 @@ class MatchWebSocketController( private val messageHistory = ArrayList() - @MessageMapping("/matches") + @MessageMapping("/all") fun receiveMessage(message: MatchBean) { println("/ws/matches $message") messageHistory.add(message) @@ -37,8 +36,7 @@ class MatchWebSocketController( * Client sends to: /app/match.update * Server broadcasts to: /topic/match.updates */ - @MessageMapping("/match.update") - @SendTo("/topic/match.updates") + @MessageMapping("/update") fun handleMatchUpdate(matchUpdateMessage: MatchUpdateMessage): MatchUpdateMessage { // Create a MatchBean from the update message val matchBean = MatchBean( @@ -73,6 +71,7 @@ class MatchWebSocketController( val headerAccessor = StompHeaderAccessor.wrap(event.message) if (CHANNEL_NAME == headerAccessor.destination) { messagingTemplate.convertAndSend(CHANNEL_NAME, messageHistory) + println("Lancement...") } } @@ -94,8 +93,10 @@ class MatchWebSocketController( broadcastMatchUpdate(match) } + @MessageMapping("/add") fun addMatchtoMainList(match:MatchBean) { matchService.addMatch(match) + messageHistory.add(match) broadcastMatchUpdate(match, MatchUpdateMessage.UpdateType.NEW_MATCH) } } \ No newline at end of file diff --git a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html b/FencerJudgeBack/src/main/resources/static/testWebSocketHTML.html similarity index 93% rename from FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html rename to FencerJudgeBack/src/main/resources/static/testWebSocketHTML.html index cc5e435..1009354 100644 --- a/FencerJudgeBack/src/main/kotlin/fr/teamflash/fencerjudgeback/views/testWebSocketHTML.html +++ b/FencerJudgeBack/src/main/resources/static/testWebSocketHTML.html @@ -47,8 +47,8 @@