added more repository classes and tests

src/main/java/com/tyler/motivateme/Forum.java

@@ -1,13 +0,0 @@
-package com.tyler.motivateme;
-
-public class Forum {
-    private int forumId;
-
-    public Forum(int forumId) {
-        this.forumId = forumId;
-    }
-
-    public String postComment(int id){
-        return null;
-    }
-}

src/main/java/com/tyler/motivateme/Inbox.java

@@ -1,13 +0,0 @@
-package com.tyler.motivateme;
-
-public class Inbox {
-    private int id;
-
-    public Inbox(int id){
-        this.id = id;
-    }
-
-    public String sendMessage(int id){
-        return null;
-    }
-}

src/main/java/com/tyler/motivateme/MainTopicsPage.java

@@ -1,19 +0,0 @@
-package com.tyler.motivateme;
-
-import com.tyler.motivateme.model.Topic;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class MainTopicsPage {
-    List<Topic> topicsList;
-
-    public MainTopicsPage(){
-        this.topicsList = new ArrayList<>();
-    }
-
-
-}

src/main/java/com/tyler/motivateme/controller/CommentController.java

@@ -1,13 +0,0 @@
-package com.tyler.motivateme.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/comments")
-public class CommentController {
-
-    public String postComment(int id){
-        return null;
-    }
-}

src/main/java/com/tyler/motivateme/controller/ForumController.java

@@ -0,0 +1,28 @@
+package com.tyler.motivateme.controller;
+
+import com.tyler.motivateme.model.Topic;
+import com.tyler.motivateme.service.ForumService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ForumController {
+    @Autowired
+    ForumService forumService;
+
+    @RequestMapping(method = RequestMethod.POST, value = "/forum")
+    public void PostComment(int forumID){
+        forumService.postComment(forumID); }
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/forum/{id}")
+    public void updateComment(int commentID){
+        forumService.updateComment(commentID); }
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/forum/{id}")
+    public void deleteComment(int commentID){
+        forumService.deleteComment(commentID); }
+
+
+}

src/main/java/com/tyler/motivateme/controller/InboxController.java

@@ -0,0 +1,34 @@
+package com.tyler.motivateme.controller;
+
+import com.tyler.motivateme.model.Topic;
+import com.tyler.motivateme.service.InboxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/Inbox")
+public class InboxController {
+    @Autowired
+    InboxService inboxService;
+
+    @RequestMapping(method = RequestMethod.POST, value = "/inbox")
+    public void sendMessage(int userID){
+        inboxService.sendMessage(userID); }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/inbox/{id}")
+    public void viewMessage(int messageID){
+        inboxService.viewMessage(messageID); }
+
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/inbox/{id}")
+    public void updateMessage(int messageID){
+        inboxService.updateMessage(messageID); }
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/inbox/{id}")
+    public void deleteMessage(int messageID){
+        inboxService.deleteMessage(messageID); }
+
+
+}

src/main/java/com/tyler/motivateme/controller/MainTopicsPageController.java

@@ -1,13 +1,22 @@
 package com.tyler.motivateme.controller;
 
-import com.tyler.motivateme.MainTopicsPage;
+import com.tyler.motivateme.model.Topic;
+import com.tyler.motivateme.service.MainTopicsPageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
-@RequestMapping("/MainTopics")
 public class MainTopicsPageController {
     @Autowired
-    MainTopicsPage mainTopicsPage;
+    MainTopicsPageService mainTopicsPageService;
+
+    @RequestMapping(method = RequestMethod.GET, value = "/topics")
+    public List<Topic> allTopics() {
+
+        return mainTopicsPageService.allTopics();
+    }
 }

src/main/java/com/tyler/motivateme/controller/MessageController.java

@@ -1,13 +0,0 @@
-package com.tyler.motivateme.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/messages")
-public class MessageController {
-
-    public String sendMessage(int id){
-        return null;
-    }
-}

src/main/java/com/tyler/motivateme/controller/TopicCreatorController.java

@@ -1,23 +1,39 @@
 package com.tyler.motivateme.controller;
 
-import com.tyler.motivateme.model.TopicCreatorService;
+import com.tyler.motivateme.service.TopicCreatorService;
 import com.tyler.motivateme.model.Topic;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
-@RequestMapping("/topics")
 public class TopicCreatorController {
 
     @Autowired
     private TopicCreatorService topicCreatorService;
 
+    @RequestMapping(method = RequestMethod.GET, value = "/CreateTopic")
     public List<Topic> allTopics() {
 
         return topicCreatorService.allTopics();
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = "/CreateTopic")
+    public void add(Topic topic){
+        topicCreatorService.add(topic); }
+
+    @RequestMapping(method = RequestMethod.PUT, value = "/CreateTopic/{id}")
+    public void update(Topic topic){
+        topicCreatorService.update(topic); }
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/CreateTopic/{id}")
+    public void delete(Topic topic){
+        topicCreatorService.delete(topic); }
+
+
+
 }

