Create events repository (EXPOSUREAPP-5470) (EXPOSUREAPP-5482)(EXPOSUREAPP-5484)

Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json

@@ -0,0 +1,82 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "65f3afcf5d1c6bf0e15c9b721418e49e",
+    "entities": [
+      {
+        "tableName": "traceLocations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`guid` TEXT NOT NULL, `version` INTEGER NOT NULL, `type` INTEGER NOT NULL, `description` TEXT NOT NULL, `location` TEXT NOT NULL, `startTime` TEXT, `endTime` TEXT, `defaultCheckInLength` INTEGER, `signature` TEXT NOT NULL, PRIMARY KEY(`guid`))",
+        "fields": [
+          {
+            "fieldPath": "guid",
+            "columnName": "guid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "startDate",
+            "columnName": "startTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "defaultCheckInLengthInMinutes",
+            "columnName": "defaultCheckInLength",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "signature",
+            "columnName": "signature",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "guid"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '65f3afcf5d1c6bf0e15c9b721418e49e')"
+    ]
+  }
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentTestEventregistrationBinding
 import de.rki.coronawarnapp.test.menu.ui.TestMenuItem
@@ -23,6 +24,8 @@ class EventRegistrationTestFragment : Fragment(R.layout.fragment_test_eventregis
     private val binding: FragmentTestEventregistrationBinding by viewBindingLazy()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
         with(binding) {
             scanCheckInQrCode.setOnClickListener {
                 doNavigate(
@@ -37,6 +40,14 @@ class EventRegistrationTestFragment : Fragment(R.layout.fragment_test_eventregis
                         .actionEventRegistrationTestFragmentToTestQrCodeCreationFragment()
                 )
             }
+
+            createEventButton.setOnClickListener {
+                findNavController().navigate(R.id.createEventTestFragment)
+            }
+
+            showEventsButton.setOnClickListener {
+                findNavController().navigate(R.id.showStoredEventsTestFragment)
+            }
         }
     }
 

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt

@@ -0,0 +1,88 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.createevent
+
+import android.os.Bundle
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
+import androidx.core.widget.doAfterTextChanged
+import androidx.core.widget.doOnTextChanged
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.contactdiary.util.hideKeyboard
+import de.rki.coronawarnapp.databinding.FragmentTestCreateeventBinding
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
+import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
+import timber.log.Timber
+import javax.inject.Inject
+
+class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+    private val vm: CreateEventTestViewModel by cwaViewModels { viewModelFactory }
+
+    private val binding: FragmentTestCreateeventBinding by viewBindingLazy()
+
+    private val eventString = "Event"
+    private val locationString = "Location"
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initSpinner()
+        initOnCreateEventClicked()
+        observeViewModelResult()
+    }
+
+    private fun observeViewModelResult() {
+        vm.result.observe2(this) {
+            when (it) {
+                is CreateEventTestViewModel.Result.Success ->
+                    binding.resultText.text = "Successfully stored: ${it.eventEntity}"
+                is CreateEventTestViewModel.Result.Error ->
+                    binding.resultText.text = "There is something wrong with your input values, please check again."
+            }
+        }
+    }
+
+    private fun initOnCreateEventClicked() = with(binding) {
+        createEventButton.setOnClickListener {
+            vm.createEvent(
+                eventOrLocationSpinner.editText!!.text.toString(),
+                eventDescription.text.toString(),
+                eventAddress.text.toString(),
+                eventStartEditText.text.toString(),
+                eventEndEditText.text.toString(),
+                eventDefaultCheckinLengthInMinutes.text.toString()
+            )
+            it.hideKeyboard()
+        }
+    }
+
+    private fun initSpinner() {
+        val items = listOf(eventString, locationString)
+        with(binding.eventOrLocationSpinner.editText as AutoCompleteTextView) {
+            setText(items.first(), false)
+            setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, items))
+            doAfterTextChanged { }
+            doOnTextChanged { text, start, before, count ->
+                Timber.d("text: $text, start: $start, before: $before, count: $count")
+
+                when (text.toString()) {
+                    eventString -> {
+                        binding.eventStart.visibility = View.VISIBLE
+                        binding.eventEnd.visibility = View.VISIBLE
+                    }
+                    locationString -> {
+                        binding.eventStart.visibility = View.GONE
+                        binding.eventEnd.visibility = View.GONE
+                        binding.eventStartEditText.text = null
+                        binding.eventEndEditText.text = null
+                    }
+                }
+            }
+        }
+    }
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragmentModule.kt

