fix: review comments

Author: hentrymartin

docs/swagger.yaml

@@ -244,7 +244,7 @@ paths:
           description: Internal Server Error
           schema:
             $ref: "#/definitions/ErrorModel"
-  "/projects/{projectId}/copilot-request":
+  "/projects/{projectId}/copilots/request":
     post:
       tags:
         - projects copilot request

src/models/copilotRequest.js

@@ -1,8 +1,8 @@
 module.exports = function defineCopilotRequest(sequelize, DataTypes) {
   const CopliotRequest = sequelize.define('CopilotRequest', {
     id: { type: DataTypes.BIGINT, primaryKey: true, autoIncrement: true },
-    status: { type: DataTypes.STRING, defaultValue: 'new' },
-    data: { type: DataTypes.JSON, defaultValue: {} },
+    status: { type: DataTypes.STRING(16), defaultValue: 'new', allowNull: false }, 
+    data: { type: DataTypes.JSON, defaultValue: {}, allowNull: false },
 
     createdAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
     updatedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },

src/routes/copilotRequest/create.js

@@ -6,6 +6,7 @@ import models from '../../models';
 import util from '../../util';
 import { COPILOT_REQUEST_STATUS } from '../../constants';
 import { PERMISSION } from '../../permissions/constants';
+import { Op } from 'sequelize';
 
 const addCopilotRequestValidations = {
   body: Joi.object().keys({
@@ -21,7 +22,7 @@ module.exports = [
       const err = new Error('Unable to create copilot request');
       _.assign(err, {
         details: JSON.stringify({ message: 'You do not have permission to create copilot request' }),
-        status: 400,
+        status: 403,
       });
       return Promise.reject(err);
     }
@@ -35,7 +36,7 @@ module.exports = [
     });
 
     models.sequelize.transaction((transaction) => {
-      req.log.debug('Create Copilot request transaction');
+      req.log.debug('Create Copilot request transaction', data);
       return models.Project.findOne({
         where: { id: projectId, deletedAt: { $eq: null } },
       })
@@ -49,6 +50,9 @@ module.exports = [
             where: {
               createdBy: req.authUser.userId,
               projectId: projectId,
+              status: {
+                [Op.in] : [COPILOT_REQUEST_STATUS.NEW, COPILOT_REQUEST_STATUS.APPROVED, COPILOT_REQUEST_STATUS.SEEKING], 
+              }
             },
           }).then((existingCopilotRequest) => {
             if (existingCopilotRequest) {

src/routes/index.js

@@ -28,7 +28,7 @@ router.get(`/${apiVersion}/projects/health`, (req, res) => {
 const jwtAuth = require('tc-core-library-js').middleware.jwtAuthenticator;
 
 router.all(
-  RegExp(`\\/${apiVersion}\\/(copilot-request|projects|timelines|orgConfig|customer-payments)(?!\\/health).*`), (req, res, next) => (
+  RegExp(`\\/${apiVersion}\\/(copilots|projects|timelines|orgConfig|customer-payments)(?!\\/health).*`), (req, res, next) => (
     // JWT authentication
     jwtAuth(config)(req, res, next)
   ),
@@ -379,7 +379,7 @@ router.route('/v5/projects/:projectId(\\d+)/settings')
   .post(require('./projectSettings/create'));
 
 // Project Copilot Request
-router.route('/v5/projects/:projectId(\\d+)/copilot-request')
+router.route('/v5/projects/:projectId(\\d+)/copilots/request')
   .post(require('./copilotRequest/create'));
 
 // Project Estimation Items