From 551062184070fc18cb8a8a7be1dbe50b968f6fee Mon Sep 17 00:00:00 2001
From: BMItter <berndus@gmx.de>
Date: Mon, 7 Dec 2020 16:59:38 +0100
Subject: [PATCH] relevant interfaces etc.

---
 .../contactdiary/model/ContactDiaryElement.kt            | 8 ++++----
 .../contactdiary/model/ContactDiaryEntry.kt              | 9 ---------
 .../contactdiary/model/DefaultContactDiaryElement.kt     | 9 +++++++++
 .../coronawarnapp/contactdiary/model/DefaultLocation.kt  | 5 +++++
 .../coronawarnapp/contactdiary/model/DefaultPerson.kt    | 5 +++++
 .../de/rki/coronawarnapp/contactdiary/model/Location.kt  | 9 ++++++---
 .../de/rki/coronawarnapp/contactdiary/model/Person.kt    | 9 ++++++---
 7 files changed, 35 insertions(+), 19 deletions(-)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
 create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
index 56c42f77d..dd94048a8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
@@ -6,12 +6,12 @@ interface ContactDiaryElement {
 
     val createdAt: Instant
 
-    val persons: List<Person>?
-    val locations: List<Location>?
+    val defaultPeople: List<DefaultPerson>
+    val defaultLocations: List<DefaultLocation>
 
     val numberOfPersons: Int?
-        get() = persons?.size
+        get() = defaultPeople?.size
 
     val numberOfLocations: Int?
-        get() = locations?.size
+        get() = defaultLocations?.size
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
deleted file mode 100644
index 89c74aa45..000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package de.rki.coronawarnapp.contactdiary.model
-
-import java.time.Instant
-
-data class ContactDiaryEntry(
-    val person: List<Person>?,
-    val location: List<Location>?,
-    val dateAddedEntry: Instant?
-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
new file mode 100644
index 000000000..527127acb
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
@@ -0,0 +1,9 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+import java.time.Instant
+
+data class DefaultContactDiaryElement(
+    val defaultPeople: List<DefaultPerson>,
+    val defaultLocation: List<DefaultLocation>,
+    val dateAddedEntry: Instant?
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
new file mode 100644
index 000000000..8782ba850
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
@@ -0,0 +1,5 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultLocation(
+    val locationName: String
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
new file mode 100644
index 000000000..c34c6d79d
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
@@ -0,0 +1,5 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultPerson(
+    val completeName: String
+)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
index b5d6bca26..2bc7220b8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
@@ -1,5 +1,8 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class Location(
-    val locationName: String
-)
+import java.time.Instant
+
+interface Location {
+    val createdAt: Instant
+    val location: Location
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
index 729634876..ae8371b1a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
@@ -1,5 +1,8 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class Person(
-    val completeName: String
-)
+import java.time.Instant
+
+interface Person {
+    val createdAt: Instant
+    val person: Person
+}
-- 
GitLab