✨ feat: Improvements from review

Author: LauraRandl

chart/templates/microblog-service.yaml

@@ -72,7 +72,7 @@ spec:
               value: {{ quote .Values.microblogService.deployment.container.env.RAG_SERVICE_PORT }}
             - name: RAG_SERVICE_ENABLED
               value: {{ .Values.ragService.enabled | quote }}
-            - name : FEEDBACK_INGESTION_SERVICE_ADDRESS
+            - name: FEEDBACK_INGESTION_SERVICE_ADDRESS
               value: {{ quote .Values.microblogService.deployment.container.env.FEEDBACK_INGESTION_SERVICE_ADDRESS }}
             - name: FEEDBACK_INGESTION_SERVICE_PORT
               value: {{ quote .Values.microblogService.deployment.container.env.FEEDBACK_INGESTION_SERVICE_PORT }}

src/feedback-ingestion-service/README.md

@@ -18,7 +18,7 @@ periodically sends a request to the RAG service to ingest a batch of feedback da
 which will generate the jar in ```build/libs```
 - Start the application by running:
 ```
-java -jar build/libs/microblog-service-{{VERSION}}.jar
+java -jar build/libs/feedback-ingestion-service-{{VERSION}}.jar
 ```
 - The feedback ingestion service should then be accessible on [localhost:8080](http://localhost:8080).
 

src/feedback-ingestion-service/src/main/java/org/dynatrace/feedbackingestionservice/utils/UserFeedbackValidator.java

@@ -8,7 +8,7 @@ public static Boolean validateUserFeedback(UserFeedback userFeedback) {
             return false;
         }
 
-        if ( userFeedback.getText().isEmpty()) {
+        if (userFeedback.getText().isEmpty()) {
             return false;
         }
 

src/feedback-ingestion-service/src/test/java/org/dynatrace/feedbackingestionservice/buffer/FeedbackBufferTest.java

@@ -0,0 +1,67 @@
+package org.dynatrace.feedbackingestionservice.buffer;
+
+import org.dynatrace.feedbackingestionservice.dto.UserFeedback;
+import org.dynatrace.feedbackingestionservice.ragservice.RAGServiceClient;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.*;
+
+class FeedbackBufferTest {
+
+    private static UserFeedback feedback(String text, String label) {
+        return new UserFeedback(text, label);
+    }
+
+    @Test
+    void doesNotIngest_whenBelowThreshold() throws IOException {
+        RAGServiceClient client = mock(RAGServiceClient.class);
+        FeedbackBuffer buffer = new FeedbackBuffer(client);
+
+        buffer.addToQueue(feedback("spam text", "spam"));
+        buffer.addToQueue(feedback("hello", "not_spam"));
+
+        verify(client, never()).ingestUserFeedbackBatchToRAGKnowledgeBase(anyList());
+        assertEquals(2, buffer.getSize());
+    }
+
+    @Test
+    void ingestsOnce_whenThresholdReached() throws IOException {
+        RAGServiceClient client = mock(RAGServiceClient.class);
+        FeedbackBuffer buffer = new FeedbackBuffer(client);
+
+        for (int i = 0; i < 100; i++) {
+            buffer.addToQueue(feedback("text", "not_spam"));
+        }
+
+        ArgumentCaptor<List<UserFeedback>> captor = ArgumentCaptor.forClass(List.class);
+        verify(client, times(1)).ingestUserFeedbackBatchToRAGKnowledgeBase(captor.capture());
+        assertEquals(100, captor.getValue().size());
+        assertEquals(0, buffer.getSize());
+    }
+
+    @Test
+    void flushedQueue_whenItemsAreIngested() throws IOException {
+        RAGServiceClient client = mock(RAGServiceClient.class);
+        FeedbackBuffer buffer = new FeedbackBuffer(client);
+
+        for (int i = 0; i < 50; i++) {
+            buffer.addToQueue(feedback("text", "not_spam"));
+        }
+
+        verify(client, never()).ingestUserFeedbackBatchToRAGKnowledgeBase(anyList());
+        assertEquals(50, buffer.getSize());
+
+        buffer.processBatchInQueue();
+
+        ArgumentCaptor<List<UserFeedback>> captor = ArgumentCaptor.forClass(List.class);
+        verify(client, times(1)).ingestUserFeedbackBatchToRAGKnowledgeBase(captor.capture());
+        assertEquals(50, captor.getValue().size());
+        assertEquals(0, buffer.getSize());
+    }
+}

src/feedback-ingestion-service/src/test/java/org/dynatrace/feedbackingestionservice/utils/UserFeedbackValidatorTest.java

@@ -0,0 +1,49 @@
+package org.dynatrace.feedbackingestionservice.utils;
+
+import org.dynatrace.feedbackingestionservice.dto.UserFeedback;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UserFeedbackValidatorTest {
+
+    private static UserFeedback feedback(String text, String label) {
+        return new UserFeedback(text, label);
+    }
+
+    @Test
+    void returnsFalse_whenUserFeedbackIsNull() {
+        assertFalse(UserFeedbackValidator.validateUserFeedback(null));
+    }
+
+    @Test
+    void returnsFalse_whenTextIsNull() {
+        assertFalse(UserFeedbackValidator.validateUserFeedback(feedback(null, "spam")));
+    }
+
+    @Test
+    void returnsFalse_whenLabelIsNull() {
+        assertFalse(UserFeedbackValidator.validateUserFeedback(feedback("hello", null)));
+    }
+
+    @Test
+    void returnsFalse_whenTextIsEmpty() {
+        assertFalse(UserFeedbackValidator.validateUserFeedback(feedback("", "spam")));
+    }
+
+    @Test
+    void returnsFalse_whenLabelIsInvalid() {
+        assertFalse(UserFeedbackValidator.validateUserFeedback(feedback("hello", "invalid_label")));
+    }
+
+    @Test
+    void returnsTrue_whenLabelIsSpam() {
+        assertTrue(UserFeedbackValidator.validateUserFeedback(feedback("hello", "spam")));
+    }
+
+    @Test
+    void returnsTrue_whenLabelIsNotSpam() {
+        assertTrue(UserFeedbackValidator.validateUserFeedback(feedback("hello", "not_spam")));
+    }
+}
+

src/feedback-ingestion-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1,2 @@
+mock-maker-subclass
+

src/microblog-service/src/main/java/org/dynatrace/microblog/exceptions/SpamIngestionFailedException.java

@@ -0,0 +1,7 @@
+package org.dynatrace.microblog.exceptions;
+
+public class SpamIngestionFailedException extends RuntimeException {
+    public SpamIngestionFailedException(String message) {
+        super(message);
+    }
+}

src/microblog-service/src/main/java/org/dynatrace/microblog/redis/RedisClient.java

@@ -23,6 +23,7 @@
 import org.dynatrace.microblog.dto.Post;
 import org.dynatrace.microblog.dto.SpamPredictionRatings;
 import org.dynatrace.microblog.dto.User;
+import org.dynatrace.microblog.exceptions.SpamIngestionFailedException;
 import org.dynatrace.microblog.exceptions.InvalidJwtException;
 import org.dynatrace.microblog.exceptions.UserNotFoundException;
 import org.dynatrace.microblog.feedbackingestionservice.FeedbackIngestionServiceClient;
@@ -177,6 +178,10 @@ public void processUserSpamFeedback(@NotNull String postId, FeedbackIngestionSer
                     isSpamUserLabel = !isSpamUserLabel;
                 }
                 String postText = jedis.hget(getCombinedKey(POST_KEY_PREFIX, postId), "body");
+                if (postText == null) {
+                    logger.warn("Post body for post with id {} is null, skipping spam feedback ingestion", postId);
+                    return;
+                }
                 String userLabel = isSpamUserLabel ? "spam" : "not_spam";
 
                 if (feedbackIngestionServiceClient.addNewSpamKnowledgeToIngestQueue(postText, userLabel)) {
@@ -185,7 +190,7 @@ public void processUserSpamFeedback(@NotNull String postId, FeedbackIngestionSer
             }
         } catch (IOException e) {
             logger.error("Error processing user spam feedback for post with id {}", postId, e);
-            throw new RuntimeException(e);
+            throw new SpamIngestionFailedException(e.getMessage());
         }
     }