From 812ceec09cfdf5bb6a2c351f26b96d06e13422d3 Mon Sep 17 00:00:00 2001
From: YarikHumster <jrik2308@gmail.com>
Date: Sun, 26 Nov 2023 22:53:05 +0300
Subject: [PATCH] v1

---
 .../java/com/yaros/sweetshopviki/common/utils/ApiUtils.kt   | 1 -
 .../java/com/yaros/sweetshopviki/data/models/Product.kt     | 4 ++--
 .../java/com/yaros/sweetshopviki/data/repo/Repository.kt    | 6 ++++--
 .../com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt   | 4 +---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yaros/sweetshopviki/common/utils/ApiUtils.kt b/app/src/main/java/com/yaros/sweetshopviki/common/utils/ApiUtils.kt
index 5447cb9..f857aa3 100644
--- a/app/src/main/java/com/yaros/sweetshopviki/common/utils/ApiUtils.kt
+++ b/app/src/main/java/com/yaros/sweetshopviki/common/utils/ApiUtils.kt
@@ -7,7 +7,6 @@ class ApiUtils {
     companion object {
         private const val BASE_URL = "https://my-json-server.typicode.com/YarikHumster/SweetShopViki/"
 
-
         fun getInterfaceDAO(): DAOInterface {
             return RetrofitClient.getClient(BASE_URL).create(DAOInterface::class.java)
         }
diff --git a/app/src/main/java/com/yaros/sweetshopviki/data/models/Product.kt b/app/src/main/java/com/yaros/sweetshopviki/data/models/Product.kt
index f9a9d82..b073d56 100644
--- a/app/src/main/java/com/yaros/sweetshopviki/data/models/Product.kt
+++ b/app/src/main/java/com/yaros/sweetshopviki/data/models/Product.kt
@@ -5,9 +5,9 @@ import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
 data class Product(
+    @SerializedName("categoryId") @Expose var categoryId: Int,
     @SerializedName("Name") @Expose var name: String?,
     @SerializedName("ImagePath") @Expose var imagePath: String?,
     @SerializedName("Price") @Expose var price: Double?,
-    @SerializedName("MenuItemId") @Expose var menuItemId: Int,
-    @SerializedName("categoryId") @Expose var categoryId: Int
+    @SerializedName("MenuItemId") @Expose var menuItemId: Int
 ): Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/yaros/sweetshopviki/data/repo/Repository.kt b/app/src/main/java/com/yaros/sweetshopviki/data/repo/Repository.kt
index 7a23c0e..86dc8ac 100644
--- a/app/src/main/java/com/yaros/sweetshopviki/data/repo/Repository.kt
+++ b/app/src/main/java/com/yaros/sweetshopviki/data/repo/Repository.kt
@@ -32,6 +32,7 @@ class Repository(context: Context) {
         try {
             isLoading.value = LOADING.LOADING
             val response = dif.getCategories()
+            Log.d("CATEGORY", response.toString())
             if (response.isSuccessful) {
                 val tempList = response.body()
                 categoriesList.value = tempList!!
@@ -50,6 +51,7 @@ class Repository(context: Context) {
         try {
             isLoading.value = LOADING.LOADING
             val response = dif.getProducts(categoryId)
+            Log.d("PRODUCT", response.toString())
             if (response.isSuccessful) {
                 val tempList = response.body()
                 productList.value = tempList!!
@@ -58,7 +60,7 @@ class Repository(context: Context) {
                 isLoading.value = LOADING.ERROR
             }
         } catch (t: Throwable) {
-            t.localizedMessage?.toString()?.let { Log.e("getCategories", it) }
+            t.localizedMessage?.toString()?.let { Log.e("getProducts", it) }
             isLoading.value = LOADING.ERROR
         }
 
@@ -77,7 +79,7 @@ class Repository(context: Context) {
 
             }
         } catch (t: Throwable) {
-            t.localizedMessage?.toString()?.let { Log.e("getCategories", it) }
+            t.localizedMessage?.toString()?.let { Log.e("getSearch", it) }
             isLoading.value = LOADING.ERROR
         }
 
diff --git a/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt b/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt
index af6a43e..a077365 100644
--- a/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt
+++ b/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt
@@ -11,11 +11,9 @@ interface DAOInterface {
     suspend fun getCategories(): Response<List<Categories>>
 
 
-    @GET("products")
+    @GET("products/{categoryId}")
     suspend fun getProducts(@Path("categoryId") categoryId: Int): Response<List<Product>>
 
-
-
     @GET("search")
     suspend fun getSearch(): Response<List<Product>>
 }
\ No newline at end of file