@pensasystems/pensa-react-native 0.1.0-beta-3 → 0.1.0-beta-5

package/PensaSdkReactNative.podspec

@@ -21,5 +21,5 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
   end
 
-  s.dependency "PensaSdk", "~> 1.0.5"
+  s.dependency "PensaSdk", "~> 1.0.6"
 end

package/android/build.gradle

@@ -7,7 +7,15 @@ buildscript {
     google()
     mavenCentral()
     maven {
-      url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
+      //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)
+      }
     }
   }
 
@@ -75,7 +83,15 @@ repositories {
   mavenCentral()
   google()
   maven {
-    url = uri("https://sdk.pensasystems.net/pensa-sdk-android")
+    //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)
+    }
   }
 }
 
@@ -83,7 +99,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
-  implementation "com.pensasystems:pensasdk:1.0.8"
+  implementation "com.pensasystems:pensasdk:1.0.13"
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

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

@@ -1,9 +1,11 @@
 package com.pensasdkreactnative
 
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.pensasystems.pensasdk.PensaSdk
 import com.pensasystems.pensasdk.PensaSdkConfiguration
@@ -169,4 +171,119 @@ class PensaSdkReactNativeModule(reactContext: ReactApplicationContext) :
       promise.reject("NO_ACTIVITY", "Current activity is null")
     }
   }
+
+  @ReactMethod
+  fun fetchScanStatuses(scanIds: ReadableArray, promise: Promise) {
+    try {
+      val ids = mutableListOf<Int>()
+      for (i in 0 until scanIds.size()) {
+        ids.add(scanIds.getInt(i))
+      }
+
+      PensaSdk.fetchScanStatuses(
+        scanIds = ids,
+        onSuccess = { statuses ->
+          val rnList = statuses.map { status ->
+            val map = Arguments.createMap()
+            map.putInt("id", status.id)
+            map.putString("created", status.created)
+            map.putString("fastStatus", status.fastStatus)
+            map.putString("scanTimestamp", status.scanTimestamp)
+            map.putString("scannerId", status.scannerId)
+            map.putString("status", status.status)
+
+            val metadata = Arguments.createMap()
+            metadata.putString("guid", status.metadata?.guid)
+            metadata.putString("serverUploadStarted", status.metadata?.serverUploadStarted)
+            map.putMap("metadata", metadata)
+
+            map
+          }
+
+          val result = Arguments.createArray()
+          rnList.forEach { result.pushMap(it) }
+          promise.resolve(result)
+
+        },
+        onError = { error ->
+          promise.reject("FETCH_SCAN_STATUSES_FAILED", error)
+        }
+      )
+    } catch (e: Exception) {
+      promise.reject("FETCH_SCAN_STATUSES_EXCEPTION", e)
+    }
+  }
+
+  @ReactMethod
+  fun fetchOnDemandReports(scanId: Int, projectId: Int?, promise: Promise) {
+    try {
+      PensaSdk.fetchOnDemandReports(
+        scanId = scanId,
+        projectId = projectId,
+        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)
+              p.putInt("brandId", product.brandId ?: 0)
+              p.putString("category", product.category)
+              p.putInt("categoryId", product.categoryId ?: 0)
+              p.putInt("facings", product.facings ?: 0)
+              p.putString("manufacturer", product.manufacturer)
+              p.putInt("manufacturerId", product.manufacturerId ?: 0)
+              p.putString("product", product.product)
+              p.putInt("productId", product.productId ?: 0)
+              p.putString("upc", product.upc)
+              productsArray.pushMap(p)
+            }
+
+            val bucketMap = Arguments.createMap()
+            bucketMap.putArray("productList", productsArray)
+            result.putMap("facingsSeen", bucketMap)
+
+          } ?: result.putNull("facingsSeen")
+
+          result.putInt("projectId", report.projectId ?: 0)
+          result.putString("projectName", report.projectName)
+          result.putInt("projectReportId", report.projectReportId ?: 0)
+          result.putString("projectReportName", report.projectReportName)
+          result.putInt("shelfId", report.shelfId ?: 0)
+          result.putString("shelfName", report.shelfName)
+
+          promise.resolve(result)
+        },
+        onError = { error ->
+          promise.reject("FETCH_ON_DEMAND_REPORTS_FAILED", error)
+        }
+      )
+    } catch (e: Exception) {
+      promise.reject("ON_DEMAND_EXCEPTION", e)
+    }
+  }
+
+  @ReactMethod
+  fun fetchProductImageBase64(productId: Int, promise: Promise) {
+    try {
+      val activity = reactApplicationContext.currentActivity
+      if (activity != null) {
+        PensaSdk.fetchProductImageBase64(
+          context = activity,
+          productId = productId,
+          onSuccess = { base64 ->
+            promise.resolve(base64)
+          },
+          onError = { error ->
+            promise.reject("FETCH_PRODUCT_IMAGE_FAILED", error)
+          }
+        )
+      } else {
+        promise.reject("NO_ACTIVITY", "Current activity is null")
+      }
+    } catch (e: Exception) {
+      promise.reject("FETCH_PRODUCT_IMAGE_EXCEPTION", e)
+    }
+  }
 }

