Merge branch 'rabbitmq' of https://github.com/Sohob/VeryLinkedIN into rabbitmq

Author: MarkNageb

verylinkedin/groups/src/main/java/com/verylinkedin/groupchat/commands/DeleteGroupCommand.java

@@ -19,7 +19,6 @@ public Object execute() {
  if (chat.getAdmin().equals(request.userId())){
  // Delete the chat
  groupRepository.delete(chat);
-
  return gson.toJson(new Response(chat.toString(), HttpStatus.OK));
  }
  return gson.toJson(new Response(chat.toString(), HttpStatus.METHOD_NOT_ALLOWED));

verylinkedin/groups/src/main/java/com/verylinkedin/groupchat/commands/UpdateGroupCommand.java

@@ -15,15 +15,16 @@ public Object execute() {
  // Query the database for GroupChats of the same ID
  GroupChat chat = groupRepository.findById(request.groupId()).get(0);
  if(chat.getAdmin().equals(request.userId())) {
+
  // Change the chat details using the given data in the body
  chat.setParticipants(request.participants());
  chat.setTitle(request.title());
  chat.setAdmin(request.admin());
  chat.setDescription(request.description());
  chat.setGroupPhoto(request.groupPhoto());
+
  // Update the group chat in the database
  groupRepository.save(chat);
-
  return gson.toJson(new Response(chat.toString(), HttpStatus.OK));
  }
  return gson.toJson(new Response(chat.toString(), HttpStatus.METHOD_NOT_ALLOWED));

verylinkedin/groups/src/main/java/com/verylinkedin/groupchat/rabbitmq/GroupsConsumer.java

@@ -64,16 +64,10 @@ public Object consumer(Message requestFromQueue) {
  Command commandObject = (Command) commandConstructor.newInstance(mappedRequest, groupRepository);
  Object response = commandObject.execute();
 
- //Creating the ObjectMapper object
- //ObjectMapper mapper = new ObjectMapper();
- //Converting the Object to JSONString
- //String jsonString = mapper.writeValueAsString(new ResponseEntity<String>((String) response, HttpStatus.OK));
- //System.out.println(jsonString);
  log.info("Executed the command with response {}", response);
  MessageProperties messageProperties = new MessageProperties();
  messageProperties.setContentType("json");
  return response;
- //return new Message(jsonString.getBytes(), messageProperties);
  }
  catch (Exception e) {
  log.info(e.toString());