From ef528aa524fed6cb578c0b8f51d6954516759609 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Wed, 3 Sep 2025 19:53:19 +0200 Subject: [PATCH 1/3] fix: log message length --- src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java index b3d170c..4d1dd9d 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/LogModel.java @@ -30,8 +30,10 @@ public class LogModel { Long target_id; + @Column(columnDefinition = "TEXT") String target_name; + @Column(columnDefinition = "TEXT") String message; public enum ActionType { -- 2.49.0 From e86fe42b3dd1a42220e56df1793368e663451fb5 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Wed, 3 Sep 2025 21:35:36 +0200 Subject: [PATCH 2/3] fix: club order --- src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java | 4 +++- src/main/webapp/src/pages/admin/club/ClubPage.jsx | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java b/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java index d4dcf09..7048e4f 100644 --- a/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java +++ b/src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java @@ -29,6 +29,7 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import java.net.URISyntaxException; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.function.Consumer; @@ -69,7 +70,8 @@ public class ClubEndpoints { @APIResponse(responseCode = "500", description = "Erreur interne du serveur") }) public Uni> getAll() { - return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).toList()); + return clubService.getAll().map(clubModels -> clubModels.stream().map(SimpleClubModel::fromModel).sorted( + Comparator.comparing(SimpleClubModel::getName)).toList()); } @GET diff --git a/src/main/webapp/src/pages/admin/club/ClubPage.jsx b/src/main/webapp/src/pages/admin/club/ClubPage.jsx index 0e4b4dd..5a6768a 100644 --- a/src/main/webapp/src/pages/admin/club/ClubPage.jsx +++ b/src/main/webapp/src/pages/admin/club/ClubPage.jsx @@ -172,6 +172,7 @@ function InformationForm({data}) { export function BureauCard({clubData}) { const setLoading = useLoadingSwitcher() const {data, error} = useFetch(`/club/desk/${clubData.id}`, setLoading, 1) + const navigate = useNavigate(); return <>
@@ -179,7 +180,8 @@ export function BureauCard({clubData}) {
    {data && data.map((d, index) => { - return
    + return
    navigate(`/admin/member/${d.id}`)}>
    {d.role}
    {d.lname} {d.fname}
    })} @@ -188,4 +190,4 @@ export function BureauCard({clubData}) {
    {error && } -} \ No newline at end of file +} -- 2.49.0 From c6659f8d8598e0fbc330ca4fb054534f19e3caca Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Wed, 3 Sep 2025 21:46:26 +0200 Subject: [PATCH 3/3] feat: keep log --- .gitea/workflows/deploy_in_prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy_in_prod.yml b/.gitea/workflows/deploy_in_prod.yml index d35802c..464262f 100644 --- a/.gitea/workflows/deploy_in_prod.yml +++ b/.gitea/workflows/deploy_in_prod.yml @@ -76,6 +76,7 @@ jobs: key: ${{ secrets.SSH_KEY }} script: | cd ${{ secrets.TARGET_DIR }} + docker logs ffsaf > "log/ffsaf_logs_$(date +"%Y-%m-%d_%H-%M-%S").log" 2>&1 docker stop ffsaf docker rm ffsaf docker compose up --build -d ffsaf -- 2.49.0