[jtx] Add builders for non-content properties (#386)

* Add `CollectionIdBuilder`
* Add `SyncPropertiesBuilder`
* Add `DirtyAndDeletedBuilder`

Author: cketti

lib/src/main/kotlin/at/bitfire/synctools/mapping/jtx/JtxItemBuilder.kt

@@ -9,8 +9,10 @@ package at.bitfire.synctools.mapping.jtx
 import android.content.ContentValues
 import android.content.Entity
 import at.bitfire.synctools.icalendar.AssociatedComponents
-import at.bitfire.synctools.mapping.jtx.builder.JtxEntityBuilder
+import at.bitfire.synctools.mapping.jtx.builder.CollectionIdBuilder
 import at.bitfire.synctools.mapping.jtx.builder.DescriptionBuilder
+import at.bitfire.synctools.mapping.jtx.builder.JtxEntityBuilder
+import at.bitfire.synctools.mapping.jtx.builder.SyncPropertiesBuilder
 import at.bitfire.synctools.storage.jtx.JtxItemAndExceptions
 import net.fortuna.ical4j.model.component.CalendarComponent
 import net.fortuna.ical4j.model.component.VJournal
@@ -19,9 +21,18 @@ import net.fortuna.ical4j.model.component.VToDo
 /**
  * Mapper from an [AssociatedComponents] data object to jtx Board content provider data rows.
  */
-class JtxItemBuilder {
+class JtxItemBuilder(
+    collectionId: Long,
+    fileName: String?,
+    eTag: String?,
+    scheduleTag: String?,
+    flags: Int
+) {
 
     private val fieldBuilders: Array<JtxEntityBuilder> = arrayOf(
+        CollectionIdBuilder(collectionId),
+        SyncPropertiesBuilder(fileName, eTag, scheduleTag, flags),
+
         DescriptionBuilder()
     )
 

lib/src/main/kotlin/at/bitfire/synctools/mapping/jtx/builder/CollectionIdBuilder.kt

@@ -0,0 +1,17 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.CalendarComponent
+
+class CollectionIdBuilder(private val collectionId: Long) : JtxEntityBuilder {
+    override fun build(from: CalendarComponent, main: CalendarComponent, to: Entity) {
+        to.entityValues.put(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID, collectionId)
+    }
+}

lib/src/main/kotlin/at/bitfire/synctools/mapping/jtx/builder/DirtyAndDeletedBuilder.kt

@@ -0,0 +1,19 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.CalendarComponent
+
+class DirtyAndDeletedBuilder : JtxEntityBuilder {
+    override fun build(from: CalendarComponent, main: CalendarComponent, to: Entity) {
+        // DIRTY and DELETED is always unset when we create or update an event row
+        to.entityValues.put(JtxContract.JtxICalObject.DIRTY, false)
+        to.entityValues.put(JtxContract.JtxICalObject.DELETED, false)
+    }
+}

lib/src/main/kotlin/at/bitfire/synctools/mapping/jtx/builder/SyncPropertiesBuilder.kt

@@ -0,0 +1,26 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.CalendarComponent
+
+class SyncPropertiesBuilder(
+    private val fileName: String?,
+    private val eTag: String?,
+    private val scheduleTag: String?,
+    private val flags: Int
+) : JtxEntityBuilder {
+
+    override fun build(from: CalendarComponent, main: CalendarComponent, to: Entity) {
+        to.entityValues.put(JtxContract.JtxICalObject.FILENAME, fileName)
+        to.entityValues.put(JtxContract.JtxICalObject.ETAG, eTag)
+        to.entityValues.put(JtxContract.JtxICalObject.SCHEDULETAG, scheduleTag)
+        to.entityValues.put(JtxContract.JtxICalObject.FLAGS, flags)
+    }
+}

lib/src/test/kotlin/at/bitfire/synctools/mapping/jtx/JtxItemBuilderTest.kt

@@ -25,7 +25,13 @@ import java.time.Instant
 @RunWith(RobolectricTestRunner::class)
 class JtxItemBuilderTest {
 
-    private val builder = JtxItemBuilder()
+    private val builder = JtxItemBuilder(
+        collectionId = 1,
+        fileName = null,
+        eTag = null,
+        scheduleTag = null,
+        flags = 0
+    )
 
     @Test
     fun `build() with VToDo`() {

lib/src/test/kotlin/at/bitfire/synctools/mapping/jtx/builder/CollectionIdBuilderTest.kt

@@ -0,0 +1,31 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.ContentValues
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.VJournal
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class CollectionIdBuilderTest {
+
+    @Test
+    fun happyPath() {
+        val builder = CollectionIdBuilder(collectionId = 1L)
+        val output = Entity(ContentValues())
+        val journal = VJournal()
+
+        builder.build(from = journal, main = journal, output)
+
+        assertEquals(1L, output.entityValues.get(JtxContract.JtxICalObject.ICALOBJECT_COLLECTIONID))
+    }
+}

lib/src/test/kotlin/at/bitfire/synctools/mapping/jtx/builder/DirtyAndDeletedBuilderTest.kt

@@ -0,0 +1,33 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.ContentValues
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.VJournal
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class DirtyAndDeletedBuilderTest {
+
+    private val builder = DirtyAndDeletedBuilder()
+
+    @Test
+    fun happyPath() {
+        val output = Entity(ContentValues())
+        val journal = VJournal()
+
+        builder.build(from = journal, main = journal, output)
+
+        assertEquals(false, output.entityValues.get(JtxContract.JtxICalObject.DIRTY))
+        assertEquals(false, output.entityValues.get(JtxContract.JtxICalObject.DELETED))
+    }
+}

lib/src/test/kotlin/at/bitfire/synctools/mapping/jtx/builder/SyncPropertiesBuilderTest.kt

@@ -0,0 +1,39 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.jtx.builder
+
+import android.content.ContentValues
+import android.content.Entity
+import at.techbee.jtx.JtxContract
+import net.fortuna.ical4j.model.component.VJournal
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class SyncPropertiesBuilderTest {
+
+    @Test
+    fun happyPath() {
+        val builder = SyncPropertiesBuilder(
+            fileName = "filename",
+            eTag = "etag",
+            scheduleTag = "scheduletag",
+            flags = 0
+        )
+        val output = Entity(ContentValues())
+        val journal = VJournal()
+
+        builder.build(from = journal, main = journal, output)
+
+        assertEquals("filename", output.entityValues.get(JtxContract.JtxICalObject.FILENAME))
+        assertEquals("etag", output.entityValues.get(JtxContract.JtxICalObject.ETAG))
+        assertEquals("scheduletag", output.entityValues.get(JtxContract.JtxICalObject.SCHEDULETAG))
+        assertEquals(0, output.entityValues.get(JtxContract.JtxICalObject.FLAGS))
+    }
+}