Merge pull request #559 from topcoder-platform/dev

feat: filter, sort type, challenge-track and challenge-type delete api

Author: jmgasper

.circleci/config.yml

@@ -71,8 +71,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
-                - feature/PLAT-2032
+                - dev
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

app-constants.js

@@ -45,6 +45,10 @@ const validChallengeParams = {
   StartDate: 'startDate',
   ProjectId: 'projectId',
   Name: 'name',
+  Type: 'type',
+  NumOfSubmissions: 'numOfSubmissions',
+  NumOfRegistrants: 'numOfRegistrants',
+  Status: 'status',
   TypeId: 'typeId',
   Prizes: 'overview.totalPrizes'
 }
@@ -64,6 +68,10 @@ const Topics = {
   ChallengeDeleted: 'challenge.notification.delete',
   ChallengeTypeCreated: 'test.new.bus.events', // 'challenge.action.type.created',
   ChallengeTypeUpdated: 'test.new.bus.events', // 'challenge.action.type.updated',
+  ChallengeTypeDeleted: 'test.new.bus.events', // 'challenge.action.type.deleted',
+  ChallengeTrackCreated: 'test.new.bus.events', // 'challenge.action.track.created',
+  ChallengeTrackUpdated: 'test.new.bus.events', // 'challenge.action.track.updated',
+  ChallengeTrackDeleted: 'test.new.bus.events', // 'challenge.action.track.deleted',
   ChallengePhaseCreated: 'test.new.bus.events', // 'challenge.action.phase.created',
   ChallengePhaseUpdated: 'test.new.bus.events', // 'challenge.action.phase.updated',
   ChallengePhaseDeleted: 'test.new.bus.events', // 'challenge.action.phase.deleted',

docs/swagger.yaml

@@ -360,6 +360,9 @@ paths:
               projectId,
               name,
               typeId,
+              numOfRegistrants,
+              numOfSubmissions,
+              status,
               overview.totalPrizes,
             ]
         - name: sortOrder
@@ -908,6 +911,46 @@ paths:
           description: Internal Server error
           schema:
             $ref: "#/definitions/ErrorModel"
+    delete:
+      tags:
+        - ChallengeTypes
+      description: Delete the challenge type with specified id.
+      security:
+        - bearer: []
+      produces:
+        - application/json
+      parameters:
+        - name: challengeTypeId
+          in: path
+          required: true
+          type: string
+          format: UUID
+          description: The id of challengeType to be deleted
+      responses:
+        "200":
+          description: Deleted - The request was successful and the resource is returned.
+          schema:
+            $ref: "#/definitions/ChallengeType"
+        "400":
+          description: Bad request. Request parameters were invalid.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "401":
+          description: Unauthorized. Fail to authenticate the requester.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "403":
+          description: Forbidden. The requester does not have the correct permission to delete the challenge type.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "404":
+          description: Not Found. Challenge type not found
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: "#/definitions/ErrorModel"
   /challenge-tracks:
     get:
       tags:
@@ -1143,6 +1186,46 @@ paths:
           description: Internal Server Error
           schema:
             $ref: "#/definitions/ErrorModel"
+    delete:
+      tags:
+        - ChallengeTracks
+      description: Delete the challenge track with specified id.
+      security:
+        - bearer: []
+      produces:
+        - application/json
+      parameters:
+        - name: challengeTrackId
+          in: path
+          required: true
+          type: string
+          format: UUID
+          description: The id of challengeTrack to be deleted.
+      responses:
+        "200":
+          description: Deleted - The request was successful and the resource is returned.
+          schema:
+            $ref: "#/definitions/ChallengeTrack"
+        "400":
+          description: Bad request. Request parameters were invalid.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "401":
+          description: Unauthorized. Fail to authenticate the requester.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "403":
+          description: Forbidden. The requester does not have the correct permission to delete the challenge track.
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "404":
+          description: Not Found. Challenge track not found
+          schema:
+            $ref: "#/definitions/ErrorModel"
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: "#/definitions/ErrorModel"
   /challenge-phases:
     get:
       tags:
