feat(Willhaben): Search Node

SIMULATAN · SIMULATAN · commit dcdf630a618b · 2025-10-01T23:36:12.000+02:00
diff --git a/integration/willhaben/build.gradle.kts b/integration/willhaben/build.gradle.kts
@@ -1 +1 @@
-version = "3.4.0-rc.1"
+version = "3.4.0-rc.2"
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/WillhabenAPI.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/WillhabenAPI.kt
@@ -11,6 +11,12 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import me.snoty.integration.contrib.utils.getOrThrow
 import me.snoty.integration.contrib.utils.parseNextPageProps
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenListing
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenSearchResult
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenWishlist
+import me.snoty.integration.contrib.willhaben.api.dto.cleanTitleFromWishlist
+import me.snoty.integration.contrib.willhaben.api.dto.parseListing
+import me.snoty.integration.contrib.willhaben.api.dto.parseSearchResult
 import me.snoty.integration.contrib.willhaben.utils.mapIf
 import org.koin.core.annotation.Single
 import org.koin.core.component.KoinComponent
@@ -23,6 +29,11 @@ interface WillhabenAPI {
 	 * @param cleanTitle whether to attempt to strip listing titles down to the actual names (without additional metadata)
 	 */
 	suspend fun fetchWishlist(creds: WillhabenCredentials, cleanTitle: Boolean): List<WillhabenListing>
+
+	/**
+	 * @param query the search query (stuff after `/iad/`)
+	 */
+	suspend fun search(query: String): List<WillhabenSearchResult>
 }
 
 @Single
@@ -95,4 +106,23 @@ class WillhabenAPIImpl(private val httpClient: HttpClient) : WillhabenAPI, KoinC
 
 		return listings
 	}
+
+	override suspend fun search(query: String): List<WillhabenSearchResult> {
+		val url = URLBuilder().apply {
+			protocol = URLProtocol.HTTPS
+			host = WILLHABEN_HOST
+			appendEncodedPathSegments("iad", query)
+		}.build()
+
+		val response = httpClient.get(url)
+
+		val props = response.parseNextPageProps(json)
+		val searchResults = props
+			.getOrThrow("searchResult").jsonObject
+			.getOrThrow("advertSummaryList").jsonObject
+			.getOrThrow("advertSummary").jsonArray
+			.map { it.jsonObject.parseSearchResult(json) }
+
+		return searchResults
+	}
 }
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenDtoUtils.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenDtoUtils.kt
@@ -0,0 +1,25 @@
+package me.snoty.integration.contrib.willhaben.api.dto
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import me.snoty.integration.contrib.utils.getOrThrow
+
+@Serializable
+data class WillhabenStatus(
+	val id: String,
+	val description: String,
+	val statusId: Int,
+)
+
+fun JsonObject.parseAttributes() = getOrThrow("attributes")
+	.jsonObject
+	.getOrThrow("attribute")
+	.jsonArray
+	.associate {
+		val key = it.jsonObject.getOrThrow("name").jsonPrimitive.content
+		val value = it.jsonObject.getOrThrow("values").jsonArray.map { item -> item.jsonPrimitive }
+		key to value
+	}
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenListing.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenListing.kt
@@ -1,16 +1,9 @@
-package me.snoty.integration.contrib.willhaben.api
+package me.snoty.integration.contrib.willhaben.api.dto
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
 import me.snoty.integration.contrib.utils.getOrThrow
 
