refactor: remove letter learning event

#208

Author: jo-elimu

app/src/main/AndroidManifest.xml

@@ -26,13 +26,6 @@
         <activity android:name=".EventListActivity" />
         <activity android:name=".language.SelectLanguageActivity" />
 
-        <receiver android:name=".receiver.LetterLearningEventReceiver"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="ai.elimu.intent.action.LETTER_LEARNING_EVENT" />
-            </intent-filter>
-        </receiver>
         <receiver android:name=".receiver.LetterAssessmentEventReceiver"
             android:enabled="true"
             android:exported="true">

app/src/main/java/ai/elimu/analytics/dao/LetterLearningEventDao.java

@@ -17,14 +17,12 @@
 import java.util.List;
 
 import ai.elimu.analytics.dao.LetterAssessmentEventDao;
-import ai.elimu.analytics.dao.LetterLearningEventDao;
 import ai.elimu.analytics.dao.LetterSoundLearningEventDao;
 import ai.elimu.analytics.dao.StoryBookLearningEventDao;
 import ai.elimu.analytics.dao.WordAssessmentEventDao;
 import ai.elimu.analytics.dao.WordLearningEventDao;
 import ai.elimu.analytics.db.RoomDb;
 import ai.elimu.analytics.entity.LetterAssessmentEvent;
-import ai.elimu.analytics.entity.LetterLearningEvent;
 import ai.elimu.analytics.entity.LetterSoundLearningEvent;
 import ai.elimu.analytics.entity.StoryBookLearningEvent;
 import ai.elimu.analytics.entity.WordAssessmentEvent;
