Merge branch 'master' into sprint6-staging-test-improvements

Author: jcreel

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

@@ -21,14 +21,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonIdentityReference;
-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
-@JsonIgnoreProperties(value = { "voters" }, allowGetters = true)
 public class FeatureProposal extends AbstractIdea {
 
     @OneToMany(fetch = EAGER, cascade = { CascadeType.REFRESH, CascadeType.DETACH, CascadeType.MERGE }, mappedBy = "featureProposal")
@@ -51,7 +49,6 @@ public class FeatureProposal extends AbstractIdea {
 
     public FeatureProposal() {
         super();
-        this.modelValidator = new FeatureProposalValidator();
         setup();
     }
 
@@ -77,6 +74,7 @@ public FeatureProposal(Idea idea) {
     }
 
     private void setup() {
+        this.modelValidator = new FeatureProposalValidator();
         this.ideas = new ArrayList<Idea>();
         this.voters = new ArrayList<User>();
         this.state = FeatureProposalState.IN_PROGRESS;

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

@@ -4,6 +4,7 @@
 
 import java.util.Optional;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 
@@ -65,16 +66,19 @@ public FeatureProposal create(Idea idea) {
     }
 
     @Override
-    public FeatureProposal update(FeatureProposal featureProposal) {
-        for (Idea idea : featureProposal.getIdeas()) {
+    public FeatureProposal update(FeatureProposal featureProposalToUpdate) {
+        FeatureProposal persistedFeatureProposal = featureProposalRepo.findOne(featureProposalToUpdate.getId());
+        // NOTE: ignore voters on update to avoid concurrency issue of save after votes occur
+        BeanUtils.copyProperties(featureProposalToUpdate, persistedFeatureProposal, "voters");
+        for (Idea idea : persistedFeatureProposal.getIdeas()) {
             idea.setState(IdeaState.ELEVATED);
-            idea.setFeatureProposal(featureProposal);
+            idea.setFeatureProposal(persistedFeatureProposal);
             idea = ideaRepo.save(idea);
             simpMessagingTemplate.convertAndSend("/channel/ideas/update", new ApiResponse(SUCCESS, idea));
         }
-        featureProposal = featureProposalRepo.save(featureProposal);
-        simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, featureProposal));
-        return featureProposal;
+        persistedFeatureProposal = featureProposalRepo.save(persistedFeatureProposal);
+        simpMessagingTemplate.convertAndSend("/channel/feature-proposals/update", new ApiResponse(SUCCESS, persistedFeatureProposal));
+        return persistedFeatureProposal;
     }
 
     @Override

src/main/resources/application.yaml

@@ -20,6 +20,9 @@ spring:
     platform: h2
     driverClassName: org.h2.Driver
     url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+    # platform: postgres
+    # driverClassName: org.postgresql.Driver
+    # url: jdbc:postgresql://localhost:5432/lsss
 
     username: spring
     password: spring
@@ -36,6 +39,7 @@ spring:
 
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
+    # database-platform: org.hibernate.dialect.PostgreSQLDialect
 
     show-sql: false
     hibernate.ddl-auto: create-drop
@@ -50,12 +54,12 @@ app:
   # Framework app properties #
   ############################
   # edu.tamu.weaver.auth.service.UserCredentialsService
-  authority.admins: 402001311,613001223,102001721,222004429,709005486,523008230,724001395,123456789
+  authority.admins: 402001311,613001223,102001721,222004429,709005486,523008230,724001395,123456789,512004707,427008012
   security:
     # edu.tamu.weaver.auth.service.CryptoService
     secret: verysecretsecret
     # edu.tamu.weaver.filter.CorsFilter
-    allow-access: http://localhost,http://localhost:8080,http://machuff.tamu.edu,http://janus.evans.tamu.edu,http://savell.evans.tamu.edu,http://jmicah.tamu.edu
+    allow-access: http://localhost,http://localhost:8080,http://machuff.tamu.edu,http://janus.evans.tamu.edu,http://savell.evans.tamu.edu,http://jmicah.tamu.edu,http://laddusaw.tamu.edu,http://muninn.evans.tamu.edu:8080
   # edu.tamu.weaver.email.config.WeaverEmailConfig
   email:
     host: relay.tamu.edu
@@ -94,4 +98,4 @@ shib:
   uin: tamuuin
   lastName: tdl-sn
   firstName: tdl-givenname
-  email: tdl-mail
+  email: tdl-mail

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

@@ -0,0 +1,41 @@
+package edu.tamu.app.model;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+public class ScheduleTest {
+
+    @Test
+    public void testNewSchedule() {
+        Calendar calendar = Calendar.getInstance();
+        Long now = calendar.getTimeInMillis();
+
+        Map<String, String> scheduleData = new HashMap<String, String>();
+        scheduleData.put("test", "This is only a test!");
+
+        User author = new User("123456789");
+        Note note = new Note("Test", author);
+
+        Schedule schedule = new Schedule();
+
+        schedule.setScheduledPostingStart(now);
+        schedule.setScheduledPostingEnd(now + 36000);
+        schedule.setScheduleData(scheduleData);
+        schedule.setScheduler(note);
+
+        assertEquals("Schedule posting start was not as expected!", now, schedule.getScheduledPostingStart());
+        assertEquals("Schedule posting end was not as expected!", now + 36000, schedule.getScheduledPostingEnd(), 0);
+        assertEquals("Schedule date was not as expected!", scheduleData, schedule.getScheduleData());
+        assertEquals("Schedule scheduler was not as expected!", note, schedule.getScheduler());
+
+    }
+
+}

src/test/resources/application.yaml

@@ -20,9 +20,6 @@ spring:
     platform: h2
     driverClassName: org.h2.Driver
     url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    # platform: postgres
-    # driverClassName: org.postgresql.Driver
-    # url: jdbc:postgresql://localhost:5432/lsss
 
     username: spring
     password: spring
@@ -39,7 +36,6 @@ spring:
 
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
-    # database-platform: org.hibernate.dialect.PostgreSQLDialect
 
     show-sql: false
     hibernate.ddl-auto: create-drop