From ebec399fbd9834426debdd1f8a880bde5f30a8ec Mon Sep 17 00:00:00 2001
From: Phillip Conrad <pconrad@cs.ucsb.edu>
Date: Mon, 16 Nov 2020 19:30:56 -0800
Subject: [PATCH 1/5] pc - add emacs backup files to .gitignore

The pattern is *~
---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index f2f1a0246..434d6e9a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# Emacs files
+
+*~
+
+# other files
+
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

From 3cdd1ebab5cfdbbbd06a61924a9c5a8063b53dff Mon Sep 17 00:00:00 2001
From: Phillip Conrad <pconrad@cs.ucsb.edu>
Date: Mon, 16 Nov 2020 19:53:55 -0800
Subject: [PATCH 2/5] pc - WIP starting point for channel list

It still uses fake data, and there are no tests yet.
Next steps are to build backend routes,
the code to get data to the front end
and then tests.
---
 javascript/src/main/App.js                    |  2 ++
 .../main/components/Channels/ChannelTable.js  | 17 ++++++++++++++
 .../src/main/components/Nav/AppNavbar.js      |  8 ++++++-
 .../src/main/pages/Channels/ChannelList.js    | 22 +++++++++++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 javascript/src/main/components/Channels/ChannelTable.js
 create mode 100644 javascript/src/main/pages/Channels/ChannelList.js

diff --git a/javascript/src/main/App.js b/javascript/src/main/App.js
index 9eb8c22e3..2558c3ee0 100644
--- a/javascript/src/main/App.js
+++ b/javascript/src/main/App.js
@@ -11,6 +11,7 @@ import PrivateRoute from "main/components/Auth/PrivateRoute";
 import Admin from "main/pages/Admin/Admin";
 import SlackUsers from "./pages/Admin/SlackUsers";
 import AuthorizedRoute from "main/components/Nav/AuthorizedRoute";
