-
🎬 Video learning events
+
Assessment events (${fn:length(videoAssessmentEvents)})
+ ...
+
+
+
Learning events (${fn:length(videoLearningEvents)})
Assessment events (${fn:length(letterSoundAssessmentEvents)})
...
From 7a9c5081d0c8d3b9d3e48729aab33511e3741482 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 28 May 2025 22:08:27 +0700
Subject: [PATCH 6/7] Update LetterSoundAssessmentEventCsvExportController.java
---
.../students/LetterSoundAssessmentEventCsvExportController.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/ai/elimu/web/analytics/students/LetterSoundAssessmentEventCsvExportController.java b/src/main/java/ai/elimu/web/analytics/students/LetterSoundAssessmentEventCsvExportController.java
index c9638a5c4..fe8421b6c 100644
--- a/src/main/java/ai/elimu/web/analytics/students/LetterSoundAssessmentEventCsvExportController.java
+++ b/src/main/java/ai/elimu/web/analytics/students/LetterSoundAssessmentEventCsvExportController.java
@@ -11,6 +11,7 @@
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
From c30663a3a424e7f246c5a9da7f46fb5a92131472 Mon Sep 17 00:00:00 2001
From: "Jo G." <1451036+jo-elimu@users.noreply.github.com>
Date: Wed, 28 May 2025 22:46:07 +0700
Subject: [PATCH 7/7] feat: rest api for letter-sound assessment events
#2191
---
...erSoundAssessmentEventsRestController.java | 91 +++++++++++++++++++
...undAssessmentEventsRestControllerTest.java | 58 ++++++++++++
2 files changed, 149 insertions(+)
create mode 100644 src/main/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestController.java
create mode 100644 src/test/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestControllerTest.java
diff --git a/src/main/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestController.java b/src/main/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestController.java
new file mode 100644
index 000000000..9c18a80bb
--- /dev/null
+++ b/src/main/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestController.java
@@ -0,0 +1,91 @@
+package ai.elimu.rest.v2.analytics;
+
+import ai.elimu.model.v2.enums.Language;
+import ai.elimu.util.AnalyticsHelper;
+import ai.elimu.util.ConfigHelper;
+import java.io.File;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.io.FileUtils;
+import org.json.JSONObject;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * REST API endpoint for receiving letter-sound assessment events from the
+ *
Analytics application.
+ */
+@RestController
+@RequestMapping(value = "/rest/v2/analytics/letter-sound-assessment-events/csv", produces = MediaType.APPLICATION_JSON_VALUE)
+@Slf4j
+public class LetterSoundAssessmentEventsRestController {
+
+ @PostMapping
+ public String handleUploadCsvRequest(
+ @RequestParam("file") MultipartFile multipartFile,
+ HttpServletResponse response
+ ) {
+ log.info("handleUploadCsvRequest");
+
+ JSONObject jsonResponseObject = new JSONObject();
+ try {
+ String contentType = multipartFile.getContentType();
+ log.info("contentType: " + contentType);
+
+ long size = multipartFile.getSize();
+ log.info("size: " + size);
+ if (size == 0) {
+ throw new IllegalArgumentException("Empty file");
+ }
+
+ // Expected format: "7161a85a0e4751cd_3002023_letter-sound-assessment-events_2025-05-28.csv"
+ String originalFilename = multipartFile.getOriginalFilename();
+ log.info("originalFilename: " + originalFilename);
+ if (originalFilename.length() != "7161a85a0e4751cd_3002023_letter-sound-assessment-events_2025-05-28.csv".length()) {
+ throw new IllegalArgumentException("Unexpected filename");
+ }
+
+ String androidIdExtractedFromFilename = AnalyticsHelper.extractAndroidIdFromCsvFilename(originalFilename);
+ log.info("androidIdExtractedFromFilename: \"" + androidIdExtractedFromFilename + "\"");
+
+ Integer versionCodeExtractedFromFilename = AnalyticsHelper.extractVersionCodeFromCsvFilename(originalFilename);
+ log.info("versionCodeExtractedFromFilename: " + versionCodeExtractedFromFilename);
+
+ byte[] bytes = multipartFile.getBytes();
+ log.info("bytes.length: " + bytes.length);
+
+ // Store the original CSV file on the filesystem
+ File elimuAiDir = new File(System.getProperty("user.home"), ".elimu-ai");
+ File languageDir = new File(elimuAiDir, "lang-" + Language.valueOf(ConfigHelper.getProperty("content.language")));
+ File analyticsDir = new File(languageDir, "analytics");
+ File androidIdDir = new File(analyticsDir, "android-id-" + androidIdExtractedFromFilename);
+ File versionCodeDir = new File(androidIdDir, "version-code-" + versionCodeExtractedFromFilename);
+ File letterSoundAssessmentEventsDir = new File(versionCodeDir, "letter-sound-assessment-events");
+ letterSoundAssessmentEventsDir.mkdirs();
+ File csvFile = new File(letterSoundAssessmentEventsDir, originalFilename);
+ log.info("Storing CSV file at " + csvFile);
+ FileUtils.writeByteArrayToFile(csvFile, bytes);
+ log.info("csvFile.exists(): " + csvFile.exists());
+
+ jsonResponseObject.put("result", "success");
+ jsonResponseObject.put("successMessage", "The CSV file was uploaded");
+ response.setStatus(HttpStatus.OK.value());
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
+
+ jsonResponseObject.put("result", "error");
+ jsonResponseObject.put("errorMessage", ex.getMessage());
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+ }
+
+ String jsonResponse = jsonResponseObject.toString();
+ log.info("jsonResponse: " + jsonResponse);
+ return jsonResponse;
+ }
+}
diff --git a/src/test/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestControllerTest.java b/src/test/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestControllerTest.java
new file mode 100644
index 000000000..34631d4db
--- /dev/null
+++ b/src/test/java/ai/elimu/rest/v2/analytics/LetterSoundAssessmentEventsRestControllerTest.java
@@ -0,0 +1,58 @@
+package ai.elimu.rest.v2.analytics;
+
+import org.json.JSONObject;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.servlet.http.HttpServletResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+public class LetterSoundAssessmentEventsRestControllerTest {
+
+ @InjectMocks
+ private LetterSoundAssessmentEventsRestController letterSoundAssessmentEventsRestController;
+
+ @Mock
+ private HttpServletResponse response;
+
+ @BeforeEach
+ public void setUp() {
+ MockitoAnnotations.openMocks(this);
+ }
+
+ @Test
+ public void testHandleUploadCsvRequest_invalidFilename() {
+ MultipartFile multipartFile = new MockMultipartFile(
+ "file",
+ "invalid_filename.csv",
+ "text/csv",
+ "test content".getBytes()
+ );
+ String jsonResponse = letterSoundAssessmentEventsRestController.handleUploadCsvRequest(multipartFile, response);
+ JSONObject jsonObject = new JSONObject(jsonResponse);
+ assertEquals("error", jsonObject.getString("result"));
+ assertEquals("Unexpected filename", jsonObject.getString("errorMessage"));
+ verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+
+ @Test
+ public void testHandleUploadCsvRequest_emptyFile() {
+ MultipartFile multipartFile = new MockMultipartFile(
+ "file",
+ "7161a85a0e4751cd_3002023_letter-sound-assessment-events_2025-05-28.csv",
+ "text/csv",
+ "".getBytes()
+ );
+ String jsonResponse = letterSoundAssessmentEventsRestController.handleUploadCsvRequest(multipartFile, response);
+ JSONObject jsonObject = new JSONObject(jsonResponse);
+ assertEquals("error", jsonObject.getString("result"));
+ assertEquals("Empty file", jsonObject.getString("errorMessage"));
+ verify(response).setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+}
" />
+
+