Merge branch 'staff-channelList' of github.com:ucsb-cs156-f20/proj-ma…

…pache-search into staff-channelList

.github/ISSUE_TEMPLATE/user-story.md

@@ -0,0 +1,39 @@
+---
+name: User Story
+about: This is the format for defining user story issues.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+# User Story
+
+As a ____ I can ____ so that ____
+
+# Acceptance Criteria
+
+- [ ] First thing that should be true when story is done.
+- [ ] Second thing that should be true when story is done.
+...
+
+# Implementation Todos
+
+Front end:
+
+- [ ] First thing that must be done in the front end code.
+- [ ] Second thing that must be done in the front end code.
+...
+
+Back end:
+
+- [ ] First thing that must be done in the back end code.
+- [ ] Second thing that must be done in the back end code.
+...
+
+
+Testing:
+
+- [ ] Front end tests pass and there is adequate coverage
+- [ ] Back end tests pass and there is adequate coverage
+...

src/main/java/edu/ucsb/mapache/documents/Channel.java

@@ -102,18 +102,6 @@ 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 boolean equals(Object o) {
         if (o == this)