Merge pull request #13 from objectcomputing/comments-tests

added tests for thank you screens

Author: mkimberlin

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

@@ -114,14 +114,10 @@ public HttpResponse sendThankYouWithCommentBlock (String userComments, String su
         LOG.info("The user has commented: " + userComments);
         LOG.info("With surveyKey: " + surveyKey);
         // put comment into the db using the survey key
-        // first check to see if there is currently a comment
-        boolean alreadyIsComment = checkForComment(surveyKey);
-        if (!alreadyIsComment) {
-            saveUserComment(surveyKey, userComments);
-            return HttpResponse.ok();
-        } else {
-            return HttpResponse.ok("This key has already been used.");
-        }
+
+        saveUserComment(surveyKey, userComments);
+
+        return HttpResponse.ok();
     }
 
     @Get("thanks")
@@ -177,12 +173,18 @@ private boolean checkForComment(String surveyKey) {
 
     }
 
-    private void saveUserComment(String surveyKey, String commentText) {
+    void saveUserComment(String surveyKey, String comments) {
 
+        boolean commentsAdded = false;
         UserComments userComments = new UserComments();
-        userComments.setCommentText(commentText);
+        userComments.setCommentText(comments);
         userComments.setResponseKey(UUID.fromString(surveyKey));
         userComments = userCommentsRepo.save(userComments);
+
+        LOG.info("Adding comment: " + comments);
+
+        if (userComments.getCommentId() != null) commentsAdded = true;
+
     }
 
     ResponseKey markKeyAsUsed(String surveyKey) {

send-surveys/src/test/java/com/objectcomputing/pulsesurvey/receive/responses/SurveyResponseControllerTest.java

@@ -3,14 +3,16 @@
 import com.objectcomputing.pulsesurvey.email.manager.GmailSender;
 import com.objectcomputing.pulsesurvey.model.Response;
 import com.objectcomputing.pulsesurvey.model.ResponseKey;
+import com.objectcomputing.pulsesurvey.model.UserComments;
 import com.objectcomputing.pulsesurvey.repositories.ResponseKeyRepository;
 import com.objectcomputing.pulsesurvey.repositories.ResponseRepository;
+import com.objectcomputing.pulsesurvey.repositories.UserCommentsRepository;
 import com.objectcomputing.pulsesurvey.send.surveys.SurveysControllerTest;
-import com.objectcomputing.pulsesurvey.template.manager.SurveyTemplateManager;
 import io.micronaut.core.io.buffer.ByteBuffer;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.HttpStatus;
+import io.micronaut.http.MediaType;
 import io.micronaut.http.client.RxHttpClient;
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.test.annotation.MicronautTest;
@@ -22,16 +24,21 @@
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-
 import java.time.LocalDateTime;
 import java.time.Month;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(SystemPropertyExtension.class)
@@ -49,7 +56,7 @@ class SurveyResponseControllerTest {
 
     ResponseKeyRepository mockResponseKeyRepository = mock(ResponseKeyRepository.class);
 
-    SurveyTemplateManager mockTemplateManager = mock(SurveyTemplateManager.class);
+    UserCommentsRepository mockUserCommentsRepository = mock(UserCommentsRepository.class);
 
     GmailSender mockGmailSender = mock(GmailSender.class);
 
@@ -59,6 +66,7 @@ class SurveyResponseControllerTest {
     void setupTest() {
         itemUnderTest.setResponseRepo(mockResponseRepository);
         itemUnderTest.setResponseKeyRepo(mockResponseKeyRepository);
+        itemUnderTest.setUserCommentsRepo(mockUserCommentsRepository);
 //        itemUnderTest.setGmailApi(gmailApiMock);
 //        itemUnderTest.setTemplateManager(mockTemplateManager);
 //        itemUnderTest.setGmailSender(mockGmailSender);
@@ -67,6 +75,7 @@ void setupTest() {
         reset(mockResponseKeyRepository);
         reset(mockGmailSender);
         reset(mockResponseRepository);
+        reset(mockUserCommentsRepository);
     }
 
     @Test
@@ -205,4 +214,79 @@ void testMarkKeyAsUsed() {
         assertTrue(fakeResponseKey.isUsed());
     }
 
+    @Test
+    void testDisplayComments() {
+
+        String surveyKey = "123";
+
+        HttpResponse<ByteBuffer> response = httpClient
+                .exchange(HttpRequest.GET(String.format("/happiness/comment?&surveyKey=%s", surveyKey)))
+                .blockingFirst();
+
+        assertEquals(HttpStatus.OK, response.getStatus());
+
+    }
+
+    @Test
+    void testSaveUserComment() {
+
+        String fakeComments = "Here are some fake comments - Test";
+        String surveyKey =       "12345678-9123-4567-abcd-123456789abc";
+        String fakeResponseKey = "98765432-9876-9876-9876-987654321234";
+
+        UserComments fakeUserComments = new UserComments();
+        fakeUserComments.setCommentId(UUID.fromString(fakeResponseKey));
+        fakeUserComments.setResponseKey(UUID.fromString(surveyKey));
+        fakeUserComments.setCommentText(fakeComments);
+        fakeUserComments.setCreatedOn(LocalDateTime.of(2020, Month.JANUARY, 27, 1, 1));
+
+        when(mockUserCommentsRepository.save(any())).thenReturn(fakeUserComments);
+
+        itemUnderTest.saveUserComment(surveyKey, fakeComments);
+        verify(mockUserCommentsRepository, times(1)).save(any(UserComments.class));
+
+    }
+
+    @Test
+    void testSendThankYouWithCommentBlock() {
+
+        String userComments = "fake user comments";
+        String fakeComments = "Here are some fake comments - Test";
+        String surveyKey =       "12345678-9123-4567-abcd-123456789abc";
+        String fakeResponseKey = "98765432-9876-9876-9876-987654321234";
+
+        UserComments fakeUserComments = new UserComments();
+        fakeUserComments.setCommentId(UUID.fromString(fakeResponseKey));
+        fakeUserComments.setResponseKey(UUID.fromString(surveyKey));
+        fakeUserComments.setCommentText(fakeComments);
+        fakeUserComments.setCreatedOn(LocalDateTime.of(2020, Month.JANUARY, 27, 1, 1));
+        Map<String, String> fakeBody = new HashMap<String, String>() {{
+            put("userComments",userComments);
+            put("surveyKey", surveyKey);
+        }};
+
+        when(mockUserCommentsRepository.save(any())).thenReturn(fakeUserComments);
+
+        HttpResponse response = httpClient
+                .exchange(HttpRequest.POST("/happiness/userComments", fakeBody)
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED))
+                .blockingFirst();
+
+        assertEquals(HttpStatus.OK, response.getStatus());
+
+    }
+
+    @Test
+    void testSendThankYou() {
+
+        String surveyKey = "123";
+
+        HttpResponse<ByteBuffer> response = httpClient
+                .exchange(HttpRequest.GET(String.format("/happiness/thanks")))
+                .blockingFirst();
+
+        assertEquals(HttpStatus.OK, response.getStatus());
+
+    }
+
 }