feat: create SearchService

yvasyliev · yvasyliev · commit 19604c9b0dbe · 2026-02-02T16:19:12.000+02:00
diff --git a/bruno-collection/search/search-album.yml b/bruno-collection/search/search-album.yml
@@ -5,12 +5,12 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search/album?q=eminem&strinct=on&order=DURATION_DESC&limit=1&index=0"
+  url: "{{api-host}}/search/album?q=eminem&strict=on&order=DURATION_DESC&limit=1&index=0"
   params:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/bruno-collection/search/search-artist.yml b/bruno-collection/search/search-artist.yml
@@ -5,12 +5,12 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search/artist?q=eminem&strinct=on&order=DURATION_DESC&limit=1&index=0"
+  url: "{{api-host}}/search/artist?q=eminem&strict=on&order=DURATION_DESC&limit=1&index=0"
   params:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/bruno-collection/search/search-playlist.yml b/bruno-collection/search/search-playlist.yml
@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search/playlist?limit=1&index=0&q=eminem&strinct=on&order=DURATION_DESC"
+  url: "{{api-host}}/search/playlist?limit=1&index=0&q=eminem&strict=on&order=DURATION_DESC"
   params:
     - name: limit
       value: "1"
@@ -16,7 +16,7 @@ http:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/bruno-collection/search/search-radio.yml b/bruno-collection/search/search-radio.yml
@@ -5,12 +5,12 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search/radio?q=eminem&strinct=on&order=DURATION_DESC&limit=1&index=0"
+  url: "{{api-host}}/search/radio?q=eminem&strict=on&order=DURATION_DESC&limit=1&index=0"
   params:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/bruno-collection/search/search-track.yml b/bruno-collection/search/search-track.yml
@@ -5,12 +5,12 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search/track?q=eminem&strinct=on&order=DURATION_DESC&limit=1&index=0"
+  url: "{{api-host}}/search/track?q=eminem&strict=on&order=DURATION_DESC&limit=1&index=0"
   params:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/bruno-collection/search/search.yml b/bruno-collection/search/search.yml
@@ -5,12 +5,12 @@ info:
 
 http:
   method: GET
-  url: "{{api-host}}/search?q=eminem&strinct=on&order=DURATION_DESC&limit=1&index=0"
+  url: "{{api-host}}/search?q=eminem&strict=on&order=DURATION_DESC&limit=1&index=0"
   params:
     - name: q
       value: eminem
       type: query
-    - name: strinct
+    - name: strict
       value: on
       type: query
     - name: order
