Expose NSData

Author: AnasMostefaoui

sdk.core/src/androidMain/kotlin/io/nyris/sdk/internal/repository/imagematching/ImageMatchingRequestBuilderImpl.kt

@@ -17,4 +17,4 @@ internal actual class ImageMatchingRequestBuilderImpl actual constructor(
     }
 }
 
-internal typealias DataType = ByteArray
+internal actual typealias DataType = ByteArray

sdk.core/src/commonMain/kotlin/io/nyris/sdk/builder/FeedbackRequestBuilder.kt

@@ -18,5 +18,12 @@ package io.nyris.sdk.builder
 import io.nyris.sdk.model.Feedback
 
 interface FeedbackRequestBuilder {
-    suspend fun send(feedback: Feedback): Result<Unit>
+    suspend fun send(feedback: Feedback): NyrisResult
+}
+
+sealed class NyrisResult {
+    object Successfull : NyrisResult()
+    object Fail : NyrisResult()
+
+
 }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/builder/ImageMatchingRequestBuilder.kt

@@ -15,25 +15,26 @@
  */
 package io.nyris.sdk.builder
 
+import io.nyris.sdk.internal.repository.imagematching.DataType
 import io.nyris.sdk.model.MatchResponse
 
-interface ImageMatchingRequestBuilder<D> {
-    fun limit(limit: Int): ImageMatchingRequestBuilder<D>
+interface ImageMatchingRequestBuilder {
+    fun limit(limit: Int): ImageMatchingRequestBuilder
 
-    fun language(language: String): ImageMatchingRequestBuilder<D>
+    fun language(language: String): ImageMatchingRequestBuilder
 
-    fun threshold(threshold: Float): ImageMatchingRequestBuilder<D>
+    fun threshold(threshold: Float): ImageMatchingRequestBuilder
 
     fun geolocation(
         lat: Float,
         lon: Float,
         dist: Int,
-    ): ImageMatchingRequestBuilder<D>
+    ): ImageMatchingRequestBuilder
 
-    fun filters(filters: Map<String, List<String>>): ImageMatchingRequestBuilder<D>
+    fun filters(filters: Map<String, List<String>>): ImageMatchingRequestBuilder
 
-    fun session(session: String): ImageMatchingRequestBuilder<D>
+    fun session(session: String): ImageMatchingRequestBuilder
 
     // Put the params before this call
-    suspend fun match(image: D): Result<MatchResponse>
+    suspend fun match(image: DataType): Result<MatchResponse>
 }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/internal/network/feedback/FeedbackService.kt

