From 1b9f00c849461a743813e2308021c13b2b04eb5d Mon Sep 17 00:00:00 2001
From: xyzcancer <xyzcancer@gmail.com>
Date: Wed, 17 Jun 2026 10:32:18 +0400
Subject: [PATCH] DEV-648: order methods

---
 demo-app/build.gradle                         |  3 +
 demo-app/local.properties.template            |  8 ++
 .../personalization/demo/OrdersDemoE2ETest.kt | 29 ++++++
 .../com/personalization/demo/MainActivity.kt  | 63 ++++++++++++
 .../src/main/res/layout/activity_main.xml     | 14 +++
 demo-app/src/main/res/values/strings.xml      |  6 ++
 .../main/kotlin/com/personalization/SDK.kt    |  4 +
 .../api/managers/OrdersManager.kt             | 46 +++++++++
 .../orders/GetLastOrderProductsResponse.kt    | 13 +++
 .../responses/orders/GetUserOrdersResponse.kt | 18 ++++
 .../api/responses/orders/Order.kt             | 47 +++++++++
 .../api/responses/orders/OrderItem.kt         | 28 ++++++
 .../com/personalization/di/SdkModule.kt       | 10 ++
 .../features/orders/impl/OrdersManagerImpl.kt | 95 +++++++++++++++++++
 14 files changed, 384 insertions(+)
 create mode 100644 demo-app/local.properties.template
 create mode 100644 demo-app/src/androidTest/java/com/personalization/demo/OrdersDemoE2ETest.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/managers/OrdersManager.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetLastOrderProductsResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetUserOrdersResponse.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/Order.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/OrderItem.kt
 create mode 100644 personalization-sdk/src/main/kotlin/com/personalization/features/orders/impl/OrdersManagerImpl.kt

diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index 16927520..c569e864 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -19,6 +19,8 @@ android {
         localProperties.load(new FileInputStream(localPropertiesFile))
     }
     def shopId = localProperties.getProperty('shop.id', '357382bf66ac0ce2f1722677c59511')
