ti2 1.0.36 → 1.0.38

package/controllers/bookings.js

@@ -1,6 +1,21 @@
 const assert = require('assert');
 
 const { UserAppKey } = require('../models/index');
+const { typeDefs: productTypeDefs, query: productQuery } = require('./graphql-schemas/product');
+const { typeDefs: availTypeDefs, query: availQuery } = require('./graphql-schemas/availability');
+const { typeDefs: bookingTypeDefs, query: bookingQuery } = require('./graphql-schemas/booking');
+const { typeDefs: rateTypeDefs, query: rateQuery } = require('./graphql-schemas/rate');
+
+const typeDefsAndQueries = {
+  productTypeDefs,
+  productQuery,
+  availTypeDefs,
+  availQuery,
+  bookingTypeDefs,
+  bookingQuery,
+  rateTypeDefs,
+  rateQuery,
+};
 
 const bookingsSearch = plugins => async (req, res, next) => {
   const {
@@ -22,6 +37,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
     const results = await search({
       token,
       payload: body,
+      typeDefsAndQueries,
     });
     return res.json(results);
   } catch (err) {
@@ -49,6 +65,7 @@ const bookingsCancel = plugins => async (req, res, next) => {
     const results = await app.cancelBooking({
       token,
       payload: body,
+      typeDefsAndQueries,
     });
     return res.json(results);
   } catch (err) {
@@ -76,6 +93,7 @@ const $bookingsProductSearch = plugins => async ({
   const results = await app.searchProducts({
     token,
     payload,
+    typeDefsAndQueries,
   });
   return results;
 };
@@ -112,6 +130,7 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
     const results = await app.searchAvailability({
       token,
       payload,
+      typeDefsAndQueries,
     });
     return res.json(results);
   } catch (err) {
@@ -139,6 +158,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
   return app.availabilityCalendar({
     token,
     payload,
+    typeDefsAndQueries,
   });
 };
 
@@ -175,6 +195,7 @@ const searchQuote = plugins => async (req, res, next) => {
     const results = await app.searchQuote({
       token,
       payload,
+      typeDefsAndQueries,
     });
     return res.json(results);
   } catch (err) {
@@ -203,6 +224,7 @@ const createBooking = plugins => async (req, res, next) => {
     const results = await app.createBooking({
       token,
       payload,
+      typeDefsAndQueries,
     });
     return res.json(results);
   } catch (err) {

package/controllers/graphql-schemas/availability.js

@@ -0,0 +1,61 @@
+const typeDefs = `
+  input UnitWithQuantity {
+    unitId: ID
+    quantity: Int
+  }
+  type Pricing {
+    unitId: ID
+    original: Int
+    retail: Int
+    net: Int
+    currencyPrecision: Int
+  }
+  type Offer {
+    offerId: ID
+    title: String
+    description: String
+  }
+  type Query {
+    key(productId: String, optionId: String, currency: String, unitsWithQuantity: [UnitWithQuantity], jwtKey: String): String
+    dateTimeStart: String
+    dateTimeEnd: String
+    allDay: Boolean
+    vacancies: Int
+    available: Boolean
+    pricing: Pricing
+    unitPricing: [Pricing]
+    offer: Offer
+  }
+`;
+
+const query = `query getAvailability ($pId: String, $oId: String, $currency: String, $unitsWithQuantity: [UnitWithQuantity], $jwtKey: String) {
+  key (productId: $pId, optionId: $oId, currency: $currency, unitsWithQuantity: $unitsWithQuantity, jwtKey: $jwtKey)
+  dateTimeStart
+  dateTimeEnd
+  allDay
+  vacancies
+  available
+  pricing {
+    ...pricingFields
+  }
+  unitPricing {
+    ...pricingFields
+  }
+  offer {
+    offerId
+    title
+    description
+  }
+}
+fragment pricingFields on Pricing {
+  unitId
+  original
+  retail
+  net
+  currencyPrecision
+}
+`;
+module.exports = {
+  typeDefs,
+  query,
+};

package/controllers/graphql-schemas/booking.js

@@ -0,0 +1,94 @@
+const typeDefs = `
+  type Holder {
+    name: String
+    surname: String
+    fullName: String
+    phoneNumber: String
+    emailAddress: String
+  }
+  type UnitItem {
+    unitItemId: ID
+    unitId: ID
+    unitName: String
+  }
+  type Price {
+    original: Int
+    retail: Int
+    net: Int
+    currencyPrecision: Int
+    currency: String
+  }
+  type Query {
+    id: ID
+    orderId: ID
+    bookingId: ID
+    supplierBookingId: ID
+    status: String
+    productId: String
+    productName: String
+    optionId: String
+    optionName: String
+    cancellable: Boolean
+    editable: Boolean
+    unitItems: [UnitItem]
+    start: String
+    end: String
+    allDay: Boolean
+    bookingDate: String
+    holder: Holder
+    notes: String
+    price: Price
+    cancelPolicy: String
+    resellerReference: String
+    publicUrl: String
+    privateUrl: String
+  }
+`;
+
+const query = `{
+  id
+  orderId
+  bookingId
+  supplierBookingId
+  status
+  productId
+  productName
+  optionId
+  optionName
+  cancellable
+  editable
+  unitItems {
+    unitItemId
+    unitId
+    unitName
+  }
+  start
+  end
+  allDay
+  bookingDate
+  holder {
+    name
+    surname
+    fullName
+    phoneNumber
+    emailAddress
+  }
+  notes
+  price {
+    original
+    retail
+    net
+    currencyPrecision
+    currency
+  }
+  cancelPolicy
+  optionId
+  resellerReference
+  publicUrl
+  privateUrl
+}`;
+
+module.exports = {
+  typeDefs,
+  query,
+};

package/controllers/graphql-schemas/product.js

@@ -0,0 +1,64 @@
+const typeDefs = `
+  type Restriction {
+    paxCount: Int
+    minAge: Int
+    maxAge: Int
+  }
+  type Pricing {
+    original: Int
+    retail: Int
+    currency: Int
+    currencyPrecision: Int
+  }
+  type Unit {
+    unitId: ID
+    unitName: String
+    subtitle: String!
+    restrictions: Restriction
+    pricing: [Pricing]
+  }
+  type Option {
+    optionId: ID
+    optionName: String
+    units: [Unit]
+  }
+  type Query {
+    productId: ID
+    productName: String
+    availableCurrencies: [String]
+    defaultCurrency: String
+    options: [Option]
+  }
+`;
+
+const query = `{
+  productId
+  productName
+  availableCurrencies
+  defaultCurrency
+  options {
+    optionId
+    optionName
+    units {
+      unitId
+      unitName
+      subtitle
+      pricing {
+        original
+        retail
+        currencyPrecision
+        currency
+      }
+      restrictions {
+        paxCount
+        minAge
+        maxAge
+      }
+    }
+  }
+}`;
+
+module.exports = {
+  typeDefs,
+  query,
+};

package/controllers/graphql-schemas/rate.js

@@ -0,0 +1,33 @@
+const typeDefs = `
+  type Pricing {
+    original: Int
+    retail: Int
+    currency: Int
+    currencyPrecision: Int
+  }
+  type Query {
+    rateId: ID
+    rateName: String
+    unitId: ID
+    unitName: String
+    pricing: [Pricing]
+  }
+`;
+
+const query = `{
+  rateId
+  rateName
+  unitId
+  unitName
+  pricing {
+    original
+    retail
+    currencyPrecision
+    currency
+  }
+}`;
+
+module.exports = {
+  typeDefs,
+  query,
+};

package/index.js

@@ -130,6 +130,21 @@ module.exports = async ({
       notImplemented: (req, res) => res.sendStatus(501),
     });
     if (elasticLogsClient) { // API request logs are saved on elastic
+      const mappings = {
+        dynamic: true,
+        properties: {
+          body: { type: 'object' },
+          client: { type: 'keyword' },
+          date: { type: 'long' },
+          method: { type: 'keyword' },
+          operationId: { type: 'keyword' },
+          params: { type: 'object' },
+          query: { type: 'object' },
+          url: { type: 'text' },
+          responseStatusCode: { type: 'long' },
+          responseTimeInMs: { type: 'long' },
+        },
+      };
       // setup the index
       elasticLogsClient.indices.existsTemplate({
         name: 'apilog',
@@ -144,22 +159,32 @@ module.exports = async ({
               settings: {
                 number_of_shards: 1,
               },
-              mappings: {
-                dynamic: true,
-                properties: {
-                  body: { type: 'object' },
-                  client: { type: 'keyword' },
-                  date: { type: 'long' },
-                  method: { type: 'keyword' },
-                  params: { type: 'object' },
-                  query: { type: 'object' },
-                  url: { type: 'text' },
-                  responseStatusCode: { type: 'long' },
-                  responseTimeInMs: { type: 'long' },
-                },
-              },
+              mappings,
             },
           });
+          console.log('index template created');
+        } else {
+          // index exists, we might have to updated it
+          const current = R.path(
+            ['body', 'apilog', 'mappings'],
+            await elasticLogsClient.indices.getTemplate({
+              name: 'apilog',
+            }),
+          );
+          if (!R.equals(current, mappings)) {
+            console.log('=- updating index template -=');
+            await elasticLogsClient.indices.putTemplate({
+              name: 'apilog',
+              body: {
+                index_patterns: [`${elasticLogIndex}*`],
+                settings: {
+                  number_of_shards: 1,
+                },
+                mappings,
+              },
+            });
+            console.log('updated');
+          }
         }
         const exists = await elasticLogsClient.indices.exists({
           index: elasticLogIndex,
@@ -169,6 +194,7 @@ module.exports = async ({
           await elasticLogsClient.indices.create({
             index: elasticLogIndex,
           });
+          console.log('index created');
         }
       }).catch(console.log);
       app.use((req, res, next) => {
@@ -181,6 +207,7 @@ module.exports = async ({
           query: req.query,
           appRecord: req.appRecord,
           method: req.method,
+          operationId: R.path(['openapi', 'operation', 'operationId'], req),
           client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
         };
         elasticLogsClient.index({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {