Response classes updated

Fixes #58: Response classes updated

Author: lakshya-20

app/src/main/java/com/github/code/gambit/data/remote/responses/ListResponse.kt

@@ -8,9 +8,13 @@ class ListResponse<T>(
     @Expose
     var statusCode: Int,
 
+    @SerializedName("error")
+    @Expose
+    var error: String?,
+
     @SerializedName("body")
     @Expose
-    var body: BodyTemplate<T>
+    var body: BodyTemplate<T>?
 )
 
 class BodyTemplate<T>(

app/src/main/java/com/github/code/gambit/data/remote/responses/Response.kt

@@ -8,7 +8,11 @@ class Response<T>(
     @Expose
     var statusCode: Int,
 
+    @SerializedName("error")
+    @Expose
+    var error: String?,
+
     @SerializedName("body")
     @Expose
-    var body: T
+    var body: T?
 )

app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt

@@ -17,27 +17,27 @@ class FileServiceImpl(
     override suspend fun getFiles(): List<FileNetworkEntity> {
         val lek: String = lekManager.getLastEvalKey(LastEvaluatedKeyManager.KeyType.FILE)
         val listResponse: ListResponse<FileNetworkEntity> = apiService.getFiles(userId, lek, null)
-        if (listResponse.body.lastEvaluatedKey != null) {
+        if (listResponse.body?.lastEvaluatedKey != null) {
             lekManager.putLastEvalKey(
-                listResponse.body.lastEvaluatedKey!!,
+                listResponse.body?.lastEvaluatedKey!!,
                 LastEvaluatedKeyManager.KeyType.FILE
             )
         }
-        return listResponse.body.items
+        return listResponse.body?.items!!
     }
 
     override suspend fun filterFiles(start: String, end: String): List<FileNetworkEntity> {
         val response = apiService.filterFiles(userId, null, start, end)
-        return response.body.items
+        return response.body?.items!!
     }
 
     override suspend fun searchFile(searchParam: String): List<FileNetworkEntity> {
         val response = apiService.getFiles(userId, null, searchParam)
-        return response.body.items
+        return response.body?.items!!
     }
 
     override suspend fun uploadFile(fileNetworkEntity: FileNetworkEntity): FileNetworkEntity {
-        return apiService.uploadFiles(userId, fileNetworkEntity).body
+        return apiService.uploadFiles(userId, fileNetworkEntity).body!!
     }
 
     override suspend fun deleteFile(fileId: String): Boolean {

app/src/main/java/com/github/code/gambit/data/remote/services/url/UrlServiceImpl.kt

@@ -14,25 +14,25 @@ class UrlServiceImpl(val apiService: ApiService, private val lekManager: LastEva
         } else {
             apiService.getUrls(fileId.split("#")[1])
         }
-        if (listResponse.body.lastEvaluatedKey != null) {
+        if (listResponse.body?.lastEvaluatedKey != null) {
             lekManager.putLastEvalKey(
-                listResponse.body.lastEvaluatedKey!!,
+                listResponse.body?.lastEvaluatedKey!!,
                 LastEvaluatedKeyManager.KeyType.URL
             )
         }
-        return listResponse.body.items
+        return listResponse.body?.items!!
     }
 
     override suspend fun generateUrl(fileId: String, urlNetworkEntity: UrlNetworkEntity): String {
         val id = fileId.split("#")[1]
-        return apiService.generateUrl(id, urlNetworkEntity).body
+        return apiService.generateUrl(id, urlNetworkEntity).body!!
     }
 
     override suspend fun updateUrl(fileId: String, urlId: String, urlNetworkEntity: UrlNetworkEntity): UrlNetworkEntity {
-        return apiService.updateUrl(fileId, urlId, urlNetworkEntity).body
+        return apiService.updateUrl(fileId, urlId, urlNetworkEntity).body!!
     }
 
     override suspend fun deleteUrl(fileId: String, urlId: String): UrlNetworkEntity {
-        return apiService.deleteUrl(fileId, urlId).body
+        return apiService.deleteUrl(fileId, urlId).body!!
     }
 }

app/src/main/java/com/github/code/gambit/data/remote/services/user/UserServiceImpl.kt

@@ -11,14 +11,14 @@ class UserServiceImpl(val apiService: ApiService, private val userManager: UserM
     override suspend fun getUser(): UserNetworkEntity {
         val id = userId
         val user = apiService.getUser(id)
-        return user.body
+        return user.body!!
     }
 
     override suspend fun updateUser(userNetworkEntity: UserNetworkEntity): UserNetworkEntity {
-        return apiService.updateUser(userId, userNetworkEntity).body
+        return apiService.updateUser(userId, userNetworkEntity).body!!
     }
 
     override suspend fun deleteUser(): UserNetworkEntity {
-        return apiService.deleteUser(userId).body
+        return apiService.deleteUser(userId).body!!
     }
 }