Merge branch 'develop' of https://github.com/objectcomputing/PulseSurvey into comments-tests

Author: Holly Williams

send-surveys/src/main/java/com/objectcomputing/pulsesurvey/receive/responses/SurveyResponseController.java

@@ -6,7 +6,6 @@
 import com.objectcomputing.pulsesurvey.repositories.ResponseKeyRepository;
 import com.objectcomputing.pulsesurvey.repositories.ResponseRepository;
 import com.objectcomputing.pulsesurvey.repositories.UserCommentsRepository;
-import io.micronaut.context.annotation.Value;
 import io.micronaut.core.util.CollectionUtils;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -22,6 +21,7 @@
 import javax.inject.Inject;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -85,7 +85,7 @@ HttpResponse<String> happiness(String currentEmotion, String surveyKey) {
 
                 try {
                     LOG.info("redirecting to /happiness/comment");
-                    return HttpResponse.redirect(new URI("/happiness/comment?surveyKey="+surveyKey));
+                    return HttpResponse.temporaryRedirect(new URI("/happiness/comment?surveyKey="+surveyKey));
                 } catch (URISyntaxException e) {
                     e.printStackTrace();
                     LOG.error("unable to redirect to /happiness/comment " + e.getMessage());
@@ -95,8 +95,7 @@ HttpResponse<String> happiness(String currentEmotion, String surveyKey) {
             LOG.warn("This key is not valid: " + surveyKey);
         }
 
-        return HttpResponse.ok("Hello, your current emotion of " + currentEmotion + "!" +
-                               " is duly noted.");
+        return HttpResponse.ok("This key has already been used.");
     }
 
     @Get("comment")
@@ -110,13 +109,12 @@ public HttpResponse displayComments(String surveyKey) {
     @Post("userComments")
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @View("thankyou")
-    public HttpResponse sendThankYouWithCommentBlock
-            (@Value("userComments") String userComments,
-             @Value("surveyKey") String surveyKey) {
+    public HttpResponse sendThankYouWithCommentBlock (String userComments, String surveyKey) {
 
         LOG.info("The user has commented: " + userComments);
         LOG.info("With surveyKey: " + surveyKey);
         // put comment into the db using the survey key
+
         boolean commentSaved = saveUserComment(surveyKey, userComments);
         LOG.info("commentSaved: " + commentSaved);
 
@@ -165,6 +163,17 @@ boolean saveResponse(String currentEmotion, String surveyKey) {
         return responseAdded;
     }
 
+    private boolean checkForComment(String surveyKey) {
+
+        LOG.info("Validating comment " + surveyKey);
+        List<UserComments> userComments = userCommentsRepo.findComments(surveyKey);
+
+        boolean isPresent = false;
+        isPresent = !userComments.isEmpty();
+        return isPresent;
+
+    }
+
     boolean saveUserComment(String surveyKey, String comments) {
 
         boolean commentsAdded = false;

send-surveys/src/main/java/com/objectcomputing/pulsesurvey/repositories/UserCommentsRepository.java

@@ -2,6 +2,7 @@
 
 import com.objectcomputing.pulsesurvey.model.UserComments;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.micronaut.data.annotation.Query;
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.repository.CrudRepository;
@@ -20,4 +21,7 @@ public interface UserCommentsRepository extends CrudRepository<UserComments, UUI
     @Override
     <S extends UserComments> S save(@Valid @NotNull @NonNull S entity);
 
+    @Query("select * from usercomments where responsekey=:key")
+    List<UserComments> findComments(String key);
+
 }

send-surveys/src/main/resources/views/thankyou.hbs

@@ -10,41 +10,6 @@
     <link rel="stylesheet" type="text/css" href="/css/main.css"/>
     <link rel="icon" href="images/favicon.png" />
 
-<!--    <style>-->
-<!--    * {-->
-<!--      box-sizing: border-box;-->
-<!--    }-->
-
-<!--    .wrapper {-->
-<!--      display: flex;-->
-<!--      justify-content: center;-->
-<!--      align-self: center;-->
-<!--&lt;!&ndash;      flex-direction: column;&ndash;&gt;-->
-<!--    }-->
-
-<!--    body {-->
-<!--          background-color: #2559a7;-->
-<!--    }-->
-
-<!--    .blue-background {-->
-<!--      padding: 1vh 2vw 1vh 2vw;-->
-<!--      background-color: #2559a7;-->
-<!--      align-self: center;-->
-<!--      justify-content: center;-->
-<!--    }-->
-
-<!--    .thank-you {-->
-<!--      padding: 2vh 2vw;-->
-<!--      font-size: 5vw;-->
-<!--      font-family: 'Roboto', Verdana, sans-serif;-->
-<!--      font-weight: 600;-->
-<!--      color: #ffffff;-->
-<!--      align-self: center;-->
-<!--      justify-content: center;-->
-<!--    }-->
-
-<!--    </style>-->
-
 </head>
 
 <body>