From 4f8e26bbbee9ef25f3e746c16eb9e78670256cdd Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Tue, 2 Mar 2021 16:10:00 +0100
Subject: [PATCH 01/36] Add events card in event registration test fragment

---
 .../fragment_test_eventregistration.xml       | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
index a80d0f83d98..1a9d95fe58d 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:ignore="HardcodedText">
 
     <LinearLayout
@@ -13,21 +14,55 @@
         android:orientation="vertical"
         android:paddingBottom="32dp">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/event_container"
             style="@style/Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_tiny"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:orientation="vertical">
+            android:layout_margin="@dimen/spacing_tiny">
 
             <TextView
+                android:id="@+id/event_title"
+                style="@style/headline6"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:text="Events"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/events_body"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Event registration" />
+                android:layout_marginTop="@dimen/spacing_tiny"
+                android:textIsSelectable="true"
+                android:text="After creating an event in the app, it is sent to the server and returned together with a guid, a signature and a QR code."
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/event_title" />
 
-        </LinearLayout>
+            <Button
+                android:id="@+id/create_event"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Create Event"
+                app:layout_constraintEnd_toStartOf="@+id/show_events"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/events_body" />
+
+            <Button
+                android:id="@+id/show_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Show stored Events"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/create_event"
+                app:layout_constraintTop_toBottomOf="@id/events_body" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>

From 20ac9a9cca86b4c82eaa64077deb0154273a64bd Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Tue, 2 Mar 2021 16:10:54 +0100
Subject: [PATCH 02/36] Format

---
 .../contactdiary/ui/durationpicker/DurationExtensionKtTest.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/durationpicker/DurationExtensionKtTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/durationpicker/DurationExtensionKtTest.kt
index 4bfa961ca21..84d647ea27c 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/durationpicker/DurationExtensionKtTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/durationpicker/DurationExtensionKtTest.kt
@@ -54,4 +54,4 @@ internal class DurationExtensionKtTest {
         val suffix: String?,
         val expectedReadableDuration: String
     )
-}
\ No newline at end of file
+}

From ebf95a33b0585635a6a576616a0bc8ef7df245f1 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Tue, 2 Mar 2021 16:45:43 +0100
Subject: [PATCH 03/36] Create empty fragments and implement navigation

---
 .../ui/CreateEventTestFragment.kt             | 11 +++++++++++
 .../ui/EventRegistrationTestFragment.kt       | 15 +++++++++++++++
 .../ui/ShowStoredEventsTestFragment.kt        | 11 +++++++++++
 .../fragment_test_eventregistration.xml       |  8 ++++----
 .../res/navigation/test_nav_graph.xml         | 19 ++++++++++++++++++-
 .../res/layout/fragment_test_createevent.xml  | 16 ++++++++++++++++
 .../layout/fragment_test_showstoredevents.xml | 16 ++++++++++++++++
 7 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
 create mode 100644 Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
 create mode 100644 Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
