add search endpoint to API

leejunkit · Jun 20, 2021 · 8ef1333 · 8ef1333
1 parent aaad352
commit 8ef1333
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 10 deletions.
diff --git a/Spottie.xcodeproj/project.pbxproj b/Spottie.xcodeproj/project.pbxproj
@@ -73,6 +73,7 @@
 		475EE248267D7784007BEBDC /* SearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE247267D7784007BEBDC /* SearchField.swift */; };
 		475EE24A267DA451007BEBDC /* GreenPlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE249267DA451007BEBDC /* GreenPlayButton.swift */; };
 		475EE24C267EBDE7007BEBDC /* SearchResultsResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE24B267EBDE7007BEBDC /* SearchResultsResponse.swift */; };
+		475EE24F267EBFEA007BEBDC /* WebAPIPagingObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475EE24E267EBFEA007BEBDC /* WebAPIPagingObject.swift */; };
 		47C56F602679A789003EA20A /* PlayerCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C56F5F2679A789003EA20A /* PlayerCommands.swift */; };
 /* End PBXBuildFile section */
 
@@ -145,6 +146,7 @@
 		475EE247267D7784007BEBDC /* SearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchField.swift; sourceTree = "<group>"; };
 		475EE249267DA451007BEBDC /* GreenPlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GreenPlayButton.swift; sourceTree = "<group>"; };
 		475EE24B267EBDE7007BEBDC /* SearchResultsResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultsResponse.swift; sourceTree = "<group>"; };
+		475EE24E267EBFEA007BEBDC /* WebAPIPagingObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebAPIPagingObject.swift; sourceTree = "<group>"; };
 		47C56F5F2679A789003EA20A /* PlayerCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerCommands.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -247,6 +249,7 @@
 			isa = PBXGroup;
 			children = (
 				4730619126591EAC001E3A1F /* Base */,
+				475EE24D267EBFD2007BEBDC /* WebAPI */,
 				4730619026591EA6001E3A1F /* Events */,
 				473061A22659FFDD001E3A1F /* API */,
 				473061712656629F001E3A1F /* Nothing.swift */,
@@ -290,16 +293,6 @@
 				4730618826591E16001E3A1F /* DateObject.swift */,
 				4730618A26591E36001E3A1F /* CoverGroupObject.swift */,
 				4730618C26591E50001E3A1F /* ImageObject.swift */,
-				473061A5265B4A10001E3A1F /* WebAPITrackObject.swift */,
-				470201B0265B54720030ECA9 /* WebAPISimplifiedAlbumObject.swift */,
-				470201B2265B55F30030ECA9 /* WebAPISimplifiedArtistObject.swift */,
-				470201B4265B56350030ECA9 /* WebAPIImageObject.swift */,
-				470201B6265B56860030ECA9 /* WebAPIArtistObject.swift */,
-				474BAFB926687AB60006EB16 /* WebAPIDeviceObject.swift */,
-				475798CC266F0F7F00AADF2F /* WebAPIPlaylistObject.swift */,
-				475798CE266F101600AADF2F /* WebAPIPublicUserObject.swift */,
-				475798D0266F103100AADF2F /* WebAPIPlaylistTrackObject.swift */,
-				475798D4266F1B9B00AADF2F /* WebAPIPlaylistTracksRefObject.swift */,
 				474BAFBB2668B0170006EB16 /* RepeatMode.swift */,
 			);
 			path = Base;
@@ -331,6 +324,24 @@
 			path = Components;
 			sourceTree = "<group>";
 		};
