Merge pull request #16 from TourConnect/fix/remarks_special_char

Fix/remarks special char, fix product name matching
TourConnect · Aug 16, 2024 · 2c85280 · 2c85280
2 parents 57d0b29 + f2b0d14
commit 2c85280
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -12,6 +12,7 @@ const Normalizer = require('./normalizer');
 
 const xmlParser = new xml2js.Parser();
 const fastParser = new XMLParser();
+const BAD_XML_CHARS = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007f-\u0084\u0086-\u009f\uD800-\uDFFF\uFDD0-\uFDFF\uFFFF\uC008\uFEFF]/g;
 
 const defaultXmlOptions = {
   prettyPrinting: { enabled: false },
@@ -210,6 +211,7 @@ class Plugin {
           Twin: 'TW',
           Triple: 'TR',
           Quad: 'QD',
+          Other: 'OT',
         })[roomType];
         if (RoomType) RoomConfig.RoomType = RoomType;
         if (passengers && passengers.length && !noPaxList) {
@@ -253,6 +255,7 @@ class Plugin {
         .replace(/>/g, '&gt;')
         .replace(/"/g, '&quot;')
         .replace(/'/g, '&apos;')
+        .replace(BAD_XML_CHARS, '')
     };
 
     // this.errorPathsAxiosErrors = () => ([ // axios triggered errors

diff --git a/resolvers/product.js b/resolvers/product.js
@@ -36,7 +36,8 @@ const translateTCMLCollection = async ({ rootValue, typeDefs, query }) => {
 
 const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
   return {
-    productId: supplierData.supplierId,
+    // LLM sends the product id as string
+    productId: supplierData.supplierId + "",
     productName: supplierData.supplierName,
     address: supplierData.supplierAddress,
     serviceTypes: supplierData.serviceTypes,