+import ChannelList from "main/pages/Channels/ChannelList";
 
 function App() {
   return (
@@ -20,6 +21,7 @@ function App() {
         <Switch>
           <AuthorizedRoute path="/admin" exact component={Admin} authorizedRoles={["admin"]} />
           <AuthorizedRoute path="/admin/slackUsers" exact component={SlackUsers} authorizedRoles={["admin"]} />
+          <AuthorizedRoute path="/member/channels" exact component={ChannelList} authorizedRoles={["admin","member"]} />
           <PrivateRoute path="/profile" component={Profile} />
           <Route path="/about" component={About} />
           <Route path="/" exact component={Home} />
diff --git a/javascript/src/main/components/Channels/ChannelTable.js b/javascript/src/main/components/Channels/ChannelTable.js
new file mode 100644
index 000000000..7064a26a7
--- /dev/null
+++ b/javascript/src/main/components/Channels/ChannelTable.js
@@ -0,0 +1,17 @@
+import React from "react";
+import BootstrapTable from 'react-bootstrap-table-next';
+
+export default ({channels}) => {
+   
+    const columns = [{
+        dataField: 'id',
+        text: 'id'
+    }, {
+        dataField: 'name',
+        text: 'name'
+    }];
+    
+    return (
+        <BootstrapTable keyField='id' data={channels} columns={columns} />
+    );
+}
\ No newline at end of file
diff --git a/javascript/src/main/components/Nav/AppNavbar.js b/javascript/src/main/components/Nav/AppNavbar.js
index 541727e01..8f9944d36 100644
--- a/javascript/src/main/components/Nav/AppNavbar.js
+++ b/javascript/src/main/components/Nav/AppNavbar.js
@@ -15,6 +15,7 @@ function AppNavbar() {
     fetchWithToken
   );
   const isAdmin = roleInfo && roleInfo.role.toLowerCase() === "admin";
+  const isMember = roleInfo && roleInfo.role.toLowerCase() === "member";
 
   return (
     <Navbar bg="dark" variant="dark">
@@ -22,12 +23,17 @@ function AppNavbar() {
         <Navbar.Brand data-testid="brand">Mapache Search</Navbar.Brand>
       </LinkContainer>
       <Nav>
-          {isAdmin &&
+          { isAdmin &&
               <NavDropdown title="Admin">
                   <NavDropdown.Item href="/admin">Maintain Admins</NavDropdown.Item>
                   <NavDropdown.Item href="/admin/slackUsers">Slack Users</NavDropdown.Item>
               </NavDropdown>
           }
+          { (isMember || isAdmin)  &&
+              <NavDropdown title="Channels">
+                  <NavDropdown.Item href="/member/channels">List Channels</NavDropdown.Item>
+              </NavDropdown>
+          }
         <LinkContainer to={"/about"}>
             <Nav.Link>About</Nav.Link>
         </LinkContainer>
diff --git a/javascript/src/main/pages/Channels/ChannelList.js b/javascript/src/main/pages/Channels/ChannelList.js
new file mode 100644
index 000000000..04c72188b
--- /dev/null
+++ b/javascript/src/main/pages/Channels/ChannelList.js
@@ -0,0 +1,22 @@
+import React from "react";
+import { Jumbotron } from "react-bootstrap";
+import {useAuth0} from "@auth0/auth0-react";
+import { Redirect } from "react-router-dom";
+import ChannelTable from "main/components/Channels/ChannelTable"
+
+const ChannelList = () => {
+    // const { isAuthenticated } = useAuth0();
+
+    
+
+    const channels = [
+        { id: "fakeChannel1id", name: "fakeChannel1name"},
+        { id: "fakeChannel2id", name: "fakeChannel2name"},
+    ];
+
+    return (
+           <ChannelTable channels={channels} />
+    );
+};
+
+export default ChannelList;

From a2a372c17e8ae27816ae0af9f3cd06f0268c8842 Mon Sep 17 00:00:00 2001
From: Phillip Conrad <pconrad@cs.ucsb.edu>
Date: Thu, 19 Nov 2020 10:13:09 -0800
Subject: [PATCH 3/5] pc - for issue #11 add list of slack channels

* Added front end component for page and table for channels
* Added backend document, repository, and controller for channels
---
 .../main/components/Channels/ChannelTable.js  |  20 +-
 .../src/main/pages/Channels/ChannelList.js    |  14 +-
 .../controllers/ChannelsController.java       |  61 ++++++
 .../edu/ucsb/mapache/documents/Channel.java   | 181 ++++++++++++++++++
 .../mapache/documents/ChannelPurpose.java     |  69 +++++++
 .../ucsb/mapache/documents/ChannelTopic.java  |  65 +++++++
 .../repositories/ChannelRepository.java       |  14 ++
 7 files changed, 407 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/edu/ucsb/mapache/controllers/ChannelsController.java
 create mode 100644 src/main/java/edu/ucsb/mapache/documents/Channel.java
 create mode 100644 src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
 create mode 100644 src/main/java/edu/ucsb/mapache/documents/ChannelTopic.java
 create mode 100644 src/main/java/edu/ucsb/mapache/repositories/ChannelRepository.java

diff --git a/javascript/src/main/components/Channels/ChannelTable.js b/javascript/src/main/components/Channels/ChannelTable.js
index 7064a26a7..fcd8a3327 100644
--- a/javascript/src/main/components/Channels/ChannelTable.js
+++ b/javascript/src/main/components/Channels/ChannelTable.js
@@ -1,16 +1,20 @@
 import React from "react";
 import BootstrapTable from 'react-bootstrap-table-next';
 
-export default ({channels}) => {
-   
+export default ({ channels }) => {
+
     const columns = [{
-        dataField: 'id',
-        text: 'id'
-    }, {
         dataField: 'name',
-        text: 'name'
-    }];
-    
+        text: 'Name'
+    },{
+        dataField: 'purpose.value',
+        text: 'Purpose'
+    },{
+        dataField: 'topic.value',
+        text: 'Topic'
+    }
+    ];
+
     return (
         <BootstrapTable keyField='id' data={channels} columns={columns} />
     );
diff --git a/javascript/src/main/pages/Channels/ChannelList.js b/javascript/src/main/pages/Channels/ChannelList.js
index 04c72188b..c4aedd1aa 100644
--- a/javascript/src/main/pages/Channels/ChannelList.js
+++ b/javascript/src/main/pages/Channels/ChannelList.js
@@ -3,19 +3,15 @@ import { Jumbotron } from "react-bootstrap";
 import {useAuth0} from "@auth0/auth0-react";
 import { Redirect } from "react-router-dom";
 import ChannelTable from "main/components/Channels/ChannelTable"
+import useSWR from "swr";
+import {fetchWithToken} from "../../utils/fetch";
 
 const ChannelList = () => {
-    // const { isAuthenticated } = useAuth0();
-
-    
-
-    const channels = [
-        { id: "fakeChannel1id", name: "fakeChannel1name"},
-        { id: "fakeChannel2id", name: "fakeChannel2name"},
-    ];
+    const { getAccessTokenSilently: getToken } = useAuth0();
+    const { data: channels } = useSWR(["/api/members/channels", getToken], fetchWithToken);
 
     return (
-           <ChannelTable channels={channels} />
+           <ChannelTable channels={channels || []} />
     );
 };
 
diff --git a/src/main/java/edu/ucsb/mapache/controllers/ChannelsController.java b/src/main/java/edu/ucsb/mapache/controllers/ChannelsController.java
new file mode 100644
index 000000000..9c373b465
--- /dev/null
+++ b/src/main/java/edu/ucsb/mapache/controllers/ChannelsController.java
@@ -0,0 +1,61 @@
+package edu.ucsb.mapache.controllers;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import javax.validation.Valid;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.ucsb.mapache.advice.AuthControllerAdvice;
+import edu.ucsb.mapache.documents.Channel;
+import edu.ucsb.mapache.documents.SlackUser;
+import edu.ucsb.mapache.entities.Admin;
+import edu.ucsb.mapache.entities.AppUser;
+import edu.ucsb.mapache.repositories.AppUserRepository;
+import edu.ucsb.mapache.repositories.ChannelRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/members")
+public class ChannelsController {
+    private final Logger logger = LoggerFactory.getLogger(ChannelsController.class);
+
+    @Autowired
+    ChannelRepository channelRepository;
+
+    @Autowired
+    private AuthControllerAdvice authControllerAdvice;
+
+    private ObjectMapper mapper = new ObjectMapper();
+
+    private ResponseEntity<String> getUnauthorizedResponse(String roleRequired) throws JsonProcessingException {
+        Map<String, String> response = new HashMap<String, String>();
+        response.put("error", String.format("Unauthorized; only %s may access this resource.", roleRequired));
+        String body = mapper.writeValueAsString(response);
+        return new ResponseEntity<String>(body, HttpStatus.UNAUTHORIZED);
+    }
+
+    @GetMapping("/channels")
+    public ResponseEntity<String> getChannels(@RequestHeader("Authorization") String authorization)
+            throws JsonProcessingException {
+        if (!authControllerAdvice.getIsMember(authorization))
+            return getUnauthorizedResponse("member");
+
+        Iterable<Channel> channels = channelRepository.findAll();
+        String body = mapper.writeValueAsString(channels);
+
+        return ResponseEntity.ok().body(body);
+    }
+}
diff --git a/src/main/java/edu/ucsb/mapache/documents/Channel.java b/src/main/java/edu/ucsb/mapache/documents/Channel.java
new file mode 100644
index 000000000..0284c2d12
--- /dev/null
+++ b/src/main/java/edu/ucsb/mapache/documents/Channel.java
@@ -0,0 +1,181 @@
+package edu.ucsb.mapache.documents;
+
+import java.util.List;
+import java.util.Objects;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+@Document(collection = "channels")
+public class Channel {
+    private String id;
+    private String name;
+    private String creator;
+    private Boolean is_archived;
+    private Boolean is_general;
+    private List<String> members;
+    private ChannelTopic topic;
+    private ChannelPurpose purpose;
+
+    public Channel() {
+    }
+
+    public Channel(String id, String name, String creator, Boolean is_archived, Boolean is_general, List<String> members, ChannelTopic topic, ChannelPurpose purpose) {
+        this.id = id;
+        this.name = name;
+        this.creator = creator;
+        this.is_archived = is_archived;
+        this.is_general = is_general;
+        this.members = members;
+        this.topic = topic;
+        this.purpose = purpose;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    public Boolean isIs_archived() {
+        return this.is_archived;
+    }
+
+    public Boolean getIs_archived() {
+        return this.is_archived;
+    }
+
+    public void setIs_archived(Boolean is_archived) {
+        this.is_archived = is_archived;
+    }
+
+    public Boolean isIs_general() {
+        return this.is_general;
+    }
+
+    public Boolean getIs_general() {
+        return this.is_general;
+    }
+
+    public void setIs_general(Boolean is_general) {
+        this.is_general = is_general;
+    }
+
+    public List<String> getMembers() {
+        return this.members;
+    }
+
+    public void setMembers(List<String> members) {
+        this.members = members;
+    }
+
+    public ChannelTopic getTopic() {
+        return this.topic;
+    }
+
+    public void setTopic(ChannelTopic topic) {
+        this.topic = topic;
+    }
+
+    public ChannelPurpose getPurpose() {
+        return this.purpose;
+    }
+
+    public void setPurpose(ChannelPurpose purpose) {
+        this.purpose = purpose;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof Channel)) {
+            return false;
+        }
+        Channel channel = (Channel) o;
+        return Objects.equals(id, channel.id) && Objects.equals(name, channel.name) && Objects.equals(creator, channel.creator) && Objects.equals(is_archived, channel.is_archived) && Objects.equals(is_general, channel.is_general) && Objects.equals(members, channel.members) && Objects.equals(topic, channel.topic) && Objects.equals(purpose, channel.purpose);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, creator, is_archived, is_general, members, topic, purpose);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+            " id='" + getId() + "'" +
+            ", name='" + getName() + "'" +
+            ", creator='" + getCreator() + "'" +
+            ", is_archived='" + isIs_archived() + "'" +
+            ", is_general='" + isIs_general() + "'" +
+            ", members='" + getMembers() + "'" +
+            ", topic='" + getTopic() + "'" +
+            ", purpose='" + getPurpose() + "'" +
+            "}";
+    }
+
+    
+}
+
+/*
+
+Example of the JSON for a Channel document
+
+{
+    "_id": {
+        "$oid": "5fb068cd0a8dccb8dbab0a82"
+    },
+    "id": "C016GMB0H5L",
+    "name": "section-6pm",
+    "created": {
+        "$numberInt": "1594143066"
+    },
+    "creator": "U017218J9B3",
+    "is_archived": false,
+    "is_general": false,
+    "members": [
+        "U017218J9B3",
+        "U0185QQSJBY",
+        "U018CH1NLPL",
+        "U018R1AULF3",
+        "U018XEKMRTM",
+        "U0192BC785N",
+        "U019B1Q0YHW"
+    ],
+    "topic": {
+        "value": "",
+        "creator": "",
+        "last_set": {
+            "$numberInt": "0"
+        }
+    },
+    "purpose": {
+        "value": "",
+        "creator": "",
+        "last_set": {
+            "$numberInt": "0"
+        }
+    }
+}
+
+
+*/
diff --git a/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java b/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
new file mode 100644
index 000000000..44e648e8c
--- /dev/null
+++ b/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
@@ -0,0 +1,69 @@
+package edu.ucsb.mapache.documents;
+import java.util.Objects;
+
+public class ChannelPurpose {
+    private String value;
+    private String creator;
+
+    public ChannelPurpose() {
+    }
+
+    public ChannelPurpose(String value, String creator) {
+        this.value = value;
+        this.creator = creator;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+   
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof ChannelPurpose)) {
+            return false;
+        }
+        ChannelPurpose channelPurpose = (ChannelPurpose) o;
+        return Objects.equals(value, channelPurpose.value) && Objects.equals(creator, channelPurpose.creator);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value, creator);
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+            " value='" + getValue() + "'" +
+            ", creator='" + getCreator() + "'" +
+            "}";
+    }
+
+}
+
+/* ChannelPurpose json
+
+ "purpose": {
+        "value": "",
+        "creator": "",
+        "last_set": {
+            "$numberInt": "0"
+        }
+    }
+
+*/
\ No newline at end of file
diff --git a/src/main/java/edu/ucsb/mapache/documents/ChannelTopic.java b/src/main/java/edu/ucsb/mapache/documents/ChannelTopic.java
new file mode 100644
index 000000000..6f3d906f9
--- /dev/null
+++ b/src/main/java/edu/ucsb/mapache/documents/ChannelTopic.java
@@ -0,0 +1,65 @@
+package edu.ucsb.mapache.documents;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
+public class ChannelTopic {
+    private String value;
+    private String creator;
+
+    public ChannelTopic() {
+    }
+
+    public ChannelTopic(String value, String creator) {
+        this.value = value;
+        this.creator = creator;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        ChannelTopic ct = (ChannelTopic) o;
+        EqualsBuilder builder = new EqualsBuilder();
+        builder.append(this.value, ct.value)
+            .append(this.creator, ct.creator);
+        return builder.build();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value, creator);
+    }
+
+    @Override
+    public String toString() {
+        return "{" + " value='" + getValue() + "'" + ", creator='" + getCreator() + "'" + "}";
+    }
+
+}
+
+/*
+ * 
+ * Shape of a ChannelTopic
+ * 
+ * "topic": { "value": "", "creator": "", "last_set": { "$numberInt": "0" } },
+ */
\ No newline at end of file
diff --git a/src/main/java/edu/ucsb/mapache/repositories/ChannelRepository.java b/src/main/java/edu/ucsb/mapache/repositories/ChannelRepository.java
new file mode 100644
index 000000000..c09434834
--- /dev/null
+++ b/src/main/java/edu/ucsb/mapache/repositories/ChannelRepository.java
@@ -0,0 +1,14 @@
+package edu.ucsb.mapache.repositories;
+
+import edu.ucsb.mapache.documents.Channel;
+import org.bson.types.ObjectId;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+@Repository
+public interface ChannelRepository extends MongoRepository<Channel, ObjectId> {
+    @Query("{ 'name': ?0}")
+    List<Channel> findByName(String name);
+}

