Merge branch 'dev' into feature/notifications-api

# Conflicts:
#	src/routes/TeamRoutes.js

Author: maxceem

docs/swagger.yaml

@@ -3593,7 +3593,56 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Error"  
+                $ref: "#/components/schemas/Error"
+  /taas-teams/isExternalMember:
+    post:
+      tags:
+        - Teams
+      description: |
+        Finds whether member is internal or external
+
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/IsExternalMemberRequestBody"
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/IsExternalMemberResponse"
+        "400":
+          description: Bad request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "401":
+          description: Not authenticated
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "403":
+          description: Forbidden
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "409":
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "500":
+          description: Internal Server Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
   /taas-teams/members-suggest/{fragment}:
     get:
       tags:
@@ -5830,6 +5879,16 @@ components:
         paymentIntentToken:
           type: string
           description: " Token required by stripe for completing payment."
+    IsExternalMemberRequestBody:
+      properties:
+        totalAmount:
+          type: number
+          description: "Member id"
+    IsExternalMemberResponse:
+      properties:
+        paymentIntentToken:
+          type: boolean
+          description: "Is the user external member"
     SubmitTeamRequestBody:
       properties:
         teamName:
@@ -5841,6 +5900,9 @@ components:
         refCode:
           type: string
           description: "Optional referral code"
+        intakeSource:
+          type: string
+          description: "The source of the intake."
         positions:
           type: array
           description: "The array of positions"

src/controllers/TeamController.js

@@ -173,6 +173,15 @@ async function createPayment (req, res) {
   res.send(await service.createPayment(req.body.totalAmount))
 }
 
+/**
+ *
+ * @param req the request
+ * @param res the response
+ */
+async function isExternalMember (req, res) {
+  res.send(await service.isExternalMember(req.body.memberId))
+}
+
 module.exports = {
   searchTeams,
   getTeam,
@@ -189,5 +198,6 @@ module.exports = {
   searchSkills,
   suggestMembers,
   createPayment,
-  calculateAmount
+  calculateAmount,
+  isExternalMember
 }

src/routes/TeamRoutes.js

@@ -123,5 +123,13 @@ module.exports = {
       auth: 'jwt',
       scopes: [constants.Scopes.CREATE_TAAS_TEAM]
     }
+  },
+  '/taas-teams/isExternalMember': {
+    post: {
+      controller: 'TeamController',
+      method: 'isExternalMember',
+      auth: 'jwt',
+      scopes: []
+    }
   }
 }

src/services/JobCandidateService.js

@@ -410,5 +410,5 @@ module.exports = {
   fullyUpdateJobCandidate,
   deleteJobCandidate,
   searchJobCandidates,
-  downloadJobCandidateResume 
+  downloadJobCandidateResume
 }

src/services/TeamService.js

@@ -794,7 +794,8 @@ async function getRoleBySkills (skills) {
     where: { listOfSkills: { [Op.overlap]: skills } },
     raw: true
   }
-  const roles = await Role.findAll(queryCriteria)
+  let roles = await Role.findAll(queryCriteria)
+  roles = _.filter(roles, role => _.find(role.rates, r => r.global && r.rate20Global && r.rate30Global))
   if (roles.length > 0) {
     let result = _.each(roles, role => {
       // role matched skills list
@@ -813,7 +814,10 @@ async function getRoleBySkills (skills) {
     }
   }
   // if no matching role found then return Custom role or empty object
-  return await Role.findOne({ where: { name: { [Op.iLike]: 'Custom' } }, raw: true }) || {}
+  const customRole = await Role.findOne({ where: { name: { [Op.iLike]: 'Custom' } }, raw: true }) || {}
+  customRole.rates[0].rate30Global = customRole.rates[0].global * 0.75
+  customRole.rates[0].rate20Global = customRole.rates[0].global * 0.5
+  return customRole
 }
 
 getRoleBySkills.schema = Joi.object()
@@ -1035,7 +1039,8 @@ async function createTeam (currentUser, data) {
     details: {
       positions: data.positions,
       utm: {
-        code: data.refCode
+        code: data.refCode,
+        intakeSource: data.intakeSource
       }
     }
   }
@@ -1075,6 +1080,7 @@ createTeam.schema = Joi.object()
       teamName: Joi.string().required(),
       teamDescription: Joi.string(),
       refCode: Joi.string(),
+      intakeSource: Joi.string(),
       positions: Joi.array().items(
         Joi.object().keys({
           roleName: Joi.string().required(),