package/ios/PensaSdkReactNative.swift

@@ -120,9 +120,11 @@ class PensaSdkReactNative: NSObject {
   }
 
     @objc(fetchScanStatuses:withResolver:withRejecter:)
-    func fetchScanStatuses(scanIds: [NSNumber],
-                           resolve: @escaping RCTPromiseResolveBlock,
-                           reject: @escaping RCTPromiseRejectBlock) {
+    func fetchScanStatuses(
+      scanIds: [NSNumber],
+      resolve: @escaping RCTPromiseResolveBlock,
+      reject: @escaping RCTPromiseRejectBlock
+    ) {
       let ids = scanIds.map { $0.intValue }
 
       Pensa.shared.fetchScanStatuses(
@@ -130,24 +132,27 @@ class PensaSdkReactNative: NSObject {
         onSuccess: { statuses in
           let mapped: [[String: Any]] = statuses.map { status in
             var dict: [String: Any] = [:]
-            dict["captureType"] = status.captureType ?? NSNull()
+
+            dict["id"] = status.id
             dict["created"] = status.created ?? NSNull()
             dict["fastStatus"] = status.fastStatus ?? NSNull()
-            dict["frameHeight"] = status.frameHeight as Any
-            dict["frameWidth"] = status.frameWidth as Any
-            dict["hasOutOfServiceSegment"] = status.hasOutOfServiceSegment as Any
-            dict["id"] = status.id
-            dict["imageCaptureQuality"] = status.imageCaptureQuality ?? NSNull()
-            dict["publish"] = status.publish as Any
-            dict["scanAreaId"] = status.scanAreaId as Any
-            dict["scanMetadataGuid"] = status.scanMetadataGuid ?? NSNull()
-            dict["scanMetadataServerUploadStarted"] = status.scanMetadataServerUploadStarted ?? NSNull()
             dict["scanTimestamp"] = status.scanTimestamp ?? NSNull()
-            dict["scannerId"] = status.scannerId as Any
-            dict["shelfScanPeriodId"] = status.shelfScanPeriodId as Any
+            dict["scannerId"] = status.scannerId ?? NSNull()
             dict["status"] = status.status ?? NSNull()
+
+            // metadata
+            if let metadata = status.metadata {
+              dict["metadata"] = [
+                "guid": (metadata.guid as Any?) ?? NSNull(),
+                "serverUploadStarted": (metadata.serverUploadStarted as Any?) ?? NSNull()
+              ]
+            } else {
+              dict["metadata"] = NSNull()
+            }
+
             return dict
           }
+
           resolve(mapped)
         },
         onError: { error in
@@ -156,45 +161,69 @@ class PensaSdkReactNative: NSObject {
       )
     }
 
-    @objc(fetchOnDemandReports:projectId:withResolver:withRejecter:)
-    func fetchOnDemandReports(scanId: NSNumber,
-                              projectId: NSNumber?,
-                              resolve: @escaping RCTPromiseResolveBlock,
-                              reject: @escaping RCTPromiseRejectBlock) {
-      Pensa.shared.fetchOnDemandReports(
-        scanId: scanId.intValue,
-        projectId: projectId?.intValue,
-        onSuccess: { report in
-          var result: [String: Any] = [:]
-          
-          print("report: \(report) result: \(result)")
-
-          if let bucket = report.itemsSeen {
+  @objc(fetchOnDemandReports:projectId:withResolver:withRejecter:)
+  func fetchOnDemandReports(
+    scanId: NSNumber,
+    projectId: NSNumber?,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+
+    Pensa.shared.fetchOnDemandReports(
+      scanId: scanId.intValue,
+      projectId: projectId?.intValue,
+      onSuccess: { report in
+
+        func rn(_ value: Any?) -> Any { value ?? NSNull() }
+
+        var result: [String: Any] = [
+          "shelfId": rn(report.shelfId),
+          "shelfName": rn(report.shelfName)
+        ]
+
+        if let item = report.facingsSeen {
+          var itemDict: [String: Any] = [
+            "projectId": rn(item.projectId),
+            "projectName": rn(item.projectName),
+            "projectReportId": rn(item.projectReportId),
+            "projectReportName": rn(item.projectReportName)
+          ]
+
+          if let bucket = item.report {
             let products: [[String: Any]] = bucket.productList.map { product in
-              var dict: [String: Any] = [:]
-              dict["brand"] = product.brand ?? NSNull()
-              dict["brandId"] = product.brandId as Any
-              dict["category"] = product.category ?? NSNull()
-              dict["categoryId"] = product.categoryId as Any
-              dict["manufacturer"] = product.manufacturer ?? NSNull()
-              dict["manufacturerId"] = product.manufacturerId as Any
-              dict["product"] = product.product ?? NSNull()
-              dict["productId"] = product.productId as Any
-              dict["upc"] = product.upc ?? NSNull()
-              return dict
+              return [
+                "brand": rn(product.brand),
+                "brandId": rn(product.brandId),
+                "category": rn(product.category),
+                "categoryId": rn(product.categoryId),
+                "facings": rn(product.facings),
+                "manufacturer": rn(product.manufacturer),
+                "manufacturerId": rn(product.manufacturerId),
+                "product": rn(product.product),
+                "productId": rn(product.productId),
+                "upc": rn(product.upc)
+              ]
             }
-            result["itemsSeen"] = ["productList": products]
+
+            itemDict["report"] = [
+              "productList": products
+            ]
           } else {
-            result["itemsSeen"] = NSNull()
+            itemDict["report"] = NSNull()
           }
 
-          resolve(result)
-        },
-        onError: { error in
-          reject("FETCH_ON_DEMAND_REPORTS_FAILED", error.localizedDescription, error)
+          result["facingsSeen"] = itemDict
+        } else {
+          result["facingsSeen"] = NSNull()
         }
-      )
-    }
+
+        resolve(result)
+      },
+      onError: { error in
+        reject("FETCH_ON_DEMAND_REPORTS_FAILED", error.localizedDescription, error)
+      }
+    )
+  }
 
     @objc(fetchProductImageBase64:withResolver:withRejecter:)
     func fetchProductImageBase64(productId: NSNumber,

package/lib/typescript/src/types.d.ts

@@ -23,22 +23,17 @@ export type PensaEventPayloads = {
     onScanUploadFailed: OnScanUploadFailed;
     onCantScanReported: OnCantScanReported;
 };
+export type PensaScanMetadata = {
+    guid: string | null;
+    serverUploadStarted: string | null;
+};
 export type PensaScanStatus = {
-    captureType: string | null;
     created: string | null;
     fastStatus: string | null;
-    frameHeight: number | null;
-    frameWidth: number | null;
-    hasOutOfServiceSegment: boolean | null;
     id: number;
-    imageCaptureQuality: string | null;
-    publish: boolean | null;
-    scanAreaId: number | null;
-    scanMetadataGuid: string | null;
-    scanMetadataServerUploadStarted: string | null;
+    metadata: PensaScanMetadata | null;
     scanTimestamp: string | null;
-    scannerId: number | null;
-    shelfScanPeriodId: number | null;
+    scannerId: string | null;
     status: string | null;
 };
 export type PensaOnDemandProduct = {
@@ -46,6 +41,7 @@ export type PensaOnDemandProduct = {
     brandId: number | null;
     category: string | null;
     categoryId: number | null;
+    facings: number | null;
     manufacturer: string | null;
     manufacturerId: number | null;
     product: string | null;
@@ -56,6 +52,12 @@ export type PensaOnDemandReportBucket = {
     productList: PensaOnDemandProduct[];
 };
 export type PensaOnDemandReport = {
-    itemsSeen: PensaOnDemandReportBucket | null;
+    facingsSeen: PensaOnDemandReportBucket | null;
+    projectId: number | null;
+    projectName: string | null;
+    projectReportId: number | null;
+    projectReportName: string | null;
+    shelfId: number | null;
+    shelfName: string | null;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,sBAAsB,EAAE,OAAO,GAAG,IAAI,CAAC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,+BAA+B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAC7C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,0BAA0B,EAAE,0BAA0B,CAAC;IACvD,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,yBAAyB,GAAG,IAAI,CAAC;IAC9C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pensasystems/pensa-react-native",
-  "version": "0.1.0-beta-3",
+  "version": "0.1.0-beta-5",
   "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",

package/src/types.ts

@@ -28,22 +28,18 @@ export type PensaEventPayloads = {
   onCantScanReported: OnCantScanReported;
 };
 
+export type PensaScanMetadata = {
+  guid: string | null;
+  serverUploadStarted: string | null;
+};
+
 export type PensaScanStatus = {
-  captureType: string | null;
   created: string | null;
   fastStatus: string | null;
-  frameHeight: number | null;
-  frameWidth: number | null;
-  hasOutOfServiceSegment: boolean | null;
   id: number;
-  imageCaptureQuality: string | null;
-  publish: boolean | null;
-  scanAreaId: number | null;
-  scanMetadataGuid: string | null;
-  scanMetadataServerUploadStarted: string | null;
+  metadata: PensaScanMetadata | null;
   scanTimestamp: string | null;
-  scannerId: number | null;
-  shelfScanPeriodId: number | null;
+  scannerId: string | null;
   status: string | null;
 };
 
@@ -52,6 +48,7 @@ export type PensaOnDemandProduct = {
   brandId: number | null;
   category: string | null;
   categoryId: number | null;
+  facings: number | null;
   manufacturer: string | null;
   manufacturerId: number | null;
   product: string | null;
@@ -64,5 +61,11 @@ export type PensaOnDemandReportBucket = {
 };
 
 export type PensaOnDemandReport = {
-  itemsSeen: PensaOnDemandReportBucket | null;
+  facingsSeen: PensaOnDemandReportBucket | null;
+  projectId: number | null;
+  projectName: string | null;
+  projectReportId: number | null;
+  projectReportName: string | null;
+  shelfId: number | null;
+  shelfName: string | null;
 };