+    // Server-side shop secret (orders/by_user). Kept out of source — set shop.secret in local.properties.
+    def shopSecret = localProperties.getProperty('shop.secret', 'demo-shop-secret')
 
     defaultConfig {
         applicationId "com.personalization.demo"
@@ -32,6 +34,7 @@ android {
 
         // Add shop ID to BuildConfig
         buildConfigField "String", "SHOP_ID", "\"${shopId}\""
+        buildConfigField "String", "SHOP_SECRET", "\"${shopSecret}\""
     }
 
     productFlavors {
diff --git a/demo-app/local.properties.template b/demo-app/local.properties.template
new file mode 100644
index 00000000..c7f0e700
--- /dev/null
+++ b/demo-app/local.properties.template
@@ -0,0 +1,8 @@
+# Template for demo-app credentials. Copy the relevant lines into your local.properties
+# (root local.properties is read first, then demo-app/local.properties). Never commit real values.
+
+# Public shop identifier (sent on every request).
+shop.id=YOUR_SHOP_ID
+
+# Server-side shop secret — required only for orders/by_user. Keep it local, never commit.
+shop.secret=YOUR_SHOP_SECRET
diff --git a/demo-app/src/androidTest/java/com/personalization/demo/OrdersDemoE2ETest.kt b/demo-app/src/androidTest/java/com/personalization/demo/OrdersDemoE2ETest.kt
new file mode 100644
index 00000000..6934b78a
--- /dev/null
+++ b/demo-app/src/androidTest/java/com/personalization/demo/OrdersDemoE2ETest.kt
@@ -0,0 +1,29 @@
+package com.personalization.demo
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OrdersDemoE2ETest {
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Test
+    fun getLastOrderProducts_tapButton_noCrash() {
+        onView(withId(R.id.btnGetLastOrderProducts)).perform(click())
+        Thread.sleep(1500)
+    }
+
+    @Test
+    fun getUserOrders_tapButton_noCrash() {
+        onView(withId(R.id.btnGetUserOrders)).perform(click())
+        Thread.sleep(1500)
+    }
+}
diff --git a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
index f210c8fe..b24991d9 100644
--- a/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
+++ b/demo-app/src/main/java/com/personalization/demo/MainActivity.kt
@@ -38,6 +38,14 @@ class MainActivity : AppCompatActivity() {
         const val COLLISION_PLACEHOLDER_VALUE = "collision_demo"
     }
 
+    private object DemoOrdersConstants {
+        /**
+         * Server-side shop secret for `orders/by_user`. Sourced from `shop.secret` in local.properties
+         * (gitignored) via BuildConfig — never hardcode a real secret here. Falls back to a placeholder.
+         */
+        val SHOP_SECRET = BuildConfig.SHOP_SECRET
+    }
+
     private object DemoProductViewConstants {
         const val PRODUCT_ID = "demo-product-view-001"
         const val DEMO_PRICE = 2499.99
@@ -121,6 +129,61 @@ class MainActivity : AppCompatActivity() {
         findViewById<Button>(R.id.btnTrackPurchaseFull).setOnClickListener {
             trackPurchaseFull()
         }
+
+        findViewById<Button>(R.id.btnGetLastOrderProducts).setOnClickListener {
+            getLastOrderProducts()
+        }
+
+        findViewById<Button>(R.id.btnGetUserOrders).setOnClickListener {
+            getUserOrders()
+        }
+    }
+
+    private fun getUserOrders() {
+        sdk.ordersManager.getUserOrders(
+            shopSecret = DemoOrdersConstants.SHOP_SECRET,
+            onSuccess = { orders ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(R.string.get_user_orders_ok, orders.size),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_user_orders_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
+    }
+
+    private fun getLastOrderProducts() {
+        sdk.ordersManager.getLastOrderProducts(
+            onGetLastOrderProducts = { response ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        getString(R.string.get_last_order_products_ok, response.products.size),
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+            onError = { code, msg ->
+                runOnUiThread {
+                    Toast.makeText(
+                        this,
+                        "${getString(R.string.get_last_order_products_fail)}: $code $msg",
+                        Toast.LENGTH_LONG,
+                    ).show()
+                }
+            },
+        )
     }
 
     private fun trackPurchaseMinimal() {
diff --git a/demo-app/src/main/res/layout/activity_main.xml b/demo-app/src/main/res/layout/activity_main.xml
index 09a45912..1843126f 100644
--- a/demo-app/src/main/res/layout/activity_main.xml
+++ b/demo-app/src/main/res/layout/activity_main.xml
@@ -69,6 +69,20 @@
         android:text="@string/track_purchase_full"
         android:layout_marginTop="16dp" />
 
+    <Button
+        android:id="@+id/btnGetLastOrderProducts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_last_order_products"
+        android:layout_marginTop="24dp" />
+
+    <Button
+        android:id="@+id/btnGetUserOrders"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/get_user_orders"
+        android:layout_marginTop="16dp" />
+
 </LinearLayout>
 
 
diff --git a/demo-app/src/main/res/values/strings.xml b/demo-app/src/main/res/values/strings.xml
index 2a2fc6b0..f62be95a 100644
--- a/demo-app/src/main/res/values/strings.xml
+++ b/demo-app/src/main/res/values/strings.xml
@@ -22,6 +22,12 @@
     <string name="track_purchase_full">Track purchase (full)</string>
     <string name="track_purchase_ok">trackPurchase: sent</string>
     <string name="track_purchase_fail">trackPurchase failed</string>
+    <string name="get_last_order_products">Get last order products</string>
+    <string name="get_last_order_products_ok">getLastOrderProducts: %1$d product(s)</string>
+    <string name="get_last_order_products_fail">getLastOrderProducts failed</string>
+    <string name="get_user_orders">Get user orders</string>
+    <string name="get_user_orders_ok">getUserOrders: %1$d order(s)</string>
+    <string name="get_user_orders_fail">getUserOrders failed</string>
 </resources>
 
 
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
index d6261e62..04b66543 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/SDK.kt
@@ -12,6 +12,7 @@ import com.personalization.api.OnApiCallbackListener
 import com.personalization.api.models.purchase.PurchaseTrackingRequest
 import com.personalization.api.managers.CartManager
 import com.personalization.api.managers.InAppNotificationManager
+import com.personalization.api.managers.OrdersManager
 import com.personalization.api.managers.ProductsManager
 import com.personalization.api.managers.PredictManager
 import com.personalization.api.managers.RecommendationManager
@@ -84,6 +85,9 @@ open class SDK {
     @Inject
     lateinit var predictManager: PredictManager
 
+    @Inject
+    lateinit var ordersManager: OrdersManager
+
     @Inject
     lateinit var inAppNotificationManager: InAppNotificationManager
 
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/managers/OrdersManager.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/OrdersManager.kt
new file mode 100644
index 00000000..96264d8c
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/managers/OrdersManager.kt
@@ -0,0 +1,46 @@
+package com.personalization.api.managers
+
+import com.personalization.Params
+import com.personalization.api.responses.orders.GetLastOrderProductsResponse
+import com.personalization.api.responses.orders.Order
+
+interface OrdersManager {
+
+    /**
+     * Request the products of the user's last order
+     *
+     * @param params Parameters for the request
+     * @param onGetLastOrderProducts Callback for get last order products
+     * @param onError Callback for error
+     */
+    fun getLastOrderProducts(
+        params: Params = Params(),
+        onGetLastOrderProducts: (GetLastOrderProductsResponse) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
+
+    /**
+     * Request the list of the user's orders (`orders/by_user`), ascending by date and internal id.
+     *
+     * The user is identified by [did] (the SDK's current device id is used when omitted) or by
+     * [email] / [phone] / [loyaltyId] / [externalId]. [dateFrom] (YYYY-MM-DD) limits orders from a date.
+     *
+     * NOTE: [shopSecret] is a server-side secret key; shipping it inside a mobile app exposes it.
+     * Use only in trusted contexts.
+     *
+     * @param shopSecret API secret key (required)
+     * @param onSuccess Callback with the list of orders
+     * @param onError Callback for error
+     */
+    fun getUserOrders(
+        shopSecret: String,
+        did: String? = null,
+        email: String? = null,
+        phone: String? = null,
+        loyaltyId: String? = null,
+        externalId: String? = null,
+        dateFrom: String? = null,
+        onSuccess: (List<Order>) -> Unit,
+        onError: (Int, String?) -> Unit = { _: Int, _: String? -> }
+    )
+}
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetLastOrderProductsResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetLastOrderProductsResponse.kt
new file mode 100644
index 00000000..8a9e862e
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetLastOrderProductsResponse.kt
@@ -0,0 +1,13 @@
+package com.personalization.api.responses.orders
+
+import com.personalization.api.responses.product.Product
+
+/**
+ * Response for the `orders/last_for_user` request.
+ *
+ * The endpoint returns a top-level JSON array of products that belong to the
+ * user's last order, so [products] is mapped directly from that array.
+ */
+data class GetLastOrderProductsResponse(
+    val products: List<Product>
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetUserOrdersResponse.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetUserOrdersResponse.kt
new file mode 100644
index 00000000..071742e2
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/GetUserOrdersResponse.kt
@@ -0,0 +1,18 @@
+package com.personalization.api.responses.orders
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Envelope of the `orders/by_user` response: `{ "status": ..., "data": { "orders": [...] } }`.
+ */
+internal data class GetUserOrdersResponse(
+    @SerializedName("status")
+    val status: String? = null,
+    @SerializedName("data")
+    val data: UserOrdersData? = null
+)
+
+internal data class UserOrdersData(
+    @SerializedName("orders")
+    val orders: List<Order> = emptyList()
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/Order.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/Order.kt
new file mode 100644
index 00000000..f71f099e
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/Order.kt
@@ -0,0 +1,47 @@
+package com.personalization.api.responses.orders
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * A single user order returned by `orders/by_user`.
+ *
+ * Monetary fields (`value`, `cashValue`, ...) are returned by the API as strings.
+ */
+data class Order(
+    @SerializedName("_id")
+    val internalId: Long? = null,
+    @SerializedName("id")
+    val id: String? = null,
+    @SerializedName("date")
+    val date: String? = null,
+    @SerializedName("value")
+    val value: String? = null,
+    @SerializedName("cash_value")
+    val cashValue: String? = null,
+    @SerializedName("bonuses_value")
+    val bonusesValue: String? = null,
+    @SerializedName("delivery_value")
+    val deliveryValue: String? = null,
+    @SerializedName("promocode")
+    val promocode: String? = null,
+    @SerializedName("delivery_date")
+    val deliveryDate: String? = null,
+    @SerializedName("internal_status")
+    val internalStatus: String? = null,
+    @SerializedName("stream")
+    val stream: String? = null,
+    @SerializedName("channel")
+    val channel: String? = null,
+    @SerializedName("tax_free")
+    val taxFree: Boolean? = null,
+    @SerializedName("delivery_type")
+    val deliveryType: String? = null,
+    @SerializedName("delivery_address")
+    val deliveryAddress: String? = null,
+    @SerializedName("order_status")
+    val orderStatus: String? = null,
+    @SerializedName("payment_type")
+    val paymentType: String? = null,
+    @SerializedName("items")
+    val items: List<OrderItem> = emptyList()
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/OrderItem.kt b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/OrderItem.kt
new file mode 100644
index 00000000..11ad4b32
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/api/responses/orders/OrderItem.kt
@@ -0,0 +1,28 @@
+package com.personalization.api.responses.orders
+
+import com.google.gson.annotations.SerializedName
+import com.personalization.api.responses.product.Product
+
+/**
+ * A line item of a user [Order]. [item] is the catalog product (same shape as other product responses).
+ *
+ * [price] / [originalPrice] are returned by the API as strings.
+ */
+data class OrderItem(
+    @SerializedName("amount")
+    val amount: Int? = null,
+    @SerializedName("price")
+    val price: String? = null,
+    @SerializedName("status")
+    val status: String? = null,
+    @SerializedName("original_price")
+    val originalPrice: String? = null,
+    @SerializedName("barcode")
+    val barcode: String? = null,
+    @SerializedName("line_id")
+    val lineId: String? = null,
+    @SerializedName("cancel_reason")
+    val cancelReason: String? = null,
+    @SerializedName("item")
+    val item: Product? = null
+)
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
index ae3194f6..1cfd907a 100644
--- a/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
+++ b/personalization-sdk/src/main/kotlin/com/personalization/di/SdkModule.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.personalization.RegisterManager
 import com.personalization.api.managers.CartManager
 import com.personalization.api.managers.InAppNotificationManager
+import com.personalization.api.managers.OrdersManager
 import com.personalization.api.managers.ProductsManager
 import com.personalization.api.managers.RecommendationManager
 import com.personalization.api.managers.PredictManager
@@ -12,6 +13,7 @@ import com.personalization.api.managers.TrackEventManager
 import com.personalization.features.cart.CartManagerImpl
 import com.personalization.features.inAppNotification.impl.InAppNotificationManagerImpl
 import com.personalization.features.notification.domain.data.NotificationDataExtractor
+import com.personalization.features.orders.impl.OrdersManagerImpl
 import com.personalization.features.predict.impl.PredictManagerImpl
 import com.personalization.features.products.impl.ProductsManagerImpl
 import com.personalization.features.recommendation.impl.RecommendationManagerImpl
@@ -119,6 +121,14 @@ class SdkModule {
         sendNetworkMethodUseCase = sendNetworkMethodUseCase
     )
 
+    @Singleton
+    @Provides
+    fun provideOrdersManager(
+        sendNetworkMethodUseCase: SendNetworkMethodUseCase
+    ): OrdersManager = OrdersManagerImpl(
+        sendNetworkMethodUseCase = sendNetworkMethodUseCase
+    )
+
     @Singleton
     @Provides
     fun provideInAppNotificationManager(
diff --git a/personalization-sdk/src/main/kotlin/com/personalization/features/orders/impl/OrdersManagerImpl.kt b/personalization-sdk/src/main/kotlin/com/personalization/features/orders/impl/OrdersManagerImpl.kt
new file mode 100644
index 00000000..4963f995
--- /dev/null
+++ b/personalization-sdk/src/main/kotlin/com/personalization/features/orders/impl/OrdersManagerImpl.kt
@@ -0,0 +1,95 @@
+package com.personalization.features.orders.impl
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.personalization.Params
+import com.personalization.api.OnApiCallbackListener
+import com.personalization.api.managers.OrdersManager
+import com.personalization.api.responses.orders.GetLastOrderProductsResponse
+import com.personalization.api.responses.orders.GetUserOrdersResponse
+import com.personalization.api.responses.orders.Order
+import com.personalization.api.responses.product.Product
+import com.personalization.sdk.domain.usecases.network.SendNetworkMethodUseCase
+import javax.inject.Inject
+import org.json.JSONArray
+import org.json.JSONObject
+
+internal class OrdersManagerImpl @Inject constructor(
+    private val sendNetworkMethodUseCase: SendNetworkMethodUseCase
+) : OrdersManager {
+
+    override fun getLastOrderProducts(
+        params: Params,
+        onGetLastOrderProducts: (GetLastOrderProductsResponse) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        sendNetworkMethodUseCase.getAsync(
+            LAST_FOR_USER_REQUEST,
+            params.build(),
+            object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONArray) {
+                    val type = object : TypeToken<List<Product>>() {}.type
+                    val products: List<Product> = Gson().fromJson(response.toString(), type)
+                    onGetLastOrderProducts(GetLastOrderProductsResponse(products))
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
+    override fun getUserOrders(
+        shopSecret: String,
+        did: String?,
+        email: String?,
+        phone: String?,
+        loyaltyId: String?,
+        externalId: String?,
+        dateFrom: String?,
+        onSuccess: (List<Order>) -> Unit,
+        onError: (Int, String?) -> Unit
+    ) {
+        val params = Params()
+        params.put(SHOP_SECRET_PARAM, shopSecret)
+        did?.let { params.put(DID_PARAM, it) }
+        email?.let { params.put(EMAIL_PARAM, it) }
+        phone?.let { params.put(PHONE_PARAM, it) }
+        loyaltyId?.let { params.put(LOYALTY_ID_PARAM, it) }
+        externalId?.let { params.put(EXTERNAL_ID_PARAM, it) }
+        dateFrom?.let { params.put(DATE_FROM_PARAM, it) }
+
+        sendNetworkMethodUseCase.getAsync(
+            BY_USER_REQUEST,
+            params.build(),
+            object : OnApiCallbackListener() {
+                override fun onSuccess(response: JSONObject?) {
+                    // Envelope: { "status": ..., "data": { "orders": [...] } }
+                    val parsed = Gson().fromJson(
+                        response.toString(),
+                        GetUserOrdersResponse::class.java
+                    )
+                    onSuccess(parsed?.data?.orders ?: emptyList())
+                }
+
+                override fun onError(code: Int, msg: String?) {
+                    onError(code, msg)
+                }
+            }
+        )
+    }
+
+    companion object {
+        const val LAST_FOR_USER_REQUEST = "orders/last_for_user"
+        const val BY_USER_REQUEST = "orders/by_user"
+
+        private const val SHOP_SECRET_PARAM = "shop_secret"
+        private const val DID_PARAM = "did"
+        private const val EMAIL_PARAM = "email"
+        private const val PHONE_PARAM = "phone"
+        private const val LOYALTY_ID_PARAM = "loyalty_id"
+        private const val EXTERNAL_ID_PARAM = "external_id"
+        private const val DATE_FROM_PARAM = "date_from"
+    }
+}