From d7326cdffe007d1db2d2b34360354094133a681a Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.uni-potsdam.de>
Date: Thu, 12 Mar 2020 20:18:09 +0100
Subject: [PATCH 01/13] change(service-food-crawler): move package into
 service-food

---
 service-food-crawler/build.gradle             | 31 -------------------
 service-food/build.gradle                     | 10 ++++++
 .../kotlin/de/hpi/cloud/food/crawler/Main.kt  |  0
 .../cloud/food/crawler/OpenMensaCrawler.kt    |  0
 .../hpi/cloud/food/crawler/OpenMensaTypes.kt  |  0
 .../food/crawler/canteens/Griebnitzsee.kt     |  0
 .../de/hpi/cloud/food/crawler/canteens/Ulf.kt |  0
 .../hpi/cloud/food/crawler/utils/UrlUtils.kt  |  0
 8 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 service-food-crawler/build.gradle
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt (100%)
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt (100%)
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt (100%)
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt (100%)
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt (100%)
 rename {service-food-crawler => service-food}/src/main/kotlin/de/hpi/cloud/food/crawler/utils/UrlUtils.kt (100%)

diff --git a/service-food-crawler/build.gradle b/service-food-crawler/build.gradle
deleted file mode 100644
index 2b8241c..0000000
--- a/service-food-crawler/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.40")
-        classpath("com.github.jengelman.gradle.plugins:shadow:5.1.0")
-    }
-}
-
-plugins {
-    id "kotlin"
-    id "application"
-    id "com.github.johnrengelman.shadow" version "5.1.0"
-}
-
-repositories {
-    jcenter()
-    maven { url "https://dl.bintray.com/hpi/hpi-cloud-mvn" }
-}
-
-dependencies {
-    implementation(project(":common"))
-
-    // Crawling
-    implementation("com.beust:klaxon:5.0.11")
-}
-
-application {
-    mainClassName = "de.hpi.cloud.food.crawler.MainKt"
-}
diff --git a/service-food/build.gradle b/service-food/build.gradle
index a47aba3..d856476 100644
--- a/service-food/build.gradle
+++ b/service-food/build.gradle
@@ -14,10 +14,20 @@ plugins {
     id "com.github.johnrengelman.shadow" version "5.1.0"
 }
 
+repositories {
+    jcenter()
+    maven { url "https://dl.bintray.com/hpi/hpi-cloud-mvn" }
+}
+
 dependencies {
     implementation(project(":common"))
+    
+    // Crawling
+    implementation("com.beust:klaxon:5.0.11")
 }
 
 application {
+    // mainClassName = "de.hpi.cloud.food.crawler.MainKt"
+    
     mainClassName = "de.hpi.cloud.food.FoodServiceKt"
 }
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt
diff --git a/service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/utils/UrlUtils.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/utils/UrlUtils.kt
similarity index 100%
rename from service-food-crawler/src/main/kotlin/de/hpi/cloud/food/crawler/utils/UrlUtils.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/utils/UrlUtils.kt

From 3be6644dd952499224728a942fb4703ed8237a51 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.uni-potsdam.de>
Date: Thu, 12 Mar 2020 20:43:47 +0100
Subject: [PATCH 02/13] feat(service-food): add entities

---
 .../de/hpi/cloud/food/entities/Counter.kt     | 39 +++++++++++
 .../de/hpi/cloud/food/entities/MenuItem.kt    | 64 +++++++++++++++++++
 .../de/hpi/cloud/food/entities/Restaurant.kt  | 32 ++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
new file mode 100644
index 0000000..8cb76ab
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
@@ -0,0 +1,39 @@
+package de.hpi.cloud.food.entities
+
+import de.hpi.cloud.common.Context
+import de.hpi.cloud.common.entity.Entity
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.common.entity.Wrapper
+import de.hpi.cloud.common.protobuf.builder
+import de.hpi.cloud.common.serializers.json.UrlSerializer
+import de.hpi.cloud.common.types.L10n
+import kotlinx.serialization.Serializable
+import java.net.URL
+import de.hpi.cloud.food.v1test.Counter as ProtoCounter
+
+@Serializable
+data class Counter(
+    val restaurantId: Id<Restaurant>,
+    val title: L10n<String>,
+    val iconUrl: @Serializable(UrlSerializer::class) URL
+) : Entity<Counter>() {
+    companion object : Entity.Companion<Counter>("counter")
+
+    object ProtoSerializer : Entity.ProtoSerializer<Counter, ProtoCounter, ProtoCounter.Builder>() {
+        override fun fromProto(proto: ProtoCounter, context: Context): Counter =
+            throw UnsupportedOperationException("Counter cannot be created via protobuf")
+
+        override fun toProtoBuilder(entity: Counter, context: Context): ProtoCounter.Builder =
+            ProtoCounter.newBuilder().builder(entity) {
+                restaurantId = it.restaurantId.value
+                title = it.title[context]
+                icon = it.iconUrl.toString()
+            }
+    }
+}
+
+fun ProtoCounter.parse(context: Context): Counter =
+    Counter.ProtoSerializer.fromProto(this, context)
+
+fun Wrapper<Counter>.toProto(context: Context): ProtoCounter =
+    Counter.ProtoSerializer.toProto(this, context)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
new file mode 100644
index 0000000..31391b4
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
@@ -0,0 +1,64 @@
+package de.hpi.cloud.food.entities
+
+import de.hpi.cloud.common.Context
+import de.hpi.cloud.common.entity.Entity
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.common.entity.Wrapper
+import de.hpi.cloud.common.entity.asId
+import de.hpi.cloud.common.protobuf.builder
+import de.hpi.cloud.common.protobuf.toLocalDate
+import de.hpi.cloud.common.protobuf.toProtoDate
+import de.hpi.cloud.common.serializers.json.LocalDateSerializer
+import de.hpi.cloud.common.serializers.proto.parse
+import de.hpi.cloud.common.serializers.proto.toProto
+import de.hpi.cloud.common.types.L10n
+import de.hpi.cloud.common.types.Money
+import de.hpi.cloud.common.types.l10n
+import kotlinx.serialization.Serializable
+import java.time.LocalDate
+import de.hpi.cloud.food.v1test.MenuItem as ProtoMenuItem
+
+@Serializable
+data class MenuItem(
+    val openMensaId: String?,
+    val date: @Serializable(LocalDateSerializer::class) LocalDate,
+    val restaurantId: Id<Restaurant>,
+    val offerTitle: L10n<String>,
+    val title: L10n<String>,
+    val counterId: Id<Counter>,
+    val labelIds: List<Id<Label>>,
+    val prices: Map<String, Money>
+) : Entity<MenuItem>() {
+    companion object : Entity.Companion<MenuItem>("menuItem")
+
+    object ProtoSerializer : Entity.ProtoSerializer<MenuItem, ProtoMenuItem, ProtoMenuItem.Builder>() {
+        override fun fromProto(proto: ProtoMenuItem, context: Context): MenuItem =
+            MenuItem(
+                openMensaId = null,
+                date = proto.date.toLocalDate(),
+                restaurantId = proto.restaurantId.asId(),
+                offerTitle = proto.offerTitle.l10n(context),
+                title = proto.title.l10n(context),
+                counterId = proto.counterId.asId(),
+                labelIds = proto.labelIdsList.map { it.asId() },
+                prices = proto.pricesMap.mapValues { (_, money) -> money.parse(context) }
+            )
+
+        override fun toProtoBuilder(entity: MenuItem, context: Context): ProtoMenuItem.Builder =
+            ProtoMenuItem.newBuilder().builder(entity) {
+                date = it.date.toProtoDate()
+                restaurantId = it.restaurantId.value
+                offerTitle = it.offerTitle[context]
+                title = it.title[context]
+                counterId = it.counterId.value
+                addAllLabelIds(it.labelIds.map { l -> l.value })
+                putAllPrices(it.prices.mapValues { (_, money) -> money.toProto(context) })
+            }
+    }
+}
+
+fun ProtoMenuItem.parse(context: Context): MenuItem =
+    MenuItem.ProtoSerializer.fromProto(this, context)
+
+fun Wrapper<MenuItem>.toProto(context: Context): ProtoMenuItem =
+    MenuItem.ProtoSerializer.toProto(this, context)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
new file mode 100644
index 0000000..b3ef165
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
@@ -0,0 +1,32 @@
+package de.hpi.cloud.food.entities
+
+import de.hpi.cloud.common.Context
+import de.hpi.cloud.common.entity.Entity
+import de.hpi.cloud.common.entity.Wrapper
+import de.hpi.cloud.common.protobuf.builder
+import de.hpi.cloud.common.types.L10n
+import kotlinx.serialization.Serializable
+import de.hpi.cloud.food.v1test.Restaurant as ProtoRestaurant
+
+@Serializable
+data class Restaurant(
+    val title: L10n<String>
+) : Entity<Restaurant>() {
+    companion object : Entity.Companion<Restaurant>("restaurant")
+
+    object ProtoSerializer : Entity.ProtoSerializer<Restaurant, ProtoRestaurant, ProtoRestaurant.Builder>() {
+        override fun fromProto(proto: ProtoRestaurant, context: Context): Restaurant =
+            throw UnsupportedOperationException("Restaurants cannot be created via protobuf")
+
+        override fun toProtoBuilder(entity: Restaurant, context: Context): ProtoRestaurant.Builder =
+            ProtoRestaurant.newBuilder().builder(entity) {
+                title = it.title[context]
+            }
+    }
+}
+
+fun ProtoRestaurant.parse(context: Context): Restaurant =
+    Restaurant.ProtoSerializer.fromProto(this, context)
+
+fun Wrapper<Restaurant>.toProto(context: Context): ProtoRestaurant =
+    Restaurant.ProtoSerializer.toProto(this, context)