@@ -18,14 +18,15 @@ package io.nyris.sdk.internal.network.feedback
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
+import io.nyris.sdk.builder.NyrisResult
 import io.nyris.sdk.internal.network.Endpoints
 import io.nyris.sdk.internal.network.NyrisHttpClient
 import io.nyris.sdk.internal.util.Logger
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.withContext
 
 internal interface FeedbackService {
-    suspend fun send(feedbackRequest: FeedbackRequest): Result<Unit>
+    suspend fun send(feedbackRequest: FeedbackRequest): NyrisResult
 }
 
 internal class FeedbackServiceImpl(
@@ -36,19 +37,17 @@ internal class FeedbackServiceImpl(
 ) : FeedbackService {
     override suspend fun send(
         feedbackRequest: FeedbackRequest,
-    ): Result<Unit> = withContext(coroutineContext) {
+    ): NyrisResult = withContext(coroutineContext) {
         logger.log("[FeedbackServiceImpl] send")
         return@withContext try {
             httpClient.post(endpoints.feedback) {
                 contentType(ContentType.Application.Json)
 
                 setBody(feedbackRequest)
             }
-            Result.success(Unit)
+            NyrisResult.Successfull
         } catch (e: Throwable) {
-            Result.failure<Unit>(e).also {
-                logger.log("[RegionsServiceImpl] result is failure")
-            }
+            NyrisResult.Fail
         }
     }
 }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/internal/repository/feedback/FeedbackRepository.kt

@@ -15,19 +15,20 @@
  */
 package io.nyris.sdk.internal.repository.feedback
 
+import io.nyris.sdk.builder.NyrisResult
 import io.nyris.sdk.internal.network.feedback.FeedbackService
 import io.nyris.sdk.internal.util.Logger
 import io.nyris.sdk.model.Feedback
 
 internal interface FeedbackRepository {
-    suspend fun send(feedback: Feedback): Result<Unit>
+    suspend fun send(feedback: Feedback): NyrisResult
 }
 
 internal class FeedbackRepositoryImpl(
     private val logger: Logger,
     private val feedbackService: FeedbackService,
 ) : FeedbackRepository {
-    override suspend fun send(feedback: Feedback): Result<Unit> {
+    override suspend fun send(feedback: Feedback): NyrisResult {
         logger.log("[FeedbackRepositoryImpl] send")
         return feedbackService.send(feedback.toFeedbackRequest())
     }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/internal/repository/feedback/FeedbackRequestBuilderImpl.kt

@@ -16,14 +16,15 @@
 package io.nyris.sdk.internal.repository.feedback
 
 import io.nyris.sdk.builder.FeedbackRequestBuilder
+import io.nyris.sdk.builder.NyrisResult
 import io.nyris.sdk.internal.util.Logger
 import io.nyris.sdk.model.Feedback
 
 internal class FeedbackRequestBuilderImpl(
     private val logger: Logger,
     private val feedbackRepository: FeedbackRepository,
 ) : FeedbackRequestBuilder {
-    override suspend fun send(feedback: Feedback): Result<Unit> {
+    override suspend fun send(feedback: Feedback): NyrisResult {
         logger.log("[FeedbackRequestBuilderImpl] send")
         return feedbackRepository.send(feedback)
     }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/internal/repository/imagematching/CommonImageMatchingRequestBuilderImpl.kt

@@ -6,7 +6,7 @@ import io.nyris.sdk.internal.util.Logger
 internal abstract class CommonImageMatchingRequestBuilderImpl(
     protected val logger: Logger,
     protected val imageMatchingRepository: ImageMatchingRepository,
-) : ImageMatchingRequestBuilder<DataType> {
+) : ImageMatchingRequestBuilder {
     private var limit: Int? = null
     private var language: String? = null
     private var threshold: Float? = null
@@ -49,7 +49,7 @@ internal abstract class CommonImageMatchingRequestBuilderImpl(
         this.filters = filters
     }
 
-    override fun session(session: String): ImageMatchingRequestBuilder<DataType> = apply {
+    override fun session(session: String): ImageMatchingRequestBuilder = apply {
         logger.log("[ImageMatchingRequestBuilderImpl] session=$session")
         this.session = session
     }

sdk.core/src/commonMain/kotlin/io/nyris/sdk/internal/repository/imagematching/ImageMatchingRequestBuilderImpl.kt

@@ -20,6 +20,6 @@ import io.nyris.sdk.internal.util.Logger
 internal expect class ImageMatchingRequestBuilderImpl(
     logger: Logger,
     imageMatchingRepository: ImageMatchingRepository,
-)
+) : CommonImageMatchingRequestBuilderImpl
 
-internal expect class DataType
+expect class DataType

sdk.core/src/commonMain/kotlin/io/nyris/sdk/model/Feedback.kt

@@ -22,6 +22,10 @@ sealed class Feedback private constructor(
     class Click(
         requestId: String,
         sessionId: String,
+        //TODO: Check if we can use @ShouldRefineInSwift
+        // https://kotlinlang.org/docs/native-objc-interop.html#hiding-kotlin-declarations
+        // @ShouldRefineInSwift
+        // TODO: try to rename KotlinInt to just NSNumber to make it more iOS friendly.
         val positions: List<Int>,
         val productIds: List<String>,
     ) : Feedback(requestId, sessionId)

sdk.core/src/iosMain/kotlin/io/nyris/sdk/Nyris.kt

@@ -28,7 +28,7 @@ actual interface Nyris {
     actual fun skuMatching(): SkuMatchingRequestBuilder
 
     actual companion object {
-        internal actual fun createInstance(
+        actual fun createInstance(
             apiKey: String,
             config: NyrisConfig,
         ): Nyris = NyrisImpl.createInstance(
@@ -48,7 +48,7 @@ class NyrisService(
         apiKey = apiKey,
         config = NyrisConfig(isDebug = true, platform = NyrisPlatform.IOS)
     )
-
+    
     override fun imageMatching(): ImageMatchingRequestBuilder {
         return instance.imageMatching()
     }