@@ -0,0 +1,19 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.createevent
+
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
+
+@Module
+abstract class CreateEventTestFragmentModule {
+
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(CreateEventTestViewModel::class)
+    abstract fun testCreateEventFragment(
+        factory: CreateEventTestViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt

@@ -0,0 +1,75 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.createevent
+
+import androidx.lifecycle.MutableLiveData
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.eventregistration.events.DefaultTraceLocation
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.util.TimeAndDateExtensions.seconds
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
+import timber.log.Timber
+import java.util.UUID
+
+class CreateEventTestViewModel @AssistedInject constructor(
+    dispatcherProvider: DispatcherProvider,
+    private val traceLocationRepository: TraceLocationRepository
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<CreateEventTestViewModel>
+
+    val result = MutableLiveData<Result>()
+
+    fun createEvent(
+        type: String,
+        description: String,
+        address: String,
+        start: String,
+        end: String,
+        defaultCheckInLengthInMinutes: String
+    ) {
+        try {
+            val startDate =
+                if (start.isBlank()) null else DateTime.parse(start, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm"))
+            val endDate =
+                if (end.isBlank()) null else DateTime.parse(end, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm"))
+
+            /* TODO: wait for new protobuf messages 'TraceLocation' and perform network request to get
+                'SignedTraceLocation' */
+
+            // Backend needs UNIX timestamp in Seconds, not milliseconds
+            val startTimeStampSeconds = startDate?.toInstant()?.seconds ?: 0
+            val endTimeStampSeconds = endDate?.toInstant()?.seconds ?: 0
+
+            val traceLocationType =
+                if (type == "Event") TraceLocation.Type.TEMPORARY_OTHER else TraceLocation.Type.PERMANENT_OTHER
+
+            val traceLocation = DefaultTraceLocation(
+                UUID.randomUUID().toString(), // will be provided by the server when the endpoint is ready
+                traceLocationType,
+                description,
+                address,
+                startDate?.toInstant(),
+                endDate?.toInstant(),
+                defaultCheckInLengthInMinutes.toInt(),
+                "ServerSignature"
+            )
+
+            traceLocationRepository.addTraceLocation(traceLocation)
+            result.postValue(Result.Success(traceLocation))
+        } catch (exception: Exception) {
+            Timber.d("Something went wrong when trying to create an event: $exception")
+            result.postValue(Result.Error)
+        }
+    }
+
+    sealed class Result {
+        object Error : Result()
+        data class Success(val eventEntity: TraceLocation) : Result()
+    }
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt

@@ -0,0 +1,48 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.showevents
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentTestShowstoredeventsBinding
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.observe2
+import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
+import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
+import javax.inject.Inject
+
+class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstoredevents), AutoInject {
+
+    @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
+    private val vm: ShowStoredEventsTestViewModel by cwaViewModels { viewModelFactory }
+
+    private val binding: FragmentTestShowstoredeventsBinding by viewBindingLazy()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        vm.storedEvents.observe2(this) { events ->
+            binding.storedEvents.text = events.joinToString(separator = "\n\n") { it.getSimpleUIString() }
+        }
+
+        binding.deleteAllEvents.setOnClickListener {
+            vm.deleteAllEvents()
+        }
+    }
+
+    private fun TraceLocation.getSimpleUIString(): String {
+        return listOf(
+            "guid = $guid",
+            "type = $type",
+            "description = $description",
+            "location = $address",
+            "startTime = $startDate",
+            "endTime = $endDate",
+            "defaultCheckInLengthInMinutes = $defaultCheckInLengthInMinutes",
+            "signature = $signature",
+            "version = $version"
+        ).joinToString(separator = "\n")
+    }
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragmentModule.kt

@@ -0,0 +1,19 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.showevents
+
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModelKey
+
+@Module
+abstract class ShowStoredEventsTestFragmentModule {
+
+    @Binds
+    @IntoMap
+    @CWAViewModelKey(ShowStoredEventsTestViewModel::class)
+    abstract fun testStoredEventsFragment(
+        factory: ShowStoredEventsTestViewModel.Factory
+    ): CWAViewModelFactory<out CWAViewModel>
+}

Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt

@@ -0,0 +1,24 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.showevents
+
+import androidx.lifecycle.asLiveData
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
+import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
+import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
+
+class ShowStoredEventsTestViewModel @AssistedInject constructor(
+    dispatcherProvider: DispatcherProvider,
+    private val traceLocationRepository: TraceLocationRepository
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<ShowStoredEventsTestViewModel>
+
+    val storedEvents = traceLocationRepository.allTraceLocations.asLiveData()
+
+    fun deleteAllEvents() {
+        traceLocationRepository.deleteAllTraceLocations()
+    }
+}