new file mode 100644
index 00000000000..9231d17800c
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
@@ -0,0 +1,11 @@
+package de.rki.coronawarnapp.test.eventregistration.ui
+
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentTestEventregistrationBinding
+import de.rki.coronawarnapp.util.ui.viewBindingLazy
+
+class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent) {
+
+    private val binding: FragmentTestEventregistrationBinding by viewBindingLazy()
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
index de69184c974..71ab5aa0c24 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
@@ -1,7 +1,10 @@
 package de.rki.coronawarnapp.test.eventregistration.ui
 
 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
@@ -19,6 +22,18 @@ 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)
+
+        binding.createEventButton.setOnClickListener {
+            findNavController().navigate(R.id.createEventTestFragment)
+        }
+
+        binding.showEventsButton.setOnClickListener {
+            findNavController().navigate(R.id.showStoredEventsTestFragment)
+        }
+    }
+
     companion object {
         val MENU_ITEM = TestMenuItem(
             title = "Event Registration",
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
new file mode 100644
index 00000000000..46c9ffa9a4f
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
@@ -0,0 +1,11 @@
+package de.rki.coronawarnapp.test.eventregistration.ui
+
+import androidx.fragment.app.Fragment
+import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.databinding.FragmentTestShowstoredeventsBinding
+import de.rki.coronawarnapp.util.ui.viewBindingLazy
+
+class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstoredevents) {
+
+    private val binding: FragmentTestShowstoredeventsBinding by viewBindingLazy()
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
index 1a9d95fe58d..e4c5571f4b2 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
@@ -44,23 +44,23 @@
                 app:layout_constraintTop_toBottomOf="@+id/event_title" />
 
             <Button
-                android:id="@+id/create_event"
+                android:id="@+id/create_event_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="Create Event"
-                app:layout_constraintEnd_toStartOf="@+id/show_events"
+                app:layout_constraintEnd_toStartOf="@+id/show_events_button"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/events_body" />
 
             <Button
-                android:id="@+id/show_events"
+                android:id="@+id/show_events_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="Show stored Events"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/create_event"
+                app:layout_constraintStart_toEndOf="@id/create_event_button"
                 app:layout_constraintTop_toBottomOf="@id/events_body" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
index 469514d4972..45349436cac 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
@@ -131,6 +131,23 @@
         android:id="@+id/eventRegistrationTestFragment"
         android:name="de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragment"
         android:label="EventRegistrationTestFragment"
-        tools:layout="@layout/fragment_test_eventregistration" />
+        tools:layout="@layout/fragment_test_eventregistration">
+        <action
+            android:id="@+id/action_eventRegistrationTestFragment_to_CreateEventTestFragment"
+            app:destination="@id/createEventTestFragment" />
+        <action
+            android:id="@+id/action_eventRegistrationTestFragment_to_ShowStoredEventsTestFragment"
+            app:destination="@id/showStoredEventsTestFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/createEventTestFragment"
+        android:name="de.rki.coronawarnapp.test.eventregistration.ui.CreateEventTestFragment"
+        android:label="CreateEventTestFragment"
+        tools:layout="@layout/fragment_test_createevent" />
+    <fragment
+        android:id="@+id/showStoredEventsTestFragment"
+        android:name="de.rki.coronawarnapp.test.eventregistration.ui.ShowStoredEventsTestFragment"
+        android:label="ShowStoredEventsTestFragment"
+        tools:layout="@layout/fragment_test_showstoredevents" />
 
 </navigation>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
new file mode 100644
index 00000000000..bd0c06221f4
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Create new event"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="HardcodedText" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml
new file mode 100644
index 00000000000..53335b52193
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Show stored Events"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="HardcodedText" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 0aed5239ff8a618c5b9510d5f2aef73399f43b9b Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Tue, 2 Mar 2021 17:10:12 +0100
Subject: [PATCH 04/36] Create layout for CreateEventTestFragment.kt

---
 .../res/layout/fragment_test_createevent.xml  | 110 ++++++++++++++++--
 1 file changed, 101 insertions(+), 9 deletions(-)

diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
index bd0c06221f4..50bc63749ce 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
@@ -1,16 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Create new event"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:ignore="HardcodedText" />
+    android:padding="@dimen/spacing_normal">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/headline5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_normal"
+                android:text="Create new event"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="HardcodedText" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_tiny">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Description"
+                    android:maxLines="1"
+                    android:padding="@dimen/spacing_tiny"
+                    tools:ignore="HardcodedText" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_tiny">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_start"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Start (yyyy-MM-dd HH:mm)"
+                    android:maxLines="1"
+                    android:padding="@dimen/spacing_tiny"
+                    tools:ignore="HardcodedText" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_tiny">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_end"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="End (yyyy-MM-dd HH:mm)"
+                    android:maxLines="1"
+                    android:padding="@dimen/spacing_tiny"
+                    tools:ignore="HardcodedText" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:layout_marginBottom="@dimen/spacing_normal">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_default_checkin_length_in_minutes"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Default Check-In Lenght in Minutes - multiple of 10"
+                    android:maxLines="1"
+                    android:padding="@dimen/spacing_tiny"
+                    tools:ignore="HardcodedText" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Button
+                android:id="@+id/create_event_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Create Event"
+                tools:ignore="HardcodedText" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 07a404a248034f3a411e0363134c6e91f43a804c Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 3 Mar 2021 17:31:37 +0100
Subject: [PATCH 05/36] Add spinner for event type

---
 .../ui/CreateEventTestFragment.kt             | 43 ++++++++++++++++++-
 .../res/layout/fragment_test_createevent.xml  | 38 +++++++++++++++-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
index 9231d17800c..26cdd7310a9 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
@@ -1,11 +1,50 @@
 package de.rki.coronawarnapp.test.eventregistration.ui
 
+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.databinding.FragmentTestEventregistrationBinding
+import de.rki.coronawarnapp.databinding.FragmentTestCreateeventBinding
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import timber.log.Timber
 
 class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent) {
 
-    private val binding: FragmentTestEventregistrationBinding by viewBindingLazy()
+    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()
+    }
+
+    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
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
index 50bc63749ce..b0fc0a1b702 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
@@ -25,6 +25,22 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="HardcodedText" />
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/eventOrLocationSpinner"
+                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu"
+                android:layout_marginBottom="@dimen/spacing_tiny"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Type">
+
+                <AutoCompleteTextView
+                    android:enabled="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
@@ -49,7 +65,24 @@
                 android:layout_marginBottom="@dimen/spacing_tiny">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/event_start"
+                    android:id="@+id/event_location"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Location"
+                    android:maxLines="1"
+                    android:padding="@dimen/spacing_tiny"
+                    tools:ignore="HardcodedText" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/event_start"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_tiny">
+
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="Start (yyyy-MM-dd HH:mm)"
@@ -60,13 +93,13 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/event_end"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/spacing_tiny">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/event_end"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="End (yyyy-MM-dd HH:mm)"
@@ -90,6 +123,7 @@
                     android:hint="Default Check-In Lenght in Minutes - multiple of 10"
                     android:maxLines="1"
                     android:padding="@dimen/spacing_tiny"
+                    android:inputType="numberDecimal"
                     tools:ignore="HardcodedText" />
 
             </com.google.android.material.textfield.TextInputLayout>

From 68c3ce3e66884aef041827dce30be8839d54c03f Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 4 Mar 2021 16:43:34 +0100
Subject: [PATCH 06/36] Build event object from input

---
 .../ui/CreateEventTestFragment.kt             | 52 +++++++++++++++++++
 .../res/layout/fragment_test_createevent.xml  | 14 ++++-
 .../fragment_test_eventregistration.xml       |  5 +-
 .../layout/fragment_test_showstoredevents.xml |  0
 4 files changed, 68 insertions(+), 3 deletions(-)
 rename Corona-Warn-App/src/{main => deviceForTesters}/res/layout/fragment_test_createevent.xml (91%)
 rename Corona-Warn-App/src/{main => deviceForTesters}/res/layout/fragment_test_showstoredevents.xml (100%)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
index 26cdd7310a9..5514777e1b0 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
@@ -7,9 +7,15 @@ import android.widget.AutoCompleteTextView
 import androidx.core.widget.doAfterTextChanged
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
+import com.google.protobuf.ByteString
 import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.contactdiary.util.hideKeyboard
 import de.rki.coronawarnapp.databinding.FragmentTestCreateeventBinding
+import de.rki.coronawarnapp.server.protocols.internal.evreg.EventOuterClass
+import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
+import org.joda.time.DateTime
+import org.joda.time.format.DateTimeFormat
 import timber.log.Timber
 
 class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent) {
@@ -23,6 +29,52 @@ class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent) {
         super.onViewCreated(view, savedInstanceState)
 
         initSpinner()
+        initOnCreateEventClicked()
+    }
+
+    private fun initOnCreateEventClicked() = with(binding) {
+        createEventButton.setOnClickListener {
+            try {
+                val description = eventDescription.text.toString()
+                val location = eventLocation.text.toString()
+                val start = eventStartEditText.text.toString()
+                val end = eventEndEditText.text.toString()
+                val defaultCheckInLengthInMinutes = eventDefaultCheckinLengthInMinutes.text.toString()
+
+                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"))
+
+                val startTimeStamp = startDate?.toInstant()?.millis?.toInt() ?: 0
+                val endTimeStamp = endDate?.toInstant()?.millis?.toInt() ?: 0
+
+                // details yet tbd, but we basically sent our event entity to the backend ...
+                val event = EventOuterClass.Event.newBuilder()
+                    .setDescription(description)
+                    // .setLocation(location) // will probably added in a future protobuf
+                    .setStart(startTimeStamp)
+                    .setEnd(endTimeStamp)
+                    .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
+
+                // and the server responds with an event object with additional information
+                val serverEvent = event
+                    // .setGuid() // Server creates GUID
+                    .build()
+
+                val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
+                    .setEvent(serverEvent)
+                    .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
+                    .build()
+
+                resultText.text = "Successfully entered envent: $signedEvent"
+            } catch (e: Exception) {
+                Timber.d("Invalid Input Values: $e")
+                resultText.text = "There is something wrong with your input values, please check again."
+            } finally {
+                it.hideKeyboard()
+            }
+        }
     }
 
     private fun initSpinner() {
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
similarity index 91%
rename from Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
rename to Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
index b0fc0a1b702..382f7cf057d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_createevent.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
@@ -83,6 +83,7 @@
                 android:layout_marginBottom="@dimen/spacing_tiny">
 
                 <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_start_edit_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="Start (yyyy-MM-dd HH:mm)"
@@ -100,6 +101,7 @@
                 android:layout_marginBottom="@dimen/spacing_tiny">
 
                 <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/event_end_edit_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="End (yyyy-MM-dd HH:mm)"
@@ -128,13 +130,23 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/create_event_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Create Event"
                 tools:ignore="HardcodedText" />
 
+            <TextView
+                android:id="@+id/resultText"
+                style="@style/subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_normal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="HardcodedText" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
index e4c5571f4b2..0218af9aef0 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
@@ -43,17 +43,18 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/event_title" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/create_event_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 android:text="Create Event"
                 app:layout_constraintEnd_toStartOf="@+id/show_events_button"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/events_body" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/show_events_button"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
similarity index 100%
rename from Corona-Warn-App/src/main/res/layout/fragment_test_showstoredevents.xml
rename to Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml

From f214a18387b15dd578c46d0285f1b48ab4c1e164 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Fri, 5 Mar 2021 12:51:39 +0100
Subject: [PATCH 07/36] Create database for event registration and store events
 in it

---
 .../1.json                                    |  70 ++++++++++++
 .../ui/CreateEventTestFragment.kt             | 102 ------------------
 .../ui/createevent/CreateEventTestFragment.kt |  87 +++++++++++++++
 .../CreateEventTestFragmentModule.kt          |  19 ++++
 .../createevent/CreateEventTestViewModel.kt   |  80 ++++++++++++++
 .../ui/main/MainActivityTestModule.kt         |   5 +
 .../res/navigation/test_nav_graph.xml         |   2 +-
 .../events/DefaultHostedEvent.kt              |  25 +++++
 .../eventregistration/events/HostedEvent.kt   |   4 +-
 .../events/HostedEventRepository.kt           |  12 ---
 .../storage/EventRegistrationDatabase.kt      |  38 +++++++
 .../storage/EventRegistrationStorageModule.kt |  16 +++
 .../storage/dao/HostedEventDao.kt             |  25 +++++
 .../storage/entity/HostedEventEntity.kt       |  34 ++++++
 .../repo/DefaultHostedEventRepository.kt      |  54 ++++++++++
 .../storage/repo/HostedEventRepository.kt     |  15 +++
 .../de/rki/coronawarnapp/ui/ActivityBinder.kt |   4 +-
 17 files changed, 474 insertions(+), 118 deletions(-)
 create mode 100644 Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
 delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragmentModule.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEventRepository.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
new file mode 100644
index 00000000000..2d929499bbf
--- /dev/null
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
@@ -0,0 +1,70 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "6570bad9213df22a0fe02a3f2185da8e",
+    "entities": [
+      {
+        "tableName": "hostedEvents",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`guid` TEXT 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": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "startTime",
+            "columnName": "startTime",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "endTime",
+            "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, '6570bad9213df22a0fe02a3f2185da8e')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
deleted file mode 100644
index 5514777e1b0..00000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/CreateEventTestFragment.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package de.rki.coronawarnapp.test.eventregistration.ui
-
-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 com.google.protobuf.ByteString
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.contactdiary.util.hideKeyboard
-import de.rki.coronawarnapp.databinding.FragmentTestCreateeventBinding
-import de.rki.coronawarnapp.server.protocols.internal.evreg.EventOuterClass
-import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
-import de.rki.coronawarnapp.util.ui.viewBindingLazy
-import org.joda.time.DateTime
-import org.joda.time.format.DateTimeFormat
-import timber.log.Timber
-
-class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent) {
-
-    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()
-    }
-
-    private fun initOnCreateEventClicked() = with(binding) {
-        createEventButton.setOnClickListener {
-            try {
-                val description = eventDescription.text.toString()
-                val location = eventLocation.text.toString()
-                val start = eventStartEditText.text.toString()
-                val end = eventEndEditText.text.toString()
-                val defaultCheckInLengthInMinutes = eventDefaultCheckinLengthInMinutes.text.toString()
-
-                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"))
-
-                val startTimeStamp = startDate?.toInstant()?.millis?.toInt() ?: 0
-                val endTimeStamp = endDate?.toInstant()?.millis?.toInt() ?: 0
-
-                // details yet tbd, but we basically sent our event entity to the backend ...
-                val event = EventOuterClass.Event.newBuilder()
-                    .setDescription(description)
-                    // .setLocation(location) // will probably added in a future protobuf
-                    .setStart(startTimeStamp)
-                    .setEnd(endTimeStamp)
-                    .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
-
-                // and the server responds with an event object with additional information
-                val serverEvent = event
-                    // .setGuid() // Server creates GUID
-                    .build()
-
-                val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
-                    .setEvent(serverEvent)
-                    .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
-                    .build()
-
-                resultText.text = "Successfully entered envent: $signedEvent"
-            } catch (e: Exception) {
-                Timber.d("Invalid Input Values: $e")
-                resultText.text = "There is something wrong with your input values, please check again."
-            } finally {
-                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
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
new file mode 100644
index 00000000000..98915cc519a
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
@@ -0,0 +1,87 @@
+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 entered event: ${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(
+                eventDescription.text.toString(),
+                eventLocation.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
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragmentModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragmentModule.kt
new file mode 100644
index 00000000000..258a96c7ad4
--- /dev/null
+++ b/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>
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
new file mode 100644
index 00000000000..ccceff63dc8
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -0,0 +1,80 @@
+package de.rki.coronawarnapp.test.eventregistration.ui.createevent
+
+import androidx.lifecycle.MutableLiveData
+import com.google.protobuf.ByteString
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import de.rki.coronawarnapp.eventregistration.events.toHostedEvent
+import de.rki.coronawarnapp.eventregistration.storage.repo.HostedEventRepository
+import de.rki.coronawarnapp.server.protocols.internal.evreg.EventOuterClass
+import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
+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 hostedEventRepository: HostedEventRepository
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<CreateEventTestViewModel>
+
+    val result = MutableLiveData<Result>()
+
+    fun createEvent(
+        description: String,
+        location: String,
+        start: String,
+        end: String,
+        defaultCheckInLengthInMinutes: String
+    ) {
+        launch {
+            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"))
+
+                val startTimeStamp = startDate?.toInstant()?.millis?.toInt() ?: 0
+                val endTimeStamp = endDate?.toInstant()?.millis?.toInt() ?: 0
+
+                // details yet tbd, but we basically sent our event entity to the backend ...
+                val event = EventOuterClass.Event.newBuilder()
+                    .setDescription(description)
+                    // .setLocation(location) // will probably added in a future protobuf
+                    .setStart(startTimeStamp)
+                    .setEnd(endTimeStamp)
+                    .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
+
+                // and the server responds with an event object with additional information
+                val serverEvent = event
+                    .setGuid(ByteString.copyFrom(UUID.randomUUID().toString().toByteArray())) // Server creates GUID
+                    .build()
+
+                val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
+                    .setEvent(serverEvent)
+                    .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
+                    .build()
+
+                val hostedEvent = signedEvent.toHostedEvent()
+
+                hostedEventRepository.addHostedEvent(hostedEvent)
+                result.postValue(Result.Success(hostedEvent))
+            } 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: HostedEvent) : Result()
+    }
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
index 2f27a4bc730..9621d18e239 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
@@ -16,6 +16,8 @@ import de.rki.coronawarnapp.test.deltaonboarding.ui.DeltaOnboardingFragmentModul
 import de.rki.coronawarnapp.test.deltaonboarding.ui.DeltaonboardingFragment
 import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragment
 import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragmentModule
+import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragment
+import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragmentModule
 import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragment
 import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragmentModule
 import de.rki.coronawarnapp.test.menu.ui.TestMenuFragment
@@ -70,4 +72,7 @@ abstract class MainActivityTestModule {
 
     @ContributesAndroidInjector(modules = [EventRegistrationTestFragmentModule::class])
     abstract fun eventRegistration(): EventRegistrationTestFragment
+
+    @ContributesAndroidInjector(modules = [CreateEventTestFragmentModule::class])
+    abstract fun createEvent(): CreateEventTestFragment
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
index 45349436cac..21f3fc00b29 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
@@ -141,7 +141,7 @@
     </fragment>
     <fragment
         android:id="@+id/createEventTestFragment"
-        android:name="de.rki.coronawarnapp.test.eventregistration.ui.CreateEventTestFragment"
+        android:name="de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragment"
         android:label="CreateEventTestFragment"
         tools:layout="@layout/fragment_test_createevent" />
     <fragment
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
new file mode 100644
index 00000000000..a3b4f68f690
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
@@ -0,0 +1,25 @@
+package de.rki.coronawarnapp.eventregistration.events
+
+import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
+import org.joda.time.Instant
+
+data class DefaultHostedEvent(
+    override val guid: String,
+    override val description: String,
+    override val location: String,
+    override val startTime: Instant?,
+    override val endTime: Instant?,
+    override val defaultCheckInLengthInMinutes: Int?,
+    override val signature: String
+) : HostedEvent
+
+fun SignedEventOuterClass.SignedEvent.toHostedEvent(): HostedEvent =
+    DefaultHostedEvent(
+        guid = event.guid.toString(),
+        description = event.description,
+        location = "hardcodedLocation", // event.location,
+        startTime = Instant.ofEpochMilli(event.start.toLong()),
+        endTime = Instant.ofEpochMilli(event.end.toLong()),
+        defaultCheckInLengthInMinutes = event.defaultCheckInLengthInMinutes,
+        signature = signature.toString()
+    )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
index df0f5db9dca..78833b56c41 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
@@ -1,6 +1,5 @@
 package de.rki.coronawarnapp.eventregistration.events
 
-import org.joda.time.Duration
 import org.joda.time.Instant
 
 /**
@@ -11,8 +10,9 @@ interface HostedEvent {
 
     val guid: String
     val description: String
+    val location: String
     val startTime: Instant?
     val endTime: Instant?
-    val defaultCheckInLength: Duration?
+    val defaultCheckInLengthInMinutes: Int?
     val signature: String
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEventRepository.kt
deleted file mode 100644
index aa8a385a52a..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEventRepository.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.events
-
-import kotlinx.coroutines.flow.Flow
-
-interface HostedEventRepository {
-
-    val allHostedEvents: Flow<List<HostedEvent>>
-
-    fun addHostedEvent(event: HostedEvent)
-
-    fun deleteHostedEvent(event: HostedEvent)
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
new file mode 100644
index 00000000000..0b41bd7cd1e
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
@@ -0,0 +1,38 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
+import de.rki.coronawarnapp.eventregistration.storage.entity.HostedEventEntity
+import de.rki.coronawarnapp.util.database.CommonConverters
+import de.rki.coronawarnapp.util.di.AppContext
+import javax.inject.Inject
+
+@Database(
+    entities = [
+        HostedEventEntity::class
+    ],
+    version = 1,
+    exportSchema = true
+)
+@TypeConverters(CommonConverters::class)
+abstract class EventRegistrationDatabase : RoomDatabase() {
+
+    abstract fun hostedEventsDao(): HostedEventDao
+
+    class Factory @Inject constructor(@AppContext private val context: Context) {
+        fun create(): EventRegistrationDatabase =
+            Room.databaseBuilder(
+                context,
+                EventRegistrationDatabase::class.java,
+                EVENT_REGISTRATION_DATABASE_NAME
+            ).build()
+    }
+
+    companion object {
+        private const val EVENT_REGISTRATION_DATABASE_NAME = "EventRegistration-db"
+    }
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
new file mode 100644
index 00000000000..18fc361d9e6
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
@@ -0,0 +1,16 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import dagger.Module
+import dagger.Provides
+import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultHostedEventRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.HostedEventRepository
+import javax.inject.Singleton
+
+@Module
+class EventRegistrationStorageModule {
+
+    @Singleton
+    @Provides
+    fun hostedEventRepository(defaultHostedEventRepository: DefaultHostedEventRepository): HostedEventRepository =
+        defaultHostedEventRepository
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
new file mode 100644
index 00000000000..88044d5bb06
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
@@ -0,0 +1,25 @@
+package de.rki.coronawarnapp.eventregistration.storage.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import de.rki.coronawarnapp.eventregistration.storage.entity.HostedEventEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+@Suppress("UnnecessaryAbstractClass")
+abstract class HostedEventDao {
+
+    @Query("SELECT * FROM hostedEvents")
+    abstract fun allEntries(): Flow<List<HostedEventEntity>>
+
+    @Insert
+    abstract suspend fun insert(hostedEvent: HostedEventEntity)
+
+    @Delete
+    abstract suspend fun delete(hostedEvent: HostedEventEntity)
+
+    @Query("DELETE FROM hostedEvents")
+    abstract suspend fun deleteAll()
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt
new file mode 100644
index 00000000000..c0cdcae9aac
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt
@@ -0,0 +1,34 @@
+package de.rki.coronawarnapp.eventregistration.storage.entity
+
+import android.os.Parcelable
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import kotlinx.parcelize.Parcelize
+import org.joda.time.Instant
+
+@Parcelize
+@Entity(tableName = "hostedEvents")
+data class HostedEventEntity(
+
+    @PrimaryKey @ColumnInfo(name = "guid") override val guid: String,
+    @ColumnInfo(name = "description") override val description: String,
+    @ColumnInfo(name = "location") override val location: String,
+    @ColumnInfo(name = "startTime") override val startTime: Instant?,
+    @ColumnInfo(name = "endTime") override val endTime: Instant?,
+    @ColumnInfo(name = "defaultCheckInLength") override val defaultCheckInLengthInMinutes: Int?,
+    @ColumnInfo(name = "signature") override val signature: String
+
+) : HostedEvent, Parcelable
+
+fun HostedEvent.toHostedEventEntity(): HostedEventEntity =
+    HostedEventEntity(
+        guid = guid,
+        description = description,
+        location = "hardcodedLocation", // event.location will be in the protobuf at some point in the future
+        startTime = startTime,
+        endTime = endTime,
+        defaultCheckInLengthInMinutes = defaultCheckInLengthInMinutes,
+        signature = signature
+    )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
new file mode 100644
index 00000000000..3b4e46cb7e1
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
@@ -0,0 +1,54 @@
+package de.rki.coronawarnapp.eventregistration.storage.repo
+
+import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase
+import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
+import de.rki.coronawarnapp.eventregistration.storage.entity.toHostedEventEntity
+import de.rki.coronawarnapp.util.coroutine.AppScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DefaultHostedEventRepository @Inject constructor(
+    eventRegistrationDatabaseFactory: EventRegistrationDatabase.Factory,
+    @AppScope private val appScope: CoroutineScope
+) : HostedEventRepository {
+
+    private val eventRegistrationDatabase: EventRegistrationDatabase by lazy {
+        eventRegistrationDatabaseFactory.create()
+    }
+
+    private val hostedEventDao: HostedEventDao by lazy {
+        eventRegistrationDatabase.hostedEventsDao()
+    }
+
+    override val allHostedEvents: Flow<List<HostedEvent>>
+        get() = hostedEventDao.allEntries() // TODO: SORTING
+
+    override suspend fun addHostedEvent(event: HostedEvent) {
+        appScope.launch {
+            Timber.d("Add hosted event: $event")
+            val eventEntity = event.toHostedEventEntity()
+            hostedEventDao.insert(eventEntity)
+        }
+    }
+
+    override suspend fun deleteHostedEvent(event: HostedEvent) {
+        appScope.launch {
+            Timber.d("Delete hosted event: $event")
+            val eventEntity = event.toHostedEventEntity()
+            hostedEventDao.delete(eventEntity)
+        }
+    }
+
+    override suspend fun deleteAllHostedEvents() {
+        appScope.launch {
+            Timber.d("Delete all hosted events.")
+            hostedEventDao.deleteAll()
+        }
+    }
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
new file mode 100644
index 00000000000..ed4ff2692cc
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
@@ -0,0 +1,15 @@
+package de.rki.coronawarnapp.eventregistration.storage.repo
+
+import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import kotlinx.coroutines.flow.Flow
+
+interface HostedEventRepository {
+
+    val allHostedEvents: Flow<List<HostedEvent>>
+
+    suspend fun addHostedEvent(event: HostedEvent)
+
+    suspend fun deleteHostedEvent(event: HostedEvent)
+
+    suspend fun deleteAllHostedEvents()
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
index 4f190973a29..f9b610e8a33 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
@@ -5,6 +5,7 @@ import dagger.android.ContributesAndroidInjector
 import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryRetentionModule
 import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryStorageModule
 import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryUIModule
+import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationStorageModule
 import de.rki.coronawarnapp.ui.launcher.LauncherActivity
 import de.rki.coronawarnapp.ui.launcher.LauncherActivityModule
 import de.rki.coronawarnapp.ui.main.MainActivity
@@ -16,7 +17,8 @@ import de.rki.coronawarnapp.ui.onboarding.OnboardingActivityModule
 @Module(
     includes = [
         ContactDiaryStorageModule::class,
-        ContactDiaryRetentionModule::class
+        ContactDiaryRetentionModule::class,
+        EventRegistrationStorageModule::class
     ]
 )
 abstract class ActivityBinder {

From b369db7f84c12636667dc54ee759e659af4bee3a Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Fri, 5 Mar 2021 17:02:29 +0100
Subject: [PATCH 08/36] Fix date issue

---
 .../ui/createevent/CreateEventTestFragment.kt    |  4 +++-
 .../ui/createevent/CreateEventTestViewModel.kt   | 16 ++++++++++------
 .../events/DefaultHostedEvent.kt                 |  5 +++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
index 98915cc519a..6ee816bea19 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
@@ -41,7 +41,7 @@ class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent), Au
             when (it) {
                 is CreateEventTestViewModel.Result.Success ->
                     binding.resultText.text =
-                        "Successfully entered event: ${it.eventEntity}"
+                        "Successfully stored event: ${it.eventEntity}"
                 is CreateEventTestViewModel.Result.Error ->
                     binding.resultText.text =
                         "There is something wrong with your input values, please check again."
@@ -79,6 +79,8 @@ class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent), Au
                     locationString -> {
                         binding.eventStart.visibility = View.GONE
                         binding.eventEnd.visibility = View.GONE
+                        binding.eventStartEditText.text = null
+                        binding.eventEndEditText.text = null
                     }
                 }
             }
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
index ccceff63dc8..e7243e4dda6 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -37,19 +37,23 @@ class CreateEventTestViewModel @AssistedInject constructor(
         launch {
             try {
                 val startDate =
-                    if (start.isBlank()) null else DateTime.parse(start, DateTimeFormat.forPattern("YYYY-MM-dd HH:mm"))
+                    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"))
+                    if (end.isBlank()) null else DateTime.parse(end, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm"))
 
-                val startTimeStamp = startDate?.toInstant()?.millis?.toInt() ?: 0
-                val endTimeStamp = endDate?.toInstant()?.millis?.toInt() ?: 0
+                val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
+                val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
+
+                // Backend needs UNIX timestamp in Seconds, not milliseconds
+                val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
+                val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
 
                 // details yet tbd, but we basically sent our event entity to the backend ...
                 val event = EventOuterClass.Event.newBuilder()
                     .setDescription(description)
                     // .setLocation(location) // will probably added in a future protobuf
-                    .setStart(startTimeStamp)
-                    .setEnd(endTimeStamp)
+                    .setStart(startTimeStampSeconds)
+                    .setEnd(endTimeStampSeconds)
                     .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
 
                 // and the server responds with an event object with additional information
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
index a3b4f68f690..395ae27f1a7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
@@ -18,8 +18,9 @@ fun SignedEventOuterClass.SignedEvent.toHostedEvent(): HostedEvent =
         guid = event.guid.toString(),
         description = event.description,
         location = "hardcodedLocation", // event.location,
-        startTime = Instant.ofEpochMilli(event.start.toLong()),
-        endTime = Instant.ofEpochMilli(event.end.toLong()),
+        // backend needs UNIX timestamp in seconds, so we have to multiply it by 1000 to get milliseconds
+        startTime = Instant.ofEpochMilli(event.start.toLong() * 1000),
+        endTime = Instant.ofEpochMilli(event.end.toLong() * 1000),
         defaultCheckInLengthInMinutes = event.defaultCheckInLengthInMinutes,
         signature = signature.toString()
     )

From bf0c668721e9bc413be0b14bda306bd4d434bf93 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Fri, 5 Mar 2021 17:23:13 +0100
Subject: [PATCH 09/36] Show stored events in a simple way

---
 .../ui/ShowStoredEventsTestFragment.kt        | 11 -------
 .../ShowStoredEventsTestFragment.kt           | 29 +++++++++++++++++++
 .../ShowStoredEventsTestFragmentModule.kt     | 19 ++++++++++++
 .../ShowStoredEventsTestViewModel.kt          | 20 +++++++++++++
 .../ui/main/MainActivityTestModule.kt         |  5 ++++
 .../layout/fragment_test_showstoredevents.xml |  1 +
 .../res/navigation/test_nav_graph.xml         |  2 +-
 7 files changed, 75 insertions(+), 12 deletions(-)
 delete mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragmentModule.kt
 create mode 100644 Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
deleted file mode 100644
index 46c9ffa9a4f..00000000000
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/ShowStoredEventsTestFragment.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package de.rki.coronawarnapp.test.eventregistration.ui
-
-import androidx.fragment.app.Fragment
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.databinding.FragmentTestShowstoredeventsBinding
-import de.rki.coronawarnapp.util.ui.viewBindingLazy
-
-class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstoredevents) {
-
-    private val binding: FragmentTestShowstoredeventsBinding by viewBindingLazy()
-}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
new file mode 100644
index 00000000000..ad25aa2e0d1
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
@@ -0,0 +1,29 @@
+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.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) {
+            binding.storedEvents.text = it.toString()
+        }
+    }
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragmentModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragmentModule.kt
new file mode 100644
index 00000000000..45e3c4763e4
--- /dev/null
+++ b/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>
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
new file mode 100644
index 00000000000..65038037293
--- /dev/null
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
@@ -0,0 +1,20 @@
+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.HostedEventRepository
+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 hostedEventRepository: HostedEventRepository
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
+
+    @AssistedFactory
+    interface Factory : SimpleCWAViewModelFactory<ShowStoredEventsTestViewModel>
+
+    val storedEvents = hostedEventRepository.allHostedEvents.asLiveData()
+}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
index 9621d18e239..2c704b6e5ca 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
@@ -18,6 +18,8 @@ import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragm
 import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragmentModule
 import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragment
 import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragmentModule
+import de.rki.coronawarnapp.test.eventregistration.ui.showevents.ShowStoredEventsTestFragment
+import de.rki.coronawarnapp.test.eventregistration.ui.showevents.ShowStoredEventsTestFragmentModule
 import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragment
 import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragmentModule
 import de.rki.coronawarnapp.test.menu.ui.TestMenuFragment
@@ -75,4 +77,7 @@ abstract class MainActivityTestModule {
 
     @ContributesAndroidInjector(modules = [CreateEventTestFragmentModule::class])
     abstract fun createEvent(): CreateEventTestFragment
+
+    @ContributesAndroidInjector(modules = [ShowStoredEventsTestFragmentModule::class])
+    abstract fun showStoredEvents(): ShowStoredEventsTestFragment
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
index 53335b52193..3bc33515424 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
@@ -6,6 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView
+        android:id="@+id/storedEvents"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Show stored Events"
diff --git a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
index 21f3fc00b29..4534ca42721 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
@@ -146,7 +146,7 @@
         tools:layout="@layout/fragment_test_createevent" />
     <fragment
         android:id="@+id/showStoredEventsTestFragment"
-        android:name="de.rki.coronawarnapp.test.eventregistration.ui.ShowStoredEventsTestFragment"
+        android:name="de.rki.coronawarnapp.test.eventregistration.ui.showevents.ShowStoredEventsTestFragment"
         android:label="ShowStoredEventsTestFragment"
         tools:layout="@layout/fragment_test_showstoredevents" />
 

From fc496f65debe6fdcee034a87df06185f6d9a1446 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 09:17:18 +0100
Subject: [PATCH 10/36] Make event list more pretty

---
 .../ShowStoredEventsTestFragment.kt           | 17 +++++++++++++--
 .../layout/fragment_test_showstoredevents.xml | 21 ++++++++++++-------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
index ad25aa2e0d1..6abd5fa17cb 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
@@ -5,6 +5,7 @@ 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.HostedEvent
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.ui.observe2
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
@@ -22,8 +23,20 @@ class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstorede
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        vm.storedEvents.observe2(this) {
-            binding.storedEvents.text = it.toString()
+        vm.storedEvents.observe2(this) { events ->
+            binding.storedEvents.text = events.joinToString(separator = "\n\n") { it.getSimpleUIString() }
         }
     }
+
+    private fun HostedEvent.getSimpleUIString(): String {
+        return listOf(
+            "guid = $guid",
+            "description = $description",
+            "location = $location",
+            "startTime = $startTime",
+            "endTime = $endTime",
+            "defaultCheckInLengthInMinutes = $defaultCheckInLengthInMinutes",
+            "signature = $signature"
+        ).joinToString(separator = "\n")
+    }
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
index 3bc33515424..b3f66a79afe 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:padding="@dimen/spacing_normal">
 
-    <TextView
-        android:id="@+id/storedEvents"
-        android:layout_width="wrap_content"
+    <ScrollView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Show stored Events"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:ignore="HardcodedText" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/storedEvents"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Show stored Events"
+            tools:ignore="HardcodedText" />
+
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d3854efc1c0c454cdd70a2e55e1bf38811dc38d3 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 12:16:23 +0100
Subject: [PATCH 11/36] Add button to delete all events in
 ShowStoredEventsTestFragment.kt

---
 .../ShowStoredEventsTestFragment.kt           |  4 ++++
 .../ShowStoredEventsTestViewModel.kt          |  6 +++++
 .../layout/fragment_test_showstoredevents.xml | 24 +++++++++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
index 6abd5fa17cb..3873679c1d5 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
@@ -26,6 +26,10 @@ class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstorede
         vm.storedEvents.observe2(this) { events ->
             binding.storedEvents.text = events.joinToString(separator = "\n\n") { it.getSimpleUIString() }
         }
+
+        binding.deleteAllEvents.setOnClickListener {
+            vm.deleteAllEvents()
+        }
     }
 
     private fun HostedEvent.getSimpleUIString(): String {
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
index 65038037293..71dc9b45536 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
@@ -17,4 +17,10 @@ class ShowStoredEventsTestViewModel @AssistedInject constructor(
     interface Factory : SimpleCWAViewModelFactory<ShowStoredEventsTestViewModel>
 
     val storedEvents = hostedEventRepository.allHostedEvents.asLiveData()
+
+    fun deleteAllEvents() {
+        launch {
+            hostedEventRepository.deleteAllHostedEvents()
+        }
+    }
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
index b3f66a79afe..3521aafdae7 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_showstoredevents.xml
@@ -12,12 +12,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/storedEvents"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Show stored Events"
-            tools:ignore="HardcodedText" />
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/storedEvents"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_normal"
+                android:text="Show stored Events"
+                tools:ignore="HardcodedText" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/deleteAllEvents"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Delete All Events" />
+
+        </LinearLayout>
 
     </ScrollView>
 

From 837dc2c38ddc50ae7815d10df4b6ac6263b84637 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 12:20:53 +0100
Subject: [PATCH 12/36] Change the functions of HostedEventRepository.kt to
 regular functions instead of suspend functions

---
 .../createevent/CreateEventTestViewModel.kt   | 64 +++++++++----------
 .../ShowStoredEventsTestViewModel.kt          |  4 +-
 .../repo/DefaultHostedEventRepository.kt      |  6 +-
 .../storage/repo/HostedEventRepository.kt     |  6 +-
 4 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
index e7243e4dda6..4d9eebe6924 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -34,46 +34,44 @@ class CreateEventTestViewModel @AssistedInject constructor(
         end: String,
         defaultCheckInLengthInMinutes: String
     ) {
-        launch {
-            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"))
+        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"))
 
-                val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
-                val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
+            val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
+            val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
 
-                // Backend needs UNIX timestamp in Seconds, not milliseconds
-                val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
-                val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
+            // Backend needs UNIX timestamp in Seconds, not milliseconds
+            val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
+            val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
 
-                // details yet tbd, but we basically sent our event entity to the backend ...
-                val event = EventOuterClass.Event.newBuilder()
-                    .setDescription(description)
-                    // .setLocation(location) // will probably added in a future protobuf
-                    .setStart(startTimeStampSeconds)
-                    .setEnd(endTimeStampSeconds)
-                    .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
+            // details yet tbd, but we basically sent our event entity to the backend ...
+            val event = EventOuterClass.Event.newBuilder()
+                .setDescription(description)
+                // .setLocation(location) // will probably added in a future protobuf
+                .setStart(startTimeStampSeconds)
+                .setEnd(endTimeStampSeconds)
+                .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
 
-                // and the server responds with an event object with additional information
-                val serverEvent = event
-                    .setGuid(ByteString.copyFrom(UUID.randomUUID().toString().toByteArray())) // Server creates GUID
-                    .build()
+            // and the server responds with an event object with additional information
+            val serverEvent = event
+                .setGuid(ByteString.copyFrom(UUID.randomUUID().toString().toByteArray())) // Server creates GUID
+                .build()
 
-                val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
-                    .setEvent(serverEvent)
-                    .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
-                    .build()
+            val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
+                .setEvent(serverEvent)
+                .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
+                .build()
 
-                val hostedEvent = signedEvent.toHostedEvent()
+            val hostedEvent = signedEvent.toHostedEvent()
 
-                hostedEventRepository.addHostedEvent(hostedEvent)
-                result.postValue(Result.Success(hostedEvent))
-            } catch (exception: Exception) {
-                Timber.d("Something went wrong when trying to create an event: $exception")
-                result.postValue(Result.Error)
-            }
+            hostedEventRepository.addHostedEvent(hostedEvent)
+            result.postValue(Result.Success(hostedEvent))
+        } catch (exception: Exception) {
+            Timber.d("Something went wrong when trying to create an event: $exception")
+            result.postValue(Result.Error)
         }
     }
 
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
index 71dc9b45536..5259fcfca79 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
@@ -19,8 +19,6 @@ class ShowStoredEventsTestViewModel @AssistedInject constructor(
     val storedEvents = hostedEventRepository.allHostedEvents.asLiveData()
 
     fun deleteAllEvents() {
-        launch {
-            hostedEventRepository.deleteAllHostedEvents()
-        }
+        hostedEventRepository.deleteAllHostedEvents()
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
index 3b4e46cb7e1..e7de97a0283 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
@@ -29,7 +29,7 @@ class DefaultHostedEventRepository @Inject constructor(
     override val allHostedEvents: Flow<List<HostedEvent>>
         get() = hostedEventDao.allEntries() // TODO: SORTING
 
-    override suspend fun addHostedEvent(event: HostedEvent) {
+    override fun addHostedEvent(event: HostedEvent) {
         appScope.launch {
             Timber.d("Add hosted event: $event")
             val eventEntity = event.toHostedEventEntity()
@@ -37,7 +37,7 @@ class DefaultHostedEventRepository @Inject constructor(
         }
     }
 
-    override suspend fun deleteHostedEvent(event: HostedEvent) {
+    override fun deleteHostedEvent(event: HostedEvent) {
         appScope.launch {
             Timber.d("Delete hosted event: $event")
             val eventEntity = event.toHostedEventEntity()
@@ -45,7 +45,7 @@ class DefaultHostedEventRepository @Inject constructor(
         }
     }
 
-    override suspend fun deleteAllHostedEvents() {
+    override fun deleteAllHostedEvents() {
         appScope.launch {
             Timber.d("Delete all hosted events.")
             hostedEventDao.deleteAll()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
index ed4ff2692cc..fc49593a60f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
@@ -7,9 +7,9 @@ interface HostedEventRepository {
 
     val allHostedEvents: Flow<List<HostedEvent>>
 
-    suspend fun addHostedEvent(event: HostedEvent)
+    fun addHostedEvent(event: HostedEvent)
 
-    suspend fun deleteHostedEvent(event: HostedEvent)
+    fun deleteHostedEvent(event: HostedEvent)
 
-    suspend fun deleteAllHostedEvents()
+    fun deleteAllHostedEvents()
 }

From eccd0f4e891849bcc055213079df8ec152ab3518 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 12:21:55 +0100
Subject: [PATCH 13/36] Change text in EventRegistration TestFragment

---
 .../res/layout/fragment_test_eventregistration.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
index 0218af9aef0..810d4854bee 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_tiny"
                 android:textIsSelectable="true"
-                android:text="After creating an event in the app, it is sent to the server and returned together with a guid, a signature and a QR code."
+                android:text="After creating an event in the app, it is sent to the server and returned together with a guid and a signature."
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/event_title" />

From d21b48cb35ca53f3dceab970b88a52bb0b29b6b7 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 12:33:49 +0100
Subject: [PATCH 14/36] Fix merge issues

---
 .../test/eventregistration/ui/EventRegistrationTestFragment.kt | 3 +++
 .../de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt     | 3 ++-
 .../res/layout/fragment_test_eventregistration.xml             | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
index 6a855ab9733..7ccb3476a11 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/EventRegistrationTestFragment.kt
@@ -1,12 +1,15 @@
 package de.rki.coronawarnapp.test.eventregistration.ui
 
 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
 import de.rki.coronawarnapp.util.di.AutoInject
+import de.rki.coronawarnapp.util.ui.doNavigate
 import de.rki.coronawarnapp.util.ui.viewBindingLazy
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
 import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
index ed0ce7c1e8b..e0ecef22020 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
@@ -18,6 +18,8 @@ import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragm
 import de.rki.coronawarnapp.test.eventregistration.ui.EventRegistrationTestFragmentModule
 import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragment
 import de.rki.coronawarnapp.test.eventregistration.ui.createevent.CreateEventTestFragmentModule
+import de.rki.coronawarnapp.test.eventregistration.ui.qrcode.QrCodeCreationTestFragment
+import de.rki.coronawarnapp.test.eventregistration.ui.qrcode.QrCodeCreationTestFragmentModule
 import de.rki.coronawarnapp.test.eventregistration.ui.showevents.ShowStoredEventsTestFragment
 import de.rki.coronawarnapp.test.eventregistration.ui.showevents.ShowStoredEventsTestFragmentModule
 import de.rki.coronawarnapp.test.keydownload.ui.KeyDownloadTestFragment
@@ -83,5 +85,4 @@ abstract class MainActivityTestModule {
 
     @ContributesAndroidInjector(modules = [ShowStoredEventsTestFragmentModule::class])
     abstract fun showStoredEvents(): ShowStoredEventsTestFragment
-
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
index 7ebdb700076..390245bc422 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_eventregistration.xml
@@ -14,7 +14,6 @@
         android:orientation="vertical"
         android:paddingBottom="32dp">
 
-
         <LinearLayout
             style="@style/Card"
             android:layout_width="match_parent"

From 3f7004b4921a28e604860fd5b00f3358eec6cde2 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 15:18:18 +0100
Subject: [PATCH 15/36] Add parameters from new TechSpec

---
 .../1.json                                    | 24 ++++++--
 .../ui/createevent/CreateEventTestFragment.kt |  9 ++-
 .../createevent/CreateEventTestViewModel.kt   | 57 +++++++++----------
 .../ShowStoredEventsTestFragment.kt           | 14 +++--
 .../res/layout/fragment_test_createevent.xml  |  4 +-
 .../events/DefaultHostedEvent.kt              | 26 ---------
 .../events/DefaultTraceLocation.kt            | 30 ++++++++++
 .../eventregistration/events/HostedEvent.kt   | 18 ------
 .../eventregistration/events/TraceLocation.kt | 21 +++++++
 .../storage/EventRegistrationDatabase.kt      |  7 ++-
 .../storage/dao/HostedEventDao.kt             |  8 +--
 .../entity/EventRegistrationConverters.kt     | 13 +++++
 ...dEventEntity.kt => TraceLocationEntity.kt} | 28 +++++----
 .../repo/DefaultHostedEventRepository.kt      |  8 +--
 .../storage/repo/HostedEventRepository.kt     |  8 +--
 15 files changed, 154 insertions(+), 121 deletions(-)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocation.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt
 rename Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/{HostedEventEntity.kt => TraceLocationEntity.kt} (51%)

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
index 2d929499bbf..04be1a61278 100644
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "6570bad9213df22a0fe02a3f2185da8e",
+    "identityHash": "4920c34b52ab4187f89584baada511ee",
     "entities": [
       {
         "tableName": "hostedEvents",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`guid` TEXT NOT NULL, `description` TEXT NOT NULL, `location` TEXT NOT NULL, `startTime` TEXT, `endTime` TEXT, `defaultCheckInLength` INTEGER, `signature` TEXT NOT NULL, PRIMARY KEY(`guid`))",
+        "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",
@@ -14,6 +14,18 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
           {
             "fieldPath": "description",
             "columnName": "description",
@@ -21,19 +33,19 @@
             "notNull": true
           },
           {
-            "fieldPath": "location",
+            "fieldPath": "address",
             "columnName": "location",
             "affinity": "TEXT",
             "notNull": true
           },
           {
-            "fieldPath": "startTime",
+            "fieldPath": "startDate",
             "columnName": "startTime",
             "affinity": "TEXT",
             "notNull": false
           },
           {
-            "fieldPath": "endTime",
+            "fieldPath": "endDate",
             "columnName": "endTime",
             "affinity": "TEXT",
             "notNull": false
@@ -64,7 +76,7 @@
     "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, '6570bad9213df22a0fe02a3f2185da8e')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4920c34b52ab4187f89584baada511ee')"
     ]
   }
 }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
index 6ee816bea19..3e6daef2373 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestFragment.kt
@@ -40,11 +40,9 @@ class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent), Au
         vm.result.observe2(this) {
             when (it) {
                 is CreateEventTestViewModel.Result.Success ->
-                    binding.resultText.text =
-                        "Successfully stored event: ${it.eventEntity}"
+                    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."
+                    binding.resultText.text = "There is something wrong with your input values, please check again."
             }
         }
     }
@@ -52,8 +50,9 @@ class CreateEventTestFragment : Fragment(R.layout.fragment_test_createevent), Au
     private fun initOnCreateEventClicked() = with(binding) {
         createEventButton.setOnClickListener {
             vm.createEvent(
+                eventOrLocationSpinner.editText!!.text.toString(),
                 eventDescription.text.toString(),
-                eventLocation.text.toString(),
+                eventAddress.text.toString(),
                 eventStartEditText.text.toString(),
                 eventEndEditText.text.toString(),
                 eventDefaultCheckinLengthInMinutes.text.toString()
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
index 4d9eebe6924..d60180064dc 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -1,14 +1,11 @@
 package de.rki.coronawarnapp.test.eventregistration.ui.createevent
 
 import androidx.lifecycle.MutableLiveData
-import com.google.protobuf.ByteString
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import de.rki.coronawarnapp.eventregistration.events.HostedEvent
-import de.rki.coronawarnapp.eventregistration.events.toHostedEvent
+import de.rki.coronawarnapp.eventregistration.events.DefaultTraceLocation
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import de.rki.coronawarnapp.eventregistration.storage.repo.HostedEventRepository
-import de.rki.coronawarnapp.server.protocols.internal.evreg.EventOuterClass
-import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
 import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
@@ -28,8 +25,9 @@ class CreateEventTestViewModel @AssistedInject constructor(
     val result = MutableLiveData<Result>()
 
     fun createEvent(
+        type: String,
         description: String,
-        location: String,
+        address: String,
         start: String,
         end: String,
         defaultCheckInLengthInMinutes: String
@@ -40,35 +38,32 @@ class CreateEventTestViewModel @AssistedInject constructor(
             val endDate =
                 if (end.isBlank()) null else DateTime.parse(end, DateTimeFormat.forPattern("yyyy-MM-dd HH:mm"))
 
-            val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
-            val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
+            /* TODO: wait for new protobuf messages 'TraceLocation' and perform network request to get
+                'SignedTraceLocation' */
 
-            // Backend needs UNIX timestamp in Seconds, not milliseconds
-            val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
-            val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
-
-            // details yet tbd, but we basically sent our event entity to the backend ...
-            val event = EventOuterClass.Event.newBuilder()
-                .setDescription(description)
-                // .setLocation(location) // will probably added in a future protobuf
-                .setStart(startTimeStampSeconds)
-                .setEnd(endTimeStampSeconds)
-                .setDefaultCheckInLengthInMinutes(defaultCheckInLengthInMinutes.toInt())
+            // val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
+            // val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
 
-            // and the server responds with an event object with additional information
-            val serverEvent = event
-                .setGuid(ByteString.copyFrom(UUID.randomUUID().toString().toByteArray())) // Server creates GUID
-                .build()
+            // Backend needs UNIX timestamp in Seconds, not milliseconds
+            // val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
+            // val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
 
-            val signedEvent = SignedEventOuterClass.SignedEvent.newBuilder()
-                .setEvent(serverEvent)
-                .setSignature(ByteString.copyFrom("ServerSignature".toByteArray()))
-                .build()
+            val traceLocationType =
+                if (type == "Event") TraceLocation.Type.TEMPORARY_OTHER else TraceLocation.Type.PERMANENT_OTHER
 
-            val hostedEvent = signedEvent.toHostedEvent()
+            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"
+            )
 
-            hostedEventRepository.addHostedEvent(hostedEvent)
-            result.postValue(Result.Success(hostedEvent))
+            hostedEventRepository.addHostedEvent(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)
@@ -77,6 +72,6 @@ class CreateEventTestViewModel @AssistedInject constructor(
 
     sealed class Result {
         object Error : Result()
-        data class Success(val eventEntity: HostedEvent) : Result()
+        data class Success(val eventEntity: TraceLocation) : Result()
     }
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
index 3873679c1d5..62bd7b04808 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestFragment.kt
@@ -5,7 +5,7 @@ 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.HostedEvent
+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
@@ -32,15 +32,17 @@ class ShowStoredEventsTestFragment : Fragment(R.layout.fragment_test_showstorede
         }
     }
 
-    private fun HostedEvent.getSimpleUIString(): String {
+    private fun TraceLocation.getSimpleUIString(): String {
         return listOf(
             "guid = $guid",
+            "type = $type",
             "description = $description",
-            "location = $location",
-            "startTime = $startTime",
-            "endTime = $endTime",
+            "location = $address",
+            "startTime = $startDate",
+            "endTime = $endDate",
             "defaultCheckInLengthInMinutes = $defaultCheckInLengthInMinutes",
-            "signature = $signature"
+            "signature = $signature",
+            "version = $version"
         ).joinToString(separator = "\n")
     }
 }
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
index 382f7cf057d..afd82d5c5bb 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_createevent.xml
@@ -65,10 +65,10 @@
                 android:layout_marginBottom="@dimen/spacing_tiny">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/event_location"
+                    android:id="@+id/event_address"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="Location"
+                    android:hint="Address"
                     android:maxLines="1"
                     android:padding="@dimen/spacing_tiny"
                     tools:ignore="HardcodedText" />
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
deleted file mode 100644
index 395ae27f1a7..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultHostedEvent.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.events
-
-import de.rki.coronawarnapp.server.protocols.internal.evreg.SignedEventOuterClass
-import org.joda.time.Instant
-
-data class DefaultHostedEvent(
-    override val guid: String,
-    override val description: String,
-    override val location: String,
-    override val startTime: Instant?,
-    override val endTime: Instant?,
-    override val defaultCheckInLengthInMinutes: Int?,
-    override val signature: String
-) : HostedEvent
-
-fun SignedEventOuterClass.SignedEvent.toHostedEvent(): HostedEvent =
-    DefaultHostedEvent(
-        guid = event.guid.toString(),
-        description = event.description,
-        location = "hardcodedLocation", // event.location,
-        // backend needs UNIX timestamp in seconds, so we have to multiply it by 1000 to get milliseconds
-        startTime = Instant.ofEpochMilli(event.start.toLong() * 1000),
-        endTime = Instant.ofEpochMilli(event.end.toLong() * 1000),
-        defaultCheckInLengthInMinutes = event.defaultCheckInLengthInMinutes,
-        signature = signature.toString()
-    )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
new file mode 100644
index 00000000000..20c438acc3a
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
@@ -0,0 +1,30 @@
+package de.rki.coronawarnapp.eventregistration.events
+
+import org.joda.time.Instant
+
+const val TRACE_LOCATION_VERSION = 1
+
+data class DefaultTraceLocation(
+    override val guid: String,
+    override val type: TraceLocation.Type,
+    override val description: String,
+    override val address: String,
+    override val startDate: Instant?,
+    override val endDate: Instant?,
+    override val defaultCheckInLengthInMinutes: Int?,
+    override val signature: String,
+    override val version: Int = TRACE_LOCATION_VERSION,
+) : TraceLocation
+
+/*fun SignedEventOuterClass.SignedEvent.toHostedEvent(): TraceLocation =
+    DefaultTraceLocation(
+        guid = event.guid.toString(),
+        type = enumValues<TraceLocation.Type>()[type],
+        description = event.description,
+        address = "hardcodedLocation", // event.location,
+        // backend needs UNIX timestamp in seconds, so we have to multiply it by 1000 to get milliseconds
+        startDate = Instant.ofEpochMilli(event.start.toLong() * 1000),
+        endDate = Instant.ofEpochMilli(event.end.toLong() * 1000),
+        defaultCheckInLengthInMinutes = event.defaultCheckInLengthInMinutes,
+        signature = signature.toString()
+    )*/
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
deleted file mode 100644
index 78833b56c41..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/HostedEvent.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.events
-
-import org.joda.time.Instant
-
-/**
- * A verified event that the host has been registered.
- * If you are a host, this is the event you created successfully.
- */
-interface HostedEvent {
-
-    val guid: String
-    val description: String
-    val location: String
-    val startTime: Instant?
-    val endTime: Instant?
-    val defaultCheckInLengthInMinutes: Int?
-    val signature: String
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocation.kt
new file mode 100644
index 00000000000..1316ea7996b
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/TraceLocation.kt
@@ -0,0 +1,21 @@
+package de.rki.coronawarnapp.eventregistration.events
+
+import org.joda.time.Instant
+
+interface TraceLocation {
+    val guid: String
+    val version: Int
+    val type: Type
+    val description: String
+    val address: String
+    val startDate: Instant?
+    val endDate: Instant?
+    val defaultCheckInLengthInMinutes: Int?
+    val signature: String
+
+    enum class Type(val value: Int) {
+        UNSPECIFIED(0),
+        PERMANENT_OTHER(1),
+        TEMPORARY_OTHER(2)
+    }
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
index 0b41bd7cd1e..2c7d50821f6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
@@ -6,19 +6,20 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.HostedEventEntity
+import de.rki.coronawarnapp.eventregistration.storage.entity.EventRegistrationConverters
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import de.rki.coronawarnapp.util.database.CommonConverters
 import de.rki.coronawarnapp.util.di.AppContext
 import javax.inject.Inject
 
 @Database(
     entities = [
-        HostedEventEntity::class
+        TraceLocationEntity::class
     ],
     version = 1,
     exportSchema = true
 )
-@TypeConverters(CommonConverters::class)
+@TypeConverters(CommonConverters::class, EventRegistrationConverters::class)
 abstract class EventRegistrationDatabase : RoomDatabase() {
 
     abstract fun hostedEventsDao(): HostedEventDao
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
index 88044d5bb06..52515618a5a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
-import de.rki.coronawarnapp.eventregistration.storage.entity.HostedEventEntity
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -12,13 +12,13 @@ import kotlinx.coroutines.flow.Flow
 abstract class HostedEventDao {
 
     @Query("SELECT * FROM hostedEvents")
-    abstract fun allEntries(): Flow<List<HostedEventEntity>>
+    abstract fun allEntries(): Flow<List<TraceLocationEntity>>
 
     @Insert
-    abstract suspend fun insert(hostedEvent: HostedEventEntity)
+    abstract suspend fun insert(hostedEvent: TraceLocationEntity)
 
     @Delete
-    abstract suspend fun delete(hostedEvent: HostedEventEntity)
+    abstract suspend fun delete(hostedEvent: TraceLocationEntity)
 
     @Query("DELETE FROM hostedEvents")
     abstract suspend fun deleteAll()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt
new file mode 100644
index 00000000000..5cef36d0066
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt
@@ -0,0 +1,13 @@
+package de.rki.coronawarnapp.eventregistration.storage.entity
+
+import androidx.room.TypeConverter
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+
+class EventRegistrationConverters {
+
+    @TypeConverter
+    fun toTraceLocationType(value: Int) = enumValues<TraceLocation.Type>()[value]
+
+    @TypeConverter
+    fun fromTraceLocationType(type: TraceLocation.Type) = type.value
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
similarity index 51%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
index c0cdcae9aac..58c81c9aca0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/HostedEventEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
@@ -4,31 +4,35 @@ import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import kotlinx.parcelize.Parcelize
 import org.joda.time.Instant
 
 @Parcelize
 @Entity(tableName = "hostedEvents")
-data class HostedEventEntity(
+data class TraceLocationEntity(
 
     @PrimaryKey @ColumnInfo(name = "guid") override val guid: String,
+    @ColumnInfo(name = "version") override val version: Int,
+    @ColumnInfo(name = "type") override val type: TraceLocation.Type,
     @ColumnInfo(name = "description") override val description: String,
-    @ColumnInfo(name = "location") override val location: String,
-    @ColumnInfo(name = "startTime") override val startTime: Instant?,
-    @ColumnInfo(name = "endTime") override val endTime: Instant?,
+    @ColumnInfo(name = "location") override val address: String,
+    @ColumnInfo(name = "startTime") override val startDate: Instant?,
+    @ColumnInfo(name = "endTime") override val endDate: Instant?,
     @ColumnInfo(name = "defaultCheckInLength") override val defaultCheckInLengthInMinutes: Int?,
     @ColumnInfo(name = "signature") override val signature: String
 
-) : HostedEvent, Parcelable
+) : TraceLocation, Parcelable
 
-fun HostedEvent.toHostedEventEntity(): HostedEventEntity =
-    HostedEventEntity(
+fun TraceLocation.toHostedEventEntity(): TraceLocationEntity =
+    TraceLocationEntity(
         guid = guid,
+        type = type,
         description = description,
-        location = "hardcodedLocation", // event.location will be in the protobuf at some point in the future
-        startTime = startTime,
-        endTime = endTime,
+        address = address,
+        startDate = startDate,
+        endDate = endDate,
         defaultCheckInLengthInMinutes = defaultCheckInLengthInMinutes,
-        signature = signature
+        signature = signature,
+        version = version
     )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
index e7de97a0283..265fba872b4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
@@ -1,6 +1,6 @@
 package de.rki.coronawarnapp.eventregistration.storage.repo
 
-import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase
 import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
 import de.rki.coronawarnapp.eventregistration.storage.entity.toHostedEventEntity
@@ -26,10 +26,10 @@ class DefaultHostedEventRepository @Inject constructor(
         eventRegistrationDatabase.hostedEventsDao()
     }
 
-    override val allHostedEvents: Flow<List<HostedEvent>>
+    override val allHostedEvents: Flow<List<TraceLocation>>
         get() = hostedEventDao.allEntries() // TODO: SORTING
 
-    override fun addHostedEvent(event: HostedEvent) {
+    override fun addHostedEvent(event: TraceLocation) {
         appScope.launch {
             Timber.d("Add hosted event: $event")
             val eventEntity = event.toHostedEventEntity()
@@ -37,7 +37,7 @@ class DefaultHostedEventRepository @Inject constructor(
         }
     }
 
-    override fun deleteHostedEvent(event: HostedEvent) {
+    override fun deleteHostedEvent(event: TraceLocation) {
         appScope.launch {
             Timber.d("Delete hosted event: $event")
             val eventEntity = event.toHostedEventEntity()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
index fc49593a60f..df3926f9659 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
@@ -1,15 +1,15 @@
 package de.rki.coronawarnapp.eventregistration.storage.repo
 
-import de.rki.coronawarnapp.eventregistration.events.HostedEvent
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import kotlinx.coroutines.flow.Flow
 
 interface HostedEventRepository {
 
-    val allHostedEvents: Flow<List<HostedEvent>>
+    val allHostedEvents: Flow<List<TraceLocation>>
 
-    fun addHostedEvent(event: HostedEvent)
+    fun addHostedEvent(event: TraceLocation)
 
-    fun deleteHostedEvent(event: HostedEvent)
+    fun deleteHostedEvent(event: TraceLocation)
 
     fun deleteAllHostedEvents()
 }

From a5385d5b839b5bd366970cedbff88f60798b3990 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 15:47:42 +0100
Subject: [PATCH 16/36] Change wording from 'hosted Events' to 'TraceLocation'

---
 .../1.json                                    |  6 ++--
 .../createevent/CreateEventTestViewModel.kt   |  6 ++--
 .../ShowStoredEventsTestViewModel.kt          |  8 ++---
 .../storage/EventRegistrationDatabase.kt      |  4 +--
 .../storage/EventRegistrationStorageModule.kt |  8 ++---
 ...{HostedEventDao.kt => TraceLocationDao.kt} | 10 +++---
 .../storage/entity/TraceLocationEntity.kt     |  4 +--
 ...y.kt => DefaultTraceLocationRepository.kt} | 32 +++++++++----------
 .../storage/repo/HostedEventRepository.kt     | 15 ---------
 .../storage/repo/TraceLocationRepository.kt   | 15 +++++++++
 10 files changed, 54 insertions(+), 54 deletions(-)
 rename Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/{HostedEventDao.kt => TraceLocationDao.kt} (64%)
 rename Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/{DefaultHostedEventRepository.kt => DefaultTraceLocationRepository.kt} (52%)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
index 04be1a61278..0f774cbaa88 100644
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
@@ -2,10 +2,10 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "4920c34b52ab4187f89584baada511ee",
+    "identityHash": "65f3afcf5d1c6bf0e15c9b721418e49e",
     "entities": [
       {
-        "tableName": "hostedEvents",
+        "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": [
           {
@@ -76,7 +76,7 @@
     "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, '4920c34b52ab4187f89584baada511ee')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '65f3afcf5d1c6bf0e15c9b721418e49e')"
     ]
   }
 }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
index d60180064dc..bf36cecd981 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -5,7 +5,7 @@ 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.HostedEventRepository
+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
@@ -16,7 +16,7 @@ import java.util.UUID
 
 class CreateEventTestViewModel @AssistedInject constructor(
     dispatcherProvider: DispatcherProvider,
-    private val hostedEventRepository: HostedEventRepository
+    private val traceLocationRepository: TraceLocationRepository
 ) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
 
     @AssistedFactory
@@ -62,7 +62,7 @@ class CreateEventTestViewModel @AssistedInject constructor(
                 "ServerSignature"
             )
 
-            hostedEventRepository.addHostedEvent(traceLocation)
+            traceLocationRepository.addTraceLocation(traceLocation)
             result.postValue(Result.Success(traceLocation))
         } catch (exception: Exception) {
             Timber.d("Something went wrong when trying to create an event: $exception")
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
index 5259fcfca79..f85513da0a4 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/showevents/ShowStoredEventsTestViewModel.kt
@@ -3,22 +3,22 @@ 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.HostedEventRepository
+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 hostedEventRepository: HostedEventRepository
+    private val traceLocationRepository: TraceLocationRepository
 ) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
 
     @AssistedFactory
     interface Factory : SimpleCWAViewModelFactory<ShowStoredEventsTestViewModel>
 
-    val storedEvents = hostedEventRepository.allHostedEvents.asLiveData()
+    val storedEvents = traceLocationRepository.allTraceLocations.asLiveData()
 
     fun deleteAllEvents() {
-        hostedEventRepository.deleteAllHostedEvents()
+        traceLocationRepository.deleteAllTraceLocations()
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
index 2c7d50821f6..7ab766872e0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
@@ -5,7 +5,7 @@ import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
+import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
 import de.rki.coronawarnapp.eventregistration.storage.entity.EventRegistrationConverters
 import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import de.rki.coronawarnapp.util.database.CommonConverters
@@ -22,7 +22,7 @@ import javax.inject.Inject
 @TypeConverters(CommonConverters::class, EventRegistrationConverters::class)
 abstract class EventRegistrationDatabase : RoomDatabase() {
 
-    abstract fun hostedEventsDao(): HostedEventDao
+    abstract fun traceLocation(): TraceLocationDao
 
     class Factory @Inject constructor(@AppContext private val context: Context) {
         fun create(): EventRegistrationDatabase =
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
index 18fc361d9e6..4542cb1a153 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.eventregistration.storage
 
 import dagger.Module
 import dagger.Provides
-import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultHostedEventRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.HostedEventRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
 import javax.inject.Singleton
 
 @Module
@@ -11,6 +11,6 @@ class EventRegistrationStorageModule {
 
     @Singleton
     @Provides
-    fun hostedEventRepository(defaultHostedEventRepository: DefaultHostedEventRepository): HostedEventRepository =
-        defaultHostedEventRepository
+    fun traceLocationRepository(defaultTraceLocationRepository: DefaultTraceLocationRepository): TraceLocationRepository =
+        defaultTraceLocationRepository
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt
similarity index 64%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt
index 52515618a5a..888f5e3c4bc 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/HostedEventDao.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/dao/TraceLocationDao.kt
@@ -9,17 +9,17 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 @Suppress("UnnecessaryAbstractClass")
-abstract class HostedEventDao {
+abstract class TraceLocationDao {
 
-    @Query("SELECT * FROM hostedEvents")
+    @Query("SELECT * FROM traceLocations")
     abstract fun allEntries(): Flow<List<TraceLocationEntity>>
 
     @Insert
-    abstract suspend fun insert(hostedEvent: TraceLocationEntity)
+    abstract suspend fun insert(traceLocation: TraceLocationEntity)
 
     @Delete
-    abstract suspend fun delete(hostedEvent: TraceLocationEntity)
+    abstract suspend fun delete(traceLocation: TraceLocationEntity)
 
-    @Query("DELETE FROM hostedEvents")
+    @Query("DELETE FROM traceLocations")
     abstract suspend fun deleteAll()
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
index 58c81c9aca0..c9c2b529a12 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
@@ -9,7 +9,7 @@ import kotlinx.parcelize.Parcelize
 import org.joda.time.Instant
 
 @Parcelize
-@Entity(tableName = "hostedEvents")
+@Entity(tableName = "traceLocations")
 data class TraceLocationEntity(
 
     @PrimaryKey @ColumnInfo(name = "guid") override val guid: String,
@@ -24,7 +24,7 @@ data class TraceLocationEntity(
 
 ) : TraceLocation, Parcelable
 
-fun TraceLocation.toHostedEventEntity(): TraceLocationEntity =
+fun TraceLocation.toTraceLocationEntity(): TraceLocationEntity =
     TraceLocationEntity(
         guid = guid,
         type = type,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
similarity index 52%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index 265fba872b4..261615e7d6c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultHostedEventRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.eventregistration.storage.repo
 
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase
-import de.rki.coronawarnapp.eventregistration.storage.dao.HostedEventDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.toHostedEventEntity
+import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
+import de.rki.coronawarnapp.eventregistration.storage.entity.toTraceLocationEntity
 import de.rki.coronawarnapp.util.coroutine.AppScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -13,42 +13,42 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class DefaultHostedEventRepository @Inject constructor(
+class DefaultTraceLocationRepository @Inject constructor(
     eventRegistrationDatabaseFactory: EventRegistrationDatabase.Factory,
     @AppScope private val appScope: CoroutineScope
-) : HostedEventRepository {
+) : TraceLocationRepository {
 
     private val eventRegistrationDatabase: EventRegistrationDatabase by lazy {
         eventRegistrationDatabaseFactory.create()
     }
 
-    private val hostedEventDao: HostedEventDao by lazy {
-        eventRegistrationDatabase.hostedEventsDao()
+    private val traceLocationDao: TraceLocationDao by lazy {
+        eventRegistrationDatabase.traceLocation()
     }
 
-    override val allHostedEvents: Flow<List<TraceLocation>>
-        get() = hostedEventDao.allEntries() // TODO: SORTING
+    override val allTraceLocations: Flow<List<TraceLocation>>
+        get() = traceLocationDao.allEntries() // TODO: SORTING
 
-    override fun addHostedEvent(event: TraceLocation) {
+    override fun addTraceLocation(event: TraceLocation) {
         appScope.launch {
             Timber.d("Add hosted event: $event")
-            val eventEntity = event.toHostedEventEntity()
-            hostedEventDao.insert(eventEntity)
+            val eventEntity = event.toTraceLocationEntity()
+            traceLocationDao.insert(eventEntity)
         }
     }
 
-    override fun deleteHostedEvent(event: TraceLocation) {
+    override fun deleteTraceLocation(event: TraceLocation) {
         appScope.launch {
             Timber.d("Delete hosted event: $event")
-            val eventEntity = event.toHostedEventEntity()
-            hostedEventDao.delete(eventEntity)
+            val eventEntity = event.toTraceLocationEntity()
+            traceLocationDao.delete(eventEntity)
         }
     }
 
-    override fun deleteAllHostedEvents() {
+    override fun deleteAllTraceLocations() {
         appScope.launch {
             Timber.d("Delete all hosted events.")
-            hostedEventDao.deleteAll()
+            traceLocationDao.deleteAll()
         }
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
deleted file mode 100644
index df3926f9659..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/HostedEventRepository.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.storage.repo
-
-import de.rki.coronawarnapp.eventregistration.events.TraceLocation
-import kotlinx.coroutines.flow.Flow
-
-interface HostedEventRepository {
-
-    val allHostedEvents: Flow<List<TraceLocation>>
-
-    fun addHostedEvent(event: TraceLocation)
-
-    fun deleteHostedEvent(event: TraceLocation)
-
-    fun deleteAllHostedEvents()
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
new file mode 100644
index 00000000000..88576a9cfc9
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
@@ -0,0 +1,15 @@
+package de.rki.coronawarnapp.eventregistration.storage.repo
+
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import kotlinx.coroutines.flow.Flow
+
+interface TraceLocationRepository {
+
+    val allTraceLocations: Flow<List<TraceLocation>>
+
+    fun addTraceLocation(event: TraceLocation)
+
+    fun deleteTraceLocation(event: TraceLocation)
+
+    fun deleteAllTraceLocations()
+}

From 58455905cdf3d8f9ff4edf593372973eaf46ac93 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 15:54:45 +0100
Subject: [PATCH 17/36] Delete event registration database on app reset

---
 .../storage/repo/DefaultTraceLocationRepository.kt         | 7 +++++++
 .../storage/repo/TraceLocationRepository.kt                | 2 ++
 .../src/main/java/de/rki/coronawarnapp/util/DataReset.kt   | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index 261615e7d6c..1efe1a324f4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -51,4 +51,11 @@ class DefaultTraceLocationRepository @Inject constructor(
             traceLocationDao.deleteAll()
         }
     }
+
+    override fun clear() {
+        appScope.launch {
+            Timber.d("Deleting all tables of event registration database.")
+            eventRegistrationDatabase.clearAllTables()
+        }
+    }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
index 88576a9cfc9..3bf2d5fc4e7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
@@ -12,4 +12,6 @@ interface TraceLocationRepository {
     fun deleteTraceLocation(event: TraceLocation)
 
     fun deleteAllTraceLocations()
+
+    fun clear()
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
index 28805584195..9e8a4f39385 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
@@ -10,6 +10,7 @@ import de.rki.coronawarnapp.datadonation.analytics.storage.AnalyticsSettings
 import de.rki.coronawarnapp.datadonation.survey.SurveySettings
 import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
 import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
 import de.rki.coronawarnapp.main.CWASettings
 import de.rki.coronawarnapp.nearby.modules.detectiontracker.ExposureDetectionTracker
 import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
@@ -44,7 +45,8 @@ class DataReset @Inject constructor(
     private val statisticsProvider: StatisticsProvider,
     private val surveySettings: SurveySettings,
     private val analyticsSettings: AnalyticsSettings,
-    private val analytics: Analytics
+    private val analytics: Analytics,
+    private val traceLocationRepository: TraceLocationRepository
 ) {
 
     private val mutex = Mutex()
@@ -83,6 +85,8 @@ class DataReset @Inject constructor(
 
         statisticsProvider.clear()
 
+        traceLocationRepository.clear()
+
         Timber.w("CWA LOCAL DATA DELETION COMPLETED.")
     }
 }

From 911ea7b2e7c16d4199387a8dc05a37c383182271 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 15:57:29 +0100
Subject: [PATCH 18/36] Fix detect issue 'MaxLineLength'

---
 .../storage/EventRegistrationStorageModule.kt                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
index 4542cb1a153..da1a5c5d6e3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
@@ -11,6 +11,6 @@ class EventRegistrationStorageModule {
 
     @Singleton
     @Provides
-    fun traceLocationRepository(defaultTraceLocationRepository: DefaultTraceLocationRepository): TraceLocationRepository =
-        defaultTraceLocationRepository
+    fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository =
+        defaultTraceLocationRepo
 }

From 40bfcf5468917d6fa090d33b849c6dc50d99b98a Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 16:03:54 +0100
Subject: [PATCH 19/36] Remove parcelable from TraceLocationEntity.kt

---
 .../storage/entity/TraceLocationEntity.kt     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
index c9c2b529a12..5840b47ccc1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
@@ -1,28 +1,25 @@
 package de.rki.coronawarnapp.eventregistration.storage.entity
 
-import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
-import kotlinx.parcelize.Parcelize
 import org.joda.time.Instant
 
-@Parcelize
 @Entity(tableName = "traceLocations")
 data class TraceLocationEntity(
 
-    @PrimaryKey @ColumnInfo(name = "guid") override val guid: String,
-    @ColumnInfo(name = "version") override val version: Int,
-    @ColumnInfo(name = "type") override val type: TraceLocation.Type,
-    @ColumnInfo(name = "description") override val description: String,
-    @ColumnInfo(name = "location") override val address: String,
-    @ColumnInfo(name = "startTime") override val startDate: Instant?,
-    @ColumnInfo(name = "endTime") override val endDate: Instant?,
-    @ColumnInfo(name = "defaultCheckInLength") override val defaultCheckInLengthInMinutes: Int?,
-    @ColumnInfo(name = "signature") override val signature: String
+    @PrimaryKey @ColumnInfo(name = "guid") val guid: String,
+    @ColumnInfo(name = "version") val version: Int,
+    @ColumnInfo(name = "type") val type: TraceLocation.Type,
+    @ColumnInfo(name = "description") val description: String,
+    @ColumnInfo(name = "location") val address: String,
+    @ColumnInfo(name = "startTime") val startDate: Instant?,
+    @ColumnInfo(name = "endTime") val endDate: Instant?,
+    @ColumnInfo(name = "defaultCheckInLength") val defaultCheckInLengthInMinutes: Int?,
+    @ColumnInfo(name = "signature") val signature: String
 
-) : TraceLocation, Parcelable
+)
 
 fun TraceLocation.toTraceLocationEntity(): TraceLocationEntity =
     TraceLocationEntity(

From 0cd1bea26fe959c2c01f31ead733d67b6327ca0e Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 16:25:27 +0100
Subject: [PATCH 20/36] Map TraceLocationEntity to TraceLocation in
 TraceLocationRepository

---
 .../events/DefaultTraceLocation.kt                | 15 +++++++++++++++
 .../repo/DefaultTraceLocationRepository.kt        |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
index 20c438acc3a..97244fdb4bb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.eventregistration.events
 
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import org.joda.time.Instant
 
 const val TRACE_LOCATION_VERSION = 1
@@ -16,6 +17,20 @@ data class DefaultTraceLocation(
     override val version: Int = TRACE_LOCATION_VERSION,
 ) : TraceLocation
 
+fun List<TraceLocationEntity>.toTraceLocations() = this.map { it.toTraceLocation() }
+
+fun TraceLocationEntity.toTraceLocation() = DefaultTraceLocation(
+    guid,
+    type,
+    description,
+    address,
+    startDate,
+    endDate,
+    defaultCheckInLengthInMinutes,
+    signature,
+    version
+)
+
 /*fun SignedEventOuterClass.SignedEvent.toHostedEvent(): TraceLocation =
     DefaultTraceLocation(
         guid = event.guid.toString(),
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index 1efe1a324f4..12e9a11741e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -1,12 +1,14 @@
 package de.rki.coronawarnapp.eventregistration.storage.repo
 
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import de.rki.coronawarnapp.eventregistration.events.toTraceLocations
 import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase
 import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
 import de.rki.coronawarnapp.eventregistration.storage.entity.toTraceLocationEntity
 import de.rki.coronawarnapp.util.coroutine.AppScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -27,7 +29,7 @@ class DefaultTraceLocationRepository @Inject constructor(
     }
 
     override val allTraceLocations: Flow<List<TraceLocation>>
-        get() = traceLocationDao.allEntries() // TODO: SORTING
+        get() = traceLocationDao.allEntries().map { it.toTraceLocations() }
 
     override fun addTraceLocation(event: TraceLocation) {
         appScope.launch {

From 65cdb5c338eab1f4e22df9dd921b85843dc004e4 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 16:37:13 +0100
Subject: [PATCH 21/36] Use the Instant.seconds extension function

---
 .../ui/createevent/CreateEventTestViewModel.kt            | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
index bf36cecd981..3668a469297 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/eventregistration/ui/createevent/CreateEventTestViewModel.kt
@@ -6,6 +6,7 @@ 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
@@ -41,12 +42,9 @@ class CreateEventTestViewModel @AssistedInject constructor(
             /* TODO: wait for new protobuf messages 'TraceLocation' and perform network request to get
                 'SignedTraceLocation' */
 
-            // val startTimeStampMillis = startDate?.toInstant()?.millis ?: 0
-            // val endTimeStampMillis = endDate?.toInstant()?.millis ?: 0
-
             // Backend needs UNIX timestamp in Seconds, not milliseconds
-            // val startTimeStampSeconds = (startTimeStampMillis / 1000).toInt()
-            // val endTimeStampSeconds = (endTimeStampMillis / 1000).toInt()
+            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

From b6ca9fab099ff70560c615b5be7b14046fa2d058 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Mon, 8 Mar 2021 16:46:19 +0100
Subject: [PATCH 22/36] Use existing EventRegistrationModule.kt instead of
 creating a new one

---
 .../eventregistration/EventRegistrationModule.kt | 10 +++++++++-
 .../storage/EventRegistrationStorageModule.kt    | 16 ----------------
 .../de/rki/coronawarnapp/ui/ActivityBinder.kt    |  4 +---
 3 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
index b9234ea0f4f..185d6926746 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
@@ -1,9 +1,17 @@
 package de.rki.coronawarnapp.eventregistration
 
 import dagger.Module
+import dagger.Provides
+import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
+import javax.inject.Singleton
 
 @Suppress("EmptyClassBlock")
 @Module
 class EventRegistrationModule {
-    // TODO
+
+    @Singleton
+    @Provides
+    fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository =
+        defaultTraceLocationRepo
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
deleted file mode 100644
index da1a5c5d6e3..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationStorageModule.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.storage
-
-import dagger.Module
-import dagger.Provides
-import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
-import javax.inject.Singleton
-
-@Module
-class EventRegistrationStorageModule {
-
-    @Singleton
-    @Provides
-    fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository =
-        defaultTraceLocationRepo
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
index f9b610e8a33..4f190973a29 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/ActivityBinder.kt
@@ -5,7 +5,6 @@ import dagger.android.ContributesAndroidInjector
 import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryRetentionModule
 import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryStorageModule
 import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryUIModule
-import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationStorageModule
 import de.rki.coronawarnapp.ui.launcher.LauncherActivity
 import de.rki.coronawarnapp.ui.launcher.LauncherActivityModule
 import de.rki.coronawarnapp.ui.main.MainActivity
@@ -17,8 +16,7 @@ import de.rki.coronawarnapp.ui.onboarding.OnboardingActivityModule
 @Module(
     includes = [
         ContactDiaryStorageModule::class,
-        ContactDiaryRetentionModule::class,
-        EventRegistrationStorageModule::class
+        ContactDiaryRetentionModule::class
     ]
 )
 abstract class ActivityBinder {

From 8cdad4bbeb140c035c49bddf9421d0963fcf7fec Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Tue, 9 Mar 2021 14:48:56 +0100
Subject: [PATCH 23/36] Only delete traceLocations on App reset instead of all
 tables in TraceLocationRepository.kt

---
 .../storage/repo/DefaultTraceLocationRepository.kt         | 7 -------
 .../storage/repo/TraceLocationRepository.kt                | 2 --
 .../src/main/java/de/rki/coronawarnapp/util/DataReset.kt   | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index 12e9a11741e..c6f028b5fca 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -53,11 +53,4 @@ class DefaultTraceLocationRepository @Inject constructor(
             traceLocationDao.deleteAll()
         }
     }
-
-    override fun clear() {
-        appScope.launch {
-            Timber.d("Deleting all tables of event registration database.")
-            eventRegistrationDatabase.clearAllTables()
-        }
-    }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
index 3bf2d5fc4e7..88576a9cfc9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/TraceLocationRepository.kt
@@ -12,6 +12,4 @@ interface TraceLocationRepository {
     fun deleteTraceLocation(event: TraceLocation)
 
     fun deleteAllTraceLocations()
-
-    fun clear()
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
index 9e8a4f39385..9b01417965c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
@@ -85,7 +85,7 @@ class DataReset @Inject constructor(
 
         statisticsProvider.clear()
 
-        traceLocationRepository.clear()
+        traceLocationRepository.deleteAllTraceLocations()
 
         Timber.w("CWA LOCAL DATA DELETION COMPLETED.")
     }

From f4fa24cecbc364a1f4e114571ccabcd077efed71 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 10 Mar 2021 16:24:04 +0100
Subject: [PATCH 24/36] Add named parameters to TraceLocation mapping

---
 .../events/DefaultTraceLocation.kt             | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
index 97244fdb4bb..f792ebf9ea5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocation.kt
@@ -20,15 +20,15 @@ data class DefaultTraceLocation(
 fun List<TraceLocationEntity>.toTraceLocations() = this.map { it.toTraceLocation() }
 
 fun TraceLocationEntity.toTraceLocation() = DefaultTraceLocation(
-    guid,
-    type,
-    description,
-    address,
-    startDate,
-    endDate,
-    defaultCheckInLengthInMinutes,
-    signature,
-    version
+    guid = guid,
+    type = type,
+    description = description,
+    address = address,
+    startDate = startDate,
+    endDate = endDate,
+    defaultCheckInLengthInMinutes = defaultCheckInLengthInMinutes,
+    signature = signature,
+    version = version
 )
 
 /*fun SignedEventOuterClass.SignedEvent.toHostedEvent(): TraceLocation =

From 93968db83093772ea8976ded04a1a2a020520039 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 10 Mar 2021 16:38:04 +0100
Subject: [PATCH 25/36] Add unit test for TraceLocation Mapper

---
 .../1.json                                    |  12 +-
 .../storage/entity/TraceLocationEntity.kt     |   6 +-
 .../events/DefaultTraceLocationKtTest.kt      | 110 ++++++++++++++++++
 3 files changed, 119 insertions(+), 9 deletions(-)
 create mode 100644 Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
index 0f774cbaa88..c9b7ba15e2d 100644
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "65f3afcf5d1c6bf0e15c9b721418e49e",
+    "identityHash": "5a4b44977bfb30cbe4204577dd194286",
     "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`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`guid` TEXT NOT NULL, `version` INTEGER NOT NULL, `type` INTEGER NOT NULL, `description` TEXT NOT NULL, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` TEXT, `defaultCheckInLength` INTEGER, `signature` TEXT NOT NULL, PRIMARY KEY(`guid`))",
         "fields": [
           {
             "fieldPath": "guid",
@@ -34,19 +34,19 @@
           },
           {
             "fieldPath": "address",
-            "columnName": "location",
+            "columnName": "address",
             "affinity": "TEXT",
             "notNull": true
           },
           {
             "fieldPath": "startDate",
-            "columnName": "startTime",
+            "columnName": "startDate",
             "affinity": "TEXT",
             "notNull": false
           },
           {
             "fieldPath": "endDate",
-            "columnName": "endTime",
+            "columnName": "endDate",
             "affinity": "TEXT",
             "notNull": false
           },
@@ -76,7 +76,7 @@
     "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')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5a4b44977bfb30cbe4204577dd194286')"
     ]
   }
 }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
index 5840b47ccc1..39988eccd22 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
@@ -13,9 +13,9 @@ data class TraceLocationEntity(
     @ColumnInfo(name = "version") val version: Int,
     @ColumnInfo(name = "type") val type: TraceLocation.Type,
     @ColumnInfo(name = "description") val description: String,
-    @ColumnInfo(name = "location") val address: String,
-    @ColumnInfo(name = "startTime") val startDate: Instant?,
-    @ColumnInfo(name = "endTime") val endDate: Instant?,
+    @ColumnInfo(name = "address") val address: String,
+    @ColumnInfo(name = "startDate") val startDate: Instant?,
+    @ColumnInfo(name = "endDate") val endDate: Instant?,
     @ColumnInfo(name = "defaultCheckInLength") val defaultCheckInLengthInMinutes: Int?,
     @ColumnInfo(name = "signature") val signature: String
 
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt
new file mode 100644
index 00000000000..4d605a308ad
--- /dev/null
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt
@@ -0,0 +1,110 @@
+package de.rki.coronawarnapp.eventregistration.events
+
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
+import io.kotest.matchers.shouldBe
+import org.joda.time.Instant
+import org.junit.jupiter.api.Test
+
+internal class DefaultTraceLocationKtTest {
+
+    @Test
+    fun `toTraceLocation() should map to correct object when providing all arguments`() {
+        TraceLocationEntity(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.TEMPORARY_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+            endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+            defaultCheckInLengthInMinutes = 15,
+            signature = "signature"
+        ).toTraceLocation() shouldBe DefaultTraceLocation(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.TEMPORARY_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+            endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+            defaultCheckInLengthInMinutes = 15,
+            signature = "signature"
+        )
+    }
+
+    @Test
+    fun `toTraceLocation() should map to correct object when providing only arguments that are required`() {
+        TraceLocationEntity(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.PERMANENT_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = null,
+            endDate = null,
+            defaultCheckInLengthInMinutes = null,
+            signature = "signature"
+        ).toTraceLocation() shouldBe DefaultTraceLocation(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.PERMANENT_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = null,
+            endDate = null,
+            defaultCheckInLengthInMinutes = null,
+            signature = "signature"
+        )
+    }
+
+    @Test
+    fun `toTraceLocations() should map a list of TraceLocationEntities correctly`() {
+        listOf(
+            TraceLocationEntity(
+                guid = "TestGuid1",
+                version = 1,
+                type = TraceLocation.Type.TEMPORARY_OTHER,
+                description = "TestTraceLocation1",
+                address = "TestTraceLocationAddress1",
+                startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+                endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+                defaultCheckInLengthInMinutes = 15,
+                signature = "signature"
+            ),
+            TraceLocationEntity(
+                guid = "TestGuid2",
+                version = 1,
+                type = TraceLocation.Type.PERMANENT_OTHER,
+                description = "TestTraceLocation2",
+                address = "TestTraceLocationAddress2",
+                startDate = null,
+                endDate = null,
+                defaultCheckInLengthInMinutes = null,
+                signature = "signature"
+            )
+        ).toTraceLocations() shouldBe listOf(
+            DefaultTraceLocation(
+                guid = "TestGuid1",
+                version = 1,
+                type = TraceLocation.Type.TEMPORARY_OTHER,
+                description = "TestTraceLocation1",
+                address = "TestTraceLocationAddress1",
+                startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+                endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+                defaultCheckInLengthInMinutes = 15,
+                signature = "signature"
+            ),
+            DefaultTraceLocation(
+                guid = "TestGuid2",
+                version = 1,
+                type = TraceLocation.Type.PERMANENT_OTHER,
+                description = "TestTraceLocation2",
+                address = "TestTraceLocationAddress2",
+                startDate = null,
+                endDate = null,
+                defaultCheckInLengthInMinutes = null,
+                signature = "signature"
+            )
+        )
+    }
+}
\ No newline at end of file

From d27347fa2d4b8b815071829175e42fef75bf3ec7 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 10 Mar 2021 17:04:35 +0100
Subject: [PATCH 26/36] Add unit tests for EventRegistrationConverters

---
 .../entity/EventRegistrationConvertersTest.kt | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt

diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt
new file mode 100644
index 00000000000..74b72cb75e1
--- /dev/null
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt
@@ -0,0 +1,28 @@
+package de.rki.coronawarnapp.eventregistration.storage.entity
+
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import io.kotest.matchers.shouldBe
+import org.junit.jupiter.api.Test
+
+internal class EventRegistrationConvertersTest {
+
+    private val converter = EventRegistrationConverters()
+
+    @Test
+    fun `toTraceLocationType() should convert different integer values to correct TraceLocation Types`() {
+        with(converter) {
+            toTraceLocationType(0) shouldBe TraceLocation.Type.UNSPECIFIED
+            toTraceLocationType(1) shouldBe TraceLocation.Type.PERMANENT_OTHER
+            toTraceLocationType(2) shouldBe TraceLocation.Type.TEMPORARY_OTHER
+        }
+    }
+
+    @Test
+    fun `fromTraceLocationType() should convert TraceLocation Types to correct integer values`() {
+        with(converter) {
+            fromTraceLocationType(TraceLocation.Type.UNSPECIFIED) shouldBe 0
+            fromTraceLocationType(TraceLocation.Type.PERMANENT_OTHER) shouldBe 1
+            fromTraceLocationType(TraceLocation.Type.TEMPORARY_OTHER) shouldBe 2
+        }
+    }
+}
\ No newline at end of file

From f2047206ec03628e27478fdf3f606fde753eab03 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 10 Mar 2021 17:10:50 +0100
Subject: [PATCH 27/36] Add unit tests for TraceLocationEntity mapping

---
 .../storage/entity/TraceLocationEntityTest.kt | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt

diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
new file mode 100644
index 00000000000..5621ba56db7
--- /dev/null
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
@@ -0,0 +1,60 @@
+package de.rki.coronawarnapp.eventregistration.storage.entity
+
+import de.rki.coronawarnapp.eventregistration.events.DefaultTraceLocation
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import io.kotest.matchers.shouldBe
+import org.joda.time.Instant
+import org.junit.jupiter.api.Test
+
+internal class TraceLocationEntityTest {
+
+    @Test
+    fun `toTraceLocationEntity() should map to TraceLocationEntity correctly with all arguments`() {
+        DefaultTraceLocation(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.TEMPORARY_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+            endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+            defaultCheckInLengthInMinutes = 15,
+            signature = "signature"
+        ).toTraceLocationEntity() shouldBe TraceLocationEntity(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.TEMPORARY_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+            endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+            defaultCheckInLengthInMinutes = 15,
+            signature = "signature"
+        )
+    }
+
+    @Test
+    fun `toTraceLocationEntity() should map to TraceLocationEntity correctly with some arguments as null`() {
+        DefaultTraceLocation(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.PERMANENT_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = null,
+            endDate = null,
+            defaultCheckInLengthInMinutes = null,
+            signature = "signature"
+        ).toTraceLocationEntity() shouldBe TraceLocationEntity(
+            guid = "TestGuid",
+            version = 1,
+            type = TraceLocation.Type.PERMANENT_OTHER,
+            description = "TestTraceLocation",
+            address = "TestTraceLocationAddress",
+            startDate = null,
+            endDate = null,
+            defaultCheckInLengthInMinutes = null,
+            signature = "signature"
+        )
+    }
+}
\ No newline at end of file

From ec939685c2bbc2ec8cd2f15df2ca8948bfeeb333 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Wed, 10 Mar 2021 17:26:15 +0100
Subject: [PATCH 28/36] Add events database table to 'TraceLocation' database
 and remove 'EventRegistration' database

---
 .../1.json                                    | 82 -------------------
 .../1.json                                    | 72 +++++++++++++++-
 .../storage/EventRegistrationDatabase.kt      | 39 ---------
 .../storage/TraceLocationDatabase.kt          | 13 ++-
 ...nverters.kt => TraceLocationConverters.kt} |  2 +-
 .../repo/DefaultTraceLocationRepository.kt    | 10 +--
 ...Test.kt => TraceLocationConvertersTest.kt} |  4 +-
 7 files changed, 87 insertions(+), 135 deletions(-)
 delete mode 100644 Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
 rename Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/{EventRegistrationConverters.kt => TraceLocationConverters.kt} (90%)
 rename Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/{EventRegistrationConvertersTest.kt => TraceLocationConvertersTest.kt} (90%)

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
deleted file mode 100644
index c9b7ba15e2d..00000000000
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase/1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 1,
-    "identityHash": "5a4b44977bfb30cbe4204577dd194286",
-    "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, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` 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": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "startDate",
-            "columnName": "startDate",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "endDate",
-            "columnName": "endDate",
-            "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, '5a4b44977bfb30cbe4204577dd194286')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
index 208aa627204..b0fb0b7db01 100644
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "244eed2a4665a1c60d0792de5945888b",
+    "identityHash": "d91fefdb35193483b49b9c65b1b7fdd8",
     "entities": [
       {
         "tableName": "checkin",
@@ -101,12 +101,80 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "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, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` 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": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "startDate",
+            "columnName": "startDate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "endDate",
+            "columnName": "endDate",
+            "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, '244eed2a4665a1c60d0792de5945888b')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd91fefdb35193483b49b9c65b1b7fdd8')"
     ]
   }
 }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
deleted file mode 100644
index 7ab766872e0..00000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/EventRegistrationDatabase.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package de.rki.coronawarnapp.eventregistration.storage
-
-import android.content.Context
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
-import de.rki.coronawarnapp.eventregistration.storage.entity.EventRegistrationConverters
-import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
-import de.rki.coronawarnapp.util.database.CommonConverters
-import de.rki.coronawarnapp.util.di.AppContext
-import javax.inject.Inject
-
-@Database(
-    entities = [
-        TraceLocationEntity::class
-    ],
-    version = 1,
-    exportSchema = true
-)
-@TypeConverters(CommonConverters::class, EventRegistrationConverters::class)
-abstract class EventRegistrationDatabase : RoomDatabase() {
-
-    abstract fun traceLocation(): TraceLocationDao
-
-    class Factory @Inject constructor(@AppContext private val context: Context) {
-        fun create(): EventRegistrationDatabase =
-            Room.databaseBuilder(
-                context,
-                EventRegistrationDatabase::class.java,
-                EVENT_REGISTRATION_DATABASE_NAME
-            ).build()
-    }
-
-    companion object {
-        private const val EVENT_REGISTRATION_DATABASE_NAME = "EventRegistration-db"
-    }
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt
index fe4ac20c105..30e508cf4c4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabase.kt
@@ -6,26 +6,31 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import de.rki.coronawarnapp.eventregistration.storage.dao.CheckInDao
+import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
 import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationConverters
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import de.rki.coronawarnapp.util.database.CommonConverters
 import de.rki.coronawarnapp.util.di.AppContext
 import javax.inject.Inject
 
 @Database(
     entities = [
-        TraceLocationCheckInEntity::class
+        TraceLocationCheckInEntity::class,
+        TraceLocationEntity::class
     ],
     version = 1,
     exportSchema = true
 )
-@TypeConverters(CommonConverters::class)
+@TypeConverters(CommonConverters::class, TraceLocationConverters::class)
 abstract class TraceLocationDatabase : RoomDatabase() {
 
     abstract fun eventCheckInDao(): CheckInDao
+    abstract fun traceLocationDao(): TraceLocationDao
 
     class Factory @Inject constructor(@AppContext private val context: Context) {
-        fun create(databaseName: String = TRACE_LOCATIONS_DATABASE_NAME): TraceLocationDatabase = Room
-            .databaseBuilder(context, TraceLocationDatabase::class.java, databaseName)
+        fun create() = Room
+            .databaseBuilder(context, TraceLocationDatabase::class.java, TRACE_LOCATIONS_DATABASE_NAME)
             .build()
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
similarity index 90%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
index 5cef36d0066..fc8d0e34ad0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConverters.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.eventregistration.storage.entity
 import androidx.room.TypeConverter
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 
-class EventRegistrationConverters {
+class TraceLocationConverters {
 
     @TypeConverter
     fun toTraceLocationType(value: Int) = enumValues<TraceLocation.Type>()[value]
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
index c6f028b5fca..ab931ee3c3f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/repo/DefaultTraceLocationRepository.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.eventregistration.storage.repo
 
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import de.rki.coronawarnapp.eventregistration.events.toTraceLocations
-import de.rki.coronawarnapp.eventregistration.storage.EventRegistrationDatabase
+import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase
 import de.rki.coronawarnapp.eventregistration.storage.dao.TraceLocationDao
 import de.rki.coronawarnapp.eventregistration.storage.entity.toTraceLocationEntity
 import de.rki.coronawarnapp.util.coroutine.AppScope
@@ -16,16 +16,16 @@ import javax.inject.Singleton
 
 @Singleton
 class DefaultTraceLocationRepository @Inject constructor(
-    eventRegistrationDatabaseFactory: EventRegistrationDatabase.Factory,
+    traceLocationDatabaseFactory: TraceLocationDatabase.Factory,
     @AppScope private val appScope: CoroutineScope
 ) : TraceLocationRepository {
 
-    private val eventRegistrationDatabase: EventRegistrationDatabase by lazy {
-        eventRegistrationDatabaseFactory.create()
+    private val traceLocationDatabase: TraceLocationDatabase by lazy {
+        traceLocationDatabaseFactory.create()
     }
 
     private val traceLocationDao: TraceLocationDao by lazy {
-        eventRegistrationDatabase.traceLocation()
+        traceLocationDatabase.traceLocationDao()
     }
 
     override val allTraceLocations: Flow<List<TraceLocation>>
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
similarity index 90%
rename from Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt
rename to Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
index 74b72cb75e1..316e83dbf7d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/EventRegistrationConvertersTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
@@ -4,9 +4,9 @@ import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
 
-internal class EventRegistrationConvertersTest {
+internal class TraceLocationConvertersTest {
 
-    private val converter = EventRegistrationConverters()
+    private val converter = TraceLocationConverters()
 
     @Test
     fun `toTraceLocationType() should convert different integer values to correct TraceLocation Types`() {

From e320ad100643a7ea218eb713b00ad38f17be82df Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 09:21:13 +0100
Subject: [PATCH 29/36] Add database tests for TraceLocations

---
 .../storage/TraceLocationDatabaseData.kt      | 32 ++++++++
 .../storage/TraceLocationDatabaseTest.kt      | 81 +++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt
 create mode 100644 Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt

diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt
new file mode 100644
index 00000000000..3891b6bdfd0
--- /dev/null
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseData.kt
@@ -0,0 +1,32 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
+import org.joda.time.Instant
+
+object TraceLocationDatabaseData {
+
+    val testTraceLocation1 = TraceLocationEntity(
+        guid = "TestGuid1",
+        version = 1,
+        type = TraceLocation.Type.TEMPORARY_OTHER,
+        description = "TestTraceLocation1",
+        address = "TestTraceLocationAddress1",
+        startDate = Instant.parse("2021-01-01T12:00:00.000Z"),
+        endDate = Instant.parse("2021-01-01T18:00:00.000Z"),
+        defaultCheckInLengthInMinutes = null,
+        signature = "signature1"
+    )
+
+    val testTraceLocation2 = TraceLocationEntity(
+        guid = "TestGuid2",
+        version = 1,
+        type = TraceLocation.Type.PERMANENT_OTHER,
+        description = "TestTraceLocation2",
+        address = "TestTraceLocationAddress2",
+        startDate = null,
+        endDate = null,
+        defaultCheckInLengthInMinutes = 15,
+        signature = "signature2"
+    )
+}
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt
new file mode 100644
index 00000000000..5871d707391
--- /dev/null
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt
@@ -0,0 +1,81 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabaseData.testTraceLocation1
+import de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabaseData.testTraceLocation2
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Test
+
+class TraceLocationDatabaseTest {
+
+    private val traceLocationDatabase = Room.inMemoryDatabaseBuilder(
+        ApplicationProvider.getApplicationContext(),
+        TraceLocationDatabase::class.java
+    ).build()
+
+    private val checkInDao = traceLocationDatabase.eventCheckInDao()
+    private val traceLocationDao = traceLocationDatabase.traceLocationDao()
+
+    @After
+    fun tearDown() {
+        traceLocationDatabase.clearAllTables()
+    }
+
+    @Test
+    fun traceLocationDaoShouldReturnNoEntriesInitially() = runBlocking {
+        val traceLocationsFlow = traceLocationDao.allEntries()
+
+        traceLocationsFlow.first() shouldBe emptyList()
+    }
+
+    @Test
+    fun traceLocationDaoShouldSuccessfullyInsertTraceLocation() = runBlocking {
+        val traceLocationsFlow = traceLocationDao.allEntries()
+
+        traceLocationDao.insert(testTraceLocation1)
+
+        traceLocationsFlow.first() shouldBe listOf(testTraceLocation1)
+    }
+
+    @Test
+    fun traceLocationDaoShouldSuccessfullyInsertMultipleTraceLocations() = runBlocking {
+        val traceLocationsFlow = traceLocationDao.allEntries()
+
+        traceLocationDao.insert(testTraceLocation1)
+        traceLocationDao.insert(testTraceLocation2)
+
+        traceLocationsFlow.first() shouldBe listOf(testTraceLocation1, testTraceLocation2)
+    }
+
+    @Test
+    fun traceLocationDaoShouldSuccessfullyDeleteSingleTraceLocation() = runBlocking {
+        val traceLocationsFlow = traceLocationDao.allEntries()
+
+        traceLocationDao.insert(testTraceLocation1)
+        traceLocationDao.delete(testTraceLocation1)
+        traceLocationsFlow.first() shouldBe emptyList()
+    }
+
+    @Test
+    fun traceLocationDaoShouldSuccessfullyDeleteAllTraceLocations() = runBlocking {
+        val traceLocationsFlow = traceLocationDao.allEntries()
+
+        traceLocationDao.insert(testTraceLocation1)
+        traceLocationDao.insert(testTraceLocation2)
+        traceLocationDao.deleteAll()
+        traceLocationsFlow.first() shouldBe emptyList()
+    }
+
+    @Test
+    fun eventCheckInDao() {
+        // Arrange
+
+        // Act 
+
+        // Assert
+    }
+}
\ No newline at end of file

From 5ad542f1beefca54fb0e32762d8bb12319fcbdb6 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 10:37:33 +0100
Subject: [PATCH 30/36] Fix issue in EventRegistrationModule.kt

---
 .../eventregistration/EventRegistrationModule.kt    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
index bd6d024534d..ccaf6ced7f5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
@@ -2,20 +2,17 @@ package de.rki.coronawarnapp.eventregistration
 
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
-import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
-import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
 import de.rki.coronawarnapp.eventregistration.checkins.qrcode.DefaultQRCodeVerifier
 import de.rki.coronawarnapp.eventregistration.checkins.qrcode.QRCodeVerifier
-import javax.inject.Singleton
+import de.rki.coronawarnapp.eventregistration.storage.repo.DefaultTraceLocationRepository
+import de.rki.coronawarnapp.eventregistration.storage.repo.TraceLocationRepository
 
 @Module
 abstract class EventRegistrationModule {
+
     @Binds
     abstract fun qrCodeVerifier(qrCodeVerifier: DefaultQRCodeVerifier): QRCodeVerifier
 
-    @Singleton
-    @Provides
-    fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository =
-        defaultTraceLocationRepo
+    @Binds
+    abstract fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository
 }

From 0eb7bf7e1a2ce47f4f1939886e565d2dd0d73bf8 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 11:14:02 +0100
Subject: [PATCH 31/36] Add database tests for checkInDao

---
 .../storage/CheckInDatabaseData.kt            | 40 +++++++++
 .../storage/TraceLocationCheckInDaoTest.kt    | 84 +++++++++++++++++++
 ...atabaseTest.kt => TraceLocationDaoTest.kt} | 12 +--
 3 files changed, 125 insertions(+), 11 deletions(-)
 create mode 100644 Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt
 create mode 100644 Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
 rename Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/{TraceLocationDatabaseTest.kt => TraceLocationDaoTest.kt} (92%)

diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt
new file mode 100644
index 00000000000..2797a59ee20
--- /dev/null
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt
@@ -0,0 +1,40 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import de.rki.coronawarnapp.eventregistration.events.TraceLocation
+import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationCheckInEntity
+import org.joda.time.Instant
+
+object CheckInDatabaseData {
+
+    val testCheckIn = TraceLocationCheckInEntity(
+        guid = "testGuid1",
+        version = 1,
+        type = TraceLocation.Type.TEMPORARY_OTHER.value,
+        description = "testDescription1",
+        address = "testAddress1",
+        traceLocationStart = Instant.parse("2021-01-01T12:00:00.000Z"),
+        traceLocationEnd = Instant.parse("2021-01-01T15:00:00.000Z"),
+        defaultCheckInLengthInMinutes = 15,
+        signature = "Signature",
+        checkInStart = Instant.parse("2021-01-01T12:30:00.000Z"),
+        checkInEnd = Instant.parse("2021-01-01T14:00:00.000Z"),
+        targetCheckInEnd = Instant.parse("2021-01-01T12:45:00.000Z"),
+        createJournalEntry = true
+    )
+
+    val testCheckInWithoutCheckOutTime = TraceLocationCheckInEntity(
+        guid = "testGuid2",
+        version = 1,
+        type = TraceLocation.Type.TEMPORARY_OTHER.value,
+        description = "testDescription2",
+        address = "testAddress2",
+        traceLocationStart = null,
+        traceLocationEnd = null,
+        defaultCheckInLengthInMinutes = null,
+        signature = "Signature",
+        checkInStart = Instant.parse("2021-01-01T12:30:00.000Z"),
+        checkInEnd = null,
+        targetCheckInEnd = Instant.parse("2021-01-01T12:45:00.000Z"),
+        createJournalEntry = true
+    )
+}
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
new file mode 100644
index 00000000000..0ae9bfe1268
--- /dev/null
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
@@ -0,0 +1,84 @@
+package de.rki.coronawarnapp.eventregistration.storage
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import de.rki.coronawarnapp.eventregistration.storage.CheckInDatabaseData.testCheckIn
+import de.rki.coronawarnapp.eventregistration.storage.CheckInDatabaseData.testCheckInWithoutCheckOutTime
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.joda.time.Instant
+import org.junit.After
+import org.junit.Test
+
+class TraceLocationCheckInDaoTest {
+
+    private val traceLocationDatabase = Room.inMemoryDatabaseBuilder(
+        ApplicationProvider.getApplicationContext(),
+        TraceLocationDatabase::class.java
+    ).build()
+
+    private val checkInDao = traceLocationDatabase.eventCheckInDao()
+
+    @After
+    fun tearDown() {
+        traceLocationDatabase.clearAllTables()
+    }
+
+    @Test
+    fun traceLocationCheckInDaoShouldReturnNoEntriesInitially() = runBlocking {
+        val checkInsFlow = checkInDao.allEntries()
+
+        checkInsFlow.first() shouldBe emptyList()
+    }
+
+    @Test
+    fun traceLocationCheckInDaoShouldSuccessfullyInsertCheckIn() = runBlocking {
+        val checkInsFlow = checkInDao.allEntries()
+
+        val generatedId = checkInDao.insert(testCheckIn)
+
+        checkInsFlow.first() shouldBe listOf(testCheckIn.copy(id = generatedId))
+    }
+
+    @Test
+    fun traceLocationCheckInDaoShouldSuccessfullyInsertMultipleCheckIns() = runBlocking {
+        val checkInsFlow = checkInDao.allEntries()
+
+        val testCheckInGeneratedId = checkInDao.insert(testCheckIn)
+        val testCheckInWithoutCheckOutTimeGeneratedId = checkInDao.insert(testCheckInWithoutCheckOutTime)
+
+        checkInsFlow.first() shouldBe listOf(
+            testCheckIn.copy(id = testCheckInGeneratedId),
+            testCheckInWithoutCheckOutTime.copy(id = testCheckInWithoutCheckOutTimeGeneratedId)
+        )
+    }
+
+    @Test
+    fun traceLocationCheckInDaoShouldSuccessfullyUpdateCheckIn() = runBlocking {
+        val checkInsFlow = checkInDao.allEntries()
+
+        val testCheckInGeneratedId = checkInDao.insert(testCheckInWithoutCheckOutTime)
+
+        val updatedCheckIn = testCheckInWithoutCheckOutTime.copy(
+            id = testCheckInGeneratedId,
+            checkInEnd = Instant.parse("2021-01-01T14:00:00.000Z")
+        )
+
+        checkInDao.update(updatedCheckIn)
+
+        checkInsFlow.first() shouldBe listOf(updatedCheckIn)
+    }
+
+    @Test
+    fun traceLocationCheckInDaoShouldSuccessfullyDeleteAllCheckIns() = runBlocking {
+        val checkInsFlow = checkInDao.allEntries()
+
+        checkInDao.insert(testCheckIn)
+        checkInDao.insert(testCheckInWithoutCheckOutTime)
+
+        checkInDao.deleteAll()
+
+        checkInsFlow.first() shouldBe emptyList()
+    }
+}
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
similarity index 92%
rename from Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt
rename to Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
index 5871d707391..862cdc5af9d 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDatabaseTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
@@ -10,14 +10,13 @@ import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Test
 
-class TraceLocationDatabaseTest {
+class TraceLocationDaoTest {
 
     private val traceLocationDatabase = Room.inMemoryDatabaseBuilder(
         ApplicationProvider.getApplicationContext(),
         TraceLocationDatabase::class.java
     ).build()
 
-    private val checkInDao = traceLocationDatabase.eventCheckInDao()
     private val traceLocationDao = traceLocationDatabase.traceLocationDao()
 
     @After
@@ -69,13 +68,4 @@ class TraceLocationDatabaseTest {
         traceLocationDao.deleteAll()
         traceLocationsFlow.first() shouldBe emptyList()
     }
-
-    @Test
-    fun eventCheckInDao() {
-        // Arrange
-
-        // Act 
-
-        // Assert
-    }
 }
\ No newline at end of file

From 16f5ef6467257efeea23acc2bd550dba19bf1422 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 11:15:31 +0100
Subject: [PATCH 32/36] Fix detekt maxLineLength issue

---
 .../coronawarnapp/eventregistration/EventRegistrationModule.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
index ccaf6ced7f5..f1416cc29d8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
@@ -14,5 +14,6 @@ abstract class EventRegistrationModule {
     abstract fun qrCodeVerifier(qrCodeVerifier: DefaultQRCodeVerifier): QRCodeVerifier
 
     @Binds
-    abstract fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository): TraceLocationRepository
+    abstract fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository)
+        : TraceLocationRepository
 }

From a6c015b21a9e57190ae46c16b919b34c4269bb4d Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 11:24:01 +0100
Subject: [PATCH 33/36] Fix inconsistency in TraceLocationEntity.kt

---
 .../1.json                                                | 8 ++++----
 .../storage/entity/TraceLocationEntity.kt                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
index b0fb0b7db01..f5c14553bb6 100644
--- a/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
+++ b/Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "d91fefdb35193483b49b9c65b1b7fdd8",
+    "identityHash": "48d71b0a00d0c7fe01ffe05d5fecb512",
     "entities": [
       {
         "tableName": "checkin",
@@ -104,7 +104,7 @@
       },
       {
         "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, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` TEXT, `defaultCheckInLength` INTEGER, `signature` TEXT NOT NULL, PRIMARY KEY(`guid`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`guid` TEXT NOT NULL, `version` INTEGER NOT NULL, `type` INTEGER NOT NULL, `description` TEXT NOT NULL, `address` TEXT NOT NULL, `startDate` TEXT, `endDate` TEXT, `defaultCheckInLengthInMinutes` INTEGER, `signature` TEXT NOT NULL, PRIMARY KEY(`guid`))",
         "fields": [
           {
             "fieldPath": "guid",
@@ -150,7 +150,7 @@
           },
           {
             "fieldPath": "defaultCheckInLengthInMinutes",
-            "columnName": "defaultCheckInLength",
+            "columnName": "defaultCheckInLengthInMinutes",
             "affinity": "INTEGER",
             "notNull": false
           },
@@ -174,7 +174,7 @@
     "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, 'd91fefdb35193483b49b9c65b1b7fdd8')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '48d71b0a00d0c7fe01ffe05d5fecb512')"
     ]
   }
 }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
index 39988eccd22..c681d3a92ac 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntity.kt
@@ -16,7 +16,7 @@ data class TraceLocationEntity(
     @ColumnInfo(name = "address") val address: String,
     @ColumnInfo(name = "startDate") val startDate: Instant?,
     @ColumnInfo(name = "endDate") val endDate: Instant?,
-    @ColumnInfo(name = "defaultCheckInLength") val defaultCheckInLengthInMinutes: Int?,
+    @ColumnInfo(name = "defaultCheckInLengthInMinutes") val defaultCheckInLengthInMinutes: Int?,
     @ColumnInfo(name = "signature") val signature: String
 
 )

From 2caf8eead4409dede3329a9e9a23377da0757265 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 11:37:19 +0100
Subject: [PATCH 34/36] Fix ktlint issues

---
 .../eventregistration/EventRegistrationModule.kt              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
index f1416cc29d8..2a082136720 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/EventRegistrationModule.kt
@@ -14,6 +14,6 @@ abstract class EventRegistrationModule {
     abstract fun qrCodeVerifier(qrCodeVerifier: DefaultQRCodeVerifier): QRCodeVerifier
 
     @Binds
-    abstract fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository)
-        : TraceLocationRepository
+    abstract fun traceLocationRepository(defaultTraceLocationRepo: DefaultTraceLocationRepository):
+        TraceLocationRepository
 }

From 430a6c0fa86b60bd1825ba81b4e0f0e7b0f3660f Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 12:03:21 +0100
Subject: [PATCH 35/36] Inherit from BaseTest or BaseTestInstrumentation in
 tests

---
 .../eventregistration/storage/TraceLocationCheckInDaoTest.kt | 3 ++-
 .../eventregistration/storage/TraceLocationDaoTest.kt        | 5 +++--
 .../eventregistration/events/DefaultTraceLocationKtTest.kt   | 3 ++-
 .../storage/entity/TraceLocationConvertersTest.kt            | 3 ++-
 .../storage/entity/TraceLocationEntityTest.kt                | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
index 0ae9bfe1268..60223bea5e5 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationCheckInDaoTest.kt
@@ -10,8 +10,9 @@ import kotlinx.coroutines.runBlocking
 import org.joda.time.Instant
 import org.junit.After
 import org.junit.Test
+import testhelpers.BaseTestInstrumentation
 
-class TraceLocationCheckInDaoTest {
+class TraceLocationCheckInDaoTest : BaseTestInstrumentation() {
 
     private val traceLocationDatabase = Room.inMemoryDatabaseBuilder(
         ApplicationProvider.getApplicationContext(),
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
index 862cdc5af9d..ab29881320b 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/TraceLocationDaoTest.kt
@@ -9,8 +9,9 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Test
+import testhelpers.BaseTestInstrumentation
 
-class TraceLocationDaoTest {
+class TraceLocationDaoTest : BaseTestInstrumentation() {
 
     private val traceLocationDatabase = Room.inMemoryDatabaseBuilder(
         ApplicationProvider.getApplicationContext(),
@@ -68,4 +69,4 @@ class TraceLocationDaoTest {
         traceLocationDao.deleteAll()
         traceLocationsFlow.first() shouldBe emptyList()
     }
-}
\ No newline at end of file
+}
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt
index 4d605a308ad..7aefa48ae7e 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/events/DefaultTraceLocationKtTest.kt
@@ -4,8 +4,9 @@ import de.rki.coronawarnapp.eventregistration.storage.entity.TraceLocationEntity
 import io.kotest.matchers.shouldBe
 import org.joda.time.Instant
 import org.junit.jupiter.api.Test
+import testhelpers.BaseTest
 
-internal class DefaultTraceLocationKtTest {
+internal class DefaultTraceLocationKtTest : BaseTest() {
 
     @Test
     fun `toTraceLocation() should map to correct object when providing all arguments`() {
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
index 316e83dbf7d..b11ff01460a 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConvertersTest.kt
@@ -3,8 +3,9 @@ package de.rki.coronawarnapp.eventregistration.storage.entity
 import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import testhelpers.BaseTest
 
-internal class TraceLocationConvertersTest {
+internal class TraceLocationConvertersTest : BaseTest() {
 
     private val converter = TraceLocationConverters()
 
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
index 5621ba56db7..e796c1838e3 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationEntityTest.kt
@@ -5,8 +5,9 @@ import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 import io.kotest.matchers.shouldBe
 import org.joda.time.Instant
 import org.junit.jupiter.api.Test
+import testhelpers.BaseTest
 
-internal class TraceLocationEntityTest {
+internal class TraceLocationEntityTest : BaseTest() {
 
     @Test
     fun `toTraceLocationEntity() should map to TraceLocationEntity correctly with all arguments`() {

From 307daa65c3666cec67009821fc918e8ad158a106 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <office@lukaslechner.com>
Date: Thu, 11 Mar 2021 18:11:56 +0100
Subject: [PATCH 36/36] Fix issue in TraceLocationConverters.kt

---
 .../eventregistration/storage/entity/TraceLocationConverters.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
index fc8d0e34ad0..89546329e0e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/eventregistration/storage/entity/TraceLocationConverters.kt
@@ -6,7 +6,7 @@ import de.rki.coronawarnapp.eventregistration.events.TraceLocation
 class TraceLocationConverters {
 
     @TypeConverter
-    fun toTraceLocationType(value: Int) = enumValues<TraceLocation.Type>()[value]
+    fun toTraceLocationType(value: Int) = enumValues<TraceLocation.Type>().single { it.value == value }
 
     @TypeConverter
     fun fromTraceLocationType(type: TraceLocation.Type) = type.value