ti2-tourplan 1.0.136 → 1.0.138

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(gh pr diff:*)",
+      "Bash(gh pr view:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/__fixtures__/GetBookingRequest_34a34449e57b0cf0147f1d0f3ad52f6702d1d7b6.txt

@@ -56,6 +56,7 @@
                 </RoomConfigs>
                 <CostedInBooking>Y</CostedInBooking>
                 <LinePrice>187795</LinePrice>
+                <AgentPrice>159000</AgentPrice>
                 <SCU>night</SCU>
                 <SCUqty>4</SCUqty>
                 <Remarks>Passenger Notes: NA.

package/__fixtures__/GetBookingRequest_3586125e1ae2acc1697b9bf145c3234bd14c62aa.txt

@@ -56,6 +56,7 @@
                 </RoomConfigs>
                 <CostedInBooking>Y</CostedInBooking>
                 <LinePrice>187795</LinePrice>
+                <AgentPrice>159000</AgentPrice>
                 <SCU>night</SCU>
                 <SCUqty>4</SCUqty>
                 <Remarks>Passenger Notes: NA.

package/__fixtures__/GetBookingRequest_ec2774e67986fab0fab72b61b2630a7f38befd5b.txt

@@ -56,6 +56,7 @@
                 </RoomConfigs>
                 <CostedInBooking>Y</CostedInBooking>
                 <LinePrice>187795</LinePrice>
+                <AgentPrice>159000</AgentPrice>
                 <SCU>night</SCU>
                 <SCUqty>4</SCUqty>
                 <Remarks>Passenger Notes: NA.

package/__snapshots__/index.test.js.snap

