Merge pull request #29 from studyplus/offset_date_time

Add OffsetDateTime support

Author: koji-1009

studyplus-android-sdk/build.gradle

@@ -30,12 +30,16 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+
     implementation "androidx.annotation:annotation:1.1.0"
 
     implementation platform("com.squareup.okhttp3:okhttp-bom:4.9.1")

studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/record/StudyRecord.kt

@@ -2,7 +2,9 @@ package jp.studyplus.android.sdk.record
 
 import androidx.annotation.IntRange
 import org.json.JSONObject
-import java.text.SimpleDateFormat
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
 import java.util.*
 
 /**
@@ -20,14 +22,27 @@ data class StudyRecord @JvmOverloads constructor(
     val duration: Int,
     val amount: StudyRecordAmount? = null,
     val comment: String? = null,
-    val recordedTime: Calendar = Calendar.getInstance(DATE_TIME_ZONE, DATE_LOCALE)
+    val recordedTime: OffsetDateTime = OffsetDateTime.now()
 ) {
 
+    constructor(
+        @IntRange(from = 0L, to = DURATION_RANGE_MAX_24H)
+        duration: Int,
+        amount: StudyRecordAmount? = null,
+        comment: String? = null,
+        recordedTime: Calendar
+    ) : this(
+        duration = duration,
+        amount = amount,
+        comment = comment,
+        recordedTime = recordedTime.toInstant().atOffset(ZoneOffset.UTC)
+    )
+
     internal fun toJson(): String = if (duration > DURATION_RANGE_MAX_24H) {
         throw IllegalArgumentException("duration must be 24 hours or less")
     } else {
         JSONObject().apply {
-            put("recorded_at", formatTime(recordedTime))
+            put("record_datetime", recordedTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
             put("duration", duration)
             comment?.let { put("comment", it) }
             amount?.let { studyRecordAmount ->
@@ -40,16 +55,6 @@ data class StudyRecord @JvmOverloads constructor(
 
     companion object {
         private const val DURATION_RANGE_MAX_24H = 24L * 60L * 60L
-
-        private const val DATE_FORMAT = "yyyy'-'MM'-'dd' 'HH':'mm':'ss"
-        private val DATE_LOCALE: Locale = Locale.US
-        private val DATE_TIME_ZONE: TimeZone = TimeZone.getTimeZone("UTC")
-
-        internal fun formatTime(calendar: Calendar): String {
-            val format = SimpleDateFormat(DATE_FORMAT, DATE_LOCALE)
-            format.timeZone = calendar.timeZone
-            return format.format(calendar.time)
-        }
     }
 
 }

studyplus-android-sdk/src/test/java/jp/studyplus/android/sdk/StudyRecordUnitTest.kt

@@ -9,18 +9,23 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import java.util.*
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
 
 @RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.P])
 class StudyRecordUnitTest {
 
+    private val date = OffsetDateTime.of(2019, 6, 1, 1, 2, 3, 0, ZoneOffset.UTC)
+    private val dateStr = date.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+
     @Test
     fun toJsonTest_littleParams() {
         val studyRecord = StudyRecord(2 * 60)
 
         assertEquals(
-            "{\"recorded_at\":\"${StudyRecord.formatTime(studyRecord.recordedTime)}\",\"duration\":120}",
+            "{\"record_datetime\":\"${studyRecord.recordedTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)}\",\"duration\":120}",
             studyRecord.toJson()
         )
     }
@@ -31,11 +36,11 @@ class StudyRecordUnitTest {
             duration = 2 * 60,
             amount = StudyRecordAmountTotal(30),
             comment = "perfect!",
-            recordedTime = Calendar.getInstance().apply { set(2019, 5, 1, 1, 2, 3) }
+            recordedTime = date
         )
 
         assertEquals(
-            "{\"recorded_at\":\"2019-06-01 01:02:03\",\"duration\":120,\"comment\":\"perfect!\",\"amount\":30}",
+            "{\"record_datetime\":\"$dateStr\",\"duration\":120,\"comment\":\"perfect!\",\"amount\":30}",
             studyRecord.toJson()
         )
     }
@@ -46,11 +51,11 @@ class StudyRecordUnitTest {
             duration = 2 * 60,
             amount = StudyRecordAmountRange(5, 12),
             comment = "perfect!",
-            recordedTime = Calendar.getInstance().apply { set(2019, 5, 1, 1, 2, 3) }
+            recordedTime = date
         )
 
         assertEquals(
-            "{\"recorded_at\":\"2019-06-01 01:02:03\",\"duration\":120,\"comment\":\"perfect!\",\"start_position\":5,\"end_position\":12}",
+            "{\"record_datetime\":\"$dateStr\",\"duration\":120,\"comment\":\"perfect!\",\"start_position\":5,\"end_position\":12}",
             studyRecord.toJson()
         )
     }