@pensasystems/pensa-react-native 0.1.0-beta-14 → 0.1.0-beta-15

package/android/build.gradle

@@ -7,15 +7,7 @@ buildscript {
     google()
     mavenCentral()
     maven {
-      //url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
-      url = uri("https://pensasystems.jfrog.io/artifactory/pensa-dev-maven-sdk-android-virtual/")
-      credentials {
-        username = "ci-cd-service"
-        password = "GChhw(Ywq&-qu1@@"
-      }
-      authentication {
-        basic(BasicAuthentication)
-      }
+      url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
     }
   }
 
@@ -83,15 +75,7 @@ repositories {
   mavenCentral()
   google()
   maven {
-    //url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
-    url = uri("https://pensasystems.jfrog.io/artifactory/pensa-dev-maven-sdk-android-virtual/")
-    credentials {
-      username = "ci-cd-service"
-      password = "GChhw(Ywq&-qu1@@"
-    }
-    authentication {
-      basic(BasicAuthentication)
-    }
+    url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
   }
 }
 
@@ -99,7 +83,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
-  implementation "com.pensasystems:pensasdk:1.0.19"
+  implementation "com.pensasystems:pensasdk:1.0.20"
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

package/android/src/main/java/com/pensasdkreactnative/PensaSdkReactNativeModule.kt

