feat(messaging): module messagerie unifié avec contact policies + member blocks
Refactor complet : fusion de Conversation + Message en un module Messaging unique avec ContactPolicy (règles qui-peut-parler-à-qui) et MemberBlock (blocages utilisateur). - Migration V28 : tables conversations/conversation_participants/messages/ contact_policies/member_blocks - Nouvelles entités : ContactPolicy, ConversationParticipant, MemberBlock (Conversation/Message mises à jour avec relations) - Nouvelles repositories : ContactPolicyRepository, ConversationParticipantRepository, MemberBlockRepository - MessagingResource (nouveau) remplace ConversationResource + MessageResource - MessagingService (nouveau) remplace ConversationService + MessageService avec vérifications appartenance org + policies + blocages avant envoi - Anciens fichiers Conversation/Message Resource/Service/Tests supprimés
This commit is contained in:
dahoud
@@ -1,145 +0,0 @@
|
||||
package dev.lions.unionflow.server.resource;
|
||||
|
||||
import dev.lions.unionflow.server.api.dto.communication.request.CreateConversationRequest;
|
||||
import dev.lions.unionflow.server.api.dto.communication.response.ConversationResponse;
|
||||
import dev.lions.unionflow.server.service.ConversationService;
|
||||
import dev.lions.unionflow.server.service.support.SecuriteHelper;
|
||||
import jakarta.annotation.security.RolesAllowed;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import org.eclipse.microprofile.openapi.annotations.Operation;
|
||||
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
|
||||
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
|
||||
import org.eclipse.microprofile.openapi.annotations.tags.Tag;
|
||||
import org.jboss.logging.Logger;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Resource REST pour la gestion des conversations
|
||||
*
|
||||
* @author UnionFlow Team
|
||||
* @version 1.0
|
||||
* @since 2026-03-16
|
||||
*/
|
||||
@Path("/api/conversations")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Tag(name = "Communication", description = "Gestion des conversations et messages")
|
||||
@RolesAllowed({"ADMIN", "SUPER_ADMIN", "MEMBRE", "ADMIN_ORGANISATION"})
|
||||
public class ConversationResource {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger(ConversationResource.class);
|
||||
|
||||
@Inject
|
||||
ConversationService conversationService;
|
||||
|
||||
@Inject
|
||||
SecuriteHelper securiteHelper;
|
||||
|
||||
/**
|
||||
* Liste les conversations de l'utilisateur connecté
|
||||
*/
|
||||
@GET
|
||||
@Operation(summary = "Lister mes conversations")
|
||||
@APIResponse(responseCode = "200", description = "Liste des conversations")
|
||||
public Response getConversations(
|
||||
@Parameter(description = "Inclure conversations archivées")
|
||||
@QueryParam("includeArchived") @DefaultValue("false") boolean includeArchived,
|
||||
@Parameter(description = "Filtrer par organisation")
|
||||
@QueryParam("organisationId") String organisationId
|
||||
) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
UUID orgId = organisationId != null ? UUID.fromString(organisationId) : null;
|
||||
|
||||
List<ConversationResponse> conversations = conversationService.getConversations(membreId, orgId, includeArchived);
|
||||
return Response.ok(conversations).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère une conversation par ID
|
||||
*/
|
||||
@GET
|
||||
@Path("/{id}")
|
||||
@Operation(summary = "Récupérer une conversation")
|
||||
@APIResponse(responseCode = "200", description = "Conversation trouvée")
|
||||
@APIResponse(responseCode = "404", description = "Conversation non trouvée")
|
||||
public Response getConversationById(@PathParam("id") UUID conversationId) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
ConversationResponse conversation = conversationService.getConversationById(conversationId, membreId);
|
||||
return Response.ok(conversation).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Crée une nouvelle conversation
|
||||
*/
|
||||
@POST
|
||||
@Operation(summary = "Créer une conversation")
|
||||
@APIResponse(responseCode = "201", description = "Conversation créée")
|
||||
@APIResponse(responseCode = "400", description = "Données invalides")
|
||||
public Response createConversation(@Valid CreateConversationRequest request) {
|
||||
UUID creatorId = securiteHelper.resolveMembreId();
|
||||
ConversationResponse conversation = conversationService.createConversation(request, creatorId);
|
||||
return Response.status(Response.Status.CREATED).entity(conversation).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Archive une conversation
|
||||
*/
|
||||
@PUT
|
||||
@Path("/{id}/archive")
|
||||
@Operation(summary = "Archiver/désarchiver une conversation")
|
||||
@APIResponse(responseCode = "204", description = "Conversation archivée")
|
||||
public Response archiveConversation(
|
||||
@PathParam("id") UUID conversationId,
|
||||
@QueryParam("archive") @DefaultValue("true") boolean archive
|
||||
) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
conversationService.archiveConversation(conversationId, membreId, archive);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Marque une conversation comme lue
|
||||
*/
|
||||
@PUT
|
||||
@Path("/{id}/mark-read")
|
||||
@Operation(summary = "Marquer conversation comme lue")
|
||||
@APIResponse(responseCode = "204", description = "Marquée comme lue")
|
||||
public Response markAsRead(@PathParam("id") UUID conversationId) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
conversationService.markAsRead(conversationId, membreId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle mute conversation
|
||||
*/
|
||||
@PUT
|
||||
@Path("/{id}/toggle-mute")
|
||||
@Operation(summary = "Activer/désactiver le son")
|
||||
@APIResponse(responseCode = "204", description = "Paramètre modifié")
|
||||
public Response toggleMute(@PathParam("id") UUID conversationId) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
conversationService.toggleMute(conversationId, membreId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle pin conversation
|
||||
*/
|
||||
@PUT
|
||||
@Path("/{id}/toggle-pin")
|
||||
@Operation(summary = "Épingler/désépingler")
|
||||
@APIResponse(responseCode = "204", description = "Paramètre modifié")
|
||||
public Response togglePin(@PathParam("id") UUID conversationId) {
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
conversationService.togglePin(conversationId, membreId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
package dev.lions.unionflow.server.resource;
|
||||
|
||||
import dev.lions.unionflow.server.api.dto.communication.request.SendMessageRequest;
|
||||
import dev.lions.unionflow.server.api.dto.communication.response.MessageResponse;
|
||||
import dev.lions.unionflow.server.service.MessageService;
|
||||
import dev.lions.unionflow.server.service.support.SecuriteHelper;
|
||||
import jakarta.annotation.security.RolesAllowed;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import org.eclipse.microprofile.openapi.annotations.Operation;
|
||||
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
|
||||
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
|
||||
import org.eclipse.microprofile.openapi.annotations.tags.Tag;
|
||||
import org.jboss.logging.Logger;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Resource REST pour la gestion des messages
|
||||
*
|
||||
* @author UnionFlow Team
|
||||
* @version 1.0
|
||||
* @since 2026-03-16
|
||||
*/
|
||||
@Path("/api/messages")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@Tag(name = "Communication", description = "Gestion des conversations et messages")
|
||||
@RolesAllowed({"ADMIN", "SUPER_ADMIN", "MEMBRE", "ADMIN_ORGANISATION"})
|
||||
public class MessageResource {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger(MessageResource.class);
|
||||
|
||||
@Inject
|
||||
MessageService messageService;
|
||||
|
||||
@Inject
|
||||
SecuriteHelper securiteHelper;
|
||||
|
||||
/**
|
||||
* Récupère les messages d'une conversation
|
||||
*/
|
||||
@GET
|
||||
@Operation(summary = "Lister les messages d'une conversation")
|
||||
@APIResponse(responseCode = "200", description = "Liste des messages")
|
||||
@APIResponse(responseCode = "404", description = "Conversation non trouvée")
|
||||
public Response getMessages(
|
||||
@Parameter(description = "ID de la conversation", required = true)
|
||||
@QueryParam("conversationId") UUID conversationId,
|
||||
@Parameter(description = "Nombre maximum de messages")
|
||||
@QueryParam("limit") @DefaultValue("50") int limit
|
||||
) {
|
||||
if (conversationId == null) {
|
||||
return Response.status(Response.Status.BAD_REQUEST)
|
||||
.entity(Map.of("error", "conversationId requis"))
|
||||
.build();
|
||||
}
|
||||
|
||||
UUID membreId = securiteHelper.resolveMembreId();
|
||||
List<MessageResponse> messages = messageService.getMessages(conversationId, membreId, limit);
|
||||
return Response.ok(messages).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Envoie un message
|
||||
*/
|
||||
@POST
|
||||
@Operation(summary = "Envoyer un message")
|
||||
@APIResponse(responseCode = "201", description = "Message envoyé")
|
||||
@APIResponse(responseCode = "400", description = "Données invalides")
|
||||
@APIResponse(responseCode = "404", description = "Conversation non trouvée")
|
||||
public Response sendMessage(@Valid SendMessageRequest request) {
|
||||
UUID senderId = securiteHelper.resolveMembreId();
|
||||
MessageResponse message = messageService.sendMessage(request, senderId);
|
||||
return Response.status(Response.Status.CREATED).entity(message).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Édite un message
|
||||
*/
|
||||
@PUT
|
||||
@Path("/{id}")
|
||||
@Operation(summary = "Éditer un message")
|
||||
@APIResponse(responseCode = "200", description = "Message édité")
|
||||
@APIResponse(responseCode = "404", description = "Message non trouvé")
|
||||
public Response editMessage(
|
||||
@PathParam("id") UUID messageId,
|
||||
Map<String, String> body
|
||||
) {
|
||||
String newContent = body.get("content");
|
||||
if (newContent == null || newContent.isEmpty()) {
|
||||
return Response.status(Response.Status.BAD_REQUEST)
|
||||
.entity(Map.of("error", "content requis"))
|
||||
.build();
|
||||
}
|
||||
|
||||
UUID senderId = securiteHelper.resolveMembreId();
|
||||
MessageResponse message = messageService.editMessage(messageId, senderId, newContent);
|
||||
return Response.ok(message).build();
|
||||
}
|
||||
|
||||
/**
|
||||
* Supprime un message
|
||||
*/
|
||||
@DELETE
|
||||
@Path("/{id}")
|
||||
@Operation(summary = "Supprimer un message")
|
||||
@APIResponse(responseCode = "204", description = "Message supprimé")
|
||||
@APIResponse(responseCode = "404", description = "Message non trouvé")
|
||||
public Response deleteMessage(@PathParam("id") UUID messageId) {
|
||||
UUID senderId = securiteHelper.resolveMembreId();
|
||||
messageService.deleteMessage(messageId, senderId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,200 @@
|
||||
package dev.lions.unionflow.server.resource;
|
||||
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.request.BloquerMembreRequest;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.request.DemarrerConversationDirecteRequest;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.request.DemarrerConversationRoleRequest;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.request.EnvoyerMessageRequest;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.request.MettreAJourPolitiqueRequest;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.response.ContactPolicyResponse;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.response.ConversationResponse;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.response.ConversationSummaryResponse;
|
||||
import dev.lions.unionflow.server.api.dto.messagerie.response.MessageResponse;
|
||||
import dev.lions.unionflow.server.service.MessagingService;
|
||||
import jakarta.annotation.security.RolesAllowed;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.ws.rs.Consumes;
|
||||
import jakarta.ws.rs.DELETE;
|
||||
import jakarta.ws.rs.DefaultValue;
|
||||
import jakarta.ws.rs.GET;
|
||||
import jakarta.ws.rs.POST;
|
||||
import jakarta.ws.rs.PUT;
|
||||
import jakarta.ws.rs.Path;
|
||||
import jakarta.ws.rs.PathParam;
|
||||
import jakarta.ws.rs.Produces;
|
||||
import jakarta.ws.rs.QueryParam;
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import org.eclipse.microprofile.openapi.annotations.tags.Tag;
|
||||
import org.jboss.logging.Logger;
|
||||
|
||||
/**
|
||||
* Resource REST pour la messagerie instantanée.
|
||||
*
|
||||
* <p>Endpoints :
|
||||
* <ul>
|
||||
* <li>POST /api/messagerie/conversations/directe — démarrer conversation 1-1</li>
|
||||
* <li>POST /api/messagerie/conversations/role — contacter un rôle officiel</li>
|
||||
* <li>GET /api/messagerie/conversations — mes conversations</li>
|
||||
* <li>GET /api/messagerie/conversations/{id} — détail + messages</li>
|
||||
* <li>DELETE /api/messagerie/conversations/{id} — archiver</li>
|
||||
* <li>POST /api/messagerie/conversations/{id}/messages — envoyer un message</li>
|
||||
* <li>GET /api/messagerie/conversations/{id}/messages — historique</li>
|
||||
* <li>PUT /api/messagerie/conversations/{id}/lire — marquer comme lu</li>
|
||||
* <li>DELETE /api/messagerie/conversations/{cId}/messages/{mId} — supprimer message</li>
|
||||
* <li>POST /api/messagerie/blocages — bloquer un membre</li>
|
||||
* <li>DELETE /api/messagerie/blocages/{membreId} — débloquer</li>
|
||||
* <li>GET /api/messagerie/blocages — mes blocages</li>
|
||||
* <li>GET /api/messagerie/politique/{orgId} — politique de communication</li>
|
||||
* <li>PUT /api/messagerie/politique/{orgId} — mettre à jour (ADMIN)</li>
|
||||
* </ul>
|
||||
*
|
||||
* @author UnionFlow Team
|
||||
* @version 4.0
|
||||
* @since 2026-04-13
|
||||
*/
|
||||
@Path("/api/messagerie")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
@RolesAllowed({"ADMIN", "ADMIN_ORGANISATION", "MEMBRE"})
|
||||
@Tag(name = "Messagerie", description = "Messagerie instantanée — conversations, messages, notes vocales")
|
||||
public class MessagingResource {
|
||||
|
||||
private static final Logger LOG = Logger.getLogger(MessagingResource.class);
|
||||
|
||||
@Inject
|
||||
MessagingService messagingService;
|
||||
|
||||
// ── Conversations ─────────────────────────────────────────────────────────
|
||||
|
||||
@POST
|
||||
@Path("/conversations/directe")
|
||||
public Response demarrerConversationDirecte(@Valid DemarrerConversationDirecteRequest request) {
|
||||
LOG.infof("POST /api/messagerie/conversations/directe → destinataire: %s", request.destinataireId());
|
||||
ConversationResponse result = messagingService.demarrerConversationDirecte(request);
|
||||
return Response.status(Response.Status.CREATED).entity(result).build();
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("/conversations/role")
|
||||
public Response demarrerConversationRole(@Valid DemarrerConversationRoleRequest request) {
|
||||
LOG.infof("POST /api/messagerie/conversations/role → rôle: %s, org: %s",
|
||||
request.roleCible(), request.organisationId());
|
||||
ConversationResponse result = messagingService.demarrerConversationRole(request);
|
||||
return Response.status(Response.Status.CREATED).entity(result).build();
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/conversations")
|
||||
public Response getMesConversations() {
|
||||
LOG.debug("GET /api/messagerie/conversations");
|
||||
List<ConversationSummaryResponse> result = messagingService.getMesConversations();
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/conversations/{id}")
|
||||
public Response getConversation(@PathParam("id") UUID id) {
|
||||
LOG.infof("GET /api/messagerie/conversations/%s", id);
|
||||
ConversationResponse result = messagingService.getConversation(id);
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
|
||||
@DELETE
|
||||
@Path("/conversations/{id}")
|
||||
public Response archiverConversation(@PathParam("id") UUID id) {
|
||||
LOG.infof("DELETE /api/messagerie/conversations/%s", id);
|
||||
ConversationResponse result = messagingService.archiverConversation(id);
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
|
||||
// ── Messages ──────────────────────────────────────────────────────────────
|
||||
|
||||
@POST
|
||||
@Path("/conversations/{id}/messages")
|
||||
public Response envoyerMessage(
|
||||
@PathParam("id") UUID conversationId,
|
||||
@Valid EnvoyerMessageRequest request) {
|
||||
LOG.infof("POST /api/messagerie/conversations/%s/messages", conversationId);
|
||||
MessageResponse result = messagingService.envoyerMessage(conversationId, request);
|
||||
return Response.status(Response.Status.CREATED).entity(result).build();
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/conversations/{id}/messages")
|
||||
public Response getMessages(
|
||||
@PathParam("id") UUID conversationId,
|
||||
@QueryParam("page") @DefaultValue("0") int page) {
|
||||
LOG.infof("GET /api/messagerie/conversations/%s/messages?page=%d", conversationId, page);
|
||||
List<MessageResponse> result = messagingService.getMessages(conversationId, page);
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
|
||||
@PUT
|
||||
@Path("/conversations/{id}/lire")
|
||||
public Response marquerLu(@PathParam("id") UUID conversationId) {
|
||||
LOG.infof("PUT /api/messagerie/conversations/%s/lire", conversationId);
|
||||
messagingService.marquerConversationLue(conversationId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
@DELETE
|
||||
@Path("/conversations/{conversationId}/messages/{messageId}")
|
||||
public Response supprimerMessage(
|
||||
@PathParam("conversationId") UUID conversationId,
|
||||
@PathParam("messageId") UUID messageId) {
|
||||
LOG.infof("DELETE /api/messagerie/conversations/%s/messages/%s", conversationId, messageId);
|
||||
messagingService.supprimerMessage(conversationId, messageId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
// ── Blocages ──────────────────────────────────────────────────────────────
|
||||
|
||||
@POST
|
||||
@Path("/blocages")
|
||||
public Response bloquerMembre(@Valid BloquerMembreRequest request) {
|
||||
LOG.infof("POST /api/messagerie/blocages → bloquer: %s", request.membreABloquerId());
|
||||
messagingService.bloquerMembre(request);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
@DELETE
|
||||
@Path("/blocages/{membreId}")
|
||||
public Response debloquerMembre(
|
||||
@PathParam("membreId") UUID membreId,
|
||||
@QueryParam("organisationId") UUID organisationId) {
|
||||
LOG.infof("DELETE /api/messagerie/blocages/%s", membreId);
|
||||
messagingService.debloquerMembre(membreId, organisationId);
|
||||
return Response.noContent().build();
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/blocages")
|
||||
public Response getMesBlocages() {
|
||||
LOG.debug("GET /api/messagerie/blocages");
|
||||
return Response.ok(messagingService.getMesBlocages()).build();
|
||||
}
|
||||
|
||||
// ── Politique de communication ────────────────────────────────────────────
|
||||
|
||||
@GET
|
||||
@Path("/politique/{organisationId}")
|
||||
public Response getPolitique(@PathParam("organisationId") UUID organisationId) {
|
||||
LOG.infof("GET /api/messagerie/politique/%s", organisationId);
|
||||
ContactPolicyResponse result = messagingService.getPolitique(organisationId);
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
|
||||
@PUT
|
||||
@Path("/politique/{organisationId}")
|
||||
@RolesAllowed({"ADMIN", "ADMIN_ORGANISATION"})
|
||||
public Response mettreAJourPolitique(
|
||||
@PathParam("organisationId") UUID organisationId,
|
||||
@Valid MettreAJourPolitiqueRequest request) {
|
||||
LOG.infof("PUT /api/messagerie/politique/%s", organisationId);
|
||||
ContactPolicyResponse result = messagingService.mettreAJourPolitique(organisationId, request);
|
||||
return Response.ok(result).build();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user