Merge branch 'main' into 5-feature-5-user-profile-display

# Conflicts:
#	src/main/java/interface_adapters/User_search_IA/UserPresenter.java
#	src/main/java/screens/Profile_screen/UserSearchUI.java
#	src/main/java/use_cases/user_profile_display_use_case/UserReader.java
#	src/test/java/TestUserSearch.java

Author: parmism

src/main/java/entities/message/Message.java

@@ -0,0 +1,59 @@
+package entities.message;
+
+import java.time.LocalDateTime;
+
+/**
+ * Message (abstract class) containing the message content and associated metadata
+ * The type of the message content is dependent on which child(ren) of Message the message is
+ * The metadata is universal for all message types and includes the ID of the sender, timestamp, ID of message
+ */
+public abstract class Message {
+    /**
+     * ID of message sender (UUID)
+     */
+    private final String senderID;
+    /**
+     * Time message was sent
+     */
+    private final LocalDateTime timestamp;
+    /**
+     * ID of message (UUID)
+     */
+    private final String msgID;
+
+    /**
+     * Construct a new message
+     * @param senderID ID of sender
+     * @param timestamp time message was sent
+     * @param msgID ID of message
+     */
+    public Message(String senderID, LocalDateTime timestamp, String msgID) {
+        this.senderID = senderID;
+        this.timestamp = timestamp;
+        this.msgID = msgID;
+    }
+
+    /**
+     * Gets ID of sender
+     * @return ID of sender
+     */
+    public String getSenderID() {
+        return senderID;
+    }
+
+    /**
+     * Gets message timestamp
+     * @return message timestamp
+     */
+    public LocalDateTime getTimestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Gets ID of message
+     * @return ID of message
+     */
+    public String getMsgID() {
+        return msgID;
+    }
+}

src/main/java/entities/message/MsgFactory.java

@@ -0,0 +1,23 @@
+package entities.message;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class MsgFactory {
+    private final String msgType;
+
+    public MsgFactory(String msgType) {
+        this.msgType = msgType;
+    }
+
+    public Message createMsg(String senderID, Object msgContent) {
+        if (msgType.equalsIgnoreCase("text")) {
+            return new TextMessage(senderID, (String) msgContent, LocalDateTime.now(), UUID.randomUUID().toString());
+            // ID of message's sender, message text/content, timestamp of message, ID of message
+        } else {
+            System.out.println("A " + msgType.toLowerCase() + " is an undefined message type for this program.");
+            // TODO: implement exception
+            return null;
+        }
+    }
+}

src/main/java/entities/message/TextMessage.java

@@ -0,0 +1,41 @@
+package entities.message;
+
+import java.time.LocalDateTime;
+
+/**
+ * A message with text as its content (child of Message)
+ */
+public class TextMessage extends Message {
+    /**
+     * Text content of message
+     */
+    private String msgContent;
+
+    /**
+     * Construct a text message
+     * @param senderID ID of sender
+     * @param msgContent text content
+     * @param timestamp message timestamp
+     * @param msgID ID of message
+     */
+    public TextMessage(String senderID, String msgContent, LocalDateTime timestamp, String msgID) {
+        super(senderID, timestamp, msgID);
+        this.msgContent = msgContent;
+    }
+
+    /**
+     * Gets text content of a message
+     * @return message content
+     */
+    public String getMsgContent() {
+        return msgContent;
+    }
+
+    /**
+     * Sets text content of a message
+     * @param msgContent updated message content
+     */
+    public void setMsgContent(String msgContent) {
+        this.msgContent = msgContent;
+    }
+}

src/main/java/interface_adapters/profile_modification_IA/ChangeController.java

@@ -0,0 +1,5 @@
+package interface_adapters.profile_modification_IA;
+
+public interface ChangeController {
+    public boolean reportChange(String username, String password, String feature, String newFeature);
+    }

src/main/java/screens/profile_update_screen/UserModificationUI.java