@@ -215,9 +215,13 @@ class PensaSdkReactNativeModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun fetchOnDemandReports(scanId: Int, projectId: Int?, reportTypes: ReadableArray?, promise: Promise) {
+  fun fetchOnDemandReports(
+    scanId: Int,
+    projectId: Int?,
+    reportTypes: ReadableArray?,
+    promise: Promise
+  ) {
     try {
-
       val finalReportTypes = parseReportTypes(reportTypes)
 
       PensaSdk.fetchOnDemandReports(
@@ -225,98 +229,65 @@ class PensaSdkReactNativeModule(reactContext: ReactApplicationContext) :
         projectId = projectId,
         reportTypes = finalReportTypes,
         onSuccess = { report ->
-
           val result = Arguments.createMap()
 
-          report.facingsSeen?.let { bucket ->
-            val productsArray = Arguments.createArray()
-            bucket.productList.forEach { product ->
-              val p = Arguments.createMap()
-              p.putString("brand", product.brand)
-
-              val brandId = product.brandId
-              if (brandId != null) p.putInt("brandId", brandId) else p.putNull("brandId")
-
-              p.putString("category", product.category)
-
-              val categoryId = product.categoryId
-              if (categoryId != null) p.putInt("categoryId", categoryId) else p.putNull("categoryId")
-
-              val expectedFacings = product.expectedFacings
-              if (expectedFacings != null) p.putInt("expectedFacings", expectedFacings) else p.putNull("expectedFacings")
+          fun toProductMap(p: com.pensasystems.pensasdk.model.PensaOnDemandProduct) =
+            Arguments.createMap().apply {
+              putString("brand", p.brand)
+              p.brandId?.let { putInt("brandId", it) } ?: putNull("brandId")
 
-              val facings = product.facings
-              if (facings != null) p.putInt("facings", facings) else p.putNull("facings")
+              putString("category", p.category)
+              p.categoryId?.let { putInt("categoryId", it) } ?: putNull("categoryId")
 
-              p.putString("manufacturer", product.manufacturer)
+              p.expectedFacings?.let { putInt("expectedFacings", it) } ?: putNull("expectedFacings")
+              p.facings?.let { putInt("facings", it) } ?: putNull("facings")
 
-              val manufacturerId = product.manufacturerId
-              if (manufacturerId != null) p.putInt("manufacturerId", manufacturerId) else p.putNull("manufacturerId")
+              putString("manufacturer", p.manufacturer)
+              p.manufacturerId?.let { putInt("manufacturerId", it) } ?: putNull("manufacturerId")
 
-              p.putString("product", product.product)
+              putString("product", p.product)
+              p.productId?.let { putInt("productId", it) } ?: putNull("productId")
 
-              val productId = product.productId
-              if (productId != null) p.putInt("productId", productId) else p.putNull("productId")
-
-              p.putString("upc", product.upc)
-
-              productsArray.pushMap(p)
+              putString("upc", p.upc)
             }
-            val bucketMap = Arguments.createMap()
-            bucketMap.putArray("productList", productsArray)
-            result.putMap("facingsSeen", bucketMap)
-          } ?: result.putNull("facingsSeen")
-
-          report.itemsSeen?.let { bucket ->
-            val productsArray = Arguments.createArray()
-            bucket.productList.forEach { product ->
-              val p = Arguments.createMap()
-              p.putString("brand", product.brand)
-
-              val brandId = product.brandId
-              if (brandId != null) p.putInt("brandId", brandId) else p.putNull("brandId")
-
-              p.putString("category", product.category)
-
-              val categoryId = product.categoryId
-              if (categoryId != null) p.putInt("categoryId", categoryId) else p.putNull("categoryId")
 
-              val facings = product.facings
-              if (facings != null) p.putInt("facings", facings) else p.putNull("facings")
-
-              p.putString("manufacturer", product.manufacturer)
-
-              val manufacturerId = product.manufacturerId
-              if (manufacturerId != null) p.putInt("manufacturerId", manufacturerId) else p.putNull("manufacturerId")
-
-              p.putString("product", product.product)
-
-              val productId = product.productId
-              if (productId != null) p.putInt("productId", productId) else p.putNull("productId")
+          fun toBucketMap(b: com.pensasystems.pensasdk.model.PensaOnDemandReportBucket) =
+            Arguments.createMap().apply {
+              val arr = Arguments.createArray()
+              b.productList.forEach { arr.pushMap(toProductMap(it)) }
+              putArray("productList", arr)
+            }
 
-              p.putString("upc", product.upc)
+          fun putBucket(key: String, bucket: com.pensasystems.pensasdk.model.PensaOnDemandReportBucket?) {
+            if (bucket == null) result.putNull(key) else result.putMap(key, toBucketMap(bucket))
+          }
 
-              productsArray.pushMap(p)
+          // Fill only requested
+          finalReportTypes.distinct().forEach { t ->
+            when (t) {
+              PensaReportType.FACINGS_SEEN -> putBucket("facingsSeen", report.facingsSeen)
+              PensaReportType.FULL_FACINGS -> putBucket("fullFacings", report.fullFacings)
+              PensaReportType.FULL_FACINGS_AND_PRODUCT_POSITIONS ->
+                putBucket("fullFacingsAndProductPositions", report.fullFacingsAndProductPositions)
+              PensaReportType.ITEMS_SEEN -> putBucket("itemsSeen", report.itemsSeen)
+              PensaReportType.NEW_PRODUCTS -> putBucket("newProducts", report.newProducts)
+              PensaReportType.NEW_PRODUCT_PACKAGING -> putBucket("newProductPackaging", report.newProductPackaging)
+              PensaReportType.NO_OOS -> putBucket("noOos", report.noOos)
+              PensaReportType.OOS -> putBucket("oos", report.oos)
+              PensaReportType.PRODUCT_POSITIONS -> putBucket("productPositions", report.productPositions)
+              PensaReportType.SCAN_FAILED -> putBucket("scanFailed", report.scanFailed)
+              PensaReportType.SCAN_REJECTED -> putBucket("scanRejected", report.scanRejected)
+              PensaReportType.SCAN_SKIPPED -> putBucket("scanSkipped", report.scanSkipped)
             }
-            val bucketMap = Arguments.createMap()
-            bucketMap.putArray("productList", productsArray)
-            result.putMap("itemsSeen", bucketMap)
-          } ?: result.putNull("itemsSeen")
-
-          val projectIdVal = report.projectId
-          if (projectIdVal != null) result.putInt("projectId", projectIdVal) else result.putNull("projectId")
+          }
 
+          // Other fields
+          report.projectId?.let { result.putInt("projectId", it) } ?: result.putNull("projectId")
           result.putString("projectName", report.projectName)
-
-          val projectReportIdVal = report.projectReportId
-          if (projectReportIdVal != null) result.putInt("projectReportId", projectReportIdVal) else result.putNull("projectReportId")
-
+          report.projectReportId?.let { result.putInt("projectReportId", it) } ?: result.putNull("projectReportId")
           result.putString("projectReportName", report.projectReportName)
           result.putString("realogramSignedUrl", report.realogramSignedUrl)
-
-          val shelfIdVal = report.shelfId
-          if (shelfIdVal != null) result.putInt("shelfId", shelfIdVal) else result.putNull("shelfId")
-
+          report.shelfId?.let { result.putInt("shelfId", it) } ?: result.putNull("shelfId")
           result.putString("shelfName", report.shelfName)
           result.putString("status", report.status)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pensasystems/pensa-react-native",
-  "version": "0.1.0-beta-14",
+  "version": "0.1.0-beta-15",
   "description": "The Pensa Mobile App SDK is a developer toolkit designed to simplify adding Pensa’s capabilities to your mobile applications. It provides pre-built libraries, tools, and APIs to accelerate development and integration, offering streamlined SDK integration, easy initialization, and comprehensive functionality. With the Pensa SDK, you can enhance your app’s features or seamlessly integrate with other services for a cohesive user experience.",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -68,7 +68,6 @@
     "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",
     "@types/react": "^19.0.0",
-    "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",
     "eslint": "^9.22.0",
     "eslint-config-prettier": "^10.1.1",