From 12ce11bc98c0a965d1145f4fe80c4fea41ded4d8 Mon Sep 17 00:00:00 2001
From: Phillip Conrad <pconrad@cs.ucsb.edu>
Date: Mon, 23 Nov 2020 15:18:48 -0800
Subject: [PATCH 4/5] pc - WIP

---
 .../mapache/documents/ChannelTopicTests.java  | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java

diff --git a/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java b/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java
new file mode 100644
index 000000000..a9a802cd2
--- /dev/null
+++ b/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java
@@ -0,0 +1,64 @@
+package edu.ucsb.mapache.documents;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Assertions;
+
+import org.junit.jupiter.api.Test;
+
+public class ChannelTopicTests {
+
+  @Test
+  public void test_toString() {
+    ChannelTopic ct = new ChannelTopic("sampleTopic", "sampleCreator");
+    String expected = "{ value='sampleTopic', creator='sampleCreator'}";
+    assertEquals(expected, ct.toString());
+  }
+
+  @Test
+  public void test_getAndSetValue() {
+    ChannelTopic ct = new ChannelTopic();
+    ct.setValue("sampleTopic");
+    assertEquals("sampleTopic", ct.getValue());  
+  }
+
+  @Test
+  public void test_getAndSetCreator() {
+    ChannelTopic ct = new ChannelTopic();
+    ct.setCreator("sampleCreator");
+    assertEquals("sampleCreator", ct.getCreator());  
+  }
+
+  @Test
+  public void test_hashCode_matchesOnSameContent() {
+    ChannelTopic ct1 = new ChannelTopic("sampleTopic", "sampleCreator");
+    ChannelTopic ct2 = new ChannelTopic("sampleTopic", "sampleCreator");
+    assertEquals(ct1.hashCode(), ct2.hashCode());
+  }
+
+  @Test
+  public void test_notEqualNull() {
+    assertNotEquals(new ChannelTopic(), null);
+  }
+
+  @Test
+  public void test_notEqualDifferentClass() {
+    ChannelTopic ct1 = new ChannelTopic("sampleTopic", "sampleCreator");
+    Assertions.assertFalse(ct1.equals(new Object()));
+  }
+
+  @Test
+  public void testAdmin_equalsCopy() {
+    ChannelTopic ct1 = new ChannelTopic("sampleTopic", "sampleCreator");
+    ChannelTopic ct2 = new ChannelTopic("sampleTopic", "sampleCreator");
+    assertTrue(ct1.equals(ct2));
+  }
+
+  @Test
+  public void testAdmin_equalsSelf() {
+    ChannelTopic ct1 = new ChannelTopic("sampleTopic", "sampleCreator");
+    assertTrue(ct1.equals(ct1));
+  }
+
+}