@@ -2927,7 +3010,7 @@ definitions:
             type: boolean
           selfServiceCopilot:
             type: string
-      cancelReason: 
+      cancelReason:
         type: string
       billing:
         type: object

src/controllers/ChallengeTrackController.js

@@ -56,10 +56,21 @@ async function partiallyUpdateChallengeTrack (req, res) {
   res.send(result)
 }
 
+/**
+ * Delete challenge track
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function deleteChallengeTrack (req, res) {
+  const result = await service.deleteChallengeTrack(req.params.challengeTrackId)
+  res.send(result)
+}
+
 module.exports = {
   searchChallengeTracks,
   createChallengeTrack,
   getChallengeTrack,
   fullyUpdateChallengeTrack,
-  partiallyUpdateChallengeTrack
+  partiallyUpdateChallengeTrack,
+  deleteChallengeTrack
 }

src/controllers/ChallengeTypeController.js

@@ -56,10 +56,21 @@ async function partiallyUpdateChallengeType (req, res) {
   res.send(result)
 }
 
+/**
+ * Delete challenge type
+ * @param {Object} req the request
+ * @param {Object} res the response
+ */
+async function deleteChallengeType (req, res) {
+  const result = await service.deleteChallengeType(req.params.challengeTypeId)
+  res.send(result)
+}
+
 module.exports = {
   searchChallengeTypes,
   createChallengeType,
   getChallengeType,
   fullyUpdateChallengeType,
-  partiallyUpdateChallengeType
+  partiallyUpdateChallengeType,
+  deleteChallengeType
 }

src/init-es.js

@@ -41,6 +41,24 @@ const initES = async () => {
           },
           normalizer: 'custom_sort_normalizer'
         },
