Merge pull request #388 from elimu-ai/375-upload-rest-api

feat(rest): upload number assessment events

Author: jo-elimu

app/src/main/java/ai/elimu/analytics/enum/EventType.kt

@@ -66,7 +66,6 @@ fun EventType.getUploadCsvFile(context: Context,
                                date: String): File {
 
     val csvFileName = androidId + "_" + versionCode + "_${this.type}_" + date + ".csv"
-    Timber.i("csvFilename: $csvFileName")
 
     val filesDir = context.filesDir
     val language = SharedPreferencesHelper.getLanguage(context)

app/src/main/java/ai/elimu/analytics/rest/NumberAssessmentEventService.kt

@@ -0,0 +1,14 @@
+package ai.elimu.analytics.rest
+
+import okhttp3.MultipartBody
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+
+interface NumberAssessmentEventService: UploadService {
+    @Multipart
+    @POST("analytics/number-assessment-events/csv")
+    override fun uploadCsvFile(@Part part: MultipartBody.Part): Call<ResponseBody?>
+}

app/src/main/java/ai/elimu/analytics/task/UploadEventsWorker.kt

@@ -4,8 +4,10 @@ import ai.elimu.analytics.BaseApplication
 import ai.elimu.analytics.BuildConfig
 import ai.elimu.analytics.enum.EventType
 import ai.elimu.analytics.enum.toServiceClass
+import ai.elimu.analytics.rest.NumberAssessmentEventService
 import ai.elimu.analytics.util.SharedPreferencesHelper
 import ai.elimu.analytics.util.VersionHelper.extractVersionCode
+import ai.elimu.model.v2.enums.Language
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
@@ -28,6 +30,7 @@ class UploadEventsWorker(context: Context, workerParams: WorkerParameters) :
         for (eventType in EventType.entries) {
             uploadLearningEvents(eventType = eventType)
         }
+        uploadNumberAssessmentEvents()
 
         return Result.success()
     }
@@ -86,4 +89,46 @@ class UploadEventsWorker(context: Context, workerParams: WorkerParameters) :
             }
         }
     }
+
+    // Upload CSV files generated by the current version of the app, e.g:
+    //   lang-THA/number-assessment-events/5b7c682a12ecbe2e_4000021_number-assessment-events_2025-06-29.csv
+    //   lang-THA/number-assessment-events/5b7c682a12ecbe2e_4000021_number-assessment-events_2025-06-30.csv
+    private fun uploadNumberAssessmentEvents() {
+        Timber.i("uploadNumberAssessmentEvents")
+
+        val languageDir = File(applicationContext.filesDir, "lang-${SharedPreferencesHelper.getLanguage(applicationContext)}")
+        val eventsDir = File(languageDir, "number-assessment-events")
+        for (csvFile in eventsDir.listFiles()) {
+            Timber.i("csvFile: ${csvFile}")
+
+            // Skip files that were not generated by the current app version, e.g. "_4000021_"
+            if (!csvFile.name.contains("_${BuildConfig.VERSION_CODE}_")) {
+                continue
+            }
+
+            // Prepare upload service
+            val baseApplication = applicationContext as BaseApplication
+            val retrofit = baseApplication.retrofit
+            val uploadService = retrofit.create(NumberAssessmentEventService::class.java)
+
+            // Prepare upload request
+            val requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), csvFile)
+            val part = MultipartBody.Part.createFormData("file", csvFile.name, requestBody)
+            val call = uploadService.uploadCsvFile(part)
+            Timber.i("call.request(): ${call.request()}")
+
+            // Upload file
+            val response = call.execute()
+            Timber.i("response: $response")
+            if (response.isSuccessful) {
+                val bodyString = response.body()?.string()
+                Timber.i("bodyString: $bodyString")
+            } else {
+                val errorBodyString = response.errorBody()?.string()
+                Timber.e("errorBodyString: $errorBodyString")
+            }
+        }
+
+        Timber.i("uploadNumberAssessmentEvents complete!")
+    }
 }

app/src/main/java/ai/elimu/analytics/util/VersionHelper.kt

@@ -17,8 +17,6 @@ object VersionHelper {
      */
     @JvmStatic
     fun getAppVersionCode(context: Context): Int {
-        Timber.i("getAppVersionCode")
-
         try {
             val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
             return packageInfo.versionCode