From 71350cb9745c344c26f7b43bec71f3530184fdd2 Mon Sep 17 00:00:00 2001
From: Phillip Conrad <pconrad@cs.ucsb.edu>
Date: Tue, 24 Nov 2020 11:37:06 -0800
Subject: [PATCH 5/5] pc/sc/al - address comments from code review

Replaced Objects.equals with EqualsBuilder for easier testing

Replaced getter/setter tests with JavaBeanTester for less code to maintain
---
 pom.xml                                       |  6 ++++
 .../edu/ucsb/mapache/documents/Channel.java   | 15 ++++++++-
 .../mapache/documents/ChannelPurpose.java     | 32 ++++++++-----------
 .../mapache/documents/ChannelTopicTests.java  | 15 +++------
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 226434db9..8f61f08d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,12 @@
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/net.codebox/javabean-tester -->
+		<dependency>
+			<groupId>net.codebox</groupId>
+			<artifactId>javabean-tester</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/edu/ucsb/mapache/documents/Channel.java b/src/main/java/edu/ucsb/mapache/documents/Channel.java
index 0284c2d12..c6e477e86 100644
--- a/src/main/java/edu/ucsb/mapache/documents/Channel.java
+++ b/src/main/java/edu/ucsb/mapache/documents/Channel.java
@@ -114,9 +114,22 @@ public boolean equals(Object o) {
         return Objects.equals(id, channel.id) && Objects.equals(name, channel.name) && Objects.equals(creator, channel.creator) && Objects.equals(is_archived, channel.is_archived) && Objects.equals(is_general, channel.is_general) && Objects.equals(members, channel.members) && Objects.equals(topic, channel.topic) && Objects.equals(purpose, channel.purpose);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof Channel)) {
+            return false;
+        }
+        Channel c = (Channel) o;
+        EqualsBuilder builder = new EqualsBuilder();
+        builder.append(name, c.getName());
+        return builder.build();
+    }
+
     @Override
     public int hashCode() {
-        return Objects.hash(id, name, creator, is_archived, is_general, members, topic, purpose);
+        return Objects.hash(name);
     }
 
     @Override