@@ -47,7 +45,6 @@ public ExportEventsToCsvWorker(@NonNull Context context, @NonNull WorkerParamete
     public Result doWork() {
         Timber.i("doWork");
 
-        exportLetterLearningEventsToCsv();
         exportLetterAssessmentEventsToCsv();
         exportLetterSoundLearningEventsToCsv();
         exportWordLearningEventsToCsv();
@@ -57,71 +54,6 @@ public Result doWork() {
         return Result.success();
     }
 
-    private void exportLetterLearningEventsToCsv() {
-        Timber.i("exportLetterLearningEventsToCsv");
-
-        // Extract LetterLearningEvents from the database that have not yet been exported to CSV.
-        RoomDb roomDb = RoomDb.getDatabase(getApplicationContext());
-        LetterLearningEventDao letterLearningEventDao = roomDb.letterLearningEventDao();
-        List<LetterLearningEvent> letterLearningEvents = letterLearningEventDao.loadAllOrderedByTimeDesc();
-        Timber.i("letterLearningEvents.size(): " + letterLearningEvents.size());
-
-        CSVFormat csvFormat = CSVFormat.DEFAULT
-                .withHeader(
-                        "id",
-                        "time",
-                        "android_id",
-                        "package_name",
-                        "letter_id",
-                        "letter_text",
-                        "learning_event_type"
-                );
-        StringWriter stringWriter = new StringWriter();
-        try {
-            CSVPrinter csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-
-            // Generate one CSV file per day of events
-            String dateOfPreviousEvent = null;
-            for (LetterLearningEvent letterLearningEvent : letterLearningEvents) {
-                // Export event to CSV file. Example format:
-                //   files/version-code-3001012/letter-learning-events/7161a85a0e4751cd_3001012_letter-learning-events_2020-03-21.csv
-                Integer versionCode = VersionHelper.getAppVersionCode(getApplicationContext());
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                String date = simpleDateFormat.format(letterLearningEvent.time.getTime());
-                if (!date.equals(dateOfPreviousEvent)) {
-                    // Reset file content
-                    stringWriter = new StringWriter();
-                    csvPrinter = new CSVPrinter(stringWriter, csvFormat);
-                }
-                dateOfPreviousEvent = date;
-                String csvFilename = letterLearningEvent.androidId + "_" + versionCode + "_letter-learning-events_" + date + ".csv";
-                Timber.i("csvFilename: " + csvFilename);
-
-                csvPrinter.printRecord(
-                        letterLearningEvent.getId(),
-                        letterLearningEvent.time.getTimeInMillis(),
-                        letterLearningEvent.androidId,
-                        letterLearningEvent.packageName,
-                        letterLearningEvent.getLetterId(),
-                        letterLearningEvent.getLetterText(),
-                        letterLearningEvent.getLearningEventType()
-                );
-                csvPrinter.flush();
-
-                String csvFileContent = stringWriter.toString();
-
-                // Write the content to the CSV file
-                File filesDir = getApplicationContext().getFilesDir();
-                File versionCodeDir = new File(filesDir, "version-code-" + versionCode);
-                File letterLearningEventsDir = new File(versionCodeDir, "letter-learning-events");
-                File csvFile = new File(letterLearningEventsDir, csvFilename);
-                FileUtils.writeStringToFile(csvFile, csvFileContent, "UTF-8");
-            }
-        } catch (IOException e) {
-            Timber.e(e);
-        }
-    }
-
     private void exportLetterAssessmentEventsToCsv() {
         Timber.i("exportLetterAssessmentEventsToCsv");
 

app/src/main/java/ai/elimu/analytics/entity/LetterLearningEvent.java

@@ -2,7 +2,6 @@ package ai.elimu.analytics.task
 
 import ai.elimu.analytics.BaseApplication
 import ai.elimu.analytics.rest.LetterAssessmentEventService
-import ai.elimu.analytics.rest.LetterLearningEventService
 import ai.elimu.analytics.rest.LetterSoundLearningEventService
 import ai.elimu.analytics.rest.StoryBookLearningEventService
 import ai.elimu.analytics.rest.WordAssessmentEventService
@@ -26,7 +25,6 @@ class UploadEventsWorker(context: Context, workerParams: WorkerParameters) :
     override fun doWork(): Result {
         Timber.i("doWork")
 
-        uploadLetterLearningEvents()
         uploadLetterAssessmentEvents()
         uploadLetterSoundLearningEvents()
         uploadWordLearningEvents()
@@ -36,58 +34,6 @@ class UploadEventsWorker(context: Context, workerParams: WorkerParameters) :
         return Result.success()
     }
 
-    private fun uploadLetterLearningEvents() {
-        Timber.i("uploadLetterLearningEvents")
-
-        // Upload CSV files to the server
-        // Example format:
-        //   files/version-code-3001012/letter-learning-events/7161a85a0e4751cd_3001012_letter-learning-events_2020-03-21.csv
-        val filesDir = applicationContext.filesDir
-        for (versionCodeDir in (filesDir.listFiles() ?: emptyArray())) {
-            Timber.i("versionCodeDir: $versionCodeDir")
-            if (versionCodeDir.name.startsWith("version-code-")) {
-                val letterLearningEventsDir = File(versionCodeDir, "letter-learning-events")
-                Timber.i("Uploading CSV files from $letterLearningEventsDir")
-                val files = letterLearningEventsDir.listFiles()
-                if (files != null) {
-                    Timber.i("files.length: " + files.size)
-                    Arrays.sort(files)
-                    for (i in files.indices) {
-                        val file = files[i]
-                        Timber.i("file.getAbsoluteFile(): " + file.absoluteFile)
-                        Timber.i("file.getName(): " + file.name)
-
-                        val baseApplication = applicationContext as BaseApplication
-                        val retrofit = baseApplication.retrofit
-                        val letterLearningEventService = retrofit.create(
-                            LetterLearningEventService::class.java
-                        )
-                        val requestBody =
-                            RequestBody.create(MediaType.parse("multipart/form-data"), file)
-                        val part = MultipartBody.Part.createFormData("file", file.name, requestBody)
-                        val call = letterLearningEventService.uploadCsvFile(part)
-                        Timber.i("call.request(): " + call.request())
-                        try {
-                            val response = call.execute()
-                            Timber.i("response: $response")
-                            Timber.i("response.isSuccessful(): " + response.isSuccessful)
-                            if (response.isSuccessful) {
-                                val bodyString = response.body()!!.string()
-                                Timber.i("bodyString: $bodyString")
-                            } else {
-                                val errorBodyString = response.errorBody()!!.string()
-                                Timber.e("errorBodyString: $errorBodyString")
-                                // TODO: Handle error
-                            }
-                        } catch (e: IOException) {
-                            Timber.e(e)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     private fun uploadLetterAssessmentEvents() {
         Timber.i("uploadLetterAssessmentEvents")
 

app/src/main/java/ai/elimu/analytics/receiver/LetterLearningEventReceiver.java

@@ -124,9 +124,10 @@ object VersionHelper {
                 }
             }
 
-            //            if (oldVersionCode < ???) {
+//            if (oldVersionCode < ???) {
 //                ...
 //            }
+
             SharedPreferencesHelper.storeAppVersionCode(context, newVersionCode)
         }
     }

app/src/main/java/ai/elimu/analytics/rest/LetterLearningEventService.java

@@ -19,25 +19,6 @@
  */
 public class LearningEventUtil {
 
-    /**
-     * @param letterGson The letter that the student is learning.
-     * @param learningEventType The type of learning (i.e. the learning format) that is presented to the student in the application ({@code packageName}).
-     * @param context Needed to fetch the {@code packageName} of the application where the learning event occurred.
-     * @param analyticsApplicationId The package name of the analytics application that will receive the Intent and store the event.
-     */
-    public static void reportLetterLearningEvent(LetterGson letterGson, LearningEventType learningEventType, Context context, String analyticsApplicationId) {
-        Log.i(LearningEventUtil.class.getName(),"reportLetterLearningEvent");
-
-        Intent broadcastIntent = new Intent();
-        broadcastIntent.setAction("ai.elimu.intent.action.LETTER_LEARNING_EVENT");
-        broadcastIntent.putExtra("packageName", context.getPackageName());
-        broadcastIntent.putExtra("letterId", letterGson.getId());
-        broadcastIntent.putExtra("letterText", letterGson.getText());
-        broadcastIntent.putExtra("learningEventType", learningEventType.toString());
-        broadcastIntent.setPackage(analyticsApplicationId);
-        context.sendBroadcast(broadcastIntent);
-    }
-
     /**
      * @param letterSoundGson The letter-sound correspondence that the student is learning.
      * @param context Needed to fetch the {@code packageName} of the application where the learning event occurred.