src/main/java/com/tyler/motivateme/controller/TopicInfoPageController.java

@@ -1,18 +1,24 @@
 package com.tyler.motivateme.controller;
 
-import com.tyler.motivateme.MainTopicsPage;
+import com.tyler.motivateme.service.TopicInfoPageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/TopicInfo")
 public class TopicInfoPageController {
 
     @Autowired
-    private MainTopicsPage mainTopicsPage;
+    private TopicInfoPageService topicInfoPageService;
 
-    public String getDescription() {return null;}
-    public String getAdviceAndStrategies() {return null;}
+    public void getTopicName() {}
+
+    public void getDescription() {
+
+    }
+
+    public void getAdviceAndStrategies() {
+
+    }
 
 }

src/main/java/com/tyler/motivateme/model/Comment.java

@@ -0,0 +1,15 @@
+package com.tyler.motivateme.model;
+
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Comment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int commentID;
+}

src/main/java/com/tyler/motivateme/model/Message.java

@@ -0,0 +1,13 @@
+package com.tyler.motivateme.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Message {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int messageID;
+}

src/main/java/com/tyler/motivateme/model/TopicCreatorService.java

@@ -1,47 +0,0 @@
-package com.tyler.motivateme.model;
-
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Service
-public class TopicCreatorService {
-
-    private List<Topic> topics;
-    private String description;
-    private String adviceAndStrategies;
-
-    public TopicCreatorService(){
-        this.topics = topics = new ArrayList<Topic>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
-        this.description = description;
-        this.adviceAndStrategies = adviceAndStrategies;
-    }
-
-    public List<Topic> allTopics() {
-
-        return topics;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setAdviceAndStrategies(String adviceAndStrategies) {
-        this.adviceAndStrategies = adviceAndStrategies;
-    }
-
-    public String getDescription() {
-
-        return description;
-    }
-
-    public String getAdviceAndStrategies() {
-        return adviceAndStrategies;
-    }
-
-    public void add(Topic topic) {
-        topics.add(topic);
-    }
-}

src/main/java/com/tyler/motivateme/repository/CommentRepository.java

@@ -0,0 +1,9 @@
+package com.tyler.motivateme.repository;
+
+import com.tyler.motivateme.model.Comment;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CommentRepository extends CrudRepository<Comment, Integer> {
+}

src/main/java/com/tyler/motivateme/repository/MessageRepository.java

@@ -0,0 +1,9 @@
+package com.tyler.motivateme.repository;
+
+import com.tyler.motivateme.model.Message;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MessageRepository extends CrudRepository<Message, Integer> {
+}

src/main/java/com/tyler/motivateme/service/ForumService.java

@@ -0,0 +1,19 @@
+package com.tyler.motivateme.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class ForumService {
+    private Integer forumID;
+//
+//    public ForumService(Integer forumID) {
+//        this.forumID = forumID;
+//    }
+
+    public void postComment(int forumID){
+    }
+
+    public void updateComment(int commentID) {}
+
+    public void deleteComment(int commentID) {}
+}

src/main/java/com/tyler/motivateme/service/InboxService.java

@@ -0,0 +1,21 @@
+package com.tyler.motivateme.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class InboxService {
+    private int userID;
+
+//    public InboxService(int userID){
+//        this.userID = userID;
+//    }
+
+    public void sendMessage(int userID){
+    }
+
+    public void viewMessage(int messageID) {}
+
+    public void updateMessage(int messageID) {}
+
+    public void deleteMessage(int messageID) {}
+}

src/main/java/com/tyler/motivateme/service/MainTopicsPageService.java

@@ -0,0 +1,23 @@
+package com.tyler.motivateme.service;
+
+import com.tyler.motivateme.model.Topic;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class MainTopicsPageService {
+    List<Topic> topics;
+
+    public MainTopicsPageService(){
+        this.topics = new ArrayList<>();
+    }
+
+    public List<Topic> allTopics() {
+
+        return topics;
+    }
+
+}

src/main/java/com/tyler/motivateme/service/TopicCreatorService.java

@@ -0,0 +1,29 @@
+package com.tyler.motivateme.service;
+
+import com.tyler.motivateme.model.Topic;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class TopicCreatorService {
+
+    private List<Topic> topics = new ArrayList<Topic>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
+    private String description;
+    private String adviceAndStrategies;
+
+    public List<Topic> allTopics() {
+
+        return topics;
+    }
+
+    public void add(Topic topic) {
+        topics.add(topic);
+    }
+
+    public void update(Topic topic) {}
+
+    public void delete(Topic topic) { topics.remove(topic); }
+}

src/main/java/com/tyler/motivateme/TopicInfoPage.java → src/main/java/com/tyler/motivateme/service/TopicInfoPageService.java

@@ -1,9 +1,9 @@
-package com.tyler.motivateme;
+package com.tyler.motivateme.service;
 
 import org.springframework.stereotype.Service;
 
 @Service
-public class TopicInfoPage{
+public class TopicInfoPageService {
 
     public String getTopicName() {return null;}
 

src/main/resources/application.properties

@@ -1,3 +1,4 @@
 spring.jpa.hibernate.ddl-auto=create-drop
-spring.datasource.url=jdbc:mysql://localhost:3306/demo1?useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/motivateme?useSSL=false
 spring.datasource.username=root
+spring.datasource.password=password

src/test/java/model/topicTest.java

@@ -0,0 +1,27 @@
+package model;
+
+import com.tyler.motivateme.model.Topic;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class topicTest {
+
+    Topic topic = new Topic();
+
+    @Test
+    public void testGetDescription() {
+        String expected = "This is a description of the topic";
+        topic.setDescription(expected);
+        String actual = topic.getDescription();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testGetAdviceAndStrategies() {
+        String expected = "This is the advice and strategies section of the topic";
+        topic.setAdviceAndStrategies(expected);
+        String actual = topic.getAdviceAndStrategies();
+        assertEquals(expected, actual);
+    }
+}

src/test/java/View/ForumTest.java → src/test/java/service/ForumServiceTest.java

@@ -1,14 +1,13 @@
-package View;
+package service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class ForumTest {
+public class ForumServiceTest {
 
     @Test
     public void testPostComment() {

src/test/java/View/InboxTest.java → src/test/java/service/InboxServiceTest.java

@@ -1,14 +1,13 @@
-package View;
+package service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class InboxTest {
+public class InboxServiceTest {
 
     @Test
     public void testSendMessage() {

src/test/java/View/MainTopicsPageTest.java → src/test/java/service/MainTopicsPageServiceTest.java

@@ -1,14 +1,13 @@
-package View;
+package service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class MainTopicsPageTest {
+public class MainTopicsPageServiceTest {
 
     @Test
     public void testGetDescription(){

src/test/java/model/TopicCreatorServiceTest.java → src/test/java/service/TopicCreatorServiceTest.java

@@ -1,7 +1,7 @@
-package model;
+package service;
 
 import com.tyler.motivateme.model.Topic;
-import com.tyler.motivateme.model.TopicCreatorService;
+import com.tyler.motivateme.service.TopicCreatorService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringRunner.class)
@@ -20,21 +21,6 @@ public class TopicCreatorServiceTest {
 
     TopicCreatorService tcs = new TopicCreatorService();
 
-    @Test
-    public void testGetDescription() {
-        String expected = "This is a description of the topic";
-        tcs.setDescription(expected);
-        String actual = tcs.getDescription();
-        assertEquals(expected, actual);
-    }
-
-    @Test
-    public void testGetAdviceAndStrategies() {
-        String expected = "This is the advice and strategies section of the topic";
-        tcs.setAdviceAndStrategies(expected);
-        String actual = tcs.getAdviceAndStrategies();
-        assertEquals(expected, actual);
-    }
 
     @Test
     public void testAllTopics_AreInList(){
@@ -53,7 +39,7 @@ public class TopicCreatorServiceTest {
     }
 
     @Test
-    public void testAddTopics_toAllTopics(){
+    public void testAddTopic_ToAllTopics(){
         Topic topic = new Topic(4, "working out");
         tcs.add(topic);
 
@@ -61,4 +47,24 @@ public class TopicCreatorServiceTest {
 
         assertTrue(topics.contains(topic));
     }
+
+    @Test
+    public void testUpdateTopic_InAllTopics(){
+        Topic topic = new Topic(4, "working out");
+        tcs.update(topic);
+
+        List<Topic> topics = tcs.allTopics();
+
+        assertFalse(topics.contains(topic));
+    }
+
+    @Test
+    public void testDeleteTopic_FromAllTopics(){
+        Topic topic = new Topic(2, "Quit Smoking");
+        tcs.delete(topic);
+
+        List<Topic> topics = tcs.allTopics();
+
+        assertFalse(topics.contains(topic));
+    }
 }

src/test/java/View/TopicInfoPageTest.java → src/test/java/service/TopicInfoPageServiceTest.java

@@ -1,14 +1,13 @@
-package View;
+package service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @ContextConfiguration
-public class TopicInfoPageTest {
+public class TopicInfoPageServiceTest {
 
     @Test
     public void testGetDescription() {