Draft trv11 2.1.0

.github/workflows/deploy-api-service-v2.yml

@@ -2,13 +2,13 @@ name: Deploy Api Service
 
 on:
   workflow_dispatch:
-  push:
-    paths:
-      - "api-service/**"
-      - "mock-service/**"
-    branches:
-      - "draft-*"
-      - "release-*"
+  # push:
+  #   paths:
+  #     - "api-service/**"
+  #     - "mock-service/**"
+  #   branches:
+  #     - "draft-*"
+  #     - "release-*"
 
 
 jobs:
@@ -310,4 +310,4 @@ jobs:
             docker run -d --name automation-api-service-${{ vars.CONTAINER_NAME }} \
               --env-file $REPO_DIR/.env \
               -p ${{ vars. API_SERVICE_PORT }}:${{ vars. API_SERVICE_PORT }} \
-              $IMAGE_NAME:stable
+              $IMAGE_NAME:stable

api-service/src/config/build.yaml

@@ -2,7 +2,8 @@ openapi: 3.0.0
 info:
   title: ONDC Specification
   description: ONDC Specification
-  version: 2.0.0
+  version: 2.1.0
+  domain: ONDC:TRV11
 security:
   - SubscriberAuth: []
 paths:
@@ -47210,13 +47211,6 @@ x-validations:
         useCode:
           - METRO
         _CONTINUE_: "!(useCasePath all in useCode)"
-      - _NAME_: REQUIRED_MESSAGE_NAME_212
-        attr: "$.message.catalog.providers[*].fulfillments[*].stops[*].location.descriptor.code"
-        _RETURN_: attr are present
-        useCasePath: "$.message.catalog.providers[*].fulfillments[*].vehicle.category"
-        useCode:
-          - METRO
-        _CONTINUE_: "!(useCasePath all in useCode)"  
       - _NAME_: REQUIRED_MESSAGE_ID_23
         attr: "$.message.catalog.providers[*].fulfillments[*].id"
         _RETURN_: attr are present
@@ -47481,6 +47475,7 @@ x-validations:
         validValues:
           - AC
           - NON_AC
+        _CONTINUE_: "!(subTags are present)"  
         _RETURN_: subTags all in validValues
       - _NAME_: VALID_ITEM_DESCRIPTOR_CODE
         _SCOPE_: "$.message.catalog.providers[*].items[*]"
@@ -47658,6 +47653,7 @@ x-validations:
           - ROUTE
           - TRIP
           - TICKET
+          - PASS
         useCasePath: "$.message.order.fulfillments[*].vehicle.category"
         useCode:
           - METRO
@@ -48213,6 +48209,7 @@ x-validations:
           - ROUTE
           - TRIP
           - TICKET
+          - PASS
         useCasePath: "$.message.order.fulfillments[*].vehicle.category"
         useCode:
           - METRO
@@ -48882,6 +48879,7 @@ x-validations:
           - ROUTE
           - TRIP
           - TICKET
+          - PASS
         useCasePath: "$.message.order.fulfillments[*].vehicle.category"
         useCode:
           - METRO

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/confirm/confirm_agent_purchase/default.yaml

@@ -19,17 +19,17 @@ message:
           - type: "START"
             location:
               descriptor:
-                name: "kashmere gate"
-                code: "KASHMERE_GATE"
+                name: "MOCK_STATION_1"
+                code: "MOCK_STATION_1"
               gps: "28.666576, 77.233332"
             id: "1"
           - type: "INTERMEDIATE_STOP"
             instructions:
               name: "Stop 1"
             location:
               descriptor:
-                name: "Indira Gandhi Technical Unviversity"
-                code: "INDIRA_GANDHI_TECHNICAL_UNIV"
+                name: "MOCK_STATION_2"
+                code: "MOCK_STATION_2"
               gps: "28.624097, 77.204991"
             id: "2"
             parent_stop_id: "1"
@@ -38,8 +38,8 @@ message:
               name: "Stop 2"
             location:
               descriptor:
-                name: "Yamuna Bazar"
-                code: "YAMUNA_BAZAR"
+                name: "MOCK_STATION_3"
+                code: "MOCK_STATION_3"
               gps: "28.625972,77.209917"
             id: "3"
             parent_stop_id: "2"
@@ -48,8 +48,8 @@ message:
               name: "Stop 3"
             location:
               descriptor:
-                name: "dhaula kuan"
-                code: "DHAULA_KUAN"
+                name: "MOCK_STATION_4"
+                code: "MOCK_STATION_4"
               gps: "28.610972,77.201717"
             id: "4"
             parent_stop_id: "3"
