submitting feature proposal

Author: tamu-sad-iii

src/main/java/edu/tamu/app/controller/ProjectController.java

@@ -6,17 +6,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 
 import edu.tamu.app.exception.UserNotFoundException;
-import edu.tamu.app.model.request.FeatureRequest;
+import edu.tamu.app.model.FeatureProposal;
 import edu.tamu.app.service.ProjectService;
 import edu.tamu.weaver.response.ApiResponse;
+import edu.tamu.weaver.validation.aspect.annotation.WeaverValidatedModel;
 
 @RestController
 @RequestMapping("/projects")
@@ -37,12 +37,10 @@ public ApiResponse getById(@PathVariable Long id) throws JsonParseException, Jso
         return projectService.getById(id);
     }
 
-    // TODO: the following method needs to create FeatureRequest from a FeatureProposal
-
     @RequestMapping("/feature")
     @PreAuthorize("hasRole('SERVICE_MANAGER')")
-    public ApiResponse submitFeatureRequest(@RequestBody FeatureRequest request) throws UserNotFoundException {
-        return projectService.submitFeatureRequest(request);
+    public ApiResponse submitFeatureRequest(@WeaverValidatedModel FeatureProposal proposal) throws UserNotFoundException {
+        return projectService.submitFeatureRequest(proposal);
     }
 
 }

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

@@ -1,6 +1,5 @@
 package edu.tamu.app.model;
 
-import static javax.persistence.CascadeType.MERGE;
 import static javax.persistence.CascadeType.REFRESH;
 import static javax.persistence.FetchType.EAGER;
 
@@ -31,10 +30,10 @@ public abstract class AbstractIdea extends ValidatingBaseEntity {
     @UpdateTimestamp
     private Calendar lastModified;
 
-    @ManyToOne(fetch = EAGER, cascade = MERGE, optional = false)
+    @ManyToOne(fetch = EAGER, cascade = REFRESH, optional = false)
     private Service service;
 
-    @ManyToOne(cascade = REFRESH, optional = false)
+    @ManyToOne(fetch = EAGER, cascade = REFRESH, optional = false)
     private User author;
 
     public AbstractIdea() {

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

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
@@ -16,9 +17,11 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 @Entity
+@JsonIgnoreProperties(value = { "voters" }, allowGetters = true)
 public class FeatureProposal extends AbstractIdea {
 
     @ManyToMany(fetch = EAGER, cascade = { CascadeType.REFRESH, CascadeType.DETACH, CascadeType.MERGE })
@@ -33,6 +36,9 @@ public class FeatureProposal extends AbstractIdea {
     @Fetch(value = SELECT)
     private List<User> voters;
 
+    @Column(nullable = false)
+    private boolean submitted;
+
     public FeatureProposal() {
         super();
         setup();
@@ -62,6 +68,7 @@ public FeatureProposal(Idea idea) {
     private void setup() {
         this.ideas = new ArrayList<Idea>();
         this.voters = new ArrayList<User>();
+        this.submitted = false;
     }
 
     public List<Idea> getIdeas() {
@@ -108,4 +115,12 @@ public int getVotes() {
         return this.voters.size();
     }
 
+    public boolean isSubmitted() {
+        return submitted;
+    }
+
+    public void setSubmitted(boolean submitted) {
+        this.submitted = submitted;
+    }
+
 }

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

@@ -21,11 +21,6 @@ public Idea(String title, String description) {
         this.elevated = false;
     }
 
-    public Idea(String title, String description, boolean elevated) {
-        super(title, description);
-        this.elevated = elevated;
-    }
-
     public Idea(ServiceRequest serviceRequest) {
         this(serviceRequest.getTitle(), serviceRequest.getDescription());
     }

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

@@ -48,15 +48,15 @@ public FeatureProposal create(FeatureProposal featureProposal, Credentials crede
     public FeatureProposal create(Idea idea) {
         idea.setElevated(true);
         idea = ideaRepo.save(idea);
-        FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));
-        idea.setElevated(true);
-        ideaRepo.save(idea);
+        simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
+        FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));        
         simpMessagingTemplate.convertAndSend("/channel/feature-proposals/create", new ApiResponse(SUCCESS, featureProposal));
         return featureProposal;
     }
 
     @Override
     public FeatureProposal update(FeatureProposal featureProposal) {
+        featureProposal = featureProposalRepo.save(featureProposal);
         simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, featureProposal));
         return featureProposal;
     }

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

@@ -41,6 +41,7 @@ public Idea create(Idea idea, Credentials credentials) throws UserNotFoundExcept
 
     @Override
     public Idea update(Idea idea) {
+        idea = ideaRepo.save(idea);
         simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
         return idea;
     }

src/main/java/edu/tamu/app/model/request/FeatureRequest.java

@@ -1,5 +1,7 @@
 package edu.tamu.app.model.request;
 
+import edu.tamu.app.model.FeatureProposal;
+
 public class FeatureRequest extends AbstractRequest {
 
     private static final long serialVersionUID = -6953745180846929244L;
@@ -23,6 +25,10 @@ public FeatureRequest(RequestType type, String title, String description, Long p
         this.projectId = projectId;
     }
 
+    public FeatureRequest(FeatureProposal proposal) {
+        this(RequestType.FEATURE, proposal.getTitle(), proposal.getDescription(), proposal.getService().getProjectId());
+    }
+
     public Long getProjectId() {
         return projectId;
     }

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

@@ -1,21 +1,27 @@
 package edu.tamu.app.service;
 
+import static edu.tamu.weaver.response.ApiStatus.SUCCESS;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import edu.tamu.app.model.FeatureProposal;
+import edu.tamu.app.model.repo.FeatureProposalRepo;
 import edu.tamu.app.model.request.FeatureRequest;
 import edu.tamu.app.model.request.IssueRequest;
-import edu.tamu.weaver.response.ApiResponse;;
+import edu.tamu.weaver.response.ApiResponse;
+import edu.tamu.weaver.response.ApiStatus;;
 
 @Service
 public class ProjectService {
@@ -29,6 +35,12 @@ public class ProjectService {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private FeatureProposalRepo featureProposalRepo;
+
+    @Autowired
+    private SimpMessagingTemplate simpMessagingTemplate;
+
     public ApiResponse getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException {
         return objectMapper.readValue(new URL(projectsUrl), ApiResponse.class);
     }
@@ -37,8 +49,14 @@ public ApiResponse getById(Long id) throws JsonParseException, JsonMappingExcept
         return objectMapper.readValue(new URL(projectsUrl + "/" + id), ApiResponse.class);
     }
 
-    public ApiResponse submitFeatureRequest(FeatureRequest request) {
-        return restTemplate.postForObject(projectsUrl + "/feature", request, ApiResponse.class);
+    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 = featureProposalRepo.save(proposal);
+            simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, proposal));
+        }
+        return response;
     }
 
     public ApiResponse submitIssueRequest(IssueRequest request) {

src/test/java/edu/tamu/app/model/FeatureProposalTest.java

@@ -31,17 +31,22 @@
 public class FeatureProposalTest {
 
     private static final String TEST_FEATURE_PROPOSAL_TITLE = "Feature Proposal Title";
+    private static final String TEST_FEATURE_PROPOSAL_DESCRIPTION = "Test Feature Proposal Description";
+
+    private static final String TEST_SERVICE_NAME = "Test Service Name";
     private static final String TEST_SERVICE_URL = "https://library.tamu.edu";
-    private static final String TEST_DESCRIPTION = "Test Service Description";
+    private static final String TEST_SERVICE_DESCRIPTION = "Test Service Description";
+
     private static final String TEST_ALTERNATIVE_FEATURE_PROPOSAL_TITLE = "Alternative Feature Proposal Title";
-    private static final String TEST_SERVICE_NAME = "Test Service Name";
-    private static final String TEST_ALTERNATIVE_SERVICE_NAME = "Different Service Name";
-    private static final String TEST_FEATURE_PROPOSAL_DESCRIPTION = "Test Feature Proposal Description";
     private static final String TEST_ALTERNATIVE_FEATURE_PROPOSAL_DESCRIPTION = "Alternative Feature Proposal Description";
+
+    private static final String TEST_ALTERNATIVE_SERVICE_NAME = "Different Service Name";
+
     private static final Boolean TEST_IS_AUTO = false;
     private static final Boolean TEST_IS_PUBLIC = true;
     private static final Boolean TEST_ON_SHORT_LIST = true;
     private static final Status TEST_SERVICE_STATUS = Status.UP;
+
     private Service service1;
     private Service service2;
 
@@ -82,8 +87,8 @@ public class FeatureProposalTest {
     @Before
     public void setUp() throws UserNotFoundException {
         testUser = userRepo.create(TEST_CREDENTIALS.getUin(), TEST_CREDENTIALS.getEmail(), TEST_CREDENTIALS.getFirstName(), TEST_CREDENTIALS.getLastName(), Role.valueOf(TEST_CREDENTIALS.getRole()));
-        service1 = serviceRepo.create(new Service(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION));
-        service2 = serviceRepo.create(new Service(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION));
+        service1 = serviceRepo.create(new Service(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_SERVICE_DESCRIPTION));
+        service2 = serviceRepo.create(new Service(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_SERVICE_DESCRIPTION));
         testFeatureProposal = featureProposalRepo.create(new FeatureProposal(TEST_FEATURE_PROPOSAL_TITLE, TEST_FEATURE_PROPOSAL_DESCRIPTION, testUser, service1), TEST_CREDENTIALS);
     }
 

src/test/java/edu/tamu/app/service/ProjectServiceTest.java

@@ -7,6 +7,7 @@
 import java.net.MalformedURLException;
 import java.util.List;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +22,18 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import edu.tamu.app.WebServerInit;
+import edu.tamu.app.enums.Role;
+import edu.tamu.app.enums.Status;
+import edu.tamu.app.exception.UserNotFoundException;
 import edu.tamu.app.mock.projects.MockProjects;
+import edu.tamu.app.model.FeatureProposal;
+import edu.tamu.app.model.Service;
+import edu.tamu.app.model.User;
+import edu.tamu.app.model.repo.FeatureProposalRepo;
+import edu.tamu.app.model.repo.ServiceRepo;
+import edu.tamu.app.model.repo.UserRepo;
 import edu.tamu.app.model.request.AbstractRequest;
-import edu.tamu.app.model.request.FeatureRequest;
+import edu.tamu.app.model.request.AbstractRequest.RequestType;
 import edu.tamu.app.model.request.IssueRequest;
 import edu.tamu.app.model.response.Project;
 import edu.tamu.weaver.auth.model.Credentials;
@@ -35,6 +45,26 @@
 @SpringBootTest(classes = { WebServerInit.class }, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class ProjectServiceTest {
 
+    private static final String TEST_SERVICE_NAME = "Test Service Name";
+    private static final String TEST_SERVICE_URL = "https://library.tamu.edu";
+    private static final String TEST_SERVICE_DESCRIPTION = "Test Service Description";
+    private static final Boolean TEST_IS_AUTO = false;
+    private static final Boolean TEST_IS_PUBLIC = true;
+    private static final Boolean TEST_ON_SHORT_LIST = true;
+    private static final Status TEST_SERVICE_STATUS = Status.UP;
+
+    private static final String TEST_FEATURE_PROPOSAL_TITLE = "Feature Proposal Title";
+    private static final String TEST_FEATURE_PROPOSAL_DESCRIPTION = "Test Feature Proposal Description";
+
+    private static final Credentials TEST_CREDENTIALS = new Credentials();
+    {
+        TEST_CREDENTIALS.setUin("123456789");
+        TEST_CREDENTIALS.setEmail("aggieJack@tamu.edu");
+        TEST_CREDENTIALS.setFirstName("Aggie");
+        TEST_CREDENTIALS.setLastName("Jack");
+        TEST_CREDENTIALS.setRole("ROLE_USER");
+    }
+
     @Autowired
     private MockProjects mockReader;
 
@@ -44,11 +74,21 @@ public class ProjectServiceTest {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @Autowired
+    private UserRepo userRepo;
+
+    @Autowired
+    private ServiceRepo serviceRepo;
+
+    @Autowired
+    private FeatureProposalRepo featureProposalRepo;
+
     @Test
     public void getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException {
         ApiResponse response = projectService.getAll();
         assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus());
-        List<Project> projects = objectMapper.convertValue(response.getPayload().get("ArrayList<Project>"), new TypeReference<List<Project>>() {});
+        List<Project> projects = objectMapper.convertValue(response.getPayload().get("ArrayList<Project>"), new TypeReference<List<Project>>() {
+        });
         List<Project> mockProjects = mockReader.getAllProjects();
         assertEquals("Projects response size was not as expected!", mockProjects.size(), projects.size());
         for (int i = 0; i < projects.size(); i++) {
@@ -71,11 +111,13 @@ public void getById() throws JsonParseException, JsonMappingException, Malformed
     }
 
     @Test
-    public void submitFeatureRequest() {
-        FeatureRequest request = new FeatureRequest(AbstractRequest.RequestType.FEATURE, "Test feature request", "This is a test feature request on project 1!", 1L);
-        ApiResponse response = projectService.submitFeatureRequest(request);
+    public void submitFeatureRequest() throws UserNotFoundException {
+        User testUser = userRepo.create(TEST_CREDENTIALS.getUin(), TEST_CREDENTIALS.getEmail(), TEST_CREDENTIALS.getFirstName(), TEST_CREDENTIALS.getLastName(), Role.valueOf(TEST_CREDENTIALS.getRole()));
+        Service service = serviceRepo.create(new Service(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_SERVICE_DESCRIPTION));
+        FeatureProposal newFeatureProposal = featureProposalRepo.create(new FeatureProposal(TEST_FEATURE_PROPOSAL_TITLE, TEST_FEATURE_PROPOSAL_DESCRIPTION, testUser, service), TEST_CREDENTIALS);
+        ApiResponse response = projectService.submitFeatureRequest(newFeatureProposal);
         assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus());
-        assertEquals("Response message was not correct!", "Successfully submitted " + request.getType().getName() + " request!", response.getMeta().getMessage());
+        assertEquals("Response message was not correct!", "Successfully submitted " + RequestType.FEATURE.getName() + " request!", response.getMeta().getMessage());
     }
 
     @Test
@@ -86,4 +128,11 @@ public void submitIssueRequest() {
         assertEquals("Response message was not correct!", "Successfully submitted " + request.getType().getName() + " request!", response.getMeta().getMessage());
     }
 
+    @After
+    public void cleanUp() {
+        featureProposalRepo.deleteAll();
+        serviceRepo.deleteAll();
+        userRepo.deleteAll();
+    }
+
 }