diff --git a/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java b/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
index 44e648e8c..278df6685 100644
--- a/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
+++ b/src/main/java/edu/ucsb/mapache/documents/ChannelPurpose.java
@@ -1,6 +1,9 @@
 package edu.ucsb.mapache.documents;
+
 import java.util.Objects;
 
+import org.apache.commons.lang3.builder.EqualsBuilder;
+
 public class ChannelPurpose {
     private String value;
     private String creator;
@@ -29,7 +32,6 @@ public void setCreator(String creator) {
         this.creator = creator;
     }
 
-   
     @Override
     public boolean equals(Object o) {
         if (o == this)
@@ -37,8 +39,10 @@ public boolean equals(Object o) {
         if (!(o instanceof ChannelPurpose)) {
             return false;
         }
-        ChannelPurpose channelPurpose = (ChannelPurpose) o;
-        return Objects.equals(value, channelPurpose.value) && Objects.equals(creator, channelPurpose.creator);
+        ChannelPurpose cp = (ChannelPurpose) o;
+        EqualsBuilder builder = new EqualsBuilder();
+        builder.append(value, cp.getValue()).append(creator,cp.getCreator());
+        return builder.build();
     }
 
     @Override
@@ -48,22 +52,14 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "{" +
-            " value='" + getValue() + "'" +
-            ", creator='" + getCreator() + "'" +
-            "}";
+        return "{" + " value='" + getValue() + "'" + ", creator='" + getCreator() + "'" + "}";
     }
 
 }
 
