Merge pull request 'message' (#15) from message into master

Reviewed-on: #15

src/main/java/com/covas/Entity/ConversationEntity.java

@@ -0,0 +1,19 @@
+package com.covas.Entity;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+import io.quarkus.mongodb.panache.common.MongoEntity;
+
+@MongoEntity(collection="conversation")
+public class ConversationEntity extends PanacheMongoEntity {
+
+
+    public Collection<String> users;
+    public Short status;
+
+    public LocalDateTime created_at;
+    public LocalDateTime updated_at;
+    public LocalDateTime deleted_at;
+}

src/main/java/com/covas/Entity/UsersEntity.java

@@ -105,8 +105,6 @@ public class UsersEntity extends PanacheEntityBase implements Serializable {
         users.created_at = LocalDateTime.now();
         users.updated_at = LocalDateTime.now();
         users.description = "";
-        
         users.persist();
-
     }  
 }

src/main/java/com/covas/Json/MessageByUser.java

@@ -0,0 +1,22 @@
+package com.covas.Json;
+
+import java.util.Collection;
+
+import com.covas.Entity.MessageEntity;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+public class MessageByUser {
+
+    public final String pseudo;
+    public final Collection<MessageEntity> message;
+
+    public MessageByUser(String pseudo, Collection<MessageEntity> message){
+        this.pseudo = pseudo;
+        this.message = message;
+        
+
+    }
+    
+}

src/main/java/com/covas/Resources/BlacklistRessources.java

@@ -4,8 +4,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
-import java.util.ArrayList;
+
-import java.util.Collection;
 
 
 import javax.annotation.security.RolesAllowed;
@@ -27,8 +26,6 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import com.covas.Entity.BlacklistEntity;
-import com.covas.Entity.FriendEntity;
-import com.covas.Entity.GroupEntity;
 import com.covas.Entity.UsersEntity;
 
 import io.quarkus.panache.common.Page;

src/main/java/com/covas/Resources/ConversationRessources.java

