Merge pull request #63 from TAMULib/sprint6-b03632-feature_proposal-enum

Sprint6 B-03632 feature proposal enum

Author: tamu-sad-iii

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

@@ -0,0 +1,5 @@
+package edu.tamu.app.enums;
+
+public enum FeatureProposalState {
+    IN_PROGRESS, ACTIVE, SUBMITTED, ON_HOLD, REJECTED;
+}

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

@@ -10,6 +10,8 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.UniqueConstraint;
@@ -21,6 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
+import edu.tamu.app.enums.FeatureProposalState;
 import edu.tamu.app.model.validation.FeatureProposalValidator;
 
 @Entity
@@ -39,8 +42,9 @@ public class FeatureProposal extends AbstractIdea {
     @Fetch(value = SELECT)
     private List<User> voters;
 
+    @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private boolean submitted;
+    private FeatureProposalState state;
 
     public FeatureProposal() {
         super();
@@ -72,7 +76,7 @@ public FeatureProposal(Idea idea) {
     private void setup() {
         this.ideas = new ArrayList<Idea>();
         this.voters = new ArrayList<User>();
-        this.submitted = false;
+        this.state = FeatureProposalState.IN_PROGRESS;
     }
 
     public List<Idea> getIdeas() {
@@ -126,12 +130,12 @@ public int getVotes() {
         return this.voters.size();
     }
 
-    public boolean isSubmitted() {
-        return submitted;
+    public FeatureProposalState getState() {
+        return state;
     }
 
-    public void setSubmitted(boolean submitted) {
-        this.submitted = submitted;
+    public void setState(FeatureProposalState state) {
+        this.state = state;
     }
 
 }

src/main/java/edu/tamu/app/service/ProjectService.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import edu.tamu.app.enums.FeatureProposalState;
 import edu.tamu.app.model.FeatureProposal;
 import edu.tamu.app.model.repo.FeatureProposalRepo;
 import edu.tamu.app.model.request.FeatureRequest;
@@ -52,7 +53,7 @@ public ApiResponse getById(Long id) throws JsonParseException, JsonMappingExcept
     public ApiResponse submitFeatureRequest(FeatureProposal proposal) {
         ApiResponse response = restTemplate.postForObject(projectsUrl + "/feature", new FeatureRequest(proposal), ApiResponse.class);
         if (response.getMeta().getStatus().equals(ApiStatus.SUCCESS)) {
-            proposal.setSubmitted(true);
+            proposal.setState(FeatureProposalState.SUBMITTED);
             proposal = featureProposalRepo.save(proposal);
             simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, proposal));
         }