updated controllers and am updating service classes

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

@@ -3,24 +3,26 @@ 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.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@CrossOrigin
 public class ForumController {
     @Autowired
     ForumService forumService;
 
-    @RequestMapping(method = RequestMethod.POST, value = "/forum")
+    @RequestMapping(method = RequestMethod.POST, value = "/forum/{forumid}")
     public void PostComment(int forumID){
         forumService.postComment(forumID); }
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/forum/{id}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/forum/{commentid}")
     public void updateComment(int commentID){
         forumService.updateComment(commentID); }
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/forum/{id}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/forum/{commentid}")
     public void deleteComment(int commentID){
         forumService.deleteComment(commentID); }
 

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

@@ -3,30 +3,31 @@ 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.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/Inbox")
+@CrossOrigin
 public class InboxController {
     @Autowired
     InboxService inboxService;
 
-    @RequestMapping(method = RequestMethod.POST, value = "/inbox")
+    @RequestMapping(method = RequestMethod.POST, value = "/inbox/{userid}")
     public void sendMessage(int userID){
         inboxService.sendMessage(userID); }
 
-    @RequestMapping(method = RequestMethod.GET, value = "/inbox/{id}")
+    @RequestMapping(method = RequestMethod.GET, value = "/inbox/{messageid}")
     public void viewMessage(int messageID){
         inboxService.viewMessage(messageID); }
 
 
-    @RequestMapping(method = RequestMethod.PUT, value = "/inbox/{id}")
+    @RequestMapping(method = RequestMethod.PUT, value = "/inbox/{messageid}")
     public void updateMessage(int messageID){
         inboxService.updateMessage(messageID); }
 
-    @RequestMapping(method = RequestMethod.DELETE, value = "/inbox/{id}")
+    @RequestMapping(method = RequestMethod.DELETE, value = "/inbox/{messageid}")
     public void deleteMessage(int messageID){
         inboxService.deleteMessage(messageID); }
 

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

@@ -1,22 +1,36 @@
 package com.tyler.motivateme.controller;
 
 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
-public class MainTopicsPageController {
-    @Autowired
-    MainTopicsPageService mainTopicsPageService;
-
-    @RequestMapping(method = RequestMethod.GET, value = "/topics")
-    public List<Topic> allTopics() {
-
-        return mainTopicsPageService.allTopics();
-    }
-}
+//import com.tyler.motivateme.service.MainTopicsPageService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.CrossOrigin;
+//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
+//@CrossOrigin
+//public class MainTopicsPageController {
+//    @Autowired
+//    MainTopicsPageService mainTopicsPageService;
+//
+//    @RequestMapping(method = RequestMethod.GET, value = "/topics")
+//    public List<Topic> allTopics() {
+//
+//        return mainTopicsPageService.allTopics();
+//    }
+//
+//    @RequestMapping(method = RequestMethod.POST, value = "/topics/{id}")
+//    public void add(Topic topic){
+//        mainTopicsPageService.add(topic); }
+//
+//    @RequestMapping(method = RequestMethod.PUT, value = "/topics/{id}")
+//    public void update(int topicIndex, Topic newTopic){
+//        mainTopicsPageService.update(topicIndex, newTopic); }
+//
+//    @RequestMapping(method = RequestMethod.DELETE, value = "/topics/{id}")
+//    public void delete(Topic topic){
+//        mainTopicsPageService.delete(topic); }
+//}

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

@@ -0,0 +1,48 @@
+package com.tyler.motivateme.controller;
+
+import com.tyler.motivateme.repository.TopicRepository;
+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.*;
+
+import java.util.List;
+
+@RestController
+@CrossOrigin
+public class TopicController {
+
+//    @Autowired
+//    private TopicCreatorService topicCreatorService;
+
+    @Autowired
+    private TopicRepository topicRepository;
+
+    @RequestMapping(method = RequestMethod.GET, value="/topics")
+    public Iterable<Topic> allTopics() {
+        return topicRepository.findAll();
+    }
+
+
+
+//    @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(int topicIndex, Topic newTopic){
+//        topicCreatorService.update(topicIndex, newTopic); }
+//
+//    @RequestMapping(method = RequestMethod.DELETE, value = "/CreateTopic/{id}")
+//    public void delete(Topic topic){
+//        topicCreatorService.delete(topic); }
+
+
+
+}

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

@@ -1,39 +0,0 @@
-package com.tyler.motivateme.controller;
-
-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
-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,24 +1,36 @@
-package com.tyler.motivateme.controller;
-
-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
-public class TopicInfoPageController {
-
-    @Autowired
-    private TopicInfoPageService topicInfoPageService;
-
-    public void getTopicName() {}
-
-    public void getDescription() {
-
-    }
-
-    public void getAdviceAndStrategies() {
-
-    }
-
-}
+//package com.tyler.motivateme.controller;
+//
+//import com.tyler.motivateme.service.TopicInfoPageService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.CrossOrigin;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@RestController
+//@CrossOrigin
+//public class TopicInfoPageController {
+//
+//    @Autowired
+//    private TopicInfoPageService topicInfoPageService;
+//
+//    @RequestMapping(method = RequestMethod.GET, value = "/TopicInfo/{topicid}")
+//    public void getTopicName() {}
+//
+//    @RequestMapping(method = RequestMethod.GET, value = "/TopicInfo/{descriptionid}")
+//    public void getDescription() {
+//
+//    }
+//
+//    @RequestMapping(method = RequestMethod.GET, value = "/TopicInfo/{ASid}")
+//    public void getAdviceAndStrategies() {
+//
+//    }
+//
+//    @RequestMapping(method = RequestMethod.POST, value = "/TopicInfo/{descriptionid}")
+//    public void updateDescription(){ }
+//
+//    @RequestMapping(method = RequestMethod.POST, value = "/TopicInfo/{ASid}")
+//    public void updateAdviceAndStrategies(){}
+//
+//}

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

@@ -10,4 +10,4 @@ public class Message {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int messageID;
-}
+}

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

@@ -16,7 +16,7 @@ public class Topic {
     private String adviceAndStrategies;
 
 
-    public Topic(int id, String name) {
+    public Topic(int id, String name, String description, String adviceAndStrategies) {
         this.id = id;
         this.name = name;
         this.description = description;

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

@@ -0,0 +1,16 @@
+package com.tyler.motivateme.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class TopicMessage {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+
+    private String user_id;
+    private String topic_id;
+    private int date;
+}

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

@@ -1,9 +1,11 @@
 package com.tyler.motivateme.repository;
 
 import com.tyler.motivateme.model.Comment;
+import org.springframework.data.jpa.repository.Query;
 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/TopicMessageRepository.java

@@ -0,0 +1,10 @@
+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 TopicMessageRepository extends CrudRepository<Message, Integer> {
+
+}

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

@@ -1,16 +1,26 @@
 package com.tyler.motivateme.service;
 
+import net.anthavio.disquo.api.DisqusApi;
+import net.anthavio.disquo.api.DisqusApplicationKeys;
+import net.anthavio.disquo.api.response.DisqusPost;
+import net.anthavio.disquo.api.response.DisqusResponse;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ForumService {
-    private Integer forumID;
-//
-//    public ForumService(Integer forumID) {
-//        this.forumID = forumID;
-//    }
+    DisqusApplicationKeys keys = new DisqusApplicationKeys("...api_key...", "...secret_key...");
+    DisqusApi disqus = new DisqusApi(keys);
+    private int forumID;
+
+
+    public ForumService (int forumID) {
+        this.forumID = forumID;
+    }
 
     public void postComment(int forumID){
+        disqus.forums();
     }
 
     public void updateComment(int commentID) {}

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

@@ -6,9 +6,9 @@ import org.springframework.stereotype.Service;
 public class InboxService {
     private int userID;
 
-//    public InboxService(int userID){
-//        this.userID = userID;
-//    }
+    public InboxService(int userID){
+        this.userID = userID;
+    }
 
     public void sendMessage(int userID){
     }

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

@@ -1,6 +1,9 @@
 package com.tyler.motivateme.service;
 
 import com.tyler.motivateme.model.Topic;
+import com.tyler.motivateme.repository.TopicRepository;
+import org.apache.el.stream.Stream;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
@@ -9,15 +12,27 @@ import java.util.List;
 
 @Service
 public class MainTopicsPageService {
-    List<Topic> topics;
 
-    public MainTopicsPageService(){
-        this.topics = new ArrayList<>();
-    }
+    @Autowired
+    private TopicRepository topicRepository;
 
     public List<Topic> allTopics() {
+        List<Topic> allTopics = new ArrayList<>();
+        topicRepository.findAll()
+                .forEach(allTopics::add);
+        return allTopics;
+    }
+
+    public void getAllTopics(Integer id){
+        topicRepository.findById(id);
+    }
 
-        return topics;
+    public void add(Topic topic) {
+        topicRepository.save(topic);
     }
 
+    public void update(Topic newTopic) { topicRepository.save(newTopic);}
+
+    public void delete(Integer id) { topicRepository.deleteById(id); }
+
 }

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

@@ -10,7 +10,7 @@ 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 List<Topic> topics = new ArrayList<>();
     private String description;
     private String adviceAndStrategies;
 
@@ -23,7 +23,7 @@ public class TopicCreatorService {
         topics.add(topic);
     }
 
-    public void update(Topic topic) {}
+    public void update(int topicIndex, Topic newTopic) { topics.set(topicIndex, newTopic);}
 
     public void delete(Topic topic) { topics.remove(topic); }
 }

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

@@ -5,13 +5,33 @@ import org.springframework.stereotype.Service;
 @Service
 public class TopicInfoPageService {
 
-    public String getTopicName() {return null;}
+    private String topicName;
+    private String description;
+    private String adviceAndStrategies;
 
-    public String getDescription() {
-        return null;
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
     }
 
-    public String getAdviceAndStrategies() {
-        return null;
+    public void setDescription(String description) {
+        this.description = description;
     }
+
+    public void setAdviceAndStrategies(String adviceAndStrategies) {
+        this.adviceAndStrategies = adviceAndStrategies;
+    }
+
+    public String getTopicName() { return topicName;}
+
+    public String getDescription() { return description;
+
+    }
+
+    public String getAdviceAndStrategies() { return adviceAndStrategies;
+
+    }
+
+    public void updateDescription(){ }
+
+    public void updateAdviceAndStrategies(){}
 }

src/main/resources/application.properties

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

src/test/java/service/TopicCreatorServiceTest.java

@@ -24,7 +24,7 @@ public class TopicCreatorServiceTest {
 
     @Test
     public void testAllTopics_AreInList(){
-        List expected = new ArrayList<>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
+        List expected = new ArrayList<>(Arrays.asList());
         List actual = tcs.allTopics();
         assertEquals(expected, actual);
     }
@@ -34,13 +34,13 @@ public class TopicCreatorServiceTest {
     public void testConstruction(){
         List<Topic> topics = tcs.allTopics();
 
-        assertEquals(topics.size(), 3);
-        assertTrue(topics.contains(new Topic(1, "Quit drinking")));
+        assertEquals(topics.size(), 0);
+        assertTrue(topics.contains(0));
     }
 
     @Test
     public void testAddTopic_ToAllTopics(){
-        Topic topic = new Topic(4, "working out");
+        Topic topic = new Topic();
         tcs.add(topic);
 
         List<Topic> topics = tcs.allTopics();
@@ -50,17 +50,18 @@ public class TopicCreatorServiceTest {
 
     @Test
     public void testUpdateTopic_InAllTopics(){
-        Topic topic = new Topic(4, "working out");
-        tcs.update(topic);
+        int topicIndex = 2;
+        Topic newTopic = new Topic();
+        tcs.update(topicIndex, newTopic);
 
         List<Topic> topics = tcs.allTopics();
 
-        assertFalse(topics.contains(topic));
+        assertTrue(topics.contains(newTopic));
     }
 
     @Test
     public void testDeleteTopic_FromAllTopics(){
-        Topic topic = new Topic(2, "Quit Smoking");
+        Topic topic = new Topic();
         tcs.delete(topic);
 
         List<Topic> topics = tcs.allTopics();

src/test/java/service/TopicInfoPageServiceTest.java

@@ -11,6 +11,7 @@ public class TopicInfoPageServiceTest {
 
     @Test
     public void testGetDescription() {
+
     }
 
     @Test