ti2 1.0.45 → 1.0.47

package/api.yml

@@ -194,6 +194,20 @@ components:
           type: array
           items:
             type: string
+    desk:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+    agent:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
     bookingSearchQuery:
       type: object
       additionalProperties: true
@@ -558,7 +572,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/AppTokenList'
+              schema:
+                $ref: '#/components/schemas/AppTokenList'
   /{app}/{userId}:
     security:
       - bearerAuth: ['app']
@@ -598,7 +613,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/Message'
+              schema:
+                $ref: '#/components/schemas/Message'
     delete:
       tags:
         - app
@@ -634,7 +650,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/Message'
+              schema:
+                $ref: '#/components/schemas/Message'
   /{app}/{userId}/{hint}/token:
     get:
       tags:
@@ -672,7 +689,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/UserApp'
+              schema:
+                $ref: '#/components/schemas/UserApp'
   /{app}/{userId}/token:
     get:
       tags:
@@ -703,7 +721,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/UserApp'
+              schema:
+                $ref: '#/components/schemas/UserApp'
   /{app}/{userId}/validate:
     post:
       tags:
@@ -740,7 +759,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/Message'
+              schema:
+                $ref: '#/components/schemas/Message'
 
   /{app}/{userId}/jobRun:
     security:
@@ -779,7 +799,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/JobStatus'
+              schema:
+                $ref: '#/components/schemas/JobStatus'
   /{app}/{userId}/{hint}/jobRun:
     security:
       - bearerAuth: ['app', 'user', 'admin']
@@ -824,7 +845,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/JobStatus'
+              schema:
+                $ref: '#/components/schemas/JobStatus'
   /{app}/{userId}/{jobId}/jobStatus:
     security:
       - bearerAuth: ['app', 'user', 'admin']
@@ -858,11 +880,12 @@ paths:
           schema:
             type: string
       responses:
-        200:
+        '200':
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/JobStatus'
+              schema:
+                $ref: '#/components/schemas/JobStatus'
   /user/{userId}/apps:
     get:
       security:
@@ -885,7 +908,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/AppTokenList'
+              schema:
+                $ref: '#/components/schemas/AppTokenList'
   /app/{appKey}/methods:
     get:
       security:
@@ -907,7 +931,8 @@ paths:
           description: the methods available
           content:
             appication/json:
-              schema: '#/components/schemas/appMethods'
+              schema:
+                $ref: '#/components/schemas/appMethods'
   /settings/{appKey}/{userId}:
     post:
       security:
@@ -938,12 +963,6 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/settingsBody'
-      responses:
-        200:
-          description: success
-          content:
-            application/json:
-              schema: '#/components/schemas/Success'
     get:
       security:
         - bearerAuth: ['admin', 'user']
@@ -971,7 +990,8 @@ paths:
           description: success
           content:
             application/json:
-              schema: '#/components/schemas/settingsBody'
+              schema:
+                $ref: '#/components/schemas/settingsBody'
     delete:
       security:
         - bearerAuth: ['admin', 'user']
@@ -1000,6 +1020,156 @@ paths:
           content:
             application/json:
                 $ref: '#/components/schemas/Status'
+  /affiliate/{appKey}/{userId}/desks:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all desks for this affiliate
+      operationId: getAffiliateDesks
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the desks for (defaults to first token found)
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: desks
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  desks:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/desk'
+  /affiliate/{appKey}/{userId}/{hint}/desks:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all desks for this affiliate
+      operationId: getAffiliateDesks
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the desks for the token using the hint
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+        - name: hint
+          in: path
+          description: a specific token hint to be used
+          required: true
+          example: 'fareharbor-helloworld'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: desks
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  desks:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/desk'
+  /affiliate/{appKey}/{userId}/agents:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all agents for this affiliate
+      operationId: getAffiliateAgents
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the agents for (defaults to first token found)
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: agents
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  agents:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/agent'
+  /affiliate/{appKey}/{userId}/{hint}/agents:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all agents for this affiliate
+      operationId: getAffiliateAgents
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the agents for the token using the hint
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+        - name: hint
+          in: path
+          description: a specific token hint to be used
+          required: true
+          example: 'fareharbor-helloworld'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: agents
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  agents:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/agent'
   /bookings/{appKey}/{userId}/search:
     post:
       security:

package/controllers/bookings.js

@@ -33,7 +33,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
     });
     assert(userAppKeys, 'could not find the app key');
     const token = await userAppKeys.token;
