Added FILE_UPLOADED fcm category

nammayatri · Sep 8, 2024 · 5d2ce35 · 5d2ce35
1 parent 4e0c3aa
commit 5d2ce35
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/lib/mobility-core/src/Kernel/External/Maps/Interface.hs b/lib/mobility-core/src/Kernel/External/Maps/Interface.hs
@@ -234,7 +234,7 @@ snapToRoadWithFallback mbMapServiceToRectifyDistantPointsFailure SnapToRoadHandl
               if dist < maxStraightLineRectificationThreshold
                 then pure (x1, dist)
                 else do
-                  distanceRes <- getDistance mapServiceCfg (GetDistanceReq {origin = x1, destination = x2, travelMode = Just CAR, distanceUnit = req.distanceUnit} :: GetDistanceReq LatLong LatLong)
+                  distanceRes <- getDistance mapServiceCfg (GetDistanceReq {origin = x1, destination = x2, travelMode = Just CAR, distanceUnit = req.distanceUnit, sourceDestinationMapping = Nothing} :: GetDistanceReq LatLong LatLong)
                   pure (x1, metersToHighPrecMeters distanceRes.distance)
           )
           straightDistancePoints

diff --git a/lib/mobility-core/src/Kernel/External/Notification/FCM/Types.hs b/lib/mobility-core/src/Kernel/External/Notification/FCM/Types.hs
@@ -170,6 +170,7 @@ data FCMNotificationType
   | TRIGGER_FCM
   | POST_RIDE_SOS_ALERT
   | REFERRAL_FLOW
+  | FILE_UPLOADED
   deriving (Show, Eq, Read, Ord, Generic, ToJSON, FromJSON)
   deriving (PrettyShow) via Showable FCMNotificationType
 

diff --git a/lib/mobility-core/src/Kernel/External/Notification/Interface/FCM.hs b/lib/mobility-core/src/Kernel/External/Notification/Interface/FCM.hs
@@ -110,6 +110,7 @@ interfaceCategoryToFCMNotificationType = \case
   Interface.TRIGGER_FCM -> FCM.TRIGGER_FCM
   Interface.POST_RIDE_SOS_ALERT -> FCM.POST_RIDE_SOS_ALERT
   Interface.REFERRAL_FLOW -> FCM.REFERRAL_FLOW
+  Interface.FILE_UPLOADED -> FCM.FILE_UPLOADED
 
 interfaceShowNotificationToFCMShowNotification :: Interface.ShowNotification -> FCM.FCMShowNotification
 interfaceShowNotificationToFCMShowNotification = \case

diff --git a/lib/mobility-core/src/Kernel/External/Notification/Interface/Types.hs b/lib/mobility-core/src/Kernel/External/Notification/Interface/Types.hs
@@ -79,6 +79,7 @@ data Category
   | TRIGGER_FCM
   | POST_RIDE_SOS_ALERT
   | REFERRAL_FLOW
+  | FILE_UPLOADED
   deriving (Show, Eq, Read, Generic, Ord, ToSchema, ToJSON, FromJSON)
 
 $(mkBeamInstancesForEnum ''Category)
@@ -89,7 +90,9 @@ data SubCategory
   | ByDriver
   | ByAllocator
   | ByApplication
-  deriving (Show, Eq, Read, Generic, ToJSON, FromJSON)
+  deriving (Show, Eq, Read, Generic, Ord, ToSchema, ToJSON, FromJSON)
+
+$(mkBeamInstancesForEnum ''SubCategory)
 
 data ShowNotification = SHOW | DO_NOT_SHOW
   deriving (Show, Eq, Read, Generic, ToJSON, FromJSON)

diff --git a/lib/mobility-core/src/Kernel/Types/Beckn/City.hs b/lib/mobility-core/src/Kernel/Types/Beckn/City.hs
@@ -324,7 +324,6 @@ instance ToHttpApiData City where
   toUrlPiece Chandigarh = "std:0172"
   toUrlPiece Jaipur = "std:0141"
   toUrlPiece Siliguri = "std:0353"
-  toUrlPiece Durgapur = "std:0342"
   toUrlPiece Asansol = "std:0341"
   toUrlPiece Durgapur = "std:0342"
   toUrlPiece Petrapole = "std:03215"