From 9a582a7d88fac58e18e3cb5485b54c62e67e835b Mon Sep 17 00:00:00 2001
From: iankang <ianngech@gmail.com>
Date: Mon, 31 Jan 2022 20:51:15 +0300
Subject: [PATCH] removed empty responses for HearThisAt

---
 .idea/workspace.xml                           |   8 +-
 src/main/java/com/mixsteroids/mixjar/main.kt  |   4 +-
 .../mixjar/models/HearthisatLoginResponse.kt  |  77 +++++++++----
 .../mixjar/models/SingleArtistResponse.kt     |  32 ++---
 .../mixjar/models/SingleTrackResponse.kt      | 109 +++++++++---------
 .../mixjar/services/HearThisAtServiceImpl.kt  |  16 +--
 6 files changed, 139 insertions(+), 107 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d530c1f..8de4240 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="a1972f3f-5662-4c20-ba65-1b43ba360cfb" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/MixCloud.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/MixCloud.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/main.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/main.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/ShowResponse.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/ShowResponse.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/UserResponse.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/UserResponse.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/MixCloudServiceImpl.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/MixCloudServiceImpl.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/Utils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/Utils.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/contracts/MixCloudInterface.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/contracts/MixCloudInterface.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/mixsteroids/mixjar/main.kt b/src/main/java/com/mixsteroids/mixjar/main.kt
