Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

wip: addr field

Browse Source
This commit is contained in:
Thibaut Valentin
2024-07-12 16:37:04 +02:00
parent 76d7a28678
commit 6c4b01590d
6 changed files with 269 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/titionfire/ffsaf/rest/ClubEndpoints.java
View File

@@ -5,6 +5,7 @@ import fr.titionfire.ffsaf.domain.service.ClubService;
import fr.titionfire.ffsaf.net2.data.SimpleClubModel;
import fr.titionfire.ffsaf.rest.data.SimpleClub;
import fr.titionfire.ffsaf.rest.from.FullClubForm;
import fr.titionfire.ffsaf.utils.Contact;
import fr.titionfire.ffsaf.utils.GroupeUtils;
import fr.titionfire.ffsaf.utils.PageResult;
import fr.titionfire.ffsaf.utils.Utils;
@@ -76,7 +77,9 @@ public class ClubEndpoints {
@RolesAllowed({"federation_admin", "club_president", "club_secretaire", "club_respo_intra"})
@Produces(MediaType.APPLICATION_JSON)
public Uni<SimpleClub> getById(@PathParam("id") long id) {
return clubService.getById(id).onItem().invoke(checkPerm).map(SimpleClub::fromModel);
return clubService.getById(id).onItem().invoke(checkPerm).map(SimpleClub::fromModel).invoke(m -> {
m.setContactMap(Contact.toSite());
});
}
@PUT

2
src/main/java/fr/titionfire/ffsaf/rest/data/SimpleClub.java
View File

@@ -8,6 +8,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.ToString;
import java.util.HashMap;
import java.util.Map;
@Data
@@ -29,6 +30,7 @@ public class SimpleClub {
private String SIRET;
private String no_affiliation;
private boolean international;
private HashMap<String, String> contactMap = null;
public static SimpleClub fromModel(ClubModel model) {
if (model == null)