@@ -0,0 +1,213 @@
+package com.covas.Resources;
+
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+
+
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.CookieParam;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PATCH;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import com.covas.Entity.ConversationEntity;
+import com.covas.Entity.UsersEntity;
+
+import io.quarkus.panache.common.Page;
+
+import org.bson.types.ObjectId;
+import org.eclipse.microprofile.jwt.Claims;
+import org.eclipse.microprofile.jwt.JsonWebToken;
+import org.jboss.logging.Logger;
+import org.postgresql.shaded.com.ongres.scram.common.bouncycastle.base64.Base64;
+
+@Produces(MediaType.APPLICATION_JSON)
+@Path("conversation")
+public class ConversationRessources {
+    private static final Logger LOGGER = Logger.getLogger(UsersRessources.class);
+    @Inject
+    JsonWebToken jwt;
+
+    /// Function
+    private Boolean checkUserCookie(String userCookie, UsersEntity users) {
+        if ((userCookie == null) || (users == null)) {
+            return false;
+        }
+        String name = new String(Base64.decode(userCookie), StandardCharsets.UTF_8);
+        if (!name.equals(users.pseudo) && (users.status != 1)) {
+            return false;
+        }
+        return true;
+    }
+
+    private Response.Status getResponseCheck(SecurityContext ctx, String userCookie, UsersEntity users) {
+        if (!ctx.getUserPrincipal().getName().equals(jwt.getName())) {
+            return Response.Status.INTERNAL_SERVER_ERROR;
+        }
+        if (!checkUserCookie(userCookie, users)) {
+            return Response.Status.FORBIDDEN;
+        }
+        return Response.Status.OK;
+    }
+
+    /// Appel HTTP
+
+
+    /// GET
+    @GET
+    @RolesAllowed("Admin")
+    public Response getFriends(@CookieParam("user") String userCookie, @Context SecurityContext ctx, 
+    @QueryParam("page") Integer page, @QueryParam("nbPages") Integer nbPages) {
+        if(nbPages == null){
+            nbPages = 20;
+        }
+        if(page == null){
+            page = 0;
+        }
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status statusHttp = getResponseCheck(ctx, userCookie, user);
+        Response responseHttp = Response.status(statusHttp).build();
+        if (statusHttp.equals(Response.Status.OK)) {
+            List<ConversationEntity> listConversations = ConversationEntity.findAll().page(Page.of(page, nbPages)).list();
+            responseHttp = Response.ok(listConversations).build();
+
+        }
+        return responseHttp;
+    }
+
+    @GET
+    @RolesAllowed("Admin")
+    @Path("count")
+    public Response getCount(@CookieParam("user") String userCookie, @Context SecurityContext ctx){
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status status = getResponseCheck(ctx, userCookie, user);
+        Response responseHttp = Response.status(status).build();
+        if (status.equals(Response.Status.OK)){
+            responseHttp = Response.ok(ConversationEntity.count()).build();
+        }
+        return responseHttp;
+    }
+
+    @GET
+    @RolesAllowed({"Admin", "User"})
+    @Path("{id}")
+    public Response getSingleFriend(@PathParam("id") String id, @CookieParam("user") String userCookie,
+            @Context SecurityContext ctx) {
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status status = getResponseCheck(ctx, userCookie, user);
+        Response responseHttp = Response.status(status).build();
+        if (status.equals(Response.Status.OK)) {
+            ConversationEntity conversation = ConversationEntity.findById(new ObjectId(id));
+            responseHttp = Response.status(Response.Status.NOT_FOUND).build();
+            if (conversation != null) {
+                responseHttp = Response.ok(conversation).build();
+            }
+
+        }
+        return responseHttp;
+    }
+
+
+    
+    // PUT
+    @PUT
+    @Consumes(MediaType.APPLICATION_JSON)
+    @RolesAllowed({"Admin", "User"})
+    @Path("{id}")
+    @Transactional
+    public Response createFriend(@Context SecurityContext ctx, @CookieParam("user") String userCookie, @PathParam("id") String id, ConversationEntity conversation) {
+
+            UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+            UsersEntity user = UsersEntity.findById(kid);
+            Response.Status status = getResponseCheck(ctx, userCookie, user);
+            ConversationEntity newConversation = new ConversationEntity();
+            if (status.equals(Response.Status.OK)) {
+                newConversation.users = conversation.users;
+                newConversation.created_at = LocalDateTime.now();
+                newConversation.updated_at = LocalDateTime.now();
+                newConversation.persist();
+                status = Response.Status.CREATED;
+                
+            }            
+        return Response.status(status).entity(newConversation).build();
+    }
+
+
+    // DELETE
+    @DELETE
+    @Path("{id}")
+    @RolesAllowed({"Admin", "User"})
+    @Transactional
+    public Response changeStatusSingleFriendToDelete(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
+            @PathParam("id") String id) {
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status status = getResponseCheck(ctx, userCookie, user);
+        if (status.equals(Response.Status.OK)) {
+            ConversationEntity singleConversation = ConversationEntity.find("id", new ObjectId(id)).firstResult();
+            if (singleConversation == null) {
+                status = Response.Status.NOT_FOUND;
+            } else {
+                singleConversation.status = -1;
+                singleConversation.updated_at = LocalDateTime.now();
+                singleConversation.deleted_at = LocalDateTime.now();
+                singleConversation.persist();
+            }
+        }
+        return Response.status(status).build();
+    }
+
+    
+
+    // PATCH
+    @PATCH
+    @RolesAllowed({"Admin", "User"})
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Transactional
+    @Path("{id}")
+    public Response updateFriend(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
+    ConversationEntity conversation, @PathParam("id") String id) {
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status status = getResponseCheck(ctx, userCookie, user);
+
+        if (status.equals(Response.Status.OK)) {
+
+            ConversationEntity conversationOrig = ConversationEntity.findById(new ObjectId(id));
+            if (conversationOrig == null) {
+                status = Response.Status.NOT_FOUND;
+            } else {
+                conversationOrig.users = conversation.users;
+
+                
+                conversationOrig.updated_at = LocalDateTime.now();
+                
+                if(conversation.status == 1){
+                    conversationOrig.deleted_at = null;
+                    conversationOrig.status = 1;
+                }
+                conversationOrig.persist();
+                
+            }
+        }
+        return Response.status(status).build();
+    }
+}

src/main/java/com/covas/Resources/FriendRessources.java

@@ -4,9 +4,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
-import java.util.ArrayList;
-import java.util.Collection;
-
 
 import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
@@ -27,7 +24,6 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import com.covas.Entity.FriendEntity;
-import com.covas.Entity.GroupEntity;
 import com.covas.Entity.UsersEntity;
 
 import io.quarkus.panache.common.Page;

src/main/java/com/covas/Resources/GroupRessources.java