+		475EE24D267EBFD2007BEBDC /* WebAPI */ = {
+			isa = PBXGroup;
+			children = (
+				473061A5265B4A10001E3A1F /* WebAPITrackObject.swift */,
+				470201B0265B54720030ECA9 /* WebAPISimplifiedAlbumObject.swift */,
+				470201B2265B55F30030ECA9 /* WebAPISimplifiedArtistObject.swift */,
+				470201B4265B56350030ECA9 /* WebAPIImageObject.swift */,
+				470201B6265B56860030ECA9 /* WebAPIArtistObject.swift */,
+				474BAFB926687AB60006EB16 /* WebAPIDeviceObject.swift */,
+				475798CC266F0F7F00AADF2F /* WebAPIPlaylistObject.swift */,
+				475798CE266F101600AADF2F /* WebAPIPublicUserObject.swift */,
+				475798D0266F103100AADF2F /* WebAPIPlaylistTrackObject.swift */,
+				475798D4266F1B9B00AADF2F /* WebAPIPlaylistTracksRefObject.swift */,
+				475EE24E267EBFEA007BEBDC /* WebAPIPagingObject.swift */,
+			);
+			path = WebAPI;
+			sourceTree = "<group>";
+		};
 		47C56F5E2679A779003EA20A /* Commands */ = {
 			isa = PBXGroup;
 			children = (
@@ -478,6 +489,7 @@
 				475798CD266F0F7F00AADF2F /* WebAPIPlaylistObject.swift in Sources */,
 				475EE248267D7784007BEBDC /* SearchField.swift in Sources */,
 				4730619526591EF9001E3A1F /* PlaybackResumedEvent.swift in Sources */,
+				475EE24F267EBFEA007BEBDC /* WebAPIPagingObject.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Spottie/Backend/SpotifyAPI.swift b/Spottie/Backend/SpotifyAPI.swift
@@ -136,4 +136,25 @@ extension SpotifyAPI {
 
         return client.run(req, decoder).map(\.value).eraseToAnyPublisher()
     }
+
+    static func search() -> AnyPublisher<SearchResultsResponse, Error> {
+        let queryItems = [
+            URLQueryItem(name: "q", value: "akmu"),
+            URLQueryItem(name: "type", value: "album,artist,playlist,track"),
+            URLQueryItem(name: "market", value: "from_token")
+        ]
+
+        var urlComponents = URLComponents(
+            url: base.appendingPathComponent("/web-api/v1/search"),
+            resolvingAgainstBaseURL: false)!
+        urlComponents.queryItems = queryItems
+
+        var req = URLRequest(url: urlComponents.url!)
+        req.httpMethod = "GET"
+
+        let decoder = JSONDecoder()
+        decoder.keyDecodingStrategy = .convertFromSnakeCase;
+
+        return client.run(req, decoder).map(\.value).eraseToAnyPublisher()
+    }
 }
diff --git a/Spottie/Backend/Types/API/SearchResultsResponse.swift b/Spottie/Backend/Types/API/SearchResultsResponse.swift
@@ -6,3 +6,10 @@
 //
 
 import Foundation
+
+struct SearchResultsResponse: Decodable {
+    let albums: WebAPIPagingObject<WebAPISimplifiedAlbumObject>
+    let artists: WebAPIPagingObject<WebAPISimplifiedAlbumObject>
+    let tracks: WebAPIPagingObject<WebAPITrackObject>
+    let playlists: WebAPIPagingObject<WebAPIPlaylistObject>
+}
diff --git a/...ckend/Types/Base/WebAPIArtistObject.swift → ...end/Types/WebAPI/WebAPIArtistObject.swift b/...ckend/Types/Base/WebAPIArtistObject.swift → ...end/Types/WebAPI/WebAPIArtistObject.swift
diff --git a/...ckend/Types/Base/WebAPIDeviceObject.swift → ...end/Types/WebAPI/WebAPIDeviceObject.swift b/...ckend/Types/Base/WebAPIDeviceObject.swift → ...end/Types/WebAPI/WebAPIDeviceObject.swift
diff --git a/...ackend/Types/Base/WebAPIImageObject.swift → ...kend/Types/WebAPI/WebAPIImageObject.swift b/...ackend/Types/Base/WebAPIImageObject.swift → ...kend/Types/WebAPI/WebAPIImageObject.swift
diff --git a/Spottie/Backend/Types/WebAPI/WebAPIPagingObject.swift b/Spottie/Backend/Types/WebAPI/WebAPIPagingObject.swift
@@ -0,0 +1,18 @@
+//
+//  WebAPIPagingObject.swift
+//  Spottie
+//
+//  Created by Lee Jun Kit on 20/6/21.
+//
+
+import Foundation
+
+struct WebAPIPagingObject<T: Decodable>: Decodable {
+    let href: String
+    let items: [T]
+    let limit: Int
+    let offset: Int
+    let total: Int
+    let next: String
+    let previous: String
+}
diff --git a/...end/Types/Base/WebAPIPlaylistObject.swift → ...d/Types/WebAPI/WebAPIPlaylistObject.swift b/...end/Types/Base/WebAPIPlaylistObject.swift → ...d/Types/WebAPI/WebAPIPlaylistObject.swift
diff --git a/...ypes/Base/WebAPIPlaylistTrackObject.swift → ...es/WebAPI/WebAPIPlaylistTrackObject.swift b/...ypes/Base/WebAPIPlaylistTrackObject.swift → ...es/WebAPI/WebAPIPlaylistTrackObject.swift
diff --git a/.../Base/WebAPIPlaylistTracksRefObject.swift → ...ebAPI/WebAPIPlaylistTracksRefObject.swift b/.../Base/WebAPIPlaylistTracksRefObject.swift → ...ebAPI/WebAPIPlaylistTracksRefObject.swift
diff --git a/...d/Types/Base/WebAPIPublicUserObject.swift → ...Types/WebAPI/WebAPIPublicUserObject.swift b/...d/Types/Base/WebAPIPublicUserObject.swift → ...Types/WebAPI/WebAPIPublicUserObject.swift
diff --git a/...es/Base/WebAPISimplifiedAlbumObject.swift → .../WebAPI/WebAPISimplifiedAlbumObject.swift b/...es/Base/WebAPISimplifiedAlbumObject.swift → .../WebAPI/WebAPISimplifiedAlbumObject.swift
diff --git a/...s/Base/WebAPISimplifiedArtistObject.swift → ...WebAPI/WebAPISimplifiedArtistObject.swift b/...s/Base/WebAPISimplifiedArtistObject.swift → ...WebAPI/WebAPISimplifiedArtistObject.swift
diff --git a/...ackend/Types/Base/WebAPITrackObject.swift → ...kend/Types/WebAPI/WebAPITrackObject.swift b/...ackend/Types/Base/WebAPITrackObject.swift → ...kend/Types/WebAPI/WebAPITrackObject.swift