@@ -58,16 +58,16 @@ message:
               name: "Stop 4"
             location:
               descriptor:
-                name: "gpo"
-                code: "GPO"
+                name: "MOCK_STATION_5"
+                code: "MOCK_STATION_5"
               gps: "28.623097,77.209917"
             id: "5"
             parent_stop_id: "4"
           - type: "END"
             location:
               descriptor:
-                name: "Greater Kailash"
-                code: "GREATER_KAILASH"
+                name: "MOCK_STATION_6"
+                code: "MOCK_STATION_6"
               gps: "28.548230, 77.238039"
             id: "6"
             parent_stop_id: "5"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/confirm/confirm_agent_purchase/generator.ts

@@ -13,8 +13,8 @@ export async function confirmGenerator(
             type: "START",
             location: {
               descriptor: {
-                name: "kashmere gate",
-                code: "KASHMERE_GATE",
+                name: "MOCK_STATION_1",
+                code: "MOCK_STATION_1",
               },
               gps: "28.666576, 77.233332",
             },
@@ -27,8 +27,8 @@ export async function confirmGenerator(
             },
             location: {
               descriptor: {
-                name: "Indira Gandhi Technical Unviversity",
-                code: "INDIRA_GANDHI_TECHNICAL_UNIV",
+                name: "MOCK_STATION_2",
+                code: "MOCK_STATION_2",
               },
               gps: "28.624097, 77.204991",
             },
@@ -42,8 +42,8 @@ export async function confirmGenerator(
             },
             location: {
               descriptor: {
-                name: "Yamuna Bazar",
-                code: "YAMUNA_BAZAR",
+                name: "MOCK_STATION_3",
+                code: "MOCK_STATION_3",
               },
               gps: "28.625972,77.209917",
             },
@@ -57,8 +57,8 @@ export async function confirmGenerator(
             },
             location: {
               descriptor: {
-                name: "dhaula kuan",
-                code: "DHAULA_KUAN",
+                name: "MOCK_STATION_4",
+                code: "MOCK_STATION_4",
               },
               gps: "28.610972,77.201717",
             },
@@ -72,8 +72,8 @@ export async function confirmGenerator(
             },
             location: {
               descriptor: {
-                name: "gpo",
-                code: "GPO",
+                name: "MOCK_STATION_5",
+                code: "MOCK_STATION_5",
               },
               gps: "28.623097,77.209917",
             },
@@ -84,8 +84,8 @@ export async function confirmGenerator(
             type: "END",
             location: {
               descriptor: {
-                name: "Greater Kailash",
-                code: "GREATER_KAILASH",
+                name: "MOCK_STATION_6",
+                code: "MOCK_STATION_6",
               },
               gps: "28.548230, 77.238039",
             },

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/confirm/confirm_veh_con_without/generator.ts

@@ -2,6 +2,12 @@ import { SessionData } from "../../../../session-types";
 
 const { v4: uuidv4 } = require("uuid");
 
+function getRandomFourDigitInt() {
+  const min = 1000;
+  const max = 9999;
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
 const transformPaymentsToPaid = (
   payments: any[],
   amount: any,
@@ -37,8 +43,28 @@ export async function confirmVehConWithoutUpdateGenerator(
     existingPayload.message.order.provider.id = sessionData.provider_id;
   }
 
-  existingPayload.message.order.fulfillments =
-    existingPayload.message.order.fulfillments;
+  if (sessionData.fulfillments) {
+    existingPayload.message.order.fulfillments = sessionData.fulfillments
+      ?.flat()
+      ?.map((f: any) => {
+        if (f.type === "TRIP") {
+          return {
+            id: f.id,
+            type: f.type,
+          };
+        }
+        if (f.type === "TICKET") {
+          const randomInt = getRandomFourDigitInt();
+          return {
+            id: f.id,
+            type: f.type,
+            vehicle: {
+              registration: `TX${randomInt}`,
+            },
+          };
+        }
+      });
+  }
 
   if (sessionData.payments) {
     existingPayload.message.order.payments = transformPaymentsToPaid(

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/init/init_agent_activation/default.yaml

@@ -24,9 +24,6 @@ message:
           - descriptor:
               code: "BUYER_FINDER_FEES_PERCENTAGE"
             value: "1"
-          - descriptor:
-              code: "SETTLEMENT_AMOUNT"
-            value: "5"
           - descriptor:
               code: "SETTLEMENT_TYPE"
             value: "NEFT"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/init/init_agent_login/default.yaml

@@ -18,9 +18,6 @@ message:
           - descriptor:
               code: "BUYER_FINDER_FEES_PERCENTAGE"
             value: "1"
-          - descriptor:
-              code: "SETTLEMENT_AMOUNT"
-            value: "5"
           - descriptor:
               code: "SETTLEMENT_TYPE"
             value: "NEFT"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm/generator.ts

@@ -27,7 +27,7 @@ function updateOrderTimestamps(payload: any) {
   }
 
 function updateFulfillmentsWithParentInfo(fulfillments: any[],sessionData:SessionData): void {
-	const validTo = new Date(Date.now()+ 6*60*60*60).toISOString();
+	const validTo = new Date(Date.now() + 2 * 24 * 60 * 60 * 1000).toISOString();
 
 	fulfillments.forEach((fulfillment) => {
 		// Generate a random QR token

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm_agent_activation/default.yaml

@@ -20,7 +20,7 @@ message:
           value: "0"
         time:
           label: "Validity"
-          duration: "PT2D"
+          duration: "P2D"
           timestamp: "2025-03-23T11:01:40.065Z"
     provider:
       id: "P1"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm_agent_login/default.yaml

@@ -20,7 +20,7 @@ message:
           value: "0"
         time:
           label: "Validity"
-          duration: "PT2D"
+          duration: "P2D"
           timestamp: "2025-03-23T11:01:40.065Z"
     provider:
       id: "P1"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm_agent_purchase/default.yaml

@@ -24,7 +24,7 @@ message:
             count: 2
         time:
           label: "Validity"
-          duration: "PT2D"
+          duration: "P2D"
           timestamp: "2025-03-23T11:01:40.065Z"
     provider:
       id: "P1"
@@ -40,17 +40,17 @@ message:
           - type: "START"
             location:
               descriptor:
-                name: "kashmere gate"
-                code: "KASHMERE_GATE"
+                name: "MOCK_STATION_1"
+                code: "MOCK_STATION_1"
               gps: "28.666576, 77.233332"
             id: "1"
           - type: "INTERMEDIATE_STOP"
             instructions:
               name: "Stop 1"
             location:
               descriptor:
-                name: "Indira Gandhi Technical Unviversity"
-                code: "INDIRA_GANDHI_TECHNICAL_UNIV"
+                name: "MOCK_STATION_2"
+                code: "MOCK_STATION_2"
               gps: "28.624097, 77.204991"
             id: "2"
             parent_stop_id: "1"
@@ -59,8 +59,8 @@ message:
               name: "Stop 2"
             location:
               descriptor:
-                name: "Yamuna Bazar"
-                code: "YAMUNA_BAZAR"
+                name: "MOCK_STATION_3"
+                code: "MOCK_STATION_3"
               gps: "28.625972,77.209917"
             id: "3"
             parent_stop_id: "2"
@@ -69,8 +69,8 @@ message:
               name: "Stop 3"
             location:
               descriptor:
-                name: "dhaula kuan"
-                code: "DHAULA_KUAN"
+                name: "MOCK_STATION_4"
+                code: "MOCK_STATION_4"
               gps: "28.610972,77.201717"
             id: "4"
             parent_stop_id: "3"
@@ -79,16 +79,16 @@ message:
               name: "Stop 4"
             location:
               descriptor:
-                name: "gpo"
-                code: "GPO"
+                name: "MOCK_STATION_5"
+                code: "MOCK_STATION_5"
               gps: "28.623097,77.209917"
             id: "5"
             parent_stop_id: "4"
           - type: "END"
             location:
               descriptor:
-                name: "Greater Kailash"
-                code: "GREATER_KAILASH"
+                name: "MOCK_STATION_6"
+                code: "MOCK_STATION_6"
               gps: "28.548230, 77.238039"
             id: "6"
             parent_stop_id: "5"

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm_agent_purchase/generator.ts

@@ -95,7 +95,7 @@ export async function onConfirmGenerator(
         price: item?.price ?? {},
         quantity: item?.quantity ?? {},
         time: (() => {
-          const duration = "PT2D";
+          const duration = "P2D";
           let validityEndDate = new Date();
           const daysMatch = duration.match(/P(?:T)?(\d+)D/);
           if (daysMatch) {

mock-service/src/config/mock-config/TRV11/BUS/2.1.0/on_confirm/on_confirm_delayed/generator.ts

@@ -41,7 +41,7 @@ function updateOrderTimestamps(payload: any) {
   }
 
 function updateFulfillmentsWithParentInfo(fulfillments: any[]): void {
-  const validTo = new Date(Date.now()+ 6*60*60*60).toISOString();
+  const validTo = new Date(Date.now() + 2 * 24 * 60 * 60 * 1000).toISOString();
 
   fulfillments.forEach((fulfillment) => {
     // Generate a random QR token