@@ -4,8 +4,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
-import java.util.ArrayList;
+
-import java.util.Collection;
 
 
 import javax.annotation.security.RolesAllowed;

src/main/java/com/covas/Resources/MessageRessources.java

@@ -23,10 +23,9 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import com.covas.Entity.CommentEntity;
 import com.covas.Entity.MessageEntity;
-import com.covas.Entity.PublisherEntity;
 import com.covas.Entity.UsersEntity;
+import com.covas.Json.MessageByUser;
 
 import io.quarkus.panache.common.Page;
 import io.quarkus.panache.common.Parameters;
@@ -140,6 +139,31 @@ public class MessageRessources {
         return responseHttp;
     }
 
+    @GET
+    @RolesAllowed("User")
+    @Path("info")
+    public Response getInfoMessage(@Context SecurityContext ctx, @CookieParam("user") String userCookie) {
+        UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
+        UsersEntity user = UsersEntity.findById(kid);
+        Response.Status status = getResponseCheck(ctx, userCookie, user);
+        if (status.equals(Response.Status.OK)) {
+            if (user == null) {
+                status = Response.Status.NOT_FOUND;
+            }
+            if (!checkUserCookie(userCookie, user)) {
+                status = Response.Status.FORBIDDEN;
+            }
+        }
+        Response responseHttp = Response.status(status).build();
+        
+        if (status.equals(Response.Status.OK)) {
+            responseHttp = Response.status(status).entity(new MessageByUser(user.pseudo, user.message))
+                    .build();
+        }
+        return responseHttp;
+    }
+
+
     
     // PUT
     @PUT
