Merge pull request #802 from topcoder-platform/pm-577_1

fix(PM-577): Return existing application if available

Author: hentrymartin

.circleci/config.yml

@@ -149,7 +149,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['develop', 'migration-setup', 'PM-577']
+              only: ['develop', 'migration-setup']
       - deployProd:
           context : org-global
           filters:

docs/swagger.yaml

@@ -487,9 +487,9 @@ paths:
             $ref: "#/definitions/ApplyCopilotOpportunity"
       responses:
         "200":
-          description: "The copilot opportunity"
+          description: "The copilot opportunity application"
           schema:
-            $ref: "#/definitions/CopilotOpportunity"
+            $ref: "#/definitions/CopilotOpportunityApplication"
         "401":
           description: "Unauthorized"
           schema:
@@ -6013,6 +6013,46 @@ definitions:
         format: int64
         description: READ-ONLY. User that last updated this task
         readOnly: true
+  CopilotOpportunityApplication:
+    type: object
+    properties:
+      id:
+        description: unique identifier
+        type: integer
+        format: int64
+      notes:
+        description: notes regarding the application
+        type: string
+      opportunityId:
+        description: copilot request id
+        type: integer
+      createdAt:
+        type: string
+        description: Datetime (GMT) when task was created
+        readOnly: true
+      createdBy:
+        type: integer
+        format: int64
+        description: READ-ONLY. User who created this task
+        readOnly: true
+      updatedAt:
+        type: string
+        description: READ-ONLY. Datetime (GMT) when task was updated
+        readOnly: true
+      updatedBy:
+        type: integer
+        format: int64
+        description: READ-ONLY. User that last updated this task
+        readOnly: true
+      deletedAt:
+        type: string
+        description: READ-ONLY. Datetime (GMT) when task was deleted
+        readOnly: true
+      deletedBy:
+        type: integer
+        format: int64
+        description: READ-ONLY. User that deleted this task
+        readOnly: true
   Project:
     type: object
     properties:

src/routes/copilotOpportunityApply/create.js

@@ -60,9 +60,8 @@ module.exports = [
       });
 
       if (existingApplication) {
-        const err = new Error('User already applied for this opportunity');
-        err.status = 400;
-        return next(err);
+        res.status(200).json(existingApplication);
+        return Promise.resolve();
       }
 
       return models.CopilotApplication.create(data)