index 8fb6a47..adafdc8 100644
--- a/src/main/java/com/mixsteroids/mixjar/main.kt
+++ b/src/main/java/com/mixsteroids/mixjar/main.kt
@@ -8,10 +8,10 @@ fun main() {
     //exclusive
 //    val item1 = mixCloudServiceImpl.getShow("DJ_Jukess","thehypeaugust-nsg-vs-wstrn-mix-dj_jukess")
 
-    val item1 = mixCloudServiceImpl.getShow("mixmastermorris","mixmaster-morris-steinski-new-york")
+//    val item1 = mixCloudServiceImpl.getShow("mixmastermorrissdfasdf","mixmaster-morris-steinski-new-york")
 //    val item =  mixCloudServiceImpl.getUser("ian-kangethe")
 //    println("actualItem: ${item?.toString()}")
-    println("getShow: $item1")
+//    println("getShow: $item1")
 //    val item = mixCloudServiceImpl.getUserFeed("ian-kangethe",1)
 //    val cloud = mixCloudServiceImpl.getUserCloudCast("The_Fixx",0)
 //    println(cloud)
diff --git a/src/main/java/com/mixsteroids/mixjar/models/HearthisatLoginResponse.kt b/src/main/java/com/mixsteroids/mixjar/models/HearthisatLoginResponse.kt
index b2339aa..f12fc88 100644
--- a/src/main/java/com/mixsteroids/mixjar/models/HearthisatLoginResponse.kt
+++ b/src/main/java/com/mixsteroids/mixjar/models/HearthisatLoginResponse.kt
@@ -5,51 +5,78 @@ import com.google.gson.annotations.SerializedName
 
 data class HearthisatLoginResponse(
     @SerializedName("allow_push")
-    var allowPush: Int,
+    var allowPush: Int?,
     @SerializedName("avatar_url")
-    var avatarUrl: String,
+    var avatarUrl: String?,
     @SerializedName("background_url")
-    var backgroundUrl: String,
+    var backgroundUrl: String?,
     @SerializedName("caption")
-    var caption: String,
+    var caption: String?,
     @SerializedName("description")
-    var description: String,
+    var description: String?,
     @SerializedName("email")
-    var email: String,
+    var email: String?,
     @SerializedName("followers_count")
-    var followersCount: String,
+    var followersCount: String?,
     @SerializedName("following")
-    var following: Boolean,
+    var following: Boolean?,
     @SerializedName("following_count")
-    var followingCount: String,
+    var followingCount: String?,
     @SerializedName("geo")
-    var geo: String,
+    var geo: String?,
     @SerializedName("id")
-    var id: String,
+    var id: String?,
     @SerializedName("key")
-    var key: String,
+    var key: String?,
     @SerializedName("likes_count")
-    var likesCount: String,
+    var likesCount: String?,
     @SerializedName("locale")
-    var locale: String,
+    var locale: String?,
     @SerializedName("720p_url")
-    var pUrl: String,
+    var pUrl: String?,
     @SerializedName("permalink")
-    var permalink: String,
+    var permalink: String?,
     @SerializedName("permalink_url")
-    var permalinkUrl: String,
+    var permalinkUrl: String?,
     @SerializedName("playlist_count")
-    var playlistCount: String,
+    var playlistCount: String?,
     @SerializedName("premium")
-    var premium: Boolean,
+    var premium: Boolean?,
     @SerializedName("secret")
-    var secret: String,
+    var secret: String?,
     @SerializedName("thumb_url")
-    var thumbUrl: String,
+    var thumbUrl: String?,
     @SerializedName("track_count")
-    var trackCount: String,
+    var trackCount: String?,
     @SerializedName("uri")
-    var uri: String,
+    var uri: String?,
     @SerializedName("username")
-    var username: String
-)
\ No newline at end of file
+    var username: String?
+){
+    constructor():this(
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+    )
+}
\ No newline at end of file
diff --git a/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt b/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt
index 0d6263e..e56c0ae 100644
--- a/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt
+++ b/src/main/java/com/mixsteroids/mixjar/models/SingleArtistResponse.kt
@@ -1,17 +1,21 @@
 package com.mixsteroids.mixjar.models
 
 data class SingleArtistResponse(
-    val avatar_url: String,
-    val background_url: String,
-    val description: String,
-    val followers_count: Int,
-    val following: Boolean,
-    val id: String,
-    val likes_count: Int,
-    val permalink: String,
-    val permalink_url: String,
-    val playlist_count: Int,
-    val track_count: Int,
-    val uri: String,
-    val username: String
-)
\ No newline at end of file
+    val avatar_url: String?,
+    val background_url: String?,
+    val description: String?,
+    val followers_count: Int?,
+    val following: Boolean?,
+    val id: String?,
+    val likes_count: Int?,
+    val permalink: String?,
+    val permalink_url: String?,
+    val playlist_count: Int?,
+    val track_count: Int?,
+    val uri: String?,
+    val username: String?
+) {
+    constructor() : this(
+        null, null, null, null, null, null, null, null, null, null, null, null, null
+    )
+}
\ No newline at end of file
diff --git a/src/main/java/com/mixsteroids/mixjar/models/SingleTrackResponse.kt b/src/main/java/com/mixsteroids/mixjar/models/SingleTrackResponse.kt
index 992b59a..afcc085 100644
--- a/src/main/java/com/mixsteroids/mixjar/models/SingleTrackResponse.kt
+++ b/src/main/java/com/mixsteroids/mixjar/models/SingleTrackResponse.kt
@@ -5,110 +5,115 @@ import com.google.gson.annotations.SerializedName
 
 data class SingleTrackResponse(
     @SerializedName("artwork_url")
-    var artworkUrl: String,
+    var artworkUrl: String?,
     @SerializedName("artwork_url_retina")
-    var artworkUrlRetina: String,
+    var artworkUrlRetina: String?,
     @SerializedName("background_url")
-    var backgroundUrl: String,
+    var backgroundUrl: String?,
     @SerializedName("bpm")
-    var bpm: String,
+    var bpm: String?,
     @SerializedName("comment_count")
-    var commentCount: String,
+    var commentCount: String?,
     @SerializedName("created_at")
-    var createdAt: String,
+    var createdAt: String?,
     @SerializedName("description")
-    var description: String,
+    var description: String?,
     @SerializedName("download_count")
-    var downloadCount: String,
+    var downloadCount: String?,
     @SerializedName("download_filename")
-    var downloadFilename: String,
+    var downloadFilename: String?,
     @SerializedName("download_url")
-    var downloadUrl: String,
+    var downloadUrl: String?,
     @SerializedName("downloadable")
-    var downloadable: Int,
+    var downloadable: Int?,
     @SerializedName("duration")
-    var duration: String,
+    var duration: String?,
     @SerializedName("fan_exclusive_download")
-    var fanExclusiveDownload: Int,
+    var fanExclusiveDownload: Int?,
     @SerializedName("fan_exclusive_play")
-    var fanExclusivePlay: Int,
+    var fanExclusivePlay: Int?,
     @SerializedName("favorited")
-    var favorited: Boolean,
+    var favorited: Boolean?,
     @SerializedName("favoritings_count")
-    var favoritingsCount: String,
+    var favoritingsCount: String?,
     @SerializedName("genre")
-    var genre: String,
+    var genre: String?,
     @SerializedName("genre_slush")
-    var genreSlush: String,
+    var genreSlush: String?,
     @SerializedName("geo")
-    var geo: String,
+    var geo: String?,
     @SerializedName("id")
-    var id: String,
+    var id: String?,
     @SerializedName("key")
-    var key: String,
+    var key: String?,
     @SerializedName("license")
-    var license: String,
+    var license: String?,
     @SerializedName("liked")
-    var liked: Boolean,
+    var liked: Boolean?,
     @SerializedName("permalink")
-    var permalink: String,
+    var permalink: String?,
     @SerializedName("permalink_url")
-    var permalinkUrl: String,
+    var permalinkUrl: String?,
     @SerializedName("playback_count")
-    var playbackCount: String,
+    var playbackCount: String?,
     @SerializedName("played")
-    var played: Boolean,
+    var played: Boolean?,
     @SerializedName("preview_url")
-    var previewUrl: String,
+    var previewUrl: String?,
     @SerializedName("private")
-    var `private`: String,
+    var `private`: String?,
     @SerializedName("release_date")
-    var releaseDate: String,
+    var releaseDate: String?,
     @SerializedName("release_timestamp")
-    var releaseTimestamp: Int,
+    var releaseTimestamp: Int?,
     @SerializedName("reshared")
-    var reshared: Boolean,
+    var reshared: Boolean?,
     @SerializedName("reshares_count")
-    var resharesCount: String,
+    var resharesCount: String?,
     @SerializedName("stream_url")
-    var streamUrl: String,
+    var streamUrl: String?,
     @SerializedName("taged_artists")
-    var tagedArtists: String,
+    var tagedArtists: String?,
     @SerializedName("tags")
-    var tags: String,
+    var tags: String?,
     @SerializedName("thumb")
-    var thumb: String,
+    var thumb: String?,
     @SerializedName("title")
-    var title: String,
+    var title: String?,
     @SerializedName("type")
-    var type: String,
+    var type: String?,
     @SerializedName("uri")
-    var uri: String,
+    var uri: String?,
     @SerializedName("user")
-    var user: HearthisAtUser,
+    var user: HearthisAtUser?,
     @SerializedName("user_id")
-    var userId: String,
+    var userId: String?,
     @SerializedName("version")
-    var version: String,
+    var version: String?,
     @SerializedName("waveform_data")
-    var waveformData: String,
+    var waveformData: String?,
     @SerializedName("waveform_url")
-    var waveformUrl: String
-)
+    var waveformUrl: String?
+){
+    constructor():this(null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null)
+}
 
 //data class HearthisAtUser(
 //    @SerializedName("avatar_url")
