-
-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1625 from elimu-ai/add-letter-sounds
feat: Add letter-sound learning events
- Loading branch information
Showing
53 changed files
with
768 additions
and
691 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
src/main/java/ai/elimu/rest/v2/analytics/LetterSoundLearningEventsRestController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package ai.elimu.rest.v2.analytics; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
|
|
||
| import javax.servlet.http.HttpServletResponse; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.json.JSONObject; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestMethod; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import org.springframework.web.multipart.MultipartFile; | ||
|
|
||
| import ai.elimu.model.v2.enums.Language; | ||
| import ai.elimu.util.AnalyticsHelper; | ||
| import ai.elimu.util.ConfigHelper; | ||
|
|
||
| /** | ||
| * REST API endpoint for receiving letter-sound learning events from the | ||
| * <a href="https://github.com/elimu-ai/analytics">Analytics</a> application. | ||
| */ | ||
| @RestController | ||
| @RequestMapping(value = "/rest/v2/analytics/letter-sound-learning-events", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) | ||
| public class LetterSoundLearningEventsRestController { | ||
|
|
||
| private Logger logger = LogManager.getLogger(); | ||
|
|
||
| @RequestMapping(value = "/csv", method = RequestMethod.POST) | ||
| public String handleUploadCsvRequest( | ||
| @RequestParam("file") MultipartFile multipartFile, | ||
| HttpServletResponse response | ||
| ) { | ||
| logger.info("handleUploadCsvRequest"); | ||
|
|
||
| // Expected format: "7161a85a0e4751cd_3001017_letter-sound-learning-events_2023-10-27.csv" | ||
| String originalFilename = multipartFile.getOriginalFilename(); | ||
| logger.info("originalFilename: " + originalFilename); | ||
|
|
||
| String androidIdExtractedFromFilename = AnalyticsHelper.extractAndroidIdFromCsvFilename(originalFilename); | ||
| logger.info("androidIdExtractedFromFilename: \"" + androidIdExtractedFromFilename + "\""); | ||
|
|
||
| Integer versionCodeExtractedFromFilename = AnalyticsHelper.extractVersionCodeFromCsvFilename(originalFilename); | ||
| logger.info("versionCodeExtractedFromFilename: " + versionCodeExtractedFromFilename); | ||
|
|
||
| // Store the original CSV file on the filesystem, e.g. | ||
| // ~/.elimuai/lang-HIN/analytics/android-id-7161a85a0e4751cd/version-code-3001017/letter-sound-learning-events/7161a85a0e4751cd_3001017_letter-sound-learning-events_2023-10-27.csv" | ||
| 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 letterSoundLearningEventsDir = new File(versionCodeDir, "letter-sound-learning-events"); | ||
| letterSoundLearningEventsDir.mkdirs(); | ||
| File csvFile = new File(letterSoundLearningEventsDir, originalFilename); | ||
| logger.info("Storing CSV file at " + csvFile); | ||
|
|
||
| JSONObject jsonObject = new JSONObject(); | ||
| try { | ||
| multipartFile.transferTo(csvFile); | ||
| jsonObject.put("result", "success"); | ||
| jsonObject.put("successMessage", "The CSV file was successfully uploaded"); | ||
| } catch (IllegalStateException | IOException e) { | ||
| logger.error(e); | ||
| jsonObject.put("result", "error"); | ||
| jsonObject.put("errorMessage", e.getMessage()); | ||
| response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); | ||
| } | ||
| String jsonResponse = jsonObject.toString(); | ||
| logger.info("jsonResponse: " + jsonResponse); | ||
| return jsonResponse; | ||
| } | ||
| } |
Oops, something went wrong.