Final version

README.md

@@ -0,0 +1 @@
+# Simple messaging server on Spring Boot

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.4</version>
+		<version>3.1.0</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
@@ -14,7 +14,7 @@
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>

src/main/java/com/example/demo/files/chats.json

@@ -1 +1,22 @@
-[]
+[
+    {
+        "deleted": false,
+        "messagesIds": [
+            "M655e9c66-c622-4b08-99b0-d409a4ae0e53"
+        ],
+        "usersIds": [
+            "test1",
+            "test2"
+        ],
+        "id": "test1"
+    },
+    {
+        "deleted": false,
+        "messagesIds": [],
+        "usersIds": [
+            "test1",
+            "test2"
+        ],
+        "id": "test2"
+    }
+]

src/main/java/com/example/demo/files/messages.json

@@ -1 +1,13 @@
-[]
+[
+    {
+        "deleted": false,
+        "text": "TEXT",
+        "time": 1685384274888,
+        "chatId": "test1",
+        "usersIds": [
+            "test1",
+            "test2"
+        ],
+        "id": "M655e9c66-c622-4b08-99b0-d409a4ae0e53"
+    }
+]

src/main/java/com/example/demo/files/users.json

@@ -1 +1,29 @@
-[{"id":"U0","isAdmin":true,"name":"Матвей Дыгало","login":"muton","password":"PASSWORD","chatArrayList":[]}]
+[
+    {
+        "admin": true,
+        "name": "name1",
+        "password": "1",
+        "chatsIds": [
+            "test1",
+            "test2"
+        ],
+        "id": "test1"
+    },
+    {
+        "admin": false,
+        "name": "name2",
+        "password": "2",
+        "chatsIds": [
+            "test1",
+            "test2"
+        ],
+        "id": "test2"
+    },
+    {
+        "admin": false,
+        "name": "rtwetw",
+        "password": "rwer",
+        "chatsIds": [],
+        "id": "Ua91f511e-1abe-4cd1-bc12-bbae88374c0e"
+    }
+]

src/main/java/com/example/demo/models/Chat.java

@@ -1,19 +1,66 @@
 package com.example.demo.models;
 
 import java.util.ArrayList;
-import java.util.TreeSet;
 
-public class Chat {
-    public String id;
-    public Boolean isDeleted;
-    public ArrayList<String> messages;
-    public TreeSet<String> setIdUsers;
+public class Chat extends ID {
+    private Boolean deleted;
+    private ArrayList<String> messagesIds;
+    private ArrayList<String> usersIds;
 
-    public Chat(String id, Boolean isDeleted, ArrayList<String> messages, TreeSet<String> setIdUsers) {
-        this.id = id;
-        this.isDeleted = isDeleted;
-        this.messages = messages;
-        this.setIdUsers = setIdUsers;
+    public Chat(String id, ArrayList<String> usersIds) {
+        super(id);
+        this.deleted = false;
+        this.messagesIds = new ArrayList<String>();
+        this.usersIds = usersIds;
     }
 
+    public void addMessage(Message message) {
+        this.messagesIds.add(message.id);
+    }
+
+    /**
+     * @return Boolean return the isDeleted
+     */
+    public Boolean isDeleted() {
+        return deleted;
+    }
+
+    /**
+     * @param isDeleted the isDeleted to set
+     */
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * @return ArrayList<String> return the messagesIds
+     */
+    public ArrayList<String> getMessagesIds() {
+        return messagesIds;
+    }
+
+    /**
+     * @param messagesIds the messagesIds to set
+     */
+    public void setMessagesIds(ArrayList<String> messagesIds) {
+        this.messagesIds = messagesIds;
+    }
+
+    /**
+     * @return ArrayList<String> return the usersIds
+     */
+    public ArrayList<String> getUsersIds() {
+        return usersIds;
+    }
+
+    /**
+     * @param usersIds the usersIds to set
+     */
+    public void setUsersIds(ArrayList<String> usersIds) {
+        this.usersIds = usersIds;
+    }
+
+    public void deleteMessage(String messageId) {
+        this.messagesIds.remove(messageId);
+    }
 }

src/main/java/com/example/demo/models/ID.java

@@ -0,0 +1,23 @@
+package com.example.demo.models;
+
+import java.util.ArrayList;
+import java.util.Optional;
+
+public abstract class ID {
+    public String id;
+    public ID(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public static Optional<ID> findInListById(ArrayList<ID> list, String objId) {
+        return list.stream().filter(listObj -> listObj.id.equals(objId)).findFirst();
+    }
+}

src/main/java/com/example/demo/models/Message.java

@@ -1,24 +1,91 @@
 package com.example.demo.models;
 
 import java.util.ArrayList;
-import java.util.TreeSet;
-
-public class Message {
-    public String id;
-    public Boolean isDeleted;
-    public String text;
-    public Long time;
-    public String idUserAuthor;
-    public String idUserRecipient;
-    public TreeSet<String> setIdUsers;
-
-    public Message(String id, Boolean isDeleted, String text, Long time, String idUserAuthor, String idUserRecipient, TreeSet<String> setIdUsers) {
-        this.id = id;
-        this.isDeleted = isDeleted;
+
+public class Message extends ID {
+    private Boolean deleted;
+    private String text;
+    private Long time;
+    private String chatId;
+    private ArrayList<String> usersIds;
+
+    public Message(String id, Boolean deleted, String text, Long time, String chatId, ArrayList<String> usersIds) {
+        super(id);
+        this.deleted = deleted;
         this.text = text;
         this.time = time;
-        this.idUserAuthor = idUserAuthor;
-        this.idUserRecipient = idUserRecipient;
-        this.setIdUsers = setIdUsers;
+        this.chatId = chatId;
+        this.usersIds = (ArrayList<String>) usersIds;
+    }
+
+    /**
+     * @return Boolean return the deleted
+     */
+    public Boolean isDeleted() {
+        return deleted;
+    }
+
+    /**
+     * @param deleted the deleted to set
+     */
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * @return String return the text
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * @param text the text to set
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    /**
+     * @return Long return the time
+     */
+    public Long getTime() {
+        return time;
     }
+
+    /**
+     * @param time the time to set
+     */
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    /**
+     * @return ArrayList<String> return the usersIds
+     */
+    public ArrayList<String> getUsersIds() {
+        return usersIds;
+    }
+
+    /**
+     * @param usersIds the usersIds to set
+     */
+    public void setUsersIds(ArrayList<String> usersIds) {
+        this.usersIds = usersIds;
+    }
+
+    /**
+     * @return String return the chatId
+     */
+    public String getChatId() {
+        return chatId;
+    }
+
+    /**
+     * @param chatId the chatId to set
+     */
+    public void setChatId(String chatId) {
+        this.chatId = chatId;
+    }
+
 }