@@ -281,6 +281,7 @@ Object {
       "ref": "ALFI393706",
       "serviceLines": Array [
         Object {
+          "agentPrice": "159000",
           "doInfo": Object {
             "date": "2025-08-17",
             "remarks": "Hotel main lobby",

package/index.test.js

@@ -140,6 +140,40 @@ describe('search tests', () => {
       });
     });
     describe('addServiceToItinerary', () => {
+      it('returns the gross line price and net agent price from Tourplan', async () => {
+        mockCallTourplan.mockImplementationOnce(async () => ({
+          AddServiceReply: {
+            BookingId: '12345',
+            Ref: 'TESTREF',
+            Services: {
+              Service: {
+                LinePrice: '10000',
+                AgentPrice: '8500',
+              },
+            },
+            ServiceLineId: '10',
+          },
+        }));
+
+        const result = await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: {
+            quoteName: 'Pricing response test',
+            optionId: 'ABC123',
+            startDate: '2026-07-03',
+            reference: 'TESTREF',
+            paxConfigs: [{ roomType: 'Double', adults: 2 }],
+            notes: '',
+          },
+        });
+
+        expect(result.booking).toMatchObject({
+          linePrice: '10000',
+          agentPrice: '8500',
+        });
+      });
+
       it('limits new booking names after escaping XML characters', async () => {
         mockCallTourplan.mockImplementationOnce(async () => ({
           AddServiceReply: {
@@ -278,6 +312,33 @@ describe('search tests', () => {
         expect(newBookingInfo.Name).toBe(`${'Ae'.repeat(29)}A`);
         expect(newBookingInfo.HeaderField).toBe('kept');
       });
+
+      it('limits service remarks to the Tourplan field length', async () => {
+        mockCallTourplan.mockImplementationOnce(async () => ({
+          AddServiceReply: {
+            BookingId: '12345',
+            Ref: 'TESTREF',
+            ServiceLineId: '10',
+          },
+        }));
+
+        await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: {
+            quoteName: 'Passenger notes test',
+            optionId: 'ABC123',
+            startDate: '2026-07-03',
+            reference: 'TESTREF',
+            paxConfigs: [{ roomType: 'Double', adults: 2 }],
+            notes: `Passenger Notes: ${'A'.repeat(80)} Service Notes: late arrival`,
+          },
+        });
+
+        const request = mockCallTourplan.mock.calls[0][0].model.AddServiceRequest;
+        expect(request.Remarks).toBe(`Passenger Notes: ${'A'.repeat(43)}`);
+        expect(request.Remarks).toHaveLength(60);
+      });
     });
 
     describe('cancelBooking', () => {
@@ -1733,6 +1794,10 @@ describe('search tests', () => {
       expect(retVal.bookings[0].serviceLines[0].paxList[0].firstName).toBe('Sean');
       expect(retVal.bookings[0].serviceLines[0].paxList[0]).toHaveProperty('lastName');
       expect(retVal.bookings[0].serviceLines[0].paxList[0].lastName).toBe('Conta');
+      expect(retVal.bookings[0].serviceLines[0]).toHaveProperty('linePrice');
+      expect(retVal.bookings[0].serviceLines[0].linePrice).toBe('187795');
+      expect(retVal.bookings[0].serviceLines[0]).toHaveProperty('agentPrice');
+      expect(retVal.bookings[0].serviceLines[0].agentPrice).toBe('159000');
       expect(retVal.bookings[0].serviceLines[0]).toHaveProperty('quantity');
       expect(retVal.bookings[0].serviceLines[0].quantity).toBe(4);
       expect(retVal.bookings[0].serviceLines[0]).toHaveProperty('status');

package/itinerary-add-service.js

@@ -9,6 +9,7 @@ const {
 
 const DEFAULT_TOURPLAN_SERVICE_STATUS = 'IR';
 const MAX_BOOKING_NAME_LENGTH = 59;
+const MAX_SERVICE_REMARKS_LENGTH = 60;
 const SERVICE_CANNOT_BE_ADDED_ERROR_MESSAGE = 'Service cannot be added to quote for the requested date/stay. (e.g. no rates, block out period, on request, minimum stay etc.)';
 
 const getBookingName = quoteName => escapeInvalidXmlChars(quoteName)
@@ -166,7 +167,7 @@ const addServiceToItinerary = async ({
           })),
         },
       } : {}),
-      Remarks: escapeInvalidXmlChars(notes).slice(0, 220),
+      Remarks: escapeInvalidXmlChars(notes).slice(0, MAX_SERVICE_REMARKS_LENGTH),
       Opt: optionId,
       DateFrom: startDate,
       RateId: rateId || 'Default',
@@ -196,6 +197,7 @@ const addServiceToItinerary = async ({
       id: R.path(['AddServiceReply', 'BookingId'], replyObj) || quoteId,
       reference: R.path(['AddServiceReply', 'Ref'], replyObj),
       linePrice: R.path(['AddServiceReply', 'Services', 'Service', 'LinePrice'], replyObj),
+      agentPrice: R.path(['AddServiceReply', 'Services', 'Service', 'AgentPrice'], replyObj),
       lineId: R.path(['AddServiceReply', 'ServiceLineId'], replyObj),
     },
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {

package/resolvers/itinerary.js

@@ -70,6 +70,7 @@ const resolvers = {
     paxList: R.path(['paxList']),
     paxConfigs: R.path(['paxConfigs']),
     linePrice: R.path(['LinePrice']),
+    agentPrice: R.path(['AgentPrice']),
     quantity: R.path(['SCUqty']),
     status: R.path(['Status']),
     puInfo: sl => puDoInfoOrNull({
@@ -133,6 +134,42 @@ const resolvers = {
  */
 const schemaCache = new Map();
 
+const typeDefinesField = (typeDefs, typeName, fieldName) => {
+  const typeMatch = String(typeDefs || '').match(new RegExp(`type\\s+${typeName}\\s*{([\\s\\S]*?)}`));
+  if (!typeMatch) return false;
+  return new RegExp(`\\b${fieldName}\\s*:`).test(typeMatch[1]);
+};
+
+/**
+ * ti2's itinerary-booking SDL may not yet declare ServiceLine.agentPrice.
+ * Extend the incoming schema so search/read can return the Tourplan net price
+ * without waiting on a ti2 release. No-op when the field is already present.
+ *
+ * @param {string|DocumentNode} typeDefs
+ * @returns {string|DocumentNode}
+ */
+const ensureAgentPriceOnServiceLineTypeDefs = typeDefs => {
+  if (typeof typeDefs !== 'string') return typeDefs;
+  if (typeDefinesField(typeDefs, 'ServiceLine', 'agentPrice')) return typeDefs;
+  return typeDefs.replace(
+    /(type\s+ServiceLine\s*{)/,
+    '$1\n    agentPrice: String',
+  );
+};
+
+/**
+ * Request agentPrice next to linePrice when the caller query omits it.
+ *
+ * @param {string} query
+ * @returns {string}
+ */
+const ensureAgentPriceInQuery = query => {
+  if (typeof query !== 'string') return query;
+  if (/\bagentPrice\b/.test(query)) return query;
+  if (!/\blinePrice\b/.test(query)) return query;
+  return query.replace(/\blinePrice\b/, 'linePrice\n    agentPrice');
+};
+
 /**
  * Return a compiled GraphQL schema for the given typeDefs, building and caching
  * it on the first call and returning the cached instance on every subsequent call.
@@ -142,7 +179,10 @@ const schemaCache = new Map();
  */
 const getSchema = typeDefs => {
   if (schemaCache.has(typeDefs)) return schemaCache.get(typeDefs);
-  const schema = makeExecutableSchema({ typeDefs, resolvers });
+  const schema = makeExecutableSchema({
+    typeDefs: ensureAgentPriceOnServiceLineTypeDefs(typeDefs),
+    resolvers,
+  });
   schemaCache.set(typeDefs, schema);
   return schema;
 };
@@ -163,7 +203,7 @@ const translateItineraryBooking = async ({ typeDefs, query, rootValue }) => {
   const retVal = await graphql({
     schema,
     rootValue,
-    source: query,
+    source: ensureAgentPriceInQuery(query),
   });
   if (retVal.errors) {
     throw new Error(retVal.errors.map(e => e.message).join('; '));

package/resolvers/itinerary.test.js

@@ -0,0 +1,85 @@
+/* globals describe, it, expect */
+const { typeDefs: itineraryBookingTypeDefs, query: itineraryBookingQuery } = require('../node_modules/ti2/controllers/graphql-schemas/itinerary-booking');
+const { translateItineraryBooking } = require('./itinerary');
+
+const typeDefsWithAgentPrice = itineraryBookingTypeDefs.replace(
+  /(type\s+ServiceLine\s*{)/,
+  '$1\n    agentPrice: String',
+);
+
+const queryWithAgentPrice = itineraryBookingQuery.replace(
+  /\blinePrice\b/,
+  'linePrice\n    agentPrice',
+);
+
+const bookingRoot = {
+  BookingId: '316559',
+  Name: 'Test booking',
+  Ref: 'ALFI393706',
+  TotalPrice: '187795',
+  Currency: 'GBP',
+  TravelDate: '2025-08-13',
+  EnteredDate: '2024-09-12',
+  ReadOnly: 'N',
+  CanAddServices: 'Y',
+  Services: {
+    Service: {
+      ServiceLineId: '745684',
+      Opt: 'LONHOSANLONBFBDLX',
+      Description: 'Bed and Full Buffet Breakfast',
+      LinePrice: '187795',
+      AgentPrice: '159000',
+      Date: '2025-08-13',
+      Status: 'OK',
+    },
+  },
+};
+
+describe('translateItineraryBooking agentPrice', () => {
+  it('maps Tourplan AgentPrice on service lines when the caller schema omits the field', async () => {
+    const retVal = await translateItineraryBooking({
+      typeDefs: itineraryBookingTypeDefs,
+      query: itineraryBookingQuery,
+      rootValue: bookingRoot,
+    });
+
+    expect(retVal.serviceLines[0]).toMatchObject({
+      serviceLineId: '745684',
+      linePrice: '187795',
+      agentPrice: '159000',
+    });
+  });
+
+  it('maps Tourplan AgentPrice when the caller schema already declares the field', async () => {
+    const retVal = await translateItineraryBooking({
+      typeDefs: typeDefsWithAgentPrice,
+      query: queryWithAgentPrice,
+      rootValue: bookingRoot,
+    });
+
+    expect(retVal.serviceLines[0]).toMatchObject({
+      serviceLineId: '745684',
+      linePrice: '187795',
+      agentPrice: '159000',
+    });
+  });
+
+  it('returns null agentPrice when Tourplan omits AgentPrice', async () => {
+    const { Services, ...rest } = bookingRoot;
+    const retVal = await translateItineraryBooking({
+      typeDefs: typeDefsWithAgentPrice,
+      query: queryWithAgentPrice,
+      rootValue: {
+        ...rest,
+        Services: {
+          Service: {
+            ...Services.Service,
+            AgentPrice: undefined,
+          },
+        },
+      },
+    });
+
+    expect(retVal.serviceLines[0].agentPrice).toBeNull();
+  });
+});