@dashx/react-native 0.1.4 → 0.1.8-alpha

package/ios/DashX.m

@@ -10,4 +10,6 @@ RCT_EXTERN_METHOD(reset)
 RCT_EXTERN_METHOD(track:(NSString *)event data:(NSDictionary *)data)
 RCT_EXTERN_METHOD(searchContent:(NSString *)contentType options:(NSDictionary *)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(fetchContent:(NSString *)urn options:(NSDictionary *)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(addItemToCart:(NSString *)itemId pricingId:(NSString *)pricingId quantity:(NSString *)quantity reset:(BOOL)reset custom:(NSDictionary *)custom resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(fetchCart:resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 @end

package/ios/DashX.swift

@@ -23,10 +23,6 @@ class DashX: RCTEventEmitter {
     func setup(_ options: NSDictionary?) {
         ConfigInterceptor.shared.publicKey = options?.value(forKey: "publicKey") as? String
 
-        if let accountType = options?.value(forKey: "accountType") {
-            dashXClient.setAccountType(to: accountType as! String)
-        }
-
         DashXAppDelegate.swizzleDidReceiveRemoteNotification()
 
         if let baseUri = options?.value(forKey: "baseUri") {
@@ -121,4 +117,28 @@ class DashX: RCTEventEmitter {
             reject
         )
     }
+
+    @objc(addItemToCart:pricingId:quantity:reset:custom:resolver:rejecter:)
+    func addItemToCart(_ itemId: String, _ pricingId: String, _ quantity: String, _ reset: Bool, _ custom: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+
+        dashXClient.addItemToCart(
+            itemId,
+            pricingId,
+            quantity,
+            reset,
+            custom,
+            resolve,
+            reject
+        )
+    }
+
+    @objc(fetchCart:rejecter:)
+    func fetchCart(resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+
+        dashXClient.fetchCart(
+            resolve,
+            reject
+        )
+    }
+
 }

package/ios/DashXClient.swift

@@ -10,7 +10,6 @@ class DashXClient {
     private var anonymousUid: String?
     private var uid: String?
     private var deviceToken: String?
-    private var accountType: String?
 
     private init() {
         generateAnonymousUid()
@@ -20,10 +19,6 @@ class DashXClient {
         self.deviceToken = to
     }
 
-    func setAccountType(to: String) {
-        self.accountType = to
-    }
-
     func setTargetEnvironment(to: String) {
         ConfigInterceptor.shared.targetEnvironment = to
     }
@@ -61,9 +56,10 @@ class DashXClient {
 
         let optionsDictionary = withOptions as? [String: String]
 
+        self.uid = optionsDictionary?["uid"]
+
         let identifyAccountInput = DashXGql.IdentifyAccountInput(
-            accountType: accountType,
-            uid: uid,
+            uid: optionsDictionary?["uid"],
             anonymousUid: anonymousUid,
             email: optionsDictionary?["email"],
             phone: optionsDictionary?["phone"],
@@ -91,27 +87,7 @@ class DashXClient {
     // MARK: -- track
 
     func track(_ event: String, withData: NSDictionary?) {
-        let trackData: String?
-
-        if accountType == nil {
-            DashXLog.d(tag: #function, "AccountType not set skipping track()")
-            return
-        }
-
-        if withData == nil {
-            trackData = nil
-        } else if JSONSerialization.isValidJSONObject(withData!) {
-            trackData = try? String(
-                data: JSONSerialization.data(withJSONObject: withData!),
-                encoding: .utf8
-            )
-        } else {
-            DashXLog.d(tag: #function, "Encountered an error while encoding track data")
-            return
-        }
-
         let trackEventInput = DashXGql.TrackEventInput(
-            accountType: accountType!,
             event: event,
             accountUid: uid,
             accountAnonymousUid: anonymousUid,
@@ -193,7 +169,7 @@ class DashXClient {
 
         let findContentQuery = DashXGql.FetchContentQuery(input: fetchContentInput)
 
-        Network.shared.apollo.fetch(query: findContentQuery) { result in
+        Network.shared.apollo.fetch(query: findContentQuery, cachePolicy: .returnCacheDataElseFetch) { result in
           switch result {
           case .success(let graphQLResult):
             DashXLog.d(tag: #function, "Sent findContent with \(String(describing: graphQLResult))")
@@ -220,34 +196,6 @@ class DashXClient {
         _ resolve: @escaping RCTPromiseResolveBlock,
         _ reject: @escaping RCTPromiseRejectBlock
     ) {
-        let filterJson: String?
-        let orderJson: String?
-
-        if filter == nil {
-            filterJson = nil
-        } else if JSONSerialization.isValidJSONObject(filter!) {
-            filterJson = try? String(
-                data: JSONSerialization.data(withJSONObject: filter!),
-                encoding: .utf8
-            )
-        } else {
-            DashXLog.d(tag: #function, "Encountered an error while encoding filter")
-            return
-        }
-
-        if order == nil {
-            orderJson = nil
-        } else if JSONSerialization.isValidJSONObject(order!) {
-            orderJson = try? String(
-                data: JSONSerialization.data(withJSONObject: order!),
-                encoding: .utf8
-            )
-        } else {
-            DashXLog.d(tag: #function, "Encountered an error while encoding order")
-            return
-        }
-
-
         let searchContentsInput  = DashXGql.SearchContentInput(
             contentType: contentType,
             returnType: returnType,
@@ -265,7 +213,7 @@ class DashXClient {
 
         let searchContentQuery = DashXGql.SearchContentQuery(input: searchContentsInput)
 
-        Network.shared.apollo.fetch(query: searchContentQuery) { result in
+        Network.shared.apollo.fetch(query: searchContentQuery, cachePolicy: .returnCacheDataElseFetch) { result in
           switch result {
           case .success(let graphQLResult):
             let json = graphQLResult.data?.searchContent
@@ -277,4 +225,60 @@ class DashXClient {
           }
         }
     }
+    // MARK: -- cart
+
+    func addItemToCart(
+        _ itemId: String,
+        _ pricingId: String,
+        _ quantity: String,
+        _ reset: Bool,
+        _ custom: NSDictionary?,
+        _ resolve: @escaping RCTPromiseResolveBlock,
+        _ reject: @escaping RCTPromiseRejectBlock
+    ) {
+        let addItemToCartInput  = DashXGql.AddItemToCartInput(
+             accountUid: self.uid, accountAnonymousUid: self.anonymousUid, itemId: itemId, pricingId: pricingId, quantity: quantity, reset: reset, custom: custom as? [String: JSONDecodable?]
+        )
+
+        DashXLog.d(tag: #function, "Calling addItemToCart with \(addItemToCartInput)")
+
+        let addItemToCartMutation = DashXGql.AddItemToCartMutation(input: addItemToCartInput)
+
+        Network.shared.apollo.perform(mutation: addItemToCartMutation) { result in
+          switch result {
+          case .success(let graphQLResult):
+            let json = graphQLResult.data?.addItemToCart
+            DashXLog.d(tag: #function, "Sent addItemToCart with \(String(describing: json))")
+            resolve(json?.resultMap)
+          case .failure(let error):
+            DashXLog.d(tag: #function, "Encountered an error during addItemToCart(): \(error)")
+            reject("", error.localizedDescription, error)
+          }
+        }
+    }
+
+    func fetchCart(
+        _ resolve: @escaping RCTPromiseResolveBlock,
+        _ reject: @escaping RCTPromiseRejectBlock
+    ) {
+        let fetchCartInput  = DashXGql.FetchCartInput(
+            accountUid: self.uid, accountAnonymousUid: self.anonymousUid
+        )
+
+        DashXLog.d(tag: #function, "Calling fetchCart with \(fetchCartInput)")
+
+        let fetchCartQuery = DashXGql.FetchCartQuery(input: fetchCartInput)
+
+        Network.shared.apollo.fetch(query: fetchCartQuery) { result in
+          switch result {
+          case .success(let graphQLResult):
+            let json = graphQLResult.data?.fetchCart
+            DashXLog.d(tag: #function, "Sent fetchCart with \(String(describing: json))")
+            resolve(json?.resultMap)
+          case .failure(let error):
+            DashXLog.d(tag: #function, "Encountered an error during fetchCart(): \(error)")
+            reject("", error.localizedDescription, error)
+          }
+        }
+    }
 }

package/ios/DashXData.swift

@@ -23,6 +23,8 @@ public extension DashXGql {
     typealias JSON = [String : Any?]
     typealias Json = [String : Any?]
     typealias UUID = String
+    typealias DateTime = String
+    typealias Decimal = String
 }
 
 extension Dictionary: JSONDecodable {
@@ -33,4 +35,3 @@ extension Dictionary: JSONDecodable {
     self = dictionary
   }
 }
-

package/ios/README.md

@@ -0,0 +1,80 @@
+# iOS Native Module
+
+## Development
+
+### Obtaining Graphql schema and generating Graphql operation
+
+- Make sure to install Apollo CLI via npm:
+
+```sh
+$ npm i -g apollo
+```
+
+- In order to generate code, Apollo requires local copy of Graphql schema, to download that:
+
+```sh
+$ apollo schema:download --endpoint="https://api.dashx.com/graphql" schema.json
+```
+
+This will save a `schama.json` file in your ios directory.
+
+- Add Graphql request in `graphql` dir.
+
+- Regenerate `API.swift` using:
+
+```sh
+$ apollo client:codegen --target=swift --namespace=DashXGql --localSchemaFile=schema.json --includes="graphql/*.graphql" --passthroughCustomScalars API.swift
+```
+
+For example, if you want to generate code for `FetchContent`.
+
+- Download schema
+
+```sh
+$ apollo schema:download --endpoint="https://api.dashx.com/graphql" schema.json
+```
+
+- Add request in `graphql` dir with following contents:
+
+```graphql
+query FetchContent($input: FetchContentInput!) {
+  fetchContent(input: $input)
+}
+```
+
+- Re-generate API.swift so it includes the `FetchContent` operation
+
+```sh
+$ apollo client:codegen --target=swift --namespace=DashXGql --localSchemaFile=schema.json --includes="graphql/*.graphql" --passthroughCustomScalars API.swift
+```
+
+- Now you can use FetchContent operation like so:
+
+```swift
+let fetchContentInput  = DashXGql.FetchContentInput( // Note the DashXGql namespace
+    contentType: contentType,
+    content: content,
+    preview: preview,
+    language: language,
+    fields: fields,
+    include: include,
+    exclude: exclude
+)
+
+DashXLog.d(tag: #function, "Calling fetchContent with \(fetchContentInput)")
+
+let fetchContentQuery = DashXGql.FetchContentQuery(input: fetchContentInput)
+
+Network.shared.apollo.fetch(query: fetchContentQuery, cachePolicy: .returnCacheDataElseFetch) { result in
+  switch result {
+  case .success(let graphQLResult):
+    DashXLog.d(tag: #function, "Sent fetchContent with \(String(describing: graphQLResult))")
+    let content = graphQLResult.data?.fetchContent
+    resolve(content)
+  case .failure(let error):
+    DashXLog.d(tag: #function, "Encountered an error during fetchContent(): \(error)")
+    reject("", error.localizedDescription, error)
+  }
+
+```
+

package/ios/graphql/AddItemToCart.graphql

@@ -0,0 +1,33 @@
+mutation AddItemToCart($input: AddItemToCartInput!) {
+  addItemToCart(input:$input) {
+    id
+    status
+    subtotal
+    discount
+    tax
+    total
+    gatewayMeta
+    currencyCode
+    orderItems {
+      id
+      quantity
+      unitPrice
+      subtotal
+      discount
+      tax
+      total
+      custom
+      currencyCode
+    }
+    couponRedemptions {
+      coupon {
+          name
+          identifier
+          discountType
+          discountAmount
+          currencyCode
+          expiresAt
+      }
+    }
+  }
+}

package/ios/graphql/FetchCart.graphql

@@ -0,0 +1,33 @@
+query FetchCart($input: FetchCartInput!) {
+  fetchCart(input:$input) {
+    id
+    status
+    subtotal
+    discount
+    tax
+    total
+    gatewayMeta
+    currencyCode
+    orderItems {
+      id
+      quantity
+      unitPrice
+      subtotal
+      discount
+      tax
+      total
+      custom
+      currencyCode
+    }
+    couponRedemptions {
+      coupon {
+        name
+        identifier
+        discountType
+        discountAmount
+        currencyCode
+        expiresAt
+      }
+    }
+  }
+}

package/ios/schema.json

@@ -906,18 +906,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -1274,18 +1262,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -9296,18 +9272,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "accountUid",
             "description": null,
@@ -11221,18 +11185,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "uid",
             "description": null,
@@ -30464,22 +30416,6 @@
         "specifiedByUrl": null,
         "fields": null,
         "inputFields": [
-          {
-            "name": "accountType",
-            "description": null,
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "event",
             "description": null,
@@ -35645,4 +35581,4 @@
       }
     ]
   }
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.4",
+  "version": "0.1.8-alpha",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [

package/android/.idea/libraries/Gradle__com_github_dashxhq_dashx_android_0df6e384d8_aar.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.github.dashxhq:dashx-android:0df6e384d8@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/1646e5ea7ecbe153971b7da08cb1a3f5/transformed/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1646e5ea7ecbe153971b7da08cb1a3f5/transformed/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/1646e5ea7ecbe153971b7da08cb1a3f5/transformed/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

package/android/build/generated/checks/apollo/debugAndroidTest/service/duplicatesCheck

@@ -1 +0,0 @@
-No duplicate found.

package/android/build/generated/checks/apollo/debugUnitTest/service/duplicatesCheck

@@ -1 +0,0 @@
-No duplicate found.

package/android/build/generated/checks/apollo/release/service/duplicatesCheck

@@ -1 +0,0 @@
-No duplicate found.

package/android/build/generated/checks/apollo/releaseUnitTest/service/duplicatesCheck

@@ -1 +0,0 @@
-No duplicate found.

package/android/build/generated/source/buildConfig/release/com/dashx/rn/sdk/BuildConfig.java

@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.dashx.rn.sdk;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String APPLICATION_ID = "com.dashx.rn.sdk";
-  public static final String BUILD_TYPE = "release";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.dashx.rn.sdk"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="30" />
-
-    <application>
-        <service android:name="com.dashx.rn.sdk.DashXMessagingService" >
-            <intent-filter android:priority="1" >
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-    </application>
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"android-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.dashx.rn.sdk","split":""}}]

package/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/annotation_processor_list/release/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/annotation_processor_list/releaseUnitTest/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/blame/res/release/multi-v2/values-af.json

@@ -1,68 +0,0 @@
-{
-    "logs": [
-        {
-            "outputFile": "/Users/rajatsharma/dashx-js/packages/react-native/android/build/intermediates/incremental/mergeReleaseResources/merged.dir/values-af/values-af.xml",
-            "map": [
-                {
-                    "source": "/Users/rajatsharma/.gradle/caches/transforms-3/959291eecabcda7a789aed9c14a90c7d/transformed/res/values-af/values-af.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776",
-                        "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79",
-                        "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851"
-                    }
-                },
-                {
-                    "source": "/Users/rajatsharma/.gradle/caches/transforms-3/10ff9a9c009d077ffb5f8664ff1f6a2d/transformed/res/values-af/values-af.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
-                    },
-                    "to": {
-                        "startLines": "30",
-                        "startColumns": "4",
-                        "startOffsets": "2856",
-                        "endColumns": "100",
-                        "endOffsets": "2952"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "/Users/rajatsharma/dashx-js/packages/react-native/android/build/intermediates/res/merged/release/values-af/values-af.xml",
-            "map": [
-                {
-                    "source": "/Users/rajatsharma/.gradle/caches/transforms-3/959291eecabcda7a789aed9c14a90c7d/transformed/res/values-af/values-af.xml",
-                    "from": {
-                        "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776",
-                        "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79",
-                        "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851"
-                    }
-                },
-                {
-                    "source": "/Users/rajatsharma/.gradle/caches/transforms-3/10ff9a9c009d077ffb5f8664ff1f6a2d/transformed/res/values-af/values-af.xml",
-                    "from": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "55",
-                        "endColumns": "100",
-                        "endOffsets": "151"
-                    },
-                    "to": {
-                        "startLines": "30",
-                        "startColumns": "4",
-                        "startOffsets": "2856",
-                        "endColumns": "100",
-                        "endOffsets": "2952"
-                    }
-                }
-            ]
-        }
-    ]
-}