endpoint updated

Author: danishjamal104

app/src/main/java/com/github/code/gambit/network/api/ApiService.kt

@@ -3,6 +3,7 @@ package com.github.code.gambit.network.api
 import com.github.code.gambit.data.entity.network.FileNetworkEntity
 import com.github.code.gambit.data.entity.network.UrlNetworkEntity
 import com.github.code.gambit.data.entity.network.UserNetworkEntity
+import com.github.code.gambit.utility.AppConstant
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -17,33 +18,33 @@ interface ApiService {
     suspend fun getUser(@Path("userId") @Named("UID") userId: String): UserNetworkEntity
 
     @PUT("user/{userId}")
-    suspend fun updateUser(@Path("userId") @Named("UID") userId: String, @Body userNetworkEntity: UserNetworkEntity): UserNetworkEntity
+    suspend fun updateUser(@Path("userId") @Named(AppConstant.Named.USER_ID) userId: String, @Body userNetworkEntity: UserNetworkEntity): UserNetworkEntity
 
     @DELETE("user/{userId}")
-    suspend fun deleteUser(@Path("userId") @Named("UID") userId: String): UserNetworkEntity
+    suspend fun deleteUser(@Path("userId") @Named(AppConstant.Named.USER_ID) userId: String): UserNetworkEntity
 
     @GET("user/{userId}/file")
-    suspend fun getFiles(@Path("userId") @Named("UID") userId: String): List<FileNetworkEntity>
+    suspend fun getFiles(@Path("userId") @Named(AppConstant.Named.USER_ID) userId: String): List<FileNetworkEntity>
 
     @POST("user/{userId}/file")
-    suspend fun uploadFiles(@Path("userId") @Named("UID") userId: String, @Body fileNetworkEntity: FileNetworkEntity): FileNetworkEntity
+    suspend fun uploadFiles(@Path("userId") @Named(AppConstant.Named.USER_ID) userId: String, @Body fileNetworkEntity: FileNetworkEntity): FileNetworkEntity
 
-    @DELETE("file/{fileId}")
-    suspend fun deleteFile(@Path("fileId") fileId: String): FileNetworkEntity
+    @DELETE("user/{userId}/file/{fileId}")
+    suspend fun deleteFile(@Path(AppConstant.API_PATH.USER_ID) userId: String, @Path(AppConstant.API_PATH.FILE_ID) fileId: String): FileNetworkEntity
 
     @GET("file/{fileId}/url")
-    suspend fun getUrls(@Path("fileId") fileId: String): List<UrlNetworkEntity>
+    suspend fun getUrls(@Path(AppConstant.API_PATH.FILE_ID) fileId: String): List<UrlNetworkEntity>
 
     @POST("file/{fileId}/url")
-    suspend fun generateUrl(@Path("fileId") fileId: String): UrlNetworkEntity
+    suspend fun generateUrl(@Path(AppConstant.API_PATH.FILE_ID) fileId: String): UrlNetworkEntity
 
     @PUT("file/{fileId}/url/{urlId}")
     suspend fun updateUrl(
-        @Path("fileId") fileId: String,
-        @Path("urlId") urlId: String,
+        @Path(AppConstant.API_PATH.FILE_ID) fileId: String,
+        @Path(AppConstant.API_PATH.URL_ID) urlId: String,
         @Body urlNetworkEntity: UrlNetworkEntity
     ): UrlNetworkEntity
 
     @DELETE("file/{fileId}/url/{urlId}")
-    suspend fun deleteUrl(@Path("fileId") fileId: String, @Path("urlId") urlId: String): UrlNetworkEntity
+    suspend fun deleteUrl(@Path(AppConstant.API_PATH.FILE_ID) fileId: String, @Path(AppConstant.API_PATH.URL_ID) urlId: String): UrlNetworkEntity
 }

app/src/main/java/com/github/code/gambit/network/api/NetworkDataSource.kt

@@ -8,7 +8,7 @@ import javax.inject.Named
 interface NetworkDataSource {
     suspend fun getFiles(@Named("UID") userId: String): List<File>
     suspend fun uploadFile(@Named("UID") userId: String, fileNetworkEntity: File): File
-    suspend fun deleteFile(fileId: String): File
+    suspend fun deleteFile(userId: String, fileId: String): File
 
     suspend fun getUrls(fileId: String): List<Url>
     suspend fun generateUrl(fileId: String): Url

app/src/main/java/com/github/code/gambit/network/api/NetworkDataSourceImpl.kt

@@ -27,8 +27,8 @@ class NetworkDataSourceImpl(
         return fileNetworkMapper.mapFromEntity(fileService.uploadFile(userId, fileNetworkMapper.mapToEntity(file)))
     }
 
-    override suspend fun deleteFile(fileId: String): File {
-        return fileNetworkMapper.mapFromEntity(fileService.deleteFile(fileId))
+    override suspend fun deleteFile(userId: String, fileId: String): File {
+        return fileNetworkMapper.mapFromEntity(fileService.deleteFile(userId, fileId))
     }
 
     override suspend fun getUrls(fileId: String): List<Url> {

app/src/main/java/com/github/code/gambit/network/api/file/FileService.kt

@@ -7,5 +7,5 @@ interface FileService {
 
     suspend fun getFiles(@Named("UID") userId: String): List<FileNetworkEntity>
     suspend fun uploadFile(@Named("UID") userId: String, fileNetworkEntity: FileNetworkEntity): FileNetworkEntity
-    suspend fun deleteFile(fileId: String): FileNetworkEntity
+    suspend fun deleteFile(userId: String, fileId: String): FileNetworkEntity
 }

app/src/main/java/com/github/code/gambit/network/api/file/FileServiceImpl.kt

@@ -16,7 +16,7 @@ class FileServiceImpl(val apiService: ApiService) : FileService {
         return apiService.uploadFiles(userId, fileNetworkEntity)
     }
 
-    override suspend fun deleteFile(fileId: String): FileNetworkEntity {
-        return apiService.deleteFile(fileId)
+    override suspend fun deleteFile(userId: String, fileId: String): FileNetworkEntity {
+        return apiService.deleteFile(userId, fileId)
     }
 }

app/src/main/java/com/github/code/gambit/utility/AppConstant.kt

@@ -4,13 +4,22 @@ object AppConstant {
     object RequestCode {
         const val PERMISSIONS = 101
     }
+
     object Named {
         const val PERMISSION_ARRAY = "PERMISSION"
         const val USER_ID = "UID"
     }
+
     object Cloudinary {
         const val UPLOAD_PRESET = "mqlj7ft0"
         const val RESULT_URL_KEY = "url"
-        const val BASE_URL = "http://res.cloudinary.com/code-gambit/image/upload/v1619956278/Profile%20Image/"
+        const val BASE_URL =
+            "http://res.cloudinary.com/code-gambit/image/upload/v1619956278/Profile%20Image/"
+    }
+
+    object API_PATH {
+        const val USER_ID = "userId"
+        const val FILE_ID = "fileId"
+        const val URL_ID = "urlId"
     }
 }