-/* ChannelPurpose json
-
- "purpose": {
-        "value": "",
-        "creator": "",
-        "last_set": {
-            "$numberInt": "0"
-        }
-    }
-
-*/
\ No newline at end of file
+/*
+ * ChannelPurpose json
+ * 
+ * "purpose": { "value": "", "creator": "", "last_set": { "$numberInt": "0" } }
+ * 
+ */
\ No newline at end of file
diff --git a/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java b/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java
index a9a802cd2..9c48f2903 100644
--- a/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java
+++ b/src/test/java/edu/ucsb/mapache/documents/ChannelTopicTests.java
@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import net.codebox.javabeantester.JavaBeanTester;
+
 public class ChannelTopicTests {
 
   @Test
@@ -16,18 +18,11 @@ public void test_toString() {
     assertEquals(expected, ct.toString());
   }
 
-  @Test
-  public void test_getAndSetValue() {
-    ChannelTopic ct = new ChannelTopic();
-    ct.setValue("sampleTopic");
-    assertEquals("sampleTopic", ct.getValue());  
-  }
 
   @Test
-  public void test_getAndSetCreator() {
-    ChannelTopic ct = new ChannelTopic();
-    ct.setCreator("sampleCreator");
-    assertEquals("sampleCreator", ct.getCreator());  
+  public void testGettersAndSetters() throws Exception {
+      // See: https://github.com/codebox/javabean-tester
+      JavaBeanTester.test(ChannelTopic.class);
   }
 
   @Test