From 46fc30148bf6787490102ec3060402afaa0f7b23 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 30 Apr 2020 19:08:23 +0200
Subject: [PATCH 03/13] build(service-food): update dependencies

---
 common/build.gradle       |  2 +-
 service-food/build.gradle | 10 +++++++---
 settings.gradle           |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index dc4bfa6..669a586 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     // API
     api("com.google.protobuf:protobuf-java:3.6.1")
     api("io.grpc:grpc-stub:1.18.0")
-    api("de.hpi.cloud:hpi-cloud:0.0.13")
+    api("de.hpi.cloud:hpi-cloud:0.0.14")
 
     // Storage
     api("com.couchbase.client:java-client:2.7.9")
diff --git a/service-food/build.gradle b/service-food/build.gradle
index d856476..3ac5158 100644
--- a/service-food/build.gradle
+++ b/service-food/build.gradle
@@ -3,16 +3,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.40")
-        classpath("com.github.jengelman.gradle.plugins:shadow:5.1.0")
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
-
 plugins {
     id "kotlin"
     id "application"
     id "com.github.johnrengelman.shadow" version "5.1.0"
 }
+apply plugin: 'kotlinx-serialization'
+apply plugin: 'kotlin'
 
 repositories {
     jcenter()
@@ -24,6 +24,7 @@ dependencies {
     
     // Crawling
     implementation("com.beust:klaxon:5.0.11")
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 application {
@@ -31,3 +32,6 @@ application {
     
     mainClassName = "de.hpi.cloud.food.FoodServiceKt"
 }
+repositories {
+    mavenCentral()
+}
diff --git a/settings.gradle b/settings.gradle
index b20b7fc..1e79c48 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ include 'service-club'
 include 'service-course', 'service-course-crawler'
 include 'service-crashreporting'
 include 'service-feedback'
-include 'service-food', 'service-food-crawler'
+include 'service-food'
 include 'service-myhpi'
 include 'service-news'
 include 'service-runner'

From 6dfd27f417c238b370ee65dcf039497f654787b2 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 30 Apr 2020 19:08:55 +0200
Subject: [PATCH 04/13] feat(service-food): add label entity

---
 .../de/hpi/cloud/food/entities/Label.kt       | 43 ++++++++++
 .../de/hpi/cloud/food/fixtures/Labels.kt      | 81 +++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
new file mode 100644
index 0000000..e7dc100
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
@@ -0,0 +1,43 @@
+package de.hpi.cloud.food.entities
+
+import de.hpi.cloud.common.Context
+import de.hpi.cloud.common.entity.Entity
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.common.entity.Wrapper
+import de.hpi.cloud.common.entity.asId
+import de.hpi.cloud.common.protobuf.builder
+import de.hpi.cloud.common.serializers.json.UrlSerializer
+import de.hpi.cloud.common.types.L10n
+import de.hpi.cloud.common.utils.contains
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import java.net.URL
+import java.util.Locale.GERMAN
+import de.hpi.cloud.food.v1test.Label as ProtoLabel
+
+@Serializable
+data class Label(
+    val title: L10n<String>,
+    val iconUrl: @Serializable(UrlSerializer::class) URL,
+    val aliases: Set<String>
+) : Entity<Label>() {
+    companion object : Entity.Companion<Label>("label")
+
+    @Transient val id: Id<Label> = title[GERMAN]!!.toLowerCase().asId()
+
+    object ProtoSerializer : Entity.ProtoSerializer<Label, ProtoLabel, ProtoLabel.Builder>() {
+        override fun fromProto(proto: ProtoLabel, context: Context): Label =
+            throw UnsupportedOperationException("Labels cannot be created via protobuf")
+
+        override fun toProtoBuilder(entity: Label, context: Context): ProtoLabel.Builder =
+            ProtoLabel.newBuilder().builder(entity) {
+                title = it.title[context]
+                icon = it.iconUrl.toString()
+            }
+    }
+
+    fun matches(label: String) : Boolean =
+        (aliases + title.values.values).contains(label, ignoreCase = true)
+}
+
+fun Wrapper<Label>.toProto(context: Context): ProtoLabel = Label.ProtoSerializer.toProto(this, context)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
new file mode 100644
index 0000000..a114517
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
@@ -0,0 +1,81 @@
+package de.hpi.cloud.food.fixtures
+
+import de.hpi.cloud.common.couchbase.upsert
+import de.hpi.cloud.common.couchbase.withBucket
+import de.hpi.cloud.common.entity.Wrapper
+import de.hpi.cloud.common.types.L10n
+import de.hpi.cloud.food.FOOD_CONTEXT
+import de.hpi.cloud.food.entities.Label
+import java.net.URL
+
+val labelFixture: List<Label> = listOf(
+    Label(
+        title = L10n.from(de = "Alkohol", en = "Alcohol"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png"),
+        aliases = setOf("Alkohol")
+    ),
+    Label(
+        title = L10n.from(de = "Rind", en = "Beef"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
+        aliases = setOf("Rindfleisch")
+    ),
+    Label(
+        title = L10n.from(de = "Fisch", en = "Fish"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png"),
+        aliases = setOf("Fisch")
+    ),
+    Label(
+        title = L10n.from(de = "Knoblauch", en = "Garlic"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png"),
+        aliases = setOf("Knoblauch")
+    ),
+    Label(
+        title = L10n.from(de = "Lamm", en = "Lamb"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png"),
+        aliases = setOf("Lamm")
+    ),
+    Label(
+        title = L10n.from(de = "Schwein", en = "Pork"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
+        aliases = setOf("Schweinefleisch")
+    ),
+    Label(
+        title = L10n.from(de = "Geflügel", en = "Poultry"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
+        aliases = setOf("Gefluegel")
+    ),
+    Label(
+        title = L10n.from(de = "Vegan", en = "Vegan"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png"),
+        aliases = setOf("Vegan")
+    ),
+    Label(
+        title = L10n.from(de = "Vegetarisch", en = "Vegetarian"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png"),
+        aliases = setOf("Vegetarisch")
+    ),
+    Label(
+        title = L10n.from(de = "Vital", en = "Vital"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vital_m.png"),
+        aliases = setOf("Vital")
+    ),
+    Label(
+        title = L10n.from(de = "Wild", en = "Venison"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
+        aliases = setOf("Wildfleisch")
+    )
+)
+
+val Label.wrapper : Wrapper<Label>
+    get() = createNewWrapper(FOOD_CONTEXT, id)
+
+/**
+ * Updates the labels in the database
+ */
+fun main() {
+    withBucket("food") { bucket ->
+        labelFixture.forEach { label ->
+            bucket.upsert(label.wrapper)
+        }
+    }
+}

From 49ed61702decd6620df65c856cb464926edbe29f Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:53:43 +0200
Subject: [PATCH 05/13] refactor(service-food): move OpenMensa types to new
 package

---
 .../hpi/cloud/food/crawler/OpenMensaTypes.kt  | 31 --------------
 .../hpi/cloud/food/crawler/ParsedMensaMeal.kt | 41 +++++++++++++++++++
 .../food/crawler/openmensa/CanteenData.kt     | 29 +++++++++++++
 .../food/crawler/openmensa/OpenMensaMeal.kt   |  9 ++++
 .../{ => openmensa}/canteens/Griebnitzsee.kt  | 11 ++---
 .../crawler/{ => openmensa}/canteens/Ulf.kt   | 11 ++---
 .../de/hpi/cloud/food/entities/Restaurant.kt  |  6 ++-
 7 files changed, 95 insertions(+), 43 deletions(-)
 delete mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/CanteenData.kt
 create mode 100644 service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/OpenMensaMeal.kt
 rename service-food/src/main/kotlin/de/hpi/cloud/food/crawler/{ => openmensa}/canteens/Griebnitzsee.kt (78%)
 rename service-food/src/main/kotlin/de/hpi/cloud/food/crawler/{ => openmensa}/canteens/Ulf.kt (53%)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
deleted file mode 100644
index dad1817..0000000
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaTypes.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.hpi.cloud.food.crawler
-
-data class OpenMensaMeal(
-    val id: Int,
-    val name: String,
-    val category: String,
-    val prices: Map<String, Double>,
-    val notes: List<String>
-)
-
-open class CanteenData(
-    val id: String,
-    val openMensaId: Int
-) {
-    open fun findOfferName(meal: OpenMensaMeal): String = meal.category
-    open fun findLabels(meal: OpenMensaMeal): List<String> = listOf()
-    open fun findCounter(meal: OpenMensaMeal): String? = null
-
-    open fun mapReduce(meals: List<MensaMeal>): List<MensaMeal> = meals
-    open fun deduplicate(meals: List<MensaMeal>): List<MensaMeal> = meals
-        // meals with the same counter have the same id - let's fix this
-        .groupBy { it.id }
-        .flatMap {
-            if (it.value.size > 1)
-                it.value.mapIndexed { index, meal ->
-                    meal.copy(uniqueIdSuffix = index + 1)
-                }
-            else // no duplicate
-                it.value
-        }
-}
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
new file mode 100644
index 0000000..c9363ec
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
@@ -0,0 +1,41 @@
+package de.hpi.cloud.food.crawler
+
+import de.hpi.cloud.food.crawler.openmensa.CanteenData
+import de.hpi.cloud.food.crawler.openmensa.OpenMensaMeal
+import java.time.LocalDate
+
+data class ParsedMensaMeal(
+    private val canteenData: CanteenData,
+    val openMensaMeal: OpenMensaMeal,
+    val date: LocalDate,
+    val counter: String?,
+    val title: String,
+    val offerName: String,
+    val labelIds: List<String>,
+    val uniqueIdSuffix: Int? = null
+) {
+    companion object {
+        fun parseMeals(canteenData: CanteenData, date: LocalDate, openMensaMeal: OpenMensaMeal) =
+            ParsedMensaMeal(
+                canteenData = canteenData,
+                openMensaMeal = openMensaMeal,
+                date = date,
+                counter = canteenData.findCounter(openMensaMeal),
+                title = openMensaMeal.name.replace("\n", "").trim(),
+                offerName = canteenData.findOfferName(openMensaMeal),
+                labelIds = canteenData.findLabels(openMensaMeal)
+            ).let { listOf(it) }
+    }
+
+    val id get() = canteenData.id.value +
+                "-${date.format(OpenMensaCrawler.DATE_FORMAT_COMPACT)}" +
+                "-${counter ?: openMensaId}" +
+                (uniqueIdSuffix?.let { "_$it" } ?: "")
+    val openMensaId get() = openMensaMeal.id
+
+    val prices: Map<String, Double> = openMensaMeal.prices
+        .mapKeys {
+            if (it.key == "others") "default"
+            else it.key
+        }
+}
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/CanteenData.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/CanteenData.kt
new file mode 100644
index 0000000..a03eb80
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/CanteenData.kt
@@ -0,0 +1,29 @@
+package de.hpi.cloud.food.crawler.openmensa
+
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.food.crawler.ParsedMensaMeal
+import de.hpi.cloud.food.entities.Restaurant
+
+open class CanteenData(
+    val id: Id<Restaurant>,
+    val openMensaId: Int
+) {
+    open fun findOfferName(meal: OpenMensaMeal): String = meal.category
+    open fun findLabels(meal: OpenMensaMeal): List<String> = listOf()
+    open fun findCounter(meal: OpenMensaMeal): String? = null
+
+    open fun mapReduce(meals: List<ParsedMensaMeal>): List<ParsedMensaMeal> = meals
+    open fun deduplicate(meals: List<ParsedMensaMeal>): List<ParsedMensaMeal> = meals
+        // meals with the same counter have the same id - let's fix this
+        .groupBy { it.id }
+        .flatMap { (_, value) ->
+            if (value.size > 1)
+                value.mapIndexed { index, meal ->
+                    meal.copy(uniqueIdSuffix = index + 1)
+                }
+            else // no duplicate
+                value
+        }
+
+    override fun toString(): String = "$id[id=$openMensaId]"
+}
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/OpenMensaMeal.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/OpenMensaMeal.kt
new file mode 100644
index 0000000..6271b42
--- /dev/null
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/OpenMensaMeal.kt
@@ -0,0 +1,9 @@
+package de.hpi.cloud.food.crawler.openmensa
+
+data class OpenMensaMeal(
+    val id: Int,
+    val name: String,
+    val category: String,
+    val prices: Map<String, Double>,
+    val notes: List<String>
+)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
similarity index 78%
rename from service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
index 7dfdf63..fd92533 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Griebnitzsee.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
@@ -1,10 +1,10 @@
-package de.hpi.cloud.food.crawler.canteens
+package de.hpi.cloud.food.crawler.openmensa.canteens
 
 import de.hpi.cloud.common.utils.getOrElse
-import de.hpi.cloud.food.crawler.CanteenData
-import de.hpi.cloud.food.crawler.OpenMensaMeal
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.food.crawler.openmensa.CanteenData
+import de.hpi.cloud.food.crawler.openmensa.OpenMensaMeal
 
-object Griebnitzsee : CanteenData("mensaGriebnitzsee", 62) {
     private val LABEL_MAPPING = mapOf(
         "Vital" to "vital",
         "Vegetarisch" to "vegetarian",
@@ -17,6 +17,7 @@ object Griebnitzsee : CanteenData("mensaGriebnitzsee", 62) {
         "Fisch" to "fish",
         "Alkohol" to "alcohol",
         "Outdoor" to null // ignore this label
+object Griebnitzsee : CanteenData(Id("mensaGriebnitzsee"), 62) {
     )
 
     override fun findLabels(meal: OpenMensaMeal): List<String> = meal
@@ -29,7 +30,7 @@ object Griebnitzsee : CanteenData("mensaGriebnitzsee", 62) {
             }
         }
 
-    fun OpenMensaMeal.categoryMatches(string: String) = category.startsWith(string, ignoreCase = true)
+    private fun OpenMensaMeal.categoryMatches(string: String) = category.startsWith(string, ignoreCase = true)
     override fun findCounter(meal: OpenMensaMeal): String? = when {
         // TODO: translations
         meal.categoryMatches("Angebot 1") -> "1"
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
similarity index 53%
rename from service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt
rename to service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
index 911718e..cbdd258 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/canteens/Ulf.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
@@ -1,10 +1,11 @@
-package de.hpi.cloud.food.crawler.canteens
+package de.hpi.cloud.food.crawler.openmensa.canteens
 
-import de.hpi.cloud.food.crawler.CanteenData
-import de.hpi.cloud.food.crawler.MensaMeal
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.food.crawler.ParsedMensaMeal
+import de.hpi.cloud.food.crawler.openmensa.CanteenData
+object Ulf : CanteenData(Id("ulfsCafe"), 112) {
 
-object Ulf : CanteenData("ulfsCafe", 112) {
-    override fun mapReduce(meals: List<MensaMeal>) = meals
+    override fun mapReduce(meals: List<ParsedMensaMeal>) = meals
         .flatMap {
             val alternativeOffer = it.openMensaMeal.notes
                 .joinToString(separator = " ")
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
index b3ef165..0876e35 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
@@ -5,6 +5,7 @@ import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.protobuf.builder
 import de.hpi.cloud.common.types.L10n
+import de.hpi.cloud.common.types.l10n
 import kotlinx.serialization.Serializable
 import de.hpi.cloud.food.v1test.Restaurant as ProtoRestaurant
 
@@ -15,8 +16,9 @@ data class Restaurant(
     companion object : Entity.Companion<Restaurant>("restaurant")
 
     object ProtoSerializer : Entity.ProtoSerializer<Restaurant, ProtoRestaurant, ProtoRestaurant.Builder>() {
-        override fun fromProto(proto: ProtoRestaurant, context: Context): Restaurant =
-            throw UnsupportedOperationException("Restaurants cannot be created via protobuf")
+        override fun fromProto(proto: ProtoRestaurant, context: Context): Restaurant = Restaurant(
+            title = proto.title.l10n(context)
+        )
 
         override fun toProtoBuilder(entity: Restaurant, context: Context): ProtoRestaurant.Builder =
             ProtoRestaurant.newBuilder().builder(entity) {

From 82582641227e5c578c39b1094117d64fd9070cd9 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:55:42 +0200
Subject: [PATCH 06/13] refactor(common): clean up unused types and imports

---
 .../kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt    | 2 +-
 .../main/kotlin/de/hpi/cloud/common/couchbase/Document.kt  | 7 +++----
 .../src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt   | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/src/main/kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt b/common/src/main/kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt
index 4275674..260e544 100644
--- a/common/src/main/kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt
+++ b/common/src/main/kotlin/de/hpi/cloud/common/couchbase/ApiDocument.kt
@@ -9,7 +9,7 @@ import de.hpi.cloud.common.grpc.throwAlreadyExists
 
 inline fun <reified E : Entity<E>, reified Proto : GeneratedMessageV3> Bucket.tryInsert(wrapper: Wrapper<E>) {
     try {
-        insert<E, Proto>(wrapper)
+        insert(wrapper)
     } catch (e: DocumentAlreadyExistsException) {
         throwAlreadyExists<Proto>(wrapper.id)
     }
diff --git a/common/src/main/kotlin/de/hpi/cloud/common/couchbase/Document.kt b/common/src/main/kotlin/de/hpi/cloud/common/couchbase/Document.kt
index a49737d..d87fa22 100644
--- a/common/src/main/kotlin/de/hpi/cloud/common/couchbase/Document.kt
+++ b/common/src/main/kotlin/de/hpi/cloud/common/couchbase/Document.kt
@@ -3,7 +3,6 @@ package de.hpi.cloud.common.couchbase
 import com.couchbase.client.java.AsyncBucket
 import com.couchbase.client.java.Bucket
 import com.couchbase.client.java.document.RawJsonDocument
-import com.google.protobuf.GeneratedMessageV3
 import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
@@ -37,9 +36,9 @@ inline fun <reified E : Entity<E>> Wrapper<E>.toJsonDocument(): RawJsonDocument
     )
 }
 
-inline fun <reified E : Entity<E>, reified Proto : GeneratedMessageV3> Bucket.insert(wrapper: Wrapper<E>) =
+inline fun <reified E : Entity<E>> Bucket.insert(wrapper: Wrapper<E>) =
     insert(wrapper.toJsonDocument())
 
-inline fun <reified E : Entity<E>> Bucket.upsert(entityWrapper: Wrapper<E>) {
-    upsert(entityWrapper.toJsonDocument())
+inline fun <reified E : Entity<E>> Bucket.upsert(wrapper: Wrapper<E>) {
+    upsert(wrapper.toJsonDocument())
 }
diff --git a/common/src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt b/common/src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt
index 4527c8e..14bb2e0 100644
--- a/common/src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt
+++ b/common/src/main/kotlin/de/hpi/cloud/common/entity/Entity.kt
@@ -3,11 +3,9 @@ package de.hpi.cloud.common.entity
 import com.google.protobuf.GeneratedMessageV3
 import de.hpi.cloud.common.Context
 import de.hpi.cloud.common.protobuf.setId
-import de.hpi.cloud.common.serializers.proto.InstantSerializer
 import kotlinx.serialization.ImplicitReflectionSerializer
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer
-import java.time.Instant
 import kotlin.reflect.KClass
 import kotlin.reflect.full.companionObjectInstance
 import de.hpi.cloud.common.serializers.proto.ProtoSerializer as AnyProtoSerializer

From 33dae8f34a8bfb98e1aac1d66a6d709dff6986f0 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:57:29 +0200
Subject: [PATCH 07/13] refactor(service-food): better label matching, clean up
 and format fix

---
 .../cloud/food/crawler/OpenMensaCrawler.kt    | 70 ++++---------------
 .../de/hpi/cloud/food/entities/Label.kt       | 15 ++--
 .../de/hpi/cloud/food/entities/MenuItem.kt    |  2 +-
 3 files changed, 24 insertions(+), 63 deletions(-)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
index 2902117..a1b66a0 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
@@ -1,11 +1,8 @@
 package de.hpi.cloud.food.crawler
 
 import com.beust.klaxon.Klaxon
-import de.hpi.cloud.common.Entity
-import de.hpi.cloud.common.utils.couchbase.i18nMap
-import de.hpi.cloud.common.utils.protobuf.euros
-import de.hpi.cloud.common.utils.protobuf.toDbMap
-import de.hpi.cloud.common.utils.protobuf.toTimestamp
+import de.hpi.cloud.food.crawler.openmensa.CanteenData
+import de.hpi.cloud.food.crawler.openmensa.OpenMensaMeal
 import de.hpi.cloud.food.crawler.utils.openStreamWith
 import java.net.URI
 import java.time.LocalDate
@@ -40,7 +37,10 @@ class OpenMensaCrawler(
             klaxon.parseJsonArray(reader)
                 .mapChildrenObjectsOnly {
                     DateStatus(
-                        date = LocalDate.parse(it.string("date")!!, DATE_FORMAT_ISO8601),
+                        date = LocalDate.parse(
+                            it.string("date")!!,
+                            DATE_FORMAT_ISO8601
+                        ),
                         isOpen = !it.boolean("closed")!!
                     )
                 }
@@ -52,7 +52,13 @@ class OpenMensaCrawler(
         .bufferedReader()
         .use { reader ->
             klaxon.parseArray<OpenMensaMeal>(reader)!!
-                .flatMap { MensaMeal.parseMeals(canteenData, date, it) }
+                .flatMap {
+                    ParsedMensaMeal.parseMeals(
+                        canteenData,
+                        date,
+                        it
+                    )
+                }
                 .let { canteenData.mapReduce(it) }
                 .let { canteenData.deduplicate(it) }
         }
@@ -63,53 +69,3 @@ data class DateStatus(
     val isOpen: Boolean
 )
 
-data class MensaMeal(
-    private val canteenData: CanteenData,
-    val openMensaMeal: OpenMensaMeal,
-    val date: LocalDate,
-    val counter: String?,
-    val title: String,
-    val offerName: String,
-    val labelIds: List<String>,
-    val uniqueIdSuffix: Int? = null
-) : Entity("menuItem", 1) {
-    companion object {
-        fun parseMeals(canteenData: CanteenData, date: LocalDate, openMensaMeal: OpenMensaMeal) =
-            MensaMeal(
-                canteenData,
-                openMensaMeal,
-                date,
-                canteenData.findCounter(openMensaMeal),
-                openMensaMeal.name.replace("\n", ""),
-                canteenData.findOfferName(openMensaMeal),
-                canteenData.findLabels(openMensaMeal)
-            ).let { listOf(it) }
-    }
-
-    override val id
-        get() = canteenData.id +
-                "-${date.format(OpenMensaCrawler.DATE_FORMAT_COMPACT)}" +
-                "-${counter ?: openMensaId}" +
-                (uniqueIdSuffix?.let { "_$it" } ?: "")
-    private val openMensaId get() = openMensaMeal.id
-
-    private val prices = openMensaMeal.prices
-        .mapKeys {
-            if (it.key == "others") "default"
-            else it.key
-        }
-        .mapValues {
-            it.value.euros().toDbMap()
-        }
-
-    override fun valueToMap() = mapOf(
-        "restaurantId" to canteenData.id,
-        "openMensaId" to openMensaId,
-        "date" to date.toTimestamp().toDbMap(),
-        "offerName" to offerName,
-        "title" to i18nMap(de = title),
-        "counter" to i18nMap(de = counter),
-        "labelIds" to labelIds,
-        "prices" to prices
-    )
-}
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
index e7dc100..d9d6925 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
@@ -8,7 +8,6 @@ import de.hpi.cloud.common.entity.asId
 import de.hpi.cloud.common.protobuf.builder
 import de.hpi.cloud.common.serializers.json.UrlSerializer
 import de.hpi.cloud.common.types.L10n
-import de.hpi.cloud.common.utils.contains
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import java.net.URL
@@ -19,11 +18,12 @@ import de.hpi.cloud.food.v1test.Label as ProtoLabel
 data class Label(
     val title: L10n<String>,
     val iconUrl: @Serializable(UrlSerializer::class) URL,
-    val aliases: Set<String>
+    val aliases: Set<String> = setOf()
 ) : Entity<Label>() {
     companion object : Entity.Companion<Label>("label")
 
-    @Transient val id: Id<Label> = title[GERMAN]!!.toLowerCase().asId()
+    @Transient
+    val id: Id<Label> = title[GERMAN]!!.toLowerCase().asId()
 
     object ProtoSerializer : Entity.ProtoSerializer<Label, ProtoLabel, ProtoLabel.Builder>() {
         override fun fromProto(proto: ProtoLabel, context: Context): Label =
@@ -36,8 +36,13 @@ data class Label(
             }
     }
 
-    fun matches(label: String) : Boolean =
-        (aliases + title.values.values).contains(label, ignoreCase = true)
+    fun matches(label: String, startOnly: Boolean = false, ignoreCase: Boolean = true): Boolean {
+        val searchSet = aliases + title.values.values
+        return if (startOnly)
+            searchSet.any { label.startsWith(it, ignoreCase) }
+        else
+            searchSet.any { label.equals(it, ignoreCase) }
+    }
 }
 
 fun Wrapper<Label>.toProto(context: Context): ProtoLabel = Label.ProtoSerializer.toProto(this, context)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
index 31391b4..0d708ee 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
@@ -40,7 +40,7 @@ data class MenuItem(
                 offerTitle = proto.offerTitle.l10n(context),
                 title = proto.title.l10n(context),
                 counterId = proto.counterId.asId(),
-                labelIds = proto.labelIdsList.map { it.asId() },
+                labelIds = proto.labelIdsList.map { it.asId<Label>() },
                 prices = proto.pricesMap.mapValues { (_, money) -> money.parse(context) }
             )
 

From 0ae3d48a7162dd6e74f3a0df23b936853efec82f Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:57:56 +0200
Subject: [PATCH 08/13] feat(service-food): better labels and matching

---
 .../openmensa/canteens/Griebnitzsee.kt        | 30 ++++------
 .../food/crawler/openmensa/canteens/Ulf.kt    | 40 +++++++++++--
 .../de/hpi/cloud/food/fixtures/Labels.kt      | 58 ++++++++++---------
 3 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
index fd92533..5b489b9 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
@@ -1,34 +1,24 @@
 package de.hpi.cloud.food.crawler.openmensa.canteens
 
-import de.hpi.cloud.common.utils.getOrElse
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.food.crawler.openmensa.CanteenData
 import de.hpi.cloud.food.crawler.openmensa.OpenMensaMeal
+import de.hpi.cloud.food.fixtures.labelFixture
 
-    private val LABEL_MAPPING = mapOf(
-        "Vital" to "vital",
-        "Vegetarisch" to "vegetarian",
-        "Vegan" to "vegan",
-        "Schweinefleisch" to "pork",
-        "Rindfleisch" to "beef",
-        "Lamm" to "lamb",
-        "Knoblauch" to "garlic",
-        "Gefluegel" to "poultry",
-        "Fisch" to "fish",
-        "Alkohol" to "alcohol",
-        "Outdoor" to null // ignore this label
 object Griebnitzsee : CanteenData(Id("mensaGriebnitzsee"), 62) {
+    private val LABEL_IGNORE_LIST = setOf(
+        "ostern", "ball", "wm"
     )
 
-    override fun findLabels(meal: OpenMensaMeal): List<String> = meal
-        .notes
-        .map { it.trim() }
+    override fun findLabels(meal: OpenMensaMeal): List<String> = meal.notes
+        .map { it.trim().toLowerCase() }
+        .filterNot { it in LABEL_IGNORE_LIST }
         .mapNotNull { note ->
-            LABEL_MAPPING.getOrElse(note) {
-                println("Unknown label \"${note}\"")
-                null
-            }
+            val label = labelFixture.find { label -> label.matches(note) }
+            if (label == null) println("Unknown label \"$note\"")
+            label
         }
+        .map { it.id.value }
 
     private fun OpenMensaMeal.categoryMatches(string: String) = category.startsWith(string, ignoreCase = true)
     override fun findCounter(meal: OpenMensaMeal): String? = when {
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
index cbdd258..8531166 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Ulf.kt
@@ -3,16 +3,46 @@ package de.hpi.cloud.food.crawler.openmensa.canteens
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.food.crawler.ParsedMensaMeal
 import de.hpi.cloud.food.crawler.openmensa.CanteenData
+import de.hpi.cloud.food.fixtures.labelFixture
+
 object Ulf : CanteenData(Id("ulfsCafe"), 112) {
+    val PRICE_REGEX = Regex("^(.*?)\\s+(\\d,\\d\\d?)\\s?€?\$")
 
     override fun mapReduce(meals: List<ParsedMensaMeal>) = meals
-        .flatMap {
-            val alternativeOffer = it.openMensaMeal.notes
+        .flatMap { meal ->
+            val alternativeOffer = meal.openMensaMeal.notes
                 .joinToString(separator = " ")
                 .trim()
-            if (alternativeOffer.startsWith("oder ", ignoreCase = true))
-                listOf(it, it.copy(title = alternativeOffer.substring(5)))
+                .substringAfter("oder ")
+
+            if (alternativeOffer.isNotEmpty()) {
+                // example: https://openmensa.org/c/112/2020-04-23
+                PRICE_REGEX.matchEntire(alternativeOffer)
+                    ?.let { match ->
+                        match.groupValues[2]
+                            .replace(',', '.')
+                            .toDoubleOrNull()
+                            ?.let { price ->
+                                val alternativeOMM = meal.openMensaMeal.copy(prices = mapOf("others" to price))
+                                val alternative =
+                                    meal.copy(title = match.groupValues[1], openMensaMeal = alternativeOMM)
+                                listOf(meal, alternative)
+                            }
+                    }
+                    ?: listOf(meal, meal.copy(title = alternativeOffer))
+            } else {
+                listOf(meal)
+            }
+        }
+        .map { meal ->
+            val titleWords = meal.title.split(' ')
+
+            val foundLabels = labelFixture
+                .filter { label -> titleWords.any { word -> label.matches(word, startOnly = true) } }
+
+            if (foundLabels.isNotEmpty())
+                meal.copy(labelIds = foundLabels.map { it.id.value })
             else
-                listOf(it)
+                meal
         }
 }
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
index a114517..545e487 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
@@ -11,58 +11,64 @@ import java.net.URL
 val labelFixture: List<Label> = listOf(
     Label(
         title = L10n.from(de = "Alkohol", en = "Alcohol"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png"),
-        aliases = setOf("Alkohol")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png")
     ),
     Label(
-        title = L10n.from(de = "Rind", en = "Beef"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
-        aliases = setOf("Rindfleisch")
+        title = L10n.from(de = "Knoblauch", en = "Garlic"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png")
     ),
     Label(
-        title = L10n.from(de = "Fisch", en = "Fish"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png"),
-        aliases = setOf("Fisch")
+        title = L10n.from(de = "Schwein", en = "Pork"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
+        aliases = setOf("Schweinefleisch")
     ),
     Label(
-        title = L10n.from(de = "Knoblauch", en = "Garlic"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png"),
-        aliases = setOf("Knoblauch")
+        title = L10n.from(de = "Rind", en = "Beef"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
+        aliases = setOf("Rindfleisch")
     ),
     Label(
         title = L10n.from(de = "Lamm", en = "Lamb"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png"),
-        aliases = setOf("Lamm")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png")
     ),
     Label(
-        title = L10n.from(de = "Schwein", en = "Pork"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
-        aliases = setOf("Schweinefleisch")
+        title = L10n.from(de = "Fisch", en = "Fish"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png")
     ),
     Label(
         title = L10n.from(de = "Geflügel", en = "Poultry"),
         iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
-        aliases = setOf("Gefluegel")
+        aliases = setOf("Gefluegel", "Huhn", "Hahn", "Hühnchen", "Huehnchen", "Ente", "Gans", "Truthahn")
+    ),
+    Label(
+        title = L10n.from(de = "Wild", en = "Venison"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
+        aliases = setOf("Wildfleisch")
     ),
     Label(
         title = L10n.from(de = "Vegan", en = "Vegan"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png"),
-        aliases = setOf("Vegan")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png")
     ),
     Label(
         title = L10n.from(de = "Vegetarisch", en = "Vegetarian"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png"),
-        aliases = setOf("Vegetarisch")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png")
     ),
     Label(
         title = L10n.from(de = "Vital", en = "Vital"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vital_m.png"),
-        aliases = setOf("Vital")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vital_m.png")
     ),
     Label(
-        title = L10n.from(de = "Wild", en = "Venison"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
-        aliases = setOf("Wildfleisch")
+        title = L10n.from(de = "Regional", en = "Regional"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_regional.png")
+    ),
+    Label(
+        title = L10n.from(de = "Draußen", en = "Outdoor"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_outdoor_o.png"),
+        aliases = setOf("Draussen")
+    ),
+    Label(
+        title = L10n.from(de = "Foottruck", en = "Foottruck"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_foottruck_o.png")
     )
 )
 

From 34f79b158ae32684a71058d929ef19449ba44098 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:59:10 +0200
Subject: [PATCH 09/13] fix(service-food): fix crawler

---
 .../kotlin/de/hpi/cloud/food/crawler/Main.kt  | 70 +++++++++++++++----
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
index 764b6dc..b0ffb1d 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
@@ -1,9 +1,20 @@
 package de.hpi.cloud.food.crawler
 
-import de.hpi.cloud.common.utils.couchbase.withBucket
-import de.hpi.cloud.food.crawler.canteens.Griebnitzsee
-import de.hpi.cloud.food.crawler.canteens.Ulf
+import de.hpi.cloud.common.couchbase.upsert
+import de.hpi.cloud.common.couchbase.withBucket
+import de.hpi.cloud.common.entity.Id
+import de.hpi.cloud.common.types.Money
+import de.hpi.cloud.common.types.l10n
+import de.hpi.cloud.food.FOOD_CONTEXT
+import de.hpi.cloud.food.crawler.openmensa.canteens.Griebnitzsee
+import de.hpi.cloud.food.crawler.openmensa.canteens.Ulf
+import de.hpi.cloud.food.entities.Counter
+import de.hpi.cloud.food.entities.Label
+import de.hpi.cloud.food.entities.MenuItem
+import java.io.IOException
+import java.net.URL
 import java.time.LocalDate
+import java.util.Locale.GERMAN
 
 const val NAME = "HPI-MobileDev-Crawler[Food]"
 const val VERSION = "1.0.0"
@@ -24,20 +35,49 @@ fun main(args: Array<String>) {
         KNOWN_CANTEENS
             .map { OpenMensaCrawler(it) }
             .forEach { crawler ->
-                println("Starting crawler $CRAWLER_INFO - ${crawler.canteenData.id}")
+                println("Starting crawler $CRAWLER_INFO - ${crawler.canteenData}")
                 println("Using User-Agent=\"$USER_AGENT\"")
 
-                val days =
-                    if (todayOnly) listOf(LocalDate.now())
-                    else crawler.queryDays()
-                        .filter { it.isOpen }
-                        .map { it.date }
-                days.forEach { date ->
-                    print("Date $date: ")
-
-                    val meals = crawler.queryMeals(date)
-                    meals.forEach { bucket.upsert(it.toJsonDocument()) }
-                    println("${meals.size} meals")
+                try {
+                    val days =
+                        if (todayOnly) listOf(LocalDate.now())
+                        else crawler.queryDays()
+                            .filter { it.isOpen }
+                            .map { it.date }
+                    days.forEach { date ->
+                        print("Date $date: ")
+
+                        val meals = crawler.queryMeals(date)
+                        meals.forEach { meal ->
+                            val counterId = meal.counter ?: "unbekannt"
+
+                            // populate counters
+                            // TODO: remove later
+                            val counter = Counter(
+                                crawler.canteenData.id,
+                                title = counterId.l10n(GERMAN),
+                                iconUrl = URL("")
+                            )
+                            bucket.upsert(counter.createNewWrapper(FOOD_CONTEXT, Id(counterId)))
+
+                            val menuItem = MenuItem(
+                                openMensaId = meal.openMensaId.toString(),
+                                date = meal.date,
+                                restaurantId = crawler.canteenData.id,
+                                offerTitle = meal.offerName.l10n(GERMAN),
+                                title = meal.title.l10n(GERMAN),
+                                counterId = Id(meal.counter ?: "null"),
+                                labelIds = meal.labelIds.map { Id<Label>(it) },
+                                prices = meal.prices.mapValues { (_, price) -> Money.eur(price) }
+                            )
+                            println(meal)
+                            println(menuItem)
+                            bucket.upsert(menuItem.createNewWrapper(FOOD_CONTEXT, Id(meal.id)))
+                        }
+                        println("${meals.size} meals")
+                    }
+                } catch (ex: IOException) {
+                    ex.printStackTrace()
                 }
             }
     }

From 14c92f2e83af0aa29376b172be85c198c7a7c39b Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:59:28 +0200
Subject: [PATCH 10/13] refactor(service-food): remove broken service code

---
 .../kotlin/de/hpi/cloud/food/FoodService.kt   | 148 +-----------------
 1 file changed, 4 insertions(+), 144 deletions(-)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/FoodService.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/FoodService.kt
index d1b73df..40dbcce 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/FoodService.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/FoodService.kt
@@ -1,149 +1,9 @@
 package de.hpi.cloud.food
 
-import com.couchbase.client.java.Bucket
-import com.couchbase.client.java.document.json.JsonObject
-import com.couchbase.client.java.query.dsl.Expression.s
-import com.couchbase.client.java.query.dsl.Expression.x
-import com.couchbase.client.java.query.dsl.Sort.asc
-import com.couchbase.client.java.query.dsl.functions.DateFunctions.millisToStr
-import com.couchbase.client.java.view.ViewQuery
-import com.google.protobuf.GeneratedMessageV3
-import de.hpi.cloud.common.Service
-import de.hpi.cloud.common.utils.couchbase.*
-import de.hpi.cloud.common.utils.getI18nString
-import de.hpi.cloud.common.utils.grpc.buildWith
-import de.hpi.cloud.common.utils.grpc.buildWithDocument
-import de.hpi.cloud.common.utils.grpc.throwException
-import de.hpi.cloud.common.utils.grpc.unary
-import de.hpi.cloud.common.utils.protobuf.getDateUsingMillis
-import de.hpi.cloud.common.utils.protobuf.getMoney
-import de.hpi.cloud.common.utils.protobuf.toIsoString
-import de.hpi.cloud.food.v1test.*
-import io.grpc.Status
-import io.grpc.stub.StreamObserver
+import de.hpi.cloud.common.Context
 
-fun main(args: Array<String>) {
-    val service = Service("food", args.firstOrNull()?.toInt()) { FoodServiceImpl(it) }
-    service.blockUntilShutdown()
-}
-
-class FoodServiceImpl(private val bucket: Bucket) : FoodServiceGrpc.FoodServiceImplBase() {
-    companion object {
-        const val DESIGN_RESTAURANT = "restaurant"
-        const val DESIGN_MENU_ITEM = "menuItem"
-        const val DESIGN_LABEL = "label"
-    }
-
-    // region Restaurant
-    override fun listRestaurants(
-        request: ListRestaurantsRequest?,
-        responseObserver: StreamObserver<ListRestaurantsResponse>?
-    ) = unary(request, responseObserver, "listRestaurants") { req ->
-        val (restaurants, newToken) = ViewQuery.from(DESIGN_RESTAURANT, VIEW_BY_ID)
-            .paginate(bucket, req.pageSize, req.pageToken) { it.parseRestaurant(req) }
-
-        ListRestaurantsResponse.newBuilder().buildWith {
-            addAllRestaurants(restaurants)
-            nextPageToken = newToken
-        }
-    }
-
-    override fun getRestaurant(request: GetRestaurantRequest?, responseObserver: StreamObserver<Restaurant>?) =
-        unary(request, responseObserver, "getRestaurant") { req ->
-            if (req.id.isNullOrEmpty()) Status.INVALID_ARGUMENT.throwException("Restaurant ID is required")
-
-            bucket.get(DESIGN_RESTAURANT, VIEW_BY_ID, req.id)
-                ?.document()?.content()?.parseRestaurant(req)
-                ?: Status.NOT_FOUND.throwException("Restaurant with ID ${req.id} not found")
-        }
-
-    private fun JsonObject.parseRestaurant(request: GeneratedMessageV3) =
-        Restaurant.newBuilder().buildWithDocument<Restaurant, Restaurant.Builder>(this) {
-            id = getString(KEY_ID)
-            title = it.getI18nString("title", request)
-        }
-    // endregion
-
-    // region MenuItem
-    override fun listMenuItems(
-        request: ListMenuItemsRequest?,
-        responseObserver: StreamObserver<ListMenuItemsResponse>?
-    ) = unary(request, responseObserver, "listMenuItems") { req ->
-        val restaurantId = req.restaurantId?.trim()?.takeIf { it.isNotEmpty() }
-        val date = if (req.hasDate()) req.date else null
-
-        val (menuItems, newToken) = paginate(bucket, {
-            where(
-                and(
-                    x(KEY_TYPE).eq(s("menuItem")),
-                    restaurantId?.let { v("restaurantId").eq(s(restaurantId)) },
-                    date?.let {
-                        millisToStr(v("date", "millis"), "1111-11-11")
-                            .eq(s(it.toIsoString()))
-                    }
-                )
-            )
-                .orderBy(
-                    *descTimestamp(v("date")),
-                    asc(v("offerName"))
-                )
-        }, req.pageSize, req.pageToken) { it.parseMenuItem(req) }
-
-        ListMenuItemsResponse.newBuilder().buildWith {
-            addAllItems(menuItems)
-            nextPageToken = newToken
-        }
-    }
-
-    override fun getMenuItem(request: GetMenuItemRequest?, responseObserver: StreamObserver<MenuItem>?) =
-        unary(request, responseObserver, "getMenuItem") { req ->
-            if (req.id.isNullOrEmpty()) Status.INVALID_ARGUMENT.throwException("Argument ID is required")
-
-            bucket.get(DESIGN_MENU_ITEM, VIEW_BY_ID, req.id)
-                ?.document()?.content()?.parseMenuItem(req)
-                ?: Status.NOT_FOUND.throwException("MenuItem with ID ${req.id} not found")
-        }
-
-    private fun JsonObject.parseMenuItem(request: GeneratedMessageV3) =
-        MenuItem.newBuilder().buildWithDocument<MenuItem, MenuItem.Builder>(this) {
-            id = getString(KEY_ID)
-            restaurantId = it.getString("restaurantId")
-            it.getDateUsingMillis("date")?.let { d -> date = d }
-            it.getI18nString("counter", request)?.let { c -> counter = c }
-            it.getObject("prices").let { prices ->
-                putAllPrices(prices.names.map { p -> p to prices.getMoney(p) }.toMap())
-            }
-            title = it.getI18nString("title", request)
-            addAllLabelIds(it.getStringArray("labelIds").filterNotNull())
-        }
-    // endregion
-
-    // region Label
-    override fun listLabels(request: ListLabelsRequest?, responseObserver: StreamObserver<ListLabelsResponse>?) =
-        unary(request, responseObserver, "listLabels") { req ->
-            val (labels, newToken) = ViewQuery.from(DESIGN_LABEL, VIEW_BY_ID)
-                .paginate(bucket, req.pageSize, req.pageToken) { it.parseLabel(req) }
-
-            ListLabelsResponse.newBuilder().buildWith {
-                addAllLabels(labels)
-                nextPageToken = newToken
-            }
-        }
-
-    override fun getLabel(request: GetLabelRequest?, responseObserver: StreamObserver<Label>?) =
-        unary(request, responseObserver, "getLabel") { req ->
-            if (req.id.isNullOrEmpty()) Status.INVALID_ARGUMENT.throwException("Label ID is required")
-
-            bucket.get(DESIGN_LABEL, VIEW_BY_ID, req.id)
-                ?.document()?.content()?.parseLabel(req)
-                ?: Status.NOT_FOUND.throwException("Label with ID ${req.id} not found")
-        }
+val FOOD_CONTEXT = Context.forInternalService("service-food")
 
-    private fun JsonObject.parseLabel(request: GeneratedMessageV3) =
-        Label.newBuilder().buildWithDocument<Label, Label.Builder>(this) {
-            id = getString(KEY_ID)
-            title = it.getI18nString("title", request)
-            it.getString("icon")?.let { i -> icon = i }
-        }
-    // endregion
+fun main() {
+    TODO()
 }

From 6abab860c2c084abac4211083053db8f20a95989 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 14 May 2020 19:59:55 +0200
Subject: [PATCH 11/13] build(service-food): update kotlin to 1.3.71

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f4bed17..c3fedd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.71'
 
     repositories {
         mavenCentral()

From 36388a0211271ddaf15f56e14fb24127494a3ded Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Fri, 15 May 2020 14:12:57 +0200
Subject: [PATCH 12/13] fix(service-food): fix PR issues, improve log, use URI
 instead of URL

---
 service-food/build.gradle                     |  4 +--
 .../kotlin/de/hpi/cloud/food/crawler/Main.kt  | 36 +++++++++----------
 .../cloud/food/crawler/OpenMensaCrawler.kt    |  5 ++-
 .../hpi/cloud/food/crawler/ParsedMensaMeal.kt | 11 +++---
 .../de/hpi/cloud/food/entities/Counter.kt     |  8 ++---
 .../de/hpi/cloud/food/entities/Label.kt       | 16 +++++----
 .../de/hpi/cloud/food/entities/MenuItem.kt    |  6 ++--
 .../de/hpi/cloud/food/fixtures/Labels.kt      | 32 ++++++++---------
 8 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/service-food/build.gradle b/service-food/build.gradle
index 3ac5158..03af3eb 100644
--- a/service-food/build.gradle
+++ b/service-food/build.gradle
@@ -16,6 +16,7 @@ apply plugin: 'kotlin'
 
 repositories {
     jcenter()
+    mavenCentral()
     maven { url "https://dl.bintray.com/hpi/hpi-cloud-mvn" }
 }
 
@@ -32,6 +33,3 @@ application {
     
     mainClassName = "de.hpi.cloud.food.FoodServiceKt"
 }
-repositories {
-    mavenCentral()
-}
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
index b0ffb1d..08e211c 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/Main.kt
@@ -12,7 +12,6 @@ import de.hpi.cloud.food.entities.Counter
 import de.hpi.cloud.food.entities.Label
 import de.hpi.cloud.food.entities.MenuItem
 import java.io.IOException
-import java.net.URL
 import java.time.LocalDate
 import java.util.Locale.GERMAN
 
@@ -31,11 +30,10 @@ fun main(args: Array<String>) {
 
     println("Starting $NAME")
     withBucket("food") { bucket ->
-        // TODO: clear previous data
         KNOWN_CANTEENS
             .map { OpenMensaCrawler(it) }
             .forEach { crawler ->
-                println("Starting crawler $CRAWLER_INFO - ${crawler.canteenData}")
+                println("\nStarting crawler $CRAWLER_INFO - ${crawler.canteenData}")
                 println("Using User-Agent=\"$USER_AGENT\"")
 
                 try {
@@ -44,21 +42,24 @@ fun main(args: Array<String>) {
                         else crawler.queryDays()
                             .filter { it.isOpen }
                             .map { it.date }
-                    days.forEach { date ->
-                        print("Date $date: ")
+                    if (days.isEmpty())
+                        println("No days available")
+                    else days.forEach { date ->
+                        println("\nQuerying date $date:")
 
                         val meals = crawler.queryMeals(date)
                         meals.forEach { meal ->
-                            val counterId = meal.counter ?: "unbekannt"
-
                             // populate counters
-                            // TODO: remove later
-                            val counter = Counter(
-                                crawler.canteenData.id,
-                                title = counterId.l10n(GERMAN),
-                                iconUrl = URL("")
-                            )
-                            bucket.upsert(counter.createNewWrapper(FOOD_CONTEXT, Id(counterId)))
+                            // TODO: remove when we've gathered all counters in the database
+                            val counterId = meal.counterName?.let { Id<Counter>(it) }
+                            val counter = meal.counterName?.let { name ->
+                                Counter(
+                                    crawler.canteenData.id,
+                                    title = name.l10n(GERMAN)
+                                )
+                            }
+                            if (counter != null)
+                                bucket.upsert(counter.createNewWrapper(FOOD_CONTEXT, counterId!!))
 
                             val menuItem = MenuItem(
                                 openMensaId = meal.openMensaId.toString(),
@@ -66,15 +67,14 @@ fun main(args: Array<String>) {
                                 restaurantId = crawler.canteenData.id,
                                 offerTitle = meal.offerName.l10n(GERMAN),
                                 title = meal.title.l10n(GERMAN),
-                                counterId = Id(meal.counter ?: "null"),
+                                counterId = counter?.let { counterId },
                                 labelIds = meal.labelIds.map { Id<Label>(it) },
                                 prices = meal.prices.mapValues { (_, price) -> Money.eur(price) }
                             )
-                            println(meal)
-                            println(menuItem)
+                            println("- $meal\n$menuItem\n")
                             bucket.upsert(menuItem.createNewWrapper(FOOD_CONTEXT, Id(meal.id)))
                         }
-                        println("${meals.size} meals")
+                        println("${meals.size} meals found for $date")
                     }
                 } catch (ex: IOException) {
                     ex.printStackTrace()
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
index a1b66a0..30a14e2 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/OpenMensaCrawler.kt
@@ -14,9 +14,8 @@ class OpenMensaCrawler(
     companion object {
         private const val OPENMENSA_API_VERSION = "v2"
 
-        val BASE_URI: URI = URI("https://openmensa.org/api/$OPENMENSA_API_VERSION/")
+        val BASE_URI = URI("https://openmensa.org/api/$OPENMENSA_API_VERSION/")
         val DATE_FORMAT_ISO8601 = DateTimeFormatter.ISO_LOCAL_DATE!!
-        val DATE_FORMAT_COMPACT = DateTimeFormatter.ofPattern("yyyyMMdd")!!
     }
 
     private val klaxon = Klaxon()
@@ -28,7 +27,7 @@ class OpenMensaCrawler(
     private fun streamJsonApi(query: String) = BASE_URI.resolve(query).toURL()
         .openStreamWith(
             "User-agent" to USER_AGENT,
-            "Accept" to "application/json, text/plain"
+            "Accept" to "application/json"
         )
 
     fun queryDays() = streamJsonApi(daysQuery())
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
index c9363ec..c42719f 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/ParsedMensaMeal.kt
@@ -3,24 +3,27 @@ package de.hpi.cloud.food.crawler
 import de.hpi.cloud.food.crawler.openmensa.CanteenData
 import de.hpi.cloud.food.crawler.openmensa.OpenMensaMeal
 import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 data class ParsedMensaMeal(
     private val canteenData: CanteenData,
     val openMensaMeal: OpenMensaMeal,
     val date: LocalDate,
-    val counter: String?,
+    val counterName: String?,
     val title: String,
     val offerName: String,
     val labelIds: List<String>,
     val uniqueIdSuffix: Int? = null
 ) {
     companion object {
+        val DATE_FORMAT_COMPACT = DateTimeFormatter.ofPattern("yyyyMMdd")!!
+
         fun parseMeals(canteenData: CanteenData, date: LocalDate, openMensaMeal: OpenMensaMeal) =
             ParsedMensaMeal(
                 canteenData = canteenData,
                 openMensaMeal = openMensaMeal,
                 date = date,
-                counter = canteenData.findCounter(openMensaMeal),
+                counterName = canteenData.findCounter(openMensaMeal),
                 title = openMensaMeal.name.replace("\n", "").trim(),
                 offerName = canteenData.findOfferName(openMensaMeal),
                 labelIds = canteenData.findLabels(openMensaMeal)
@@ -28,8 +31,8 @@ data class ParsedMensaMeal(
     }
 
     val id get() = canteenData.id.value +
-                "-${date.format(OpenMensaCrawler.DATE_FORMAT_COMPACT)}" +
-                "-${counter ?: openMensaId}" +
+                "-${date.format(DATE_FORMAT_COMPACT)}" +
+                "-${counterName ?: openMensaId}" +
                 (uniqueIdSuffix?.let { "_$it" } ?: "")
     val openMensaId get() = openMensaMeal.id
 
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
index 8cb76ab..d9a5003 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
@@ -5,17 +5,17 @@ import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.protobuf.builder
-import de.hpi.cloud.common.serializers.json.UrlSerializer
+import de.hpi.cloud.common.serializers.json.UriSerializer
 import de.hpi.cloud.common.types.L10n
 import kotlinx.serialization.Serializable
-import java.net.URL
+import java.net.URI
 import de.hpi.cloud.food.v1test.Counter as ProtoCounter
 
 @Serializable
 data class Counter(
     val restaurantId: Id<Restaurant>,
     val title: L10n<String>,
-    val iconUrl: @Serializable(UrlSerializer::class) URL
+    val iconUri: @Serializable(UriSerializer::class) URI? = null
 ) : Entity<Counter>() {
     companion object : Entity.Companion<Counter>("counter")
 
@@ -27,7 +27,7 @@ data class Counter(
             ProtoCounter.newBuilder().builder(entity) {
                 restaurantId = it.restaurantId.value
                 title = it.title[context]
-                icon = it.iconUrl.toString()
+                icon = it.iconUri.toString()
             }
     }
 }
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
index d9d6925..7e4aa80 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
@@ -6,19 +6,19 @@ import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.entity.asId
 import de.hpi.cloud.common.protobuf.builder
-import de.hpi.cloud.common.serializers.json.UrlSerializer
+import de.hpi.cloud.common.serializers.json.UriSerializer
 import de.hpi.cloud.common.types.L10n
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import java.net.URL
+import java.net.URI
 import java.util.Locale.GERMAN
 import de.hpi.cloud.food.v1test.Label as ProtoLabel
 
 @Serializable
 data class Label(
     val title: L10n<String>,
-    val iconUrl: @Serializable(UrlSerializer::class) URL,
-    val aliases: Set<String> = setOf()
+    val aliases: Set<String> = setOf(),
+    val iconUri: @Serializable(UriSerializer::class) URI? = null
 ) : Entity<Label>() {
     companion object : Entity.Companion<Label>("label")
 
@@ -32,7 +32,7 @@ data class Label(
         override fun toProtoBuilder(entity: Label, context: Context): ProtoLabel.Builder =
             ProtoLabel.newBuilder().builder(entity) {
                 title = it.title[context]
-                icon = it.iconUrl.toString()
+                icon = it.iconUri.toString()
             }
     }
 
@@ -45,4 +45,8 @@ data class Label(
     }
 }
 
-fun Wrapper<Label>.toProto(context: Context): ProtoLabel = Label.ProtoSerializer.toProto(this, context)
+fun ProtoLabel.parse(context: Context): Label =
+    Label.ProtoSerializer.fromProto(this, context)
+
+fun Wrapper<Label>.toProto(context: Context): ProtoLabel =
+    Label.ProtoSerializer.toProto(this, context)
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
index 0d708ee..35387d0 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/MenuItem.kt
@@ -25,7 +25,7 @@ data class MenuItem(
     val restaurantId: Id<Restaurant>,
     val offerTitle: L10n<String>,
     val title: L10n<String>,
-    val counterId: Id<Counter>,
+    val counterId: Id<Counter>?,
     val labelIds: List<Id<Label>>,
     val prices: Map<String, Money>
 ) : Entity<MenuItem>() {
@@ -50,8 +50,8 @@ data class MenuItem(
                 restaurantId = it.restaurantId.value
                 offerTitle = it.offerTitle[context]
                 title = it.title[context]
-                counterId = it.counterId.value
-                addAllLabelIds(it.labelIds.map { l -> l.value })
+                counterId = it.counterId?.value
+                addAllLabelIds(it.labelIds.map { label -> label.value })
                 putAllPrices(it.prices.mapValues { (_, money) -> money.toProto(context) })
             }
     }
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
index 545e487..d423416 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
@@ -6,69 +6,69 @@ import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.types.L10n
 import de.hpi.cloud.food.FOOD_CONTEXT
 import de.hpi.cloud.food.entities.Label
-import java.net.URL
+import java.net.URI
 
 val labelFixture: List<Label> = listOf(
     Label(
         title = L10n.from(de = "Alkohol", en = "Alcohol"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png")
     ),
     Label(
         title = L10n.from(de = "Knoblauch", en = "Garlic"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png")
     ),
     Label(
         title = L10n.from(de = "Schwein", en = "Pork"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
         aliases = setOf("Schweinefleisch")
     ),
     Label(
         title = L10n.from(de = "Rind", en = "Beef"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
         aliases = setOf("Rindfleisch")
     ),
     Label(
         title = L10n.from(de = "Lamm", en = "Lamb"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png")
     ),
     Label(
         title = L10n.from(de = "Fisch", en = "Fish"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png")
     ),
     Label(
         title = L10n.from(de = "Geflügel", en = "Poultry"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
         aliases = setOf("Gefluegel", "Huhn", "Hahn", "Hühnchen", "Huehnchen", "Ente", "Gans", "Truthahn")
     ),
     Label(
         title = L10n.from(de = "Wild", en = "Venison"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
         aliases = setOf("Wildfleisch")
     ),
     Label(
         title = L10n.from(de = "Vegan", en = "Vegan"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png")
     ),
     Label(
         title = L10n.from(de = "Vegetarisch", en = "Vegetarian"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png")
     ),
     Label(
         title = L10n.from(de = "Vital", en = "Vital"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vital_m.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vital_m.png")
     ),
     Label(
         title = L10n.from(de = "Regional", en = "Regional"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_regional.png")
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_regional.png")
     ),
     Label(
         title = L10n.from(de = "Draußen", en = "Outdoor"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_outdoor_o.png"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_outdoor_o.png"),
         aliases = setOf("Draussen")
     ),
     Label(
-        title = L10n.from(de = "Foottruck", en = "Foottruck"),
-        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_foottruck_o.png")
+        title = L10n.from(de = "Foodtruck", en = "Food Truck"),
+        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_foottruck_o.png")
     )
 )
 

From f9eaad6ff063554ef6cf92a7814354d1fd8d7a84 Mon Sep 17 00:00:00 2001
From: Maximilian Stiede <maximilian.stiede@student.hpi.de>
Date: Thu, 21 May 2020 20:56:18 +0200
Subject: [PATCH 13/13] fix(service-food): revert to URL instead of URI

---
 .../openmensa/canteens/Griebnitzsee.kt        |  1 -
 .../de/hpi/cloud/food/entities/Counter.kt     |  8 ++---
 .../de/hpi/cloud/food/entities/Label.kt       |  8 ++---
 .../de/hpi/cloud/food/entities/Restaurant.kt  |  5 +++-
 .../de/hpi/cloud/food/fixtures/Labels.kt      | 30 +++++++++----------
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
index 5b489b9..1ce0c57 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/crawler/openmensa/canteens/Griebnitzsee.kt
@@ -22,7 +22,6 @@ object Griebnitzsee : CanteenData(Id("mensaGriebnitzsee"), 62) {
 
     private fun OpenMensaMeal.categoryMatches(string: String) = category.startsWith(string, ignoreCase = true)
     override fun findCounter(meal: OpenMensaMeal): String? = when {
-        // TODO: translations
         meal.categoryMatches("Angebot 1") -> "1"
         meal.categoryMatches("Angebot 2") -> "2"
         meal.categoryMatches("Angebot 3") -> "3"
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
index d9a5003..582c45c 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Counter.kt
@@ -5,17 +5,17 @@ import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.protobuf.builder
-import de.hpi.cloud.common.serializers.json.UriSerializer
+import de.hpi.cloud.common.serializers.json.UrlSerializer
 import de.hpi.cloud.common.types.L10n
 import kotlinx.serialization.Serializable
-import java.net.URI
+import java.net.URL
 import de.hpi.cloud.food.v1test.Counter as ProtoCounter
 
 @Serializable
 data class Counter(
     val restaurantId: Id<Restaurant>,
     val title: L10n<String>,
-    val iconUri: @Serializable(UriSerializer::class) URI? = null
+    val iconUrl: @Serializable(UrlSerializer::class) URL? = null
 ) : Entity<Counter>() {
     companion object : Entity.Companion<Counter>("counter")
 
@@ -27,7 +27,7 @@ data class Counter(
             ProtoCounter.newBuilder().builder(entity) {
                 restaurantId = it.restaurantId.value
                 title = it.title[context]
-                icon = it.iconUri.toString()
+                icon = it.iconUrl.toString()
             }
     }
 }
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
index 7e4aa80..ae800da 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Label.kt
@@ -6,11 +6,11 @@ import de.hpi.cloud.common.entity.Id
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.entity.asId
 import de.hpi.cloud.common.protobuf.builder
-import de.hpi.cloud.common.serializers.json.UriSerializer
+import de.hpi.cloud.common.serializers.json.UrlSerializer
 import de.hpi.cloud.common.types.L10n
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import java.net.URI
+import java.net.URL
 import java.util.Locale.GERMAN
 import de.hpi.cloud.food.v1test.Label as ProtoLabel
 
@@ -18,7 +18,7 @@ import de.hpi.cloud.food.v1test.Label as ProtoLabel
 data class Label(
     val title: L10n<String>,
     val aliases: Set<String> = setOf(),
-    val iconUri: @Serializable(UriSerializer::class) URI? = null
+    val iconUrl: @Serializable(UrlSerializer::class) URL? = null
 ) : Entity<Label>() {
     companion object : Entity.Companion<Label>("label")
 
@@ -32,7 +32,7 @@ data class Label(
         override fun toProtoBuilder(entity: Label, context: Context): ProtoLabel.Builder =
             ProtoLabel.newBuilder().builder(entity) {
                 title = it.title[context]
-                icon = it.iconUri.toString()
+                icon = it.iconUrl.toString()
             }
     }
 
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
index 0876e35..1fc4c0d 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/entities/Restaurant.kt
@@ -4,14 +4,17 @@ import de.hpi.cloud.common.Context
 import de.hpi.cloud.common.entity.Entity
 import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.protobuf.builder
+import de.hpi.cloud.common.serializers.json.UrlSerializer
 import de.hpi.cloud.common.types.L10n
 import de.hpi.cloud.common.types.l10n
 import kotlinx.serialization.Serializable
+import java.net.URL
 import de.hpi.cloud.food.v1test.Restaurant as ProtoRestaurant
 
 @Serializable
 data class Restaurant(
-    val title: L10n<String>
+    val title: L10n<String>,
+    val iconUrl: @Serializable(UrlSerializer::class) URL? = null
 ) : Entity<Restaurant>() {
     companion object : Entity.Companion<Restaurant>("restaurant")
 
diff --git a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
index d423416..337d0f7 100644
--- a/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
+++ b/service-food/src/main/kotlin/de/hpi/cloud/food/fixtures/Labels.kt
@@ -6,69 +6,69 @@ import de.hpi.cloud.common.entity.Wrapper
 import de.hpi.cloud.common.types.L10n
 import de.hpi.cloud.food.FOOD_CONTEXT
 import de.hpi.cloud.food.entities.Label
-import java.net.URI
+import java.net.URL
 
 val labelFixture: List<Label> = listOf(
     Label(
         title = L10n.from(de = "Alkohol", en = "Alcohol"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_alkohol_a.png")
     ),
     Label(
         title = L10n.from(de = "Knoblauch", en = "Garlic"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_knoblauch_k_dick.png")
     ),
     Label(
         title = L10n.from(de = "Schwein", en = "Pork"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_schwein_s.png"),
         aliases = setOf("Schweinefleisch")
     ),
     Label(
         title = L10n.from(de = "Rind", en = "Beef"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_rind_r.png"),
         aliases = setOf("Rindfleisch")
     ),
     Label(
         title = L10n.from(de = "Lamm", en = "Lamb"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_lamm_l.png")
     ),
     Label(
         title = L10n.from(de = "Fisch", en = "Fish"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_fisch_f.png")
     ),
     Label(
         title = L10n.from(de = "Geflügel", en = "Poultry"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_hahn_g.png"),
         aliases = setOf("Gefluegel", "Huhn", "Hahn", "Hühnchen", "Huehnchen", "Ente", "Gans", "Truthahn")
     ),
     Label(
         title = L10n.from(de = "Wild", en = "Venison"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_wild_h.png"),
         aliases = setOf("Wildfleisch")
     ),
     Label(
         title = L10n.from(de = "Vegan", en = "Vegan"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegan_w.png")
     ),
     Label(
         title = L10n.from(de = "Vegetarisch", en = "Vegetarian"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vegetarisch_v.png")
     ),
     Label(
         title = L10n.from(de = "Vital", en = "Vital"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_vital_m.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_vital_m.png")
     ),
     Label(
         title = L10n.from(de = "Regional", en = "Regional"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_regional.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_regional.png")
     ),
     Label(
         title = L10n.from(de = "Draußen", en = "Outdoor"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_outdoor_o.png"),
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_outdoor_o.png"),
         aliases = setOf("Draussen")
     ),
     Label(
         title = L10n.from(de = "Foodtruck", en = "Food Truck"),
-        iconUri = URI("https://xml.stw-potsdam.de/images/icons/su_foottruck_o.png")
+        iconUrl = URL("https://xml.stw-potsdam.de/images/icons/su_foottruck_o.png")
     )
 )