@@ -147,27 +171,26 @@ public class MessageRessources {
     @RolesAllowed({"Admin", "User"})
     @Path("{id}")
     @Transactional
-    public Response createComment(@Context SecurityContext ctx, @CookieParam("user") String userCookie, @PathParam("id") String id, CommentEntity comment) {
+    public Response createMessage(@Context SecurityContext ctx, @CookieParam("user") String userCookie, @PathParam("id") String id, MessageEntity message) {
 
             UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
             UsersEntity user = UsersEntity.findById(kid);
             Response.Status status = getResponseCheck(ctx, userCookie, user);
-            CommentEntity newComment = new CommentEntity();
+            MessageEntity newMessage = new MessageEntity();
-            PublisherEntity publishers = PublisherEntity.findById(UUID.fromString(id));
             if (status.equals(Response.Status.OK)) {
-                newComment.comment = comment.comment;
+                newMessage.content = message.content;
-                newComment.users = user;
+                newMessage.conversation = message.conversation;
-                newComment.publishers = publishers;
+                newMessage.users = user;
-                newComment.created_at = LocalDateTime.now();
+                newMessage.created_at = LocalDateTime.now();
-                newComment.updated_at = LocalDateTime.now();
+                newMessage.updated_at = LocalDateTime.now();
-                newComment.persist();
+                newMessage.persist();
-                if (newComment.isPersistent()) {
+                if (newMessage.isPersistent()) {
                     status = Response.Status.CREATED;
                 } else {
                     status = Response.Status.NO_CONTENT;
                 }
             }            
-        return Response.status(status).entity(newComment).build();
+        return Response.status(status).entity(newMessage).build();
     }
 
 
@@ -176,21 +199,21 @@ public class MessageRessources {
     @Path("{id}")
     @RolesAllowed({"Admin", "User"})
     @Transactional
-    public Response changeStatusSingleCommentToDelete(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
+    public Response changeStatusSingleMessageToDelete(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
             @PathParam("id") String id) {
         UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
         UsersEntity user = UsersEntity.findById(kid);
         Response.Status status = getResponseCheck(ctx, userCookie, user);
         if (status.equals(Response.Status.OK)) {
-            CommentEntity singleComment = CommentEntity.find("id", UUID.fromString(id)).firstResult();
+            MessageEntity singleMessage= MessageEntity.find("id", UUID.fromString(id)).firstResult();
-            if (singleComment == null) {
+            if (singleMessage == null) {
                 status = Response.Status.NOT_FOUND;
             } else {
-                singleComment.status = -1;
+                singleMessage.status = -1;
-                singleComment.updated_at = LocalDateTime.now();
+                singleMessage.updated_at = LocalDateTime.now();
-                singleComment.deleted_at = LocalDateTime.now();
+                singleMessage.deleted_at = LocalDateTime.now();
-                singleComment.persist();
+                singleMessage.persist();
-                if (!singleComment.isPersistent()) {
+                if (!singleMessage.isPersistent()) {
                     status = Response.Status.NOT_MODIFIED;
                 }
             }
@@ -200,23 +223,23 @@ public class MessageRessources {
 
     @DELETE
     @Path("/disable/{id}")
-    @RolesAllowed({"Admin", "User"})
+    @RolesAllowed("Admin")
     @Transactional
-    public Response changeStatusSingleCommentToDisable(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
+    public Response changeStatusSingleMessageToDisable(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
             @PathParam("id") String id) {
         UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
         UsersEntity user = UsersEntity.findById(kid);
         Response.Status status = getResponseCheck(ctx, userCookie, user);
         if (status.equals(Response.Status.OK)) {
-            CommentEntity singleComment = CommentEntity.find("id", UUID.fromString(id)).firstResult();
+            MessageEntity singleMessage = MessageEntity.find("id", UUID.fromString(id)).firstResult();
-            if (singleComment == null) {
+            if (singleMessage == null) {
                 status = Response.Status.NOT_FOUND;
             } else {
-                singleComment.status = 0;
+                singleMessage.status = 0;
-                singleComment.updated_at = LocalDateTime.now();
+                singleMessage.updated_at = LocalDateTime.now();
-                singleComment.deleted_at = LocalDateTime.now();
+                singleMessage.deleted_at = LocalDateTime.now();
-                singleComment.persist();
+                singleMessage.persist();
-                if (!singleComment.isPersistent()) {
+                if (!singleMessage.isPersistent()) {
                     status = Response.Status.NOT_MODIFIED;
                 }
             }
@@ -230,29 +253,29 @@ public class MessageRessources {
     @Consumes(MediaType.APPLICATION_JSON)
     @Transactional
     @Path("{id}")
-    public Response updateCommentAdmin(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
+    public Response updateMessageAdmin(@Context SecurityContext ctx, @CookieParam("user") String userCookie,
-    CommentEntity comment, @PathParam("id") String id) {
+    MessageEntity message, @PathParam("id") String id) {
         UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
         UsersEntity user = UsersEntity.findById(kid);
         Response.Status status = getResponseCheck(ctx, userCookie, user);
 
         if (status.equals(Response.Status.OK)) {
 
-            CommentEntity commentOrig = CommentEntity.findById(UUID.fromString(id));
+            MessageEntity messageOrig = MessageEntity.findById(UUID.fromString(id));
-            if (commentOrig == null) {
+            if (messageOrig == null) {
                 status = Response.Status.NOT_FOUND;
             } else {
-                commentOrig.comment = comment.comment;
+                messageOrig.content = message.content;
                 
                 
-                commentOrig.updated_at = LocalDateTime.now();
+                messageOrig.updated_at = LocalDateTime.now();
                 
-                if(comment.status == 1){
+                if(message.status == 1){
-                    commentOrig.deleted_at = null;
+                    messageOrig.deleted_at = null;
-                    commentOrig.status = 1;
+                    messageOrig.status = 1;
                 }
-                commentOrig.persist();
+                messageOrig.persist();
-                if (!commentOrig.isPersistent()) {
+                if (!messageOrig.isPersistent()) {
                     status = Response.Status.NOT_MODIFIED;
                 }
             }
@@ -263,7 +286,7 @@ public class MessageRessources {
 
 
     @PATCH
-    @RolesAllowed({"Admin", "User"})
+    @RolesAllowed("Admin")
     @Consumes(MediaType.APPLICATION_JSON)
     @Transactional
     @Path("enable/{id}")
@@ -273,13 +296,13 @@ public class MessageRessources {
         Response.Status status = getResponseCheck(ctx, userCookie, user);
         if (status.equals(Response.Status.OK)) {
 
-            CommentEntity commentOrig = CommentEntity.findById(UUID.fromString(id));
+            MessageEntity messageOrig = MessageEntity.findById(UUID.fromString(id));
-            if (commentOrig == null) {
+            if (messageOrig == null) {
                 status = Response.Status.NOT_FOUND;
             } else {
-                commentOrig.status = 1;
+                messageOrig.status = 1;
-                commentOrig.persist();
+                messageOrig.persist();
-                if (!commentOrig.isPersistent()) {
+                if (!messageOrig.isPersistent()) {
                     status = Response.Status.NOT_MODIFIED;
                 }
             }