@sentiance-react-native/event-timeline 6.10.0-rc.5 → 6.10.0

package/android/src/main/java/com/sentiance/react/bridge/eventtimeline/ErrorCodes.java

@@ -2,4 +2,6 @@ package com.sentiance.react.bridge.eventtimeline;
 
 public class ErrorCodes {
     public static final String E_TRANSPORT_TAG_ERROR = "E_TRANSPORT_TAG_ERROR";
+    public static final String E_INVALID_FEEDBACK_TYPE = "E_INVALID_FEEDBACK_TYPE";
+    public static final String E_OCCUPANT_ROLE_FEEDBACK_SUBMISSION = "E_OCCUPANT_ROLE_FEEDBACK_SUBMISSION";
 }

package/android/src/main/java/com/sentiance/react/bridge/eventtimeline/SentianceEventTimelinePackage.java

@@ -10,8 +10,10 @@ import com.sentiance.react.bridge.core.common.SentianceSubscriptionsManager;
 import com.sentiance.react.bridge.eventtimeline.converters.OnDeviceTypesConverter;
 import com.sentiance.sdk.Sentiance;
 import com.sentiance.sdk.eventtimeline.api.EventTimelineApi;
+import com.sentiance.sdk.feedback.api.FeedbackApi;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -19,7 +21,6 @@ public class SentianceEventTimelinePackage implements ReactPackage {
   @NonNull
   @Override
   public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
     SentianceEventTimelineModule eventTimelineModule = new SentianceEventTimelineModule(
       reactContext,
       Sentiance.getInstance(reactContext),
@@ -28,8 +29,16 @@ public class SentianceEventTimelinePackage implements ReactPackage {
       new EventTimelineEmitter(reactContext),
       new OnDeviceTypesConverter()
     );
-    modules.add(eventTimelineModule);
-    return modules;
+
+    SentianceFeedbackModule feedbackModule = new SentianceFeedbackModule(
+      reactContext,
+      Sentiance.getInstance(reactContext),
+      FeedbackApi.getInstance(),
+      new SentianceSubscriptionsManager(),
+      new OnDeviceTypesConverter()
+    );
+
+    return Arrays.asList(eventTimelineModule, feedbackModule);
   }
 
   @NonNull

package/android/src/main/java/com/sentiance/react/bridge/eventtimeline/SentianceFeedbackModule.java

@@ -0,0 +1,79 @@
+package com.sentiance.react.bridge.eventtimeline;
+
+import static com.sentiance.react.bridge.eventtimeline.ErrorCodes.E_INVALID_FEEDBACK_TYPE;
+import static com.sentiance.react.bridge.eventtimeline.ErrorCodes.E_OCCUPANT_ROLE_FEEDBACK_SUBMISSION;
+
+import androidx.annotation.NonNull;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.sentiance.react.bridge.core.common.SentianceSubscriptionsManager;
+import com.sentiance.react.bridge.core.common.base.AbstractSentianceModule;
+import com.sentiance.react.bridge.eventtimeline.converters.OnDeviceTypesConverter;
+import com.sentiance.sdk.Sentiance;
+import com.sentiance.sdk.feedback.api.FeedbackApi;
+import com.sentiance.sdk.feedback.api.OccupantRoleFeedback;
+import com.sentiance.sdk.feedback.api.OccupantRoleFeedbackResult;
+
+public class SentianceFeedbackModule extends AbstractSentianceModule {
+    public static final String NATIVE_MODULE_NAME = "SentianceFeedback";
+
+    private final FeedbackApi mFeedbackApi;
+    private final OnDeviceTypesConverter mOnDeviceTypesConverter;
+
+    public SentianceFeedbackModule(ReactApplicationContext reactApplicationContext,
+                                   Sentiance sentiance,
+                                   FeedbackApi feedbackApi,
+                                   SentianceSubscriptionsManager subscriptionsManager,
+                                   OnDeviceTypesConverter converter) {
+        super(reactApplicationContext, sentiance, subscriptionsManager);
+        this.mOnDeviceTypesConverter = converter;
+        this.mFeedbackApi = feedbackApi;
+    }
+
+    @Override
+    protected void removeNativeListener(String eventName, int subscriptionId, Promise promise) {
+        // Implementation can be added here if needed
+    }
+
+    @Override
+    protected void addNativeListener(String eventName, int subscriptionId, Promise promise) {
+        // Implementation can be added here if needed
+    }
+
+    @Override
+    @ReactMethod
+    protected void addListener(String eventName) {
+        // Implementation can be added here if needed
+    }
+
+    @Override
+    @ReactMethod
+    protected void removeListeners(Integer count) {
+        // Implementation can be added here if needed
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return NATIVE_MODULE_NAME;
+    }
+
+    @ReactMethod
+    public void submitOccupantRoleFeedback(final String transportId,
+                                           final String occupantFeedbackRole,
+                                           final Promise promise) {
+        if (rejectIfNotInitialized(promise)) {
+            return;
+        }
+
+        OccupantRoleFeedback occupantRoleFeedback = mOnDeviceTypesConverter.getOccupantRoleFeedbackFrom(occupantFeedbackRole);
+        if (occupantRoleFeedback == null) {
+            promise.reject(E_INVALID_FEEDBACK_TYPE, "Invalid feedback role");
+            return;
+        }
+
+        OccupantRoleFeedbackResult result = mFeedbackApi.submitOccupantRoleFeedback(transportId, occupantRoleFeedback);
+        promise.resolve(result.name());
+    }
+}

package/android/src/main/java/com/sentiance/react/bridge/eventtimeline/converters/OnDeviceTypesConverter.java

@@ -5,10 +5,14 @@ import static com.sentiance.react.bridge.core.SentianceConverter.JS_KEY_LATITUDE
 import static com.sentiance.react.bridge.core.SentianceConverter.JS_KEY_LONGITUDE;
 import static com.sentiance.react.bridge.core.SentianceConverter.JS_KEY_TIMESTAMP;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.sentiance.sdk.feedback.api.OccupantRoleFeedback;
+import com.sentiance.sdk.feedback.api.OccupantRoleFeedbackResult;
 import com.sentiance.sdk.ondevice.api.GeoLocation;
 import com.sentiance.sdk.ondevice.api.Waypoint;
 import com.sentiance.sdk.ondevice.api.event.Event;
@@ -40,6 +44,9 @@ public class OnDeviceTypesConverter {
     public static final String JS_KEY_HAS_UNLIMITED_SPEED_LIMIT = "hasUnlimitedSpeedLimit";
     public static final String JS_KEY_IS_SPEED_LIMIT_INFO_SET = "isSpeedLimitInfoSet";
     public static final String JS_KEY_TRANSPORT_TAGS = "transportTags";
+    public static final String JS_KEY_IS_SYNTHETIC = "isSynthetic";
+    public static final String JS_KEY_OCCUPANT_ROLE = "occupantRole";
+
 
     private final TransportTagsConverter transportTagsConverter;
 
@@ -86,7 +93,7 @@ public class OnDeviceTypesConverter {
 
         map.putString(JS_KEY_TYPE, event.getEventType().toString());
 
-        if (event instanceof StationaryEvent) {
+      if (event instanceof StationaryEvent) {
             addStationaryEventInfo(map, (StationaryEvent) event);
         } else if (event instanceof TransportEvent) {
             addTransportEventInfo(map, (TransportEvent) event);
@@ -117,6 +124,7 @@ public class OnDeviceTypesConverter {
     private void addTransportEventInfo(WritableMap map, TransportEvent event) {
         map.putString(JS_KEY_TRANSPORT_MODE, event.getTransportMode().toString());
         map.putArray(JS_KEY_WAYPOINTS, convertWaypointList(event.getWaypoints()));
+        map.putString(JS_KEY_OCCUPANT_ROLE, event.getOccupantRole().name());
 
         if (event.getDistanceInMeters() != null) {
             map.putInt(JS_KEY_DISTANCE, event.getDistanceInMeters());
@@ -149,6 +157,7 @@ public class OnDeviceTypesConverter {
         }
         waypointMap.putBoolean(JS_KEY_IS_SPEED_LIMIT_INFO_SET, waypoint.isSpeedLimitInfoSet());
         waypointMap.putBoolean(JS_KEY_HAS_UNLIMITED_SPEED_LIMIT, waypoint.hasUnlimitedSpeedLimit());
+        waypointMap.putBoolean(JS_KEY_IS_SYNTHETIC, waypoint.isSynthetic());
 
         return waypointMap;
     }
@@ -164,4 +173,13 @@ public class OnDeviceTypesConverter {
     public Map<String, String> convertTransportTags(ReadableMap tags) {
         return transportTagsConverter.convertFrom(tags);
     }
+
+    @Nullable
+    public OccupantRoleFeedback getOccupantRoleFeedbackFrom(String value) {
+      try {
+        return OccupantRoleFeedback.valueOf(value.toUpperCase());  // Ensures case insensitivity
+      } catch (IllegalArgumentException | NullPointerException e) {
+        return null;
+      }
+    }
 }

package/lib/feedback.js

@@ -0,0 +1,40 @@
+const { NativeModules, Platform } = require("react-native");
+const { varToString } = require("@sentiance-react-native/core/lib/utils");
+
+const {SentianceFeedback, SentianceCore} = NativeModules;
+
+const VALID_OCCUPANT_ROLE_TYPES = ["DRIVER", "PASSENGER"];
+
+let feedbackModule = {};
+if (Platform.OS === "android") {
+  if (!SentianceFeedback) {
+    const nativeModuleName = varToString({ SentianceFeedback });
+    console.error(`Could not locate the native ${nativeModuleName} module.
+    Make sure that your native code is properly linked, and that the module name you specified is correct.`);
+  } else {
+    feedbackModule = SentianceFeedback;
+  }
+} else {
+  if (!SentianceCore) {
+    const nativeModuleName = varToString({ SentianceCore });
+    console.error(`Could not locate the native ${nativeModuleName} module.
+    Make sure that your native code is properly linked, and that the module name you specified is correct.`);
+  } else {
+    feedbackModule = SentianceCore;
+  }
+}
+
+const submitOccupantRoleFeedback = (transportId: string, occupantRoleFeedback: string) => {
+  if (!_isOccupantRoleFeedbackTypeValid(occupantRoleFeedback)) {
+    return Promise.reject(new Error("submitOccupantRoleFeedback was called with invalid feedback type: " + occupantRoleFeedback));
+  }
+  return feedbackModule.submitOccupantRoleFeedback(transportId, occupantRoleFeedback);
+};
+
+const _isOccupantRoleFeedbackTypeValid = (type: string): boolean => {
+  return VALID_OCCUPANT_ROLE_TYPES.includes(type);
+};
+
+module.exports = {
+  submitOccupantRoleFeedback
+};

package/lib/index.d.ts

@@ -19,6 +19,7 @@ declare module "@sentiance-react-native/event-timeline" {
     waypoints: Waypoint[];
     distance?: number; // in meters
     transportTags: TransportTags;
+    occupantRole: OccupantRole
   }
 
   export interface GeoLocation {
@@ -86,6 +87,21 @@ declare module "@sentiance-react-native/event-timeline" {
     | "BUS"
     | "MOTORCYCLE";
 
+  export type OccupantRole =
+    | "DRIVER"
+    | "PASSENGER"
+    | "UNAVAILABLE";
+
+  export type OccupantRoleFeedback = Exclude<OccupantRole, "UNAVAILABLE">;
+
+  export type OccupantRoleFeedbackResult =
+    | "ACCEPTED"
+    | "TRANSPORT_TYPE_NOT_SUPPORTED"
+    | "TRANSPORT_NOT_FOUND"
+    | "TRANSPORT_NOT_YET_COMPLETE"
+    | "FEEDBACK_ALREADY_PROVIDED"
+    | "UNEXPECTED_ERROR";
+
   export interface Waypoint {
     latitude: number;
     longitude: number;
@@ -95,10 +111,15 @@ declare module "@sentiance-react-native/event-timeline" {
     speedLimitInMps?: number;  // in meters per second
     hasUnlimitedSpeedLimit: boolean;
     isSpeedLimitInfoSet: boolean;
+    isSynthetic: boolean;
   }
 
   export type TransportTags = { [key: string]: string };
 
+  export interface SentianceFeedback {
+    submitOccupantRoleFeedback(transportId: string, occupantRoleFeedback: OccupantRoleFeedback): Promise<OccupantRoleFeedbackResult>;
+  }
+
   export interface SentianceEventTimeline {
     getTimelineUpdates(afterEpochTimeMs: number): Promise<Event[]>;
     getTimelineEvents(fromEpochTimeMs: number, toEpochTimeMs: number): Promise<Event[]>;
@@ -139,6 +160,8 @@ declare module "@sentiance-react-native/event-timeline" {
      * the 256 characters limit.
      */
     setTransportTags(tags: TransportTags): Promise<void>;
+
+    sentianceFeedback: SentianceFeedback;
   }
 
   /**

package/lib/index.js

@@ -3,7 +3,9 @@ const { varToString } = require("@sentiance-react-native/core/lib/utils");
 const SentianceEventEmitter = require("@sentiance-react-native/core/lib/SentianceEventEmitter");
 const { createEventListener } = require("@sentiance-react-native/core/lib/SentianceEventListenerUtils");
 const { TransportTaggingError, E_TRANSPORT_TAG_ERROR } = require("./errors/errors");
-const { SentianceEventTimeline, SentianceCore } = NativeModules;
+const { SentianceEventTimeline, SentianceCore} = NativeModules;
+const sentianceFeedback = require("./feedback");
+
 
 const TIMELINE_UPDATE_EVENT = "SENTIANCE_TIMELINE_UPDATE_EVENT";
 
@@ -61,8 +63,10 @@ module.exports = {
   getTimelineEvents,
   getTimelineEvent,
   addTimelineUpdateListener,
-  setTransportTags
+  setTransportTags,
+  sentianceFeedback
 };
+
 module.exports.events = {
   TIMELINE_UPDATE_EVENT
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/event-timeline",
-  "version": "6.10.0-rc.5",
+  "version": "6.10.0",
   "description": "The Sentiance Event Timeline library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -14,7 +14,7 @@
     "sentiance"
   ],
   "peerDependencies": {
-    "@sentiance-react-native/core": "6.10.0-rc.5"
+    "@sentiance-react-native/core": "6.10.0"
   },
   "author": "",
   "license": "",