-@Serializable
-data class WillhabenStatus(
-	val id: String,
-	val description: String,
-	val statusId: Int,
-)
-
 @Serializable
 data class WillhabenListing(
 	val id: String,
@@ -23,11 +16,7 @@ data class WillhabenListing(
 
 fun JsonObject.parseListing(json: Json): WillhabenListing {
 	val id = this["id"]
-	val attributes = getOrThrow("attributes").jsonObject.getOrThrow("attribute").jsonArray.associate {
-		val key = it.jsonObject.getOrThrow("name").jsonPrimitive.content
-		val value = it.jsonObject.getOrThrow("values").jsonArray.map { item -> item.jsonPrimitive }
-		key to value
-	}
+	val attributes = parseAttributes()
 
 	val title = getOrThrow("description").jsonPrimitive.content
 	val description = attributes["DESCRIPTION"]?.joinToString("\n") { it.content }
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenSearchResult.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenSearchResult.kt
@@ -0,0 +1,37 @@
+package me.snoty.integration.contrib.willhaben.api.dto
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.*
+import me.snoty.integration.contrib.utils.getOrThrow
+
+@Serializable
+data class WillhabenSearchResult(
+	val id: String,
+	val title: String,
+	val description: String?,
+	val price: Double,
+	val status: WillhabenStatus,
+	val attributes: Map<String, List<String>>,
+)
+
+fun JsonObject.parseSearchResult(json: Json): WillhabenSearchResult {
+	val id = this["id"]!!.jsonPrimitive.content
+	val attributes = parseAttributes()
+	
+	val title = getOrThrow("description").jsonPrimitive.content
+	val description = attributes["BODY_DYN"]?.joinToString("\n") { it.content }
+	val price = attributes["PRICE"]?.firstOrNull()?.doubleOrNull
+		?: throw IllegalArgumentException("Price not found in listing")
+	val status: WillhabenStatus = json.decodeFromJsonElement(getOrThrow("advertStatus"))
+	
+	return WillhabenSearchResult(
+		id = id,
+		title = title,
+		description = description,
+		price = price,
+		attributes = attributes.mapValues { (_, values) ->
+			values.map { it.content }
+		},
+		status = status,
+	)
+}
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenWishlist.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenWishlist.kt
@@ -1,4 +1,4 @@
-package me.snoty.integration.contrib.willhaben.api
+package me.snoty.integration.contrib.willhaben.api.dto
 
 typealias WillhabenWishlist = List<WillhabenListing>
 
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/listing/WillhabenListingNodeHandler.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/listing/WillhabenListingNodeHandler.kt
@@ -13,7 +13,7 @@ import me.snoty.integration.common.wiring.iterableStructOutput
 import me.snoty.integration.common.wiring.node.NodeHandler
 import me.snoty.integration.common.wiring.node.NodeSettings
 import me.snoty.integration.contrib.willhaben.api.WillhabenAPI
-import me.snoty.integration.contrib.willhaben.api.WillhabenListing
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenListing
 import org.koin.core.annotation.Single
 
 data class ListingInput(
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/search/WillhabenSearchNodeHandler.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/search/WillhabenSearchNodeHandler.kt
@@ -0,0 +1,45 @@
+package me.snoty.integration.contrib.willhaben.search
+
+import kotlinx.serialization.Serializable
+import me.snoty.integration.common.annotation.RegisterNode
+import me.snoty.integration.common.model.NodePosition
+import me.snoty.integration.common.model.metadata.FieldDescription
+import me.snoty.integration.common.wiring.Node
+import me.snoty.integration.common.wiring.NodeHandleContext
+import me.snoty.integration.common.wiring.data.IntermediateData
+import me.snoty.integration.common.wiring.data.NodeOutput
+import me.snoty.integration.common.wiring.iterableStructOutput
+import me.snoty.integration.common.wiring.node.NodeHandler
+import me.snoty.integration.common.wiring.node.NodeSettings
+import me.snoty.integration.contrib.willhaben.api.WILLHABEN_HOST
+import me.snoty.integration.contrib.willhaben.api.WillhabenAPI
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenSearchResult
+import org.koin.core.annotation.Single
+
+@Serializable
+data class WillhabenSearchSettings(
+	override val name: String,
+	@FieldDescription("Path after `https://${WILLHABEN_HOST}/iad/`")
+	val query: String,
+) : NodeSettings
+
+@RegisterNode(
+	name = "willhaben_search",
+	displayName = "Willhaben Suche",
+	settingsType = WillhabenSearchSettings::class,
+	outputType = WillhabenSearchResult::class,
+	position = NodePosition.START,
+)
+@Single
+class WillhabenSearchNodeHandler(
+	private val willhabenAPI: WillhabenAPI,
+) : NodeHandler {
+	override suspend fun NodeHandleContext.process(
+		node: Node,
+		input: Collection<IntermediateData>
+	): NodeOutput {
+		val settings = node.settings as WillhabenSearchSettings
+		val result = willhabenAPI.search(settings.query)
+		return iterableStructOutput(result)
+	}
+}
diff --git a/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/wishlist/WillhabenWishlistNodeHandler.kt b/integration/willhaben/src/main/kotlin/me/snoty/integration/contrib/willhaben/wishlist/WillhabenWishlistNodeHandler.kt
@@ -14,7 +14,7 @@ import me.snoty.integration.common.wiring.node.NodeHandler
 import me.snoty.integration.common.wiring.node.NodeSettings
 import me.snoty.integration.contrib.willhaben.api.WillhabenAPI
 import me.snoty.integration.contrib.willhaben.api.WillhabenCredentials
-import me.snoty.integration.contrib.willhaben.api.WillhabenListing
+import me.snoty.integration.contrib.willhaben.api.dto.WillhabenListing
 import org.koin.core.annotation.Single
 
 @Serializable
diff --git a/integration/willhaben/src/test/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenWishlistTest.kt b/integration/willhaben/src/test/kotlin/me/snoty/integration/contrib/willhaben/api/dto/WillhabenWishlistTest.kt
@@ -1,4 +1,4 @@
-package me.snoty.integration.contrib.willhaben.api
+package me.snoty.integration.contrib.willhaben.api.dto
 
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = "3.4.0-rc.1"`
	`1`	`+version = "3.4.0-rc.2"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.snoty.integration.contrib.willhaben.api`
	`1`	`+package me.snoty.integration.contrib.willhaben.api.dto`
`2`	`2`
`3`	`3`	`typealias WillhabenWishlist = List<WillhabenListing>`
`4`	`4`