-//    var avatarUrl: String,
+//    var avatarUrl: String?,
 //    @SerializedName("caption")
-//    var caption: String,
+//    var caption: String?,
 //    @SerializedName("id")
-//    var id: String,
+//    var id: String?,
 //    @SerializedName("permalink")
-//    var permalink: String,
+//    var permalink: String?,
 //    @SerializedName("permalink_url")
-//    var permalinkUrl: String,
+//    var permalinkUrl: String?,
 //    @SerializedName("uri")
-//    var uri: String,
+//    var uri: String?,
 //    @SerializedName("username")
 //    var username: String
 //)
\ No newline at end of file
diff --git a/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt b/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt
index 2f75606..0bdf292 100644
--- a/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt
+++ b/src/main/java/com/mixsteroids/mixjar/services/HearThisAtServiceImpl.kt
@@ -24,7 +24,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
         showFeedEnd: String
     ): HearthisAtFeedResponse? {
         val feedCall =  hearThisAtApi.getFeed(page, count, duration, type, category, showFeedStart, showFeedEnd)
-        var feedResponse :HearthisAtFeedResponse? = null
+        var feedResponse :HearthisAtFeedResponse? = HearthisAtFeedResponse()
         feedCall.subscribe{feed, throwable ->
             if(throwable == null){
                 feedResponse =  feed
@@ -37,7 +37,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getAllGenres(): HearThisAtGenresResponse? {
         val genresCall = hearThisAtApi.getAllGenres()
-        var genreResponse:HearThisAtGenresResponse? = null
+        var genreResponse:HearThisAtGenresResponse? = HearThisAtGenresResponse()
         genresCall.subscribe { genres, throwable ->
             if(throwable == null){
                 genreResponse = genres
@@ -50,7 +50,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getGenreList(categoryName: String, page: Int, count: Int,duration: Int?): GenreList? {
         val genreListCall = hearThisAtApi.getGenreList(categoryName, page, count,duration)
-        var genreListResponse:GenreList? = null
+        var genreListResponse:GenreList? = GenreList()
         genreListCall.subscribe { genres,throwable ->
             if(throwable == null){
                 genreListResponse = genres
@@ -63,7 +63,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getSingleArtist(artistName: String): SingleArtistResponse? {
         val singleArtistCall = hearThisAtApi.getSingleArtist(artistName)
-        var singleArtistResponse:SingleArtistResponse? = null
+        var singleArtistResponse:SingleArtistResponse? = SingleArtistResponse()
         singleArtistCall.subscribe { single,throwable ->
             if(throwable == null){
                 singleArtistResponse = single
@@ -76,7 +76,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getArtistsList(artistName: String, type: String?, page: Int?, count: Int?): ArtistListResponse? {
         val artistsListCall = hearThisAtApi.getArtistsLists(artistName, type, page, count)
-        var artistListResponse:ArtistListResponse? = null
+        var artistListResponse:ArtistListResponse? = ArtistListResponse()
         artistsListCall.subscribe { artistList, throwable ->
             if(throwable == null){
                 artistListResponse = artistList
@@ -89,7 +89,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getSingleTrack(artistName: String, trackName: String): SingleTrackResponse? {
         val singleTrackCall= hearThisAtApi.getSingleTrack(artistName, trackName)
-        var singleTrackResponse:SingleTrackResponse? = null
+        var singleTrackResponse:SingleTrackResponse? = SingleTrackResponse()
         singleTrackCall.subscribe { track, throwable ->
             if(throwable == null){
                 singleTrackResponse = track
@@ -102,7 +102,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun getSinglePlaylist(artistName: String,types: String, page: Int?, count: Int?): SinglePlaylist? {
         val singlePlaylistCall = hearThisAtApi.getSinglePlaylist(artistName,types, page, count)
-        var singlePlaylistResponse:SinglePlaylist? = null
+        var singlePlaylistResponse:SinglePlaylist? = SinglePlaylist()
         singlePlaylistCall.subscribe { playlist,throwable ->
             if(throwable == null){
                 singlePlaylistResponse = playlist
@@ -130,7 +130,7 @@ class HearThisAtServiceImpl: HearThisAtInterface {
 
     override fun login(email: String, password: String): HearthisatLoginResponse? {
         val loginCall = hearThisAtApi.login(email, password)
-        var loginResponse:HearthisatLoginResponse? = null
+        var loginResponse:HearthisatLoginResponse? = HearthisatLoginResponse()
         loginCall.subscribe { login, throwable ->
             if(throwable == null){
                 loginResponse = login