From e95c2f5ed8dab17275b61133f2c337c70fa30b2b Mon Sep 17 00:00:00 2001
From: YarikHumster <jrik2308@gmail.com>
Date: Mon, 13 Nov 2023 22:56:12 +0300
Subject: [PATCH] v1

---
 .../java/com/yaros/sweetshopviki/common/Extension.kt     | 2 +-
 .../java/com/yaros/sweetshopviki/data/models/Product.kt  | 4 +---
 .../yaros/sweetshopviki/data/retrofit/DAOInterface.kt    | 9 ++++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt b/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt
index 7fcead6..3680474 100644
--- a/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt
+++ b/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt
@@ -20,7 +20,7 @@ fun Float.formatPrice(): String {
 
 fun ImageView.loadImage(url: String?) {
     Picasso.get()
-        .load("https://liwapos.com/samba.mobil/Content/$url")
+        .load("https://my-json-server.typicode.com/YarikHumster/SweetShopViki/$url")
         .placeholder(R.drawable.loading)
         .error(R.drawable.error)
         .into(this)
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 2ea55f4..d91f6c7 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
@@ -8,7 +8,5 @@ data class Product(
     @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("GroupName") @Expose var groupName: String?,
-    @SerializedName("CustomTags") @Expose var customTags: String?,
+    @SerializedName("MenuItemId") @Expose var menuItemId: Int
 ): Serializable
\ No newline at end of file
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 29329fe..f88ba3b 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
@@ -7,11 +7,14 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface DAOInterface {
-    @GET("JsonCategories")
+    @GET("categories")
     suspend fun getCategories(): Response<List<Categories>>
 
-    @GET("JsonItems/{id}")
-    suspend fun getProducts(@Path("id") id: Int): Response<List<Product>>
+
+    @GET("categories/{categoryId}/products")
+    suspend fun getProducts(@Path("categoryId") categoryId: Int): Response<List<Product>>
+
+
 
     @GET("JsonSearch")
     suspend fun getSearch(): Response<List<Product>>