diff --git a/src/main/java/io/github/yvasyliev/deezer/databind/util/QuotingStringConverter.java b/src/main/java/io/github/yvasyliev/deezer/databind/util/QuotingStringConverter.java
@@ -0,0 +1,12 @@
+package io.github.yvasyliev.deezer.databind.util;
+
+import tools.jackson.databind.util.StdConverter;
+
+public class QuotingStringConverter extends StdConverter<String, String> {
+    private static final String QUOTE = "\"";
+
+    @Override
+    public String convert(String value) {
+        return QUOTE + value + QUOTE;
+    }
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/feign/DeezerContract.java b/src/main/java/io/github/yvasyliev/deezer/feign/DeezerContract.java
@@ -0,0 +1,35 @@
+package io.github.yvasyliev.deezer.feign;
+
+import feign.Contract;
+import feign.MethodMetadata;
+import feign.Param;
+import lombok.RequiredArgsConstructor;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+public class DeezerContract extends Contract.Default {
+    private final Map<Class<? extends Param.Expander>, Param.Expander> expanders;
+
+
+
+    @Override
+    protected MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
+        var methodMetadata = super.parseAndValidateMetadata(targetType, method);
+
+        setExpanders(methodMetadata);
+
+        return methodMetadata;
+    }
+
+    private void setExpanders(MethodMetadata methodMetadata) {
+        var indexToExpander = methodMetadata.indexToExpander();
+
+        methodMetadata.indexToExpanderClass().forEach(
+                (index, expanderClass) -> Optional.ofNullable(expanders.get(expanderClass))
+                        .ifPresent(expander -> indexToExpander.put(index, expander))
+        );
+    }
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/feign/QueryExpander.java b/src/main/java/io/github/yvasyliev/deezer/feign/QueryExpander.java
@@ -0,0 +1,43 @@
+package io.github.yvasyliev.deezer.feign;
+
+import feign.Param;
+import io.github.yvasyliev.deezer.model.AdvancedQuery;
+import io.github.yvasyliev.deezer.model.Query;
+import io.github.yvasyliev.deezer.model.SimpleQuery;
+import lombok.RequiredArgsConstructor;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.json.JsonMapper;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RequiredArgsConstructor
+public class QueryExpander implements Param.Expander {
+    private static final String MESSAGE_TEMPLATE = "%s expects %s type, but got: %%s".formatted(
+            QueryExpander.class.getSimpleName(),
+            Query.class.getName()
+    );
+    private static final TypeReference<Map<String, String>> QUERY_MAP_TYPE = new TypeReference<>() {};
+    private final JsonMapper jsonMapper;
+
+    @Override
+    public String expand(Object value) {
+        if (value instanceof SimpleQuery query) {
+            return query.query();
+        }
+
+        if (value instanceof AdvancedQuery query) {
+            return expand(query);
+        }
+
+        throw new IllegalArgumentException(MESSAGE_TEMPLATE.formatted(value.getClass()));
+    }
+
+    private String expand(AdvancedQuery query) {
+        return jsonMapper.convertValue(query, QUERY_MAP_TYPE)
+                .entrySet()
+                .stream()
+                .map(entry -> entry.getKey() + ":" + entry.getValue())
+                .collect(Collectors.joining(" "));
+    }
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/feign/StrictExpander.java b/src/main/java/io/github/yvasyliev/deezer/feign/StrictExpander.java
@@ -0,0 +1,10 @@
+package io.github.yvasyliev.deezer.feign;
+
+import feign.Param;
+
+public class StrictExpander implements Param.Expander {
+    @Override
+    public String expand(Object value) {
+        return Boolean.TRUE.equals(value) ? "on" : null;
+    }
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/model/AdvancedQuery.java b/src/main/java/io/github/yvasyliev/deezer/model/AdvancedQuery.java
@@ -0,0 +1,23 @@
+package io.github.yvasyliev.deezer.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.github.yvasyliev.deezer.databind.util.QuotingStringConverter;
+import lombok.Builder;
+import tools.jackson.databind.annotation.JsonSerialize;
+
+import java.time.Duration;
+
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record AdvancedQuery(
+        @JsonProperty("artist") @JsonSerialize(converter = QuotingStringConverter.class) String artist,
+        @JsonProperty("album") @JsonSerialize(converter = QuotingStringConverter.class) String album,
+        @JsonProperty("track") @JsonSerialize(converter = QuotingStringConverter.class) String track,
+        @JsonProperty("label") @JsonSerialize(converter = QuotingStringConverter.class) String label,
+        @JsonProperty("dur_min") @JsonFormat(shape = JsonFormat.Shape.NUMBER_INT, pattern = "SECONDS") Duration durMin,
+        @JsonProperty("dur_max") @JsonFormat(shape = JsonFormat.Shape.NUMBER_INT, pattern = "SECONDS") Duration durMax,
+        @JsonProperty("bpm_min") Integer bpmMin,
+        @JsonProperty("bpm_max") Integer bpmMax
+) implements Query {}
diff --git a/src/main/java/io/github/yvasyliev/deezer/model/Order.java b/src/main/java/io/github/yvasyliev/deezer/model/Order.java
@@ -0,0 +1,61 @@
+package io.github.yvasyliev.deezer.model;
+
+/**
+ * Enumeration of possible orderings for search results.
+ */
+public enum Order {
+    /**
+     * Order by ranking.
+     */
+    RANKING,
+
+    /**
+     * Order by track name ascending.
+     */
+    TRACK_ASC,
+
+    /**
+     * Order by track name descending.
+     */
+    TRACK_DESC,
+
+    /**
+     * Order by artist name ascending.
+     */
+    ARTIST_ASC,
+
+    /**
+     * Order by artist name descending.
+     */
+    ARTIST_DESC,
+
+    /**
+     * Order by album name ascending.
+     */
+    ALBUM_ASC,
+
+    /**
+     * Order by album name descending.
+     */
+    ALBUM_DESC,
+
+    /**
+     * Order by rating ascending.
+     */
+    RATING_ASC,
+
+    /**
+     * Order by rating descending.
+     */
+    RATING_DESC,
+
+    /**
+     * Order by duration ascending.
+     */
+    DURATION_ASC,
+
+    /**
+     * Order by duration descending.
+     */
+    DURATION_DESC
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/model/Query.java b/src/main/java/io/github/yvasyliev/deezer/model/Query.java
@@ -0,0 +1,3 @@
+package io.github.yvasyliev.deezer.model;
+
+public sealed interface Query permits AdvancedQuery, SimpleQuery {}
diff --git a/src/main/java/io/github/yvasyliev/deezer/model/SimpleQuery.java b/src/main/java/io/github/yvasyliev/deezer/model/SimpleQuery.java
@@ -0,0 +1,3 @@
+package io.github.yvasyliev.deezer.model;
+
+public record SimpleQuery(String query) implements Query {}
diff --git a/src/main/java/io/github/yvasyliev/deezer/service/SearchService.java b/src/main/java/io/github/yvasyliev/deezer/service/SearchService.java
diff --git a/src/test/resources/api/deezer/response/episode/get-episode.json b/src/test/resources/api/deezer/response/episode/get-episode.json
diff --git a/src/test/resources/api/deezer/response/podcast/get-podcast.json b/src/test/resources/api/deezer/response/podcast/get-podcast.json
diff --git a/src/test/resources/api/deezer/response/user/get-playlists.json b/src/test/resources/api/deezer/response/user/get-playlists.json
