#179 - Update submissionPhaseId to be an integer data type only

Author: callmekatootie

docs/swagger.yaml

@@ -95,7 +95,7 @@ paths:
                 challengeId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacySubmissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacyUploadId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
-                submissionPhaseId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
+                submissionPhaseId: 764567
                 created: '2018-05-20T07:00:30.123Z'
                 updated: '2018-06-01T07:36:28.178Z'
                 createdBy: 'topcoder user'
@@ -107,7 +107,7 @@ paths:
                 challengeId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacySubmissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacyUploadId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
-                submissionPhaseId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
+                submissionPhaseId: 764567
                 created: '2018-05-20T08:00:30.000Z'
                 updated: '2018-06-01T09:23:00.178Z'
                 createdBy: 'topcoder user'
@@ -261,9 +261,7 @@ paths:
           description: Legacy Submission Id
         - in: formData
           name: submissionPhaseId
-          oneOf:
-            - type: string
-            - type: integer
+          type: integer
           description: Submission Phase Id
       responses:
         201:
@@ -1604,9 +1602,7 @@ parameters:
     name: submissionPhaseId
     description: The submission phase id filter for submissions.
     required: false
-    oneOf:
-      - type: string
-      - type: integer
+    type: integer
 
   filterSubmissionReviewScore:
     in: query
@@ -1900,9 +1896,7 @@ definitions:
         description: The legacy upload id.
         example: '5da27562-eaec-4c9f-ad1c-ddfbed6ffdbc'
       submissionPhaseId:
-        oneOf:
-          - type: string
-          - type: integer
+        type: integer
         description: The submission phase id.
         example: '5dea6d9e-161a-4c7a-b316-597c73a7b8f4'
 

scripts/createIndex.js

@@ -32,7 +32,7 @@ co(function * createIndex () {
       aggregateScore: { type: 'float' },
       isPassing: { type: 'boolean' },
       legacySubmissionId: { type: 'keyword' },
-      submissionPhaseId: { type: 'keyword' },
+      submissionPhaseId: { type: 'long' },
       fileType: { type: 'keyword' },
       filename: { type: 'keyword' },
       review: { type: 'nested',

src/services/SubmissionService.js

@@ -280,7 +280,7 @@ const listSubmissionsQuerySchema = {
   challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()),
   legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
   legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-  submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid()),
+  submissionPhaseId: joi.id(),
   page: joi.id(),
   perPage: joi.pageSize(),
   orderBy: joi.sortOrder(),
@@ -441,7 +441,7 @@ createSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()).required(),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   }).required()
 }
 
@@ -569,7 +569,7 @@ updateSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()).required(),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   }).required()
 }
 
@@ -595,7 +595,7 @@ patchSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   })
 }
 

test/common/testData.js

@@ -131,7 +131,7 @@ const testSubmission = {
     url: 'https://s3.amazonaws.com/test-submission/123456',
     memberId: 40493050,
     legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
-    submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
+    submissionPhaseId: 764567,
     created: '2018-05-20T07:00:30.123Z',
     createdBy: 'topcoder user',
     updated: '2018-06-01T07:36:28.178Z',
@@ -161,7 +161,7 @@ const testSubmissionWReview = {
     url: 'https://s3.amazonaws.com/test-submission/123456',
     memberId: 40493050,
     legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
-    submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
+    submissionPhaseId: 764567,
     review: [
       {
         id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
@@ -209,7 +209,7 @@ const testSubmissionPatch = {
     url: 'https://s3.amazonaws.com/test-submission/123456',
     memberId: 40493050,
     legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0502',
-    submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0502',
+    submissionPhaseId: 764567,
     created: '2018-05-20T07:00:30.123Z',
     createdBy: 'topcoder user',
     updated: '2018-06-01T07:36:28.178Z',
@@ -234,7 +234,7 @@ const testSubmissionES = {
          url: 'https://s3.amazonaws.com/test-submission/123456',
          memberId: 40493050,
          legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
-         submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
+         submissionPhaseId: 764567,
          created: '2018-05-20T07:00:30.123Z',
          createdBy: 'topcoder user',
          updated: '2018-06-01T07:36:28.178Z',