+        status: {
+          type: 'keyword',
+          fields: {
+            text: {
+              type: 'text'
+            }
+          },
+          normalizer: 'custom_sort_normalizer'
+        },
+        type: {
+          type: 'keyword',
+          fields: {
+            text: {
+              type: 'text'
+            }
+          },
+          normalizer: 'custom_sort_normalizer'
+        },
         prizeSets: {
           properties: {
             type: { type: 'text' },

src/routes.js

@@ -113,6 +113,13 @@ module.exports = {
       auth: 'jwt',
       access: [constants.UserRoles.Admin, constants.UserRoles.Copilot, constants.UserRoles.Manager],
       scopes: [UPDATE, ALL]
+    },
+    delete: {
+      controller: 'ChallengeTypeController',
+      method: 'deleteChallengeType',
+      auth: 'jwt',
+      access: [constants.UserRoles.Admin, constants.UserRoles.Copilot, constants.UserRoles.Manager],
+      scopes: [DELETE, ALL]
     }
   },
   '/challenge-tracks': {
@@ -146,6 +153,13 @@ module.exports = {
       auth: 'jwt',
       access: [constants.UserRoles.Admin, constants.UserRoles.Copilot, constants.UserRoles.Manager],
       scopes: [UPDATE, ALL]
+    },
+    delete: {
+      controller: 'ChallengeTrackController',
+      method: 'deleteChallengeTrack',
+      auth: 'jwt',
+      access: [constants.UserRoles.Admin, constants.UserRoles.Copilot, constants.UserRoles.Manager],
+      scopes: [DELETE, ALL]
     }
   },
   '/challenge-timelines': {

src/services/ChallengeService.js

@@ -165,7 +165,7 @@ async function searchChallenges (currentUser, criteria) {
   if (criteria.types) {
     for (const t of criteria.types) {
       const typeSearchRes = await ChallengeTypeService.searchChallengeTypes({ abbreviation: t })
-      if (typeSearchRes.total > 0) {
+      if (typeSearchRes.total > 0 || criteria.types.length === 1) {
         includedTypeIds.push(_.get(typeSearchRes, 'result[0].id'))
       }
     }

src/services/ChallengeTrackService.js

@@ -172,12 +172,30 @@ partiallyUpdateChallengeTrack.schema = {
   }).required()
 }
 
+/**
+ * Delete challenge track.
+ * @param {String} id the challenge track id
+ * @return {Object} the deleted challenge track
+ */
+async function deleteChallengeTrack (id) {
+  const record = await helper.getById('ChallengeTrack', id)
+  await record.delete()
+  // post bus event
+  await helper.postBusEvent(constants.Topics.ChallengeTrackDeleted, record)
+  return record
+}
+
+deleteChallengeTrack.schema = {
+  id: Joi.id()
+}
+
 module.exports = {
   searchChallengeTracks,
   createChallengeTrack,
   getChallengeTrack,
   fullyUpdateChallengeTrack,
-  partiallyUpdateChallengeTrack
+  partiallyUpdateChallengeTrack,
+  deleteChallengeTrack
 }
 
 // logger.buildService(module.exports)

src/services/ChallengeTypeService.js

@@ -150,12 +150,30 @@ partiallyUpdateChallengeType.schema = {
   }).required()
 }
 
+/**
+ * Delete challenge type.
+ * @param {String} id the challenge type id
+ * @returns {Object} the deleted challenge type
+ */
+async function deleteChallengeType (id) {
+  const ret = await helper.getById('ChallengeType', id)
+  await ret.delete()
+  // post bus event
+  await helper.postBusEvent(constants.Topics.ChallengeTypeDeleted, ret)
+  return ret
+}
+
+deleteChallengeType.schema = {
+  id: Joi.id()
+}
+
 module.exports = {
   searchChallengeTypes,
   createChallengeType,
   getChallengeType,
   fullyUpdateChallengeType,
-  partiallyUpdateChallengeType
+  partiallyUpdateChallengeType,
+  deleteChallengeType
 }
 
 // logger.buildService(module.exports)

test/e2e/challenge.type.api.test.js

@@ -665,4 +665,46 @@ describe('challenge type API E2E tests', () => {
       should.equal(response.body.message, '"legacyId" must be a number')
     })
   })
+
+  describe('remove challenge type API tests', () => {
+    it('remove challenge type - forbidden', async () => {
+      const response = await chai.request(app)
+        .delete(`${basePath}/${id}`)
+        .set('Authorization', `Bearer ${config.USER_TOKEN}`)
+      should.equal(response.status, 403)
+      should.equal(response.body.message, 'You are not allowed to perform this action!')
+    })
+
+    it('remove challenge type successfully', async () => {
+      const response = await chai.request(app)
+        .delete(`${basePath}/${id}`)
+        .set('Authorization', `Bearer ${config.ADMIN_TOKEN}`)
+      should.equal(response.status, 200)
+      should.equal(response.body.id, id)
+    })
+
+    it('remove challenge type - not found 1', async () => {
+      const response = await chai.request(app)
+        .delete(`${basePath}/${id}`)
+        .set('Authorization', `Bearer ${config.ADMIN_TOKEN}`)
+      should.equal(response.status, 404)
+      should.equal(response.body.message, `ChallengeType with id: ${id} doesn't exist`)
+    })
+
+    it('remove challenge type - not found 2', async () => {
+      const response = await chai.request(app)
+        .delete(`${basePath}/${notFoundId}`)
+        .set('Authorization', `Bearer ${config.ADMIN_TOKEN}`)
+      should.equal(response.status, 404)
+      should.equal(response.body.message, `ChallengeType with id: ${notFoundId} doesn't exist`)
+    })
+
+    it('remove challenge type - invalid id', async () => {
+      const response = await chai.request(app)
+        .delete(`${basePath}/invalid`)
+        .set('Authorization', `Bearer ${config.ADMIN_TOKEN}`)
+      should.equal(response.status, 400)
+      should.equal(response.body.message, '"challengeTypeId" must be a valid GUID')
+    })
+  })
 })