@@ -0,0 +1,97 @@
+package screens.profile_update_screen; /**
+ * Provides the UI elements
+ */
+import interface_adapters.profile_modification_IA.ChangeController;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class UserModificationUI implements ChangeController {
+    private JLabel label;
+    public UserModificationUI() {
+        final JFrame frame = new JFrame();
+        frame.setSize(500, 300);
+
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+        frame.setLayout(new FlowLayout());
+
+//      Field for username
+        final JTextField usernameField = new JTextField("Enter your current username");
+        usernameField.setBounds(10, 25, 100, 25);
+
+//      Field for password
+        final JTextField passwordField = new JTextField("Enter your current password");
+        passwordField.setBounds(10, 25, 100, 25);
+
+//      to select feature that user wants to change
+        JLabel lbl = new JLabel("<html>Select what feature<br>you wish to change</html>");
+        lbl.setVisible(true);
+        lbl.setBounds(10, 25, 100, 25);
+        String[] choices = { "Username","Password", "Email"};
+        final JComboBox<String> cb = new JComboBox<>(choices);
+
+//      new value of the feature
+        final JTextField newFeatureField = new JTextField("Enter the new value for this feature and click OK");
+        newFeatureField.setBounds(10, 25, 100, 25);
+
+
+//      OK button to process
+        JButton btn = new JButton("OK");
+
+        btn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String username = (usernameField.getText());
+                String password = (passwordField.getText());
+                String item = cb.getSelectedItem().toString();
+                String newFeature = (newFeatureField.getText());
+                boolean success = reportChange(username, password, item, newFeature);
+                if (success){
+                    label.setText("Your " + item + " was successfully changed.");
+                }
+                else{
+                    label.setText("<html>Change was not successful.<br>Please make sure your username and " +
+                            "<br>password match an existing account.</html>");
+                }
+            }
+        });
+
+        label = new JLabel();
+
+        frame.add(usernameField);
+        frame.add(passwordField);
+        frame.add(cb);
+        frame.add(lbl);
+        frame.add(newFeatureField);
+        frame.add(btn);
+        frame.add(label);
+
+
+        frame.setVisible(true);
+    }
+
+//      profile_modification_IA.ChangeController makes UI implement reportChange to invert the use-case --> UI dependency
+    @Override
+    public boolean reportChange(String username, String password, String feature, String newFeature) {
+        UserDatabase db = new UserDatabase();
+        if (db.UserExists(username)){
+            User user = db.getUser(username);
+            if (user.PasswordMatch(password) & user.getUsername().equals(username)){
+                user.changeFeature(feature, newFeature);
+                // this serializes the change
+                db.modifyUser(username, user);
+                return true;
+            }
+        }
+        return false;
+    }
+
+// for trying out the code:
+//    public static void main(String[] args) {
+//        new profile_update_screen.UserModificationUI();
+//
+//    }
+
+}

src/main/java/tutorial/Chat.java

@@ -0,0 +1,55 @@
+package tutorial;
+import java.util.ArrayList;
+
+/**
+ * Copied from Branch Chat Initiation
+ **/
+public class Chat {
+    protected String name;
+    protected String chatID;
+    protected String senderUsername;
+
+    // chat's conversation history
+    protected ArrayList<Message> convHist;
+
+
+    /**
+     * Get the chat's name
+     * @return name
+     */
+    public String getName(){
+        return this.name;
+    }
+
+    /**
+     * Get the chat's ID
+     * @return chatID
+     */
+    public String getChatID(){
+        return this.chatID;
+    }
+
+    /**
+     * Get the sender's username
+     * @return senderUsername
+     */
+    public String getSenderUsername(){
+        return this.senderUsername;
+    }
+
+    /**
+     * Return this conversation history of the chat
+     * @return convHist
+     */
+    public ArrayList<Message> getConvHist(){
+        return new ArrayList<Message>(this.convHist);
+    }
+
+    /**
+     * Add a message to the chat's conversation history when a message is sent or received
+     * @param message Message that is sent or received
+     */
+    public void addtoconvHist(Message message){
+        this.convHist.add(message);
+    }
+}

src/main/java/tutorial/Message.java

@@ -0,0 +1,61 @@
+package tutorial;
+import java.time.LocalDateTime;
+/**
+ * Copied from Branch Conversation History
+ * **/
+public abstract class Message {
+        /**
+         * ID of message sender (UUID)
+         */
+        private final String senderID;
+        /**
+         * Time message was sent
+         */
+        private final LocalDateTime timestamp;
+        /**
+         * ID of message (UUID)
+         */
+        private final String msgID;
+
+
+        /**
+         * Construct a new message
+         * @param senderID ID of sender
+         * @param timestamp time message was sent
+         * @param msgID ID of message
+         */
+        public Message(String senderID, LocalDateTime timestamp, String msgID) {
+            this.senderID = senderID;
+            this.timestamp = timestamp;
+            this.msgID = msgID;
+        }
+
+        /**
+         * Gets ID of sender
+         * @return ID of sender
+         */
+        public String getSenderID() {
+            return senderID;
+        }
+
+        /**
+         * Gets message timestamp
+         * @return message timestamp
+         */
+        public LocalDateTime getTimestamp() {
+            return timestamp;
+        }
+
+        /**
+         * Gets ID of message
+         * @return ID of message
+         */
+        public String getMsgID() {
+            return msgID;
+        }
+
+        //Implemented this method from James' code -Emma
+        public abstract String getMsgContent();
+
+
+    }

src/main/java/tutorial/SearchInputBoundary.java

@@ -0,0 +1,19 @@
+package tutorial;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+
+/**
+ * The input boundary for the login use case.
+ */
+// Note: The interface that the SearchUseCase implements
+// It specifies what the input (arguments) and output (return type) are.
+
+public interface SearchInputBoundary {
+    ArrayList<Message> SearchBykeyword(Chat c, String word);
+
+    ArrayList<Message> SearchBytime(Chat c, LocalDateTime time);
+
+    Message  SearchByNewest(ArrayList<Message> ar);
+}