-    const search = app.searchHotelBooking || app.searchBooking;
+    const search = (app.searchHotelBooking || app.searchBooking).bind(app);
     const results = await search({
       token,
       payload: body,
@@ -232,6 +232,62 @@ const createBooking = plugins => async (req, res, next) => {
   }
 };
 
+const getAffiliateAgents = plugins => async (req, res, next) => {
+  const {
+    params: { appKey, userId, hint },
+    body: payload,
+  } = req;
+  try {
+    const app = plugins.find(({ name }) => name === appKey);
+    // const app = load(appKey);
+    const userAppKeys = (await UserAppKey.findOne({
+      where: {
+        userId,
+        integrationId: appKey,
+        ...(hint ? { hint } : {}),
+      },
+    }));
+    assert(userAppKeys, 'could not find the app key');
+    const token = await userAppKeys.token;
+    assert(app.getAffiliateAgents, `getAffiliateAgents is not available for ${appKey}`);
+    const results = await app.getAffiliateAgents({
+      token,
+      payload,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
+const getAffiliateDesks = plugins => async (req, res, next) => {
+  const {
+    params: { appKey, userId, hint },
+    body: payload,
+  } = req;
+  try {
+    const app = plugins.find(({ name }) => name === appKey);
+    // const app = load(appKey);
+    const userAppKeys = (await UserAppKey.findOne({
+      where: {
+        userId,
+        integrationId: appKey,
+        ...(hint ? { hint } : {}),
+      },
+    }));
+    assert(userAppKeys, 'could not find the app key');
+    const token = await userAppKeys.token;
+    assert(app.getAffiliateDesks, `getAffiliateDesks is not available for ${appKey}`);
+    const results = await app.getAffiliateDesks({
+      token,
+      payload,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
 module.exports = plugins => ({
   bookingsSearch: bookingsSearch(plugins),
   bookingsCancel: bookingsCancel(plugins),
@@ -242,4 +298,6 @@ module.exports = plugins => ({
   bookingsAvailabilityCalendar: bookingsAvailabilityCalendar(plugins),
   searchQuote: searchQuote(plugins),
   createBooking: createBooking(plugins),
+  getAffiliateAgents: getAffiliateAgents(plugins),
+  getAffiliateDesks: getAffiliateDesks(plugins),
 });

package/controllers/graphql-schemas/availability.js

@@ -15,8 +15,22 @@ const typeDefs = `
     title: String
     description: String
   }
+  type PickupPoint {
+    id: ID
+    name: String
+    pickupAvail: Boolean
+    directions: String
+    latitude: Float
+    longitude: Float
+    street: String
+    postal: String
+    city: String
+    state: String
+    country: String
+    localDateTime: String
+  }
   type Query {
-    key(productId: String, optionId: String, currency: String, unitsWithQuantity: [UnitWithQuantity], jwtKey: String): String
+    key(productId: ID, optionId: ID, currency: String, unitsWithQuantity: [UnitWithQuantity], jwtKey: String): String
     dateTimeStart: String
     dateTimeEnd: String
     allDay: Boolean
@@ -25,16 +39,35 @@ const typeDefs = `
     pricing: Pricing
     unitPricing: [Pricing]
     offer: Offer
+    pickupAvailable: Boolean
+    pickupRequired: Boolean
+    pickupPoints: [PickupPoint]
   }
 `;
 
-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)
+const query = `query getAvailability ($productId: ID, $optionId: ID, $currency: String, $unitsWithQuantity: [UnitWithQuantity], $jwtKey: String) {
+  key (productId: $productId, optionId: $optionId, currency: $currency, unitsWithQuantity: $unitsWithQuantity, jwtKey: $jwtKey)
   dateTimeStart
   dateTimeEnd
   allDay
   vacancies
   available
+  pickupAvailable
+  pickupRequired
+  pickupPoints {
+    id
+    name
+    pickupAvail
+    directions
+    latitude
+    longitude
+    street
+    postal
+    city
+    state
+    country
+    localDateTime
+  }
   pricing {
     ...pricingFields
   }

package/controllers/graphql-schemas/booking.js

@@ -18,6 +18,27 @@ const typeDefs = `
     currencyPrecision: Int
     currency: String
   }
+  type Agent {
+    id: Int
+    name: String
+  }
+  type Desk {
+    id: Int
+    name: String
+  }
+  type PickupPoint {
+    id: ID
+    name: String
+    directions: String
+    latitude: Float
+    longitude: Float
+    street: String
+    postal: String
+    city: String
+    state: String
+    country: String
+    localDateTime: String
+  }
   type Query {
     id: ID
     orderId: ID
@@ -42,6 +63,13 @@ const typeDefs = `
     resellerReference: String
     publicUrl: String
     privateUrl: String
+    agent: Agent
+    desk: Desk
+    pickupRequested: Boolean
+    pickupPointId: ID
+    pickupHotel: String
+    pickupHotelRoom: String
+    pickupPoint: PickupPoint
   }
 `;
 
@@ -86,6 +114,31 @@ const query = `{
   resellerReference
   publicUrl
   privateUrl
+  agent {
+    id
+    name
+  }
+  desk {
+    id
+    name
+  }
+  pickupRequested
+  pickupPointId
+  pickupHotel
+  pickupHotelRoom
+  pickupPoint {
+    id
+    name
+    directions
+    latitude
+    longitude
+    street
+    postal
+    city
+    state
+    country
+    localDateTime
+  }
 }`;
 
 module.exports = {

package/controllers/graphql-schemas/product.js

@@ -7,13 +7,13 @@ const typeDefs = `
   type Pricing {
     original: Int
     retail: Int
-    currency: Int
+    currency: String
     currencyPrecision: Int
   }
   type Unit {
     unitId: ID
     unitName: String
-    subtitle: String!
+    subtitle: String
     restrictions: Restriction
     type: String
     pricing: [Pricing]

package/index.js

@@ -241,7 +241,7 @@ module.exports = async ({
         return next(err);
       }
       if (process.env.CONSOLE_ERRORS || process.env.JEST_WORKER_ID) {
-        console.error(R.path(['response', 'data'], err), err.message);
+        console.error(R.path(['response', 'data'], err), err);
       }
       return res.status((() => {
         if (!isNumber(err.status)) return 500;

package/package.json

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