Merge pull request #62 from TAMULib/sprint6-b03624-idea-state-enum

Created IdeaState enum and cleaned up elevated boolean

Author: tamu-sad-iii

src/main/java/edu/tamu/app/enums/IdeaState.java

@@ -0,0 +1,5 @@
+package edu.tamu.app.enums;
+
+public enum IdeaState {
+    WAITING_ON_REVIEW, ELEVATED, SENT_TO_HELPDESK, REJECTED
+}

src/main/java/edu/tamu/app/model/Idea.java

@@ -2,25 +2,29 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 
+import edu.tamu.app.enums.IdeaState;
 import edu.tamu.app.model.request.ServiceRequest;
 import edu.tamu.app.model.validation.IdeaValidator;
 
 @Entity
 public class Idea extends AbstractIdea {
 
+    @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private boolean elevated;
+    private IdeaState state;
 
     public Idea() {
         super();
         this.modelValidator = new IdeaValidator();
-        this.elevated = false;
+        this.state = IdeaState.WAITING_ON_REVIEW;
     }
 
     public Idea(String title, String description) {
         super(title, description);
-        this.elevated = false;
+        this.state = IdeaState.WAITING_ON_REVIEW;
     }
 
     public Idea(ServiceRequest serviceRequest) {
@@ -29,20 +33,21 @@ public Idea(ServiceRequest serviceRequest) {
 
     public Idea(String title, String description, User author) {
         super(title, description, author);
-        this.elevated = false;
+        this.state = IdeaState.WAITING_ON_REVIEW;
     }
 
     public Idea(String title, String description, User author, Service service) {
         super(title, description, author, service);
-        this.elevated = false;
+        this.state = IdeaState.WAITING_ON_REVIEW;
     }
 
-    public boolean isElevated() {
-        return elevated;
+    public IdeaState getState() {
+        return state;
     }
 
-    public void setElevated(boolean elevated) {
-        this.elevated = elevated;
+    public void setState(IdeaState state) {
+        this.state = state;
     }
-
 }
+
+

src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java

@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 
+import edu.tamu.app.enums.IdeaState;
 import edu.tamu.app.exception.UserNotFoundException;
 import edu.tamu.app.model.FeatureProposal;
 import edu.tamu.app.model.Idea;
@@ -38,7 +39,7 @@ public FeatureProposal create(FeatureProposal featureProposal, Credentials crede
         if (user.isPresent()) {
             featureProposal.setAuthor(user.get());
             featureProposal.getIdeas().forEach(idea -> {
-                idea.setElevated(true);
+                idea.setState(IdeaState.ELEVATED);
                 idea = ideaRepo.save(idea);
                 simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
             });
@@ -51,7 +52,7 @@ public FeatureProposal create(FeatureProposal featureProposal, Credentials crede
 
     @Override
     public FeatureProposal create(Idea idea) {
-        idea.setElevated(true);
+        idea.setState(IdeaState.ELEVATED);
         idea = ideaRepo.save(idea);
         simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
         FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));
@@ -62,7 +63,7 @@ public FeatureProposal create(Idea idea) {
     @Override
     public FeatureProposal update(FeatureProposal featureProposal) {
         featureProposal.getIdeas().forEach(idea -> {
-            idea.setElevated(true);
+            idea.setState(IdeaState.ELEVATED);
             idea = ideaRepo.save(idea);
             simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
         });
@@ -74,7 +75,7 @@ public FeatureProposal update(FeatureProposal featureProposal) {
     @Override
     public void delete(FeatureProposal featureProposal) {
         featureProposal.getIdeas().forEach(idea -> {
-            idea.setElevated(false);
+            idea.setState(IdeaState.WAITING_ON_REVIEW);
             idea = ideaRepo.save(idea);
             simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
         });