Skip to content

Commit b08cf17

Browse files
meshdemeshde
committed
Change legacyReviewId datatype from UUID to int
1 parent 54e5660 commit b08cf17

File tree

7 files changed

+44
-48
lines changed

7 files changed

+44
-48
lines changed

‎docs/Submission API.postman_collection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@
825825
],
826826
"body": {
827827
"mode": "raw",
828-
"raw": "{\n\t\"score\": 92.5,\n\t\"legacyReviewId\": \"6b4faff1-7685-4866-a2e3-24afabf5c2c9\",\n\t\"scoreCardId\": 123456789,\n\t\"submissionId\": \"{{submissionID}}\",\n\t\"status\": \"queued\",\n\t\"typeId\": \"c56a4180-65aa-42ec-a945-5fd21dec0503\",\n\t\"reviewerId\": \"c56a4180-65aa-42ec-a945-5fd21d3d26f8\"\n}"
828+
"raw": "{\n\t\"score\": 92.5,\n\t\"legacyReviewId\": 123456788,\n\t\"scoreCardId\": 123456789,\n\t\"submissionId\": \"{{submissionID}}\",\n\t\"status\": \"queued\",\n\t\"typeId\": \"c56a4180-65aa-42ec-a945-5fd21dec0503\",\n\t\"reviewerId\": \"c56a4180-65aa-42ec-a945-5fd21d3d26f8\"\n}"
829829
},
830830
"url": {
831831
"raw": "{{URL}}/reviews",
@@ -1405,7 +1405,7 @@
14051405
],
14061406
"body": {
14071407
"mode": "raw",
1408-
"raw": "{\n\t\"score\": 90.5,\n\t\"legacyReviewId\": \"6b4faff1-7685-4866-a2e3-24afabf5c2c9\",\n\t\"scoreCardId\": 123456789,\n\t\"submissionId\": \"{{submissionID}}\",\n\t\"status\": \"completed\",\n\t\"typeId\": \"c56a4180-65aa-42ec-a945-5fd21dec0503\",\n\t\"reviewerId\": \"c56a4180-65aa-42ec-a945-5fd21d3d26f8\"\n}"
1408+
"raw": "{\n\t\"score\": 90.5,\n\t\"legacyReviewId\": 123456789,\n\t\"scoreCardId\": 123456789,\n\t\"submissionId\": \"{{submissionID}}\",\n\t\"status\": \"completed\",\n\t\"typeId\": \"c56a4180-65aa-42ec-a945-5fd21dec0503\",\n\t\"reviewerId\": \"c56a4180-65aa-42ec-a945-5fd21d3d26f8\"\n}"
14091409
},
14101410
"url": {
14111411
"raw": "{{URL}}/reviews/{{reviewID}}",
@@ -3179,4 +3179,4 @@
31793179
]
31803180
}
31813181
]
3182-
}
3182+
}

‎docs/swagger.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ paths:
930930
example:
931931
- id: 'a12a4180-65aa-42ec-a945-5fd21dec0503'
932932
score: 95.5
933-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1'
933+
legacyReviewId: 1234567891
934934
typeId: 'c56a4180-65aa-42ec-a945-5fd21dec0503'
935935
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503'
936936
scoreCardId: 123456789
@@ -942,7 +942,7 @@ paths:
942942
updatedBy: 'admin'
943943
- id: 'a23c4180-65aa-42ec-a945-5fd21dec0503'
944944
score: 73.2
945-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c4'
945+
legacyReviewId: 1234567892
946946
typeId: 'c56a4180-65aa-42ec-a945-5fd21dec0503'
947947
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503'
948948
scoreCardId: 123456789
@@ -1620,7 +1620,7 @@ parameters:
16201620
name: review.legacyReviewId
16211621
description: The legacy review id filter of the reviews associated with the submission.
16221622
required: false
1623-
type: string
1623+
type: integer
16241624

16251625
filterSubmissionReviewTypeId:
16261626
in: query
@@ -1735,7 +1735,7 @@ parameters:
17351735
name: legacyReviewId
17361736
description: The legacy review id filter for reviews.
17371737
required: false
1738-
type: string
1738+
type: integer
17391739

17401740
filterReviewTypeId:
17411741
in: query
@@ -2009,9 +2009,9 @@ definitions:
20092009
description: The review score.
20102010
example: 95.5
20112011
legacyReviewId:
2012-
type: string
2012+
type: integer
20132013
description: The legacy review id.
2014-
example: 'a12bc180-65ab-42ec-a945-5fd21dec1567'
2014+
example: 123456789
20152015
typeId:
20162016
type: string
20172017
description: The review type id.

‎scripts/data/Reviews.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"id": "d24d4180-65aa-42ec-a945-5fd21dec0501",
44
"score": 95.5,
5-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c1",
5+
"legacyReviewId": 1234567891,
66
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
77
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
88
"scoreCardId": 123456789,
@@ -15,7 +15,7 @@
1515
{
1616
"id": "d24d4180-65aa-42ec-a945-5fd21dec0502",
1717
"score": 92.0,
18-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c2",
18+
"legacyReviewId": 1234567892,
1919
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0501",
2020
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
2121
"scoreCardId": 123456789,
@@ -28,7 +28,7 @@
2828
{
2929
"id": "d24d4180-65aa-42ec-a945-5fd21dec0503",
3030
"score": 80.83,
31-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c3",
31+
"legacyReviewId": 1234567893,
3232
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
3333
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
3434
"scoreCardId": 123456789,
@@ -41,7 +41,7 @@
4141
{
4242
"id": "d24d4180-65aa-42ec-a945-5fd21dec0504",
4343
"score": 85.62,
44-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c4",
44+
"legacyReviewId": 1234567894,
4545
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
4646
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0502",
4747
"scoreCardId": 123456789,
@@ -54,7 +54,7 @@
5454
{
5555
"id": "d24d4180-65aa-42ec-a945-5fd21dec0505",
5656
"score": 100,
57-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c5",
57+
"legacyReviewId": 1234567895,
5858
"typeId": "f28b2725-ef90-4495-af59-ceb2bd98fc10",
5959
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
6060
"scoreCardId": 123456789,
@@ -67,7 +67,7 @@
6767
{
6868
"id": "d24d4180-65aa-42ec-a945-5fd21dec0506",
6969
"score": 65.0,
70-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c6",
70+
"legacyReviewId": 1234567896,
7171
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
7272
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
7373
"scoreCardId": 123456789,
@@ -80,7 +80,7 @@
8080
{
8181
"id": "d24d4180-65aa-42ec-a945-5fd21dec0507",
8282
"score": 68.0,
83-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c7",
83+
"legacyReviewId": 1234567897,
8484
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
8585
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0502",
8686
"scoreCardId": 123456789,
@@ -93,7 +93,7 @@
9393
{
9494
"id": "d24d4180-65aa-42ec-a945-5fd21dec0508",
9595
"score": 100,
96-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c8",
96+
"legacyReviewId": 1234567898,
9797
"typeId": "f28b2725-ef90-4495-af59-ceb2bd98fc10",
9898
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
9999
"scoreCardId": 123456789,
@@ -106,7 +106,7 @@
106106
{
107107
"id": "d24d4180-65aa-42ec-a945-5fd21dec0509",
108108
"score": 92.5,
109-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c9",
109+
"legacyReviewId": 1234567899,
110110
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
111111
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
112112
"scoreCardId": 123456789,

‎scripts/data/Submissions.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"id": "d24d4180-65aa-42ec-a945-5fd21dec0501",
1111
"score": 95.5,
12-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c1",
12+
"legacyReviewId": 1234567891,
1313
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
1414
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
1515
"scoreCardId": 123456789,
@@ -26,7 +26,7 @@
2626
{
2727
"id": "d24d4180-65aa-42ec-a945-5fd21dec0502",
2828
"score": 92.0,
29-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c2",
29+
"legacyReviewId": 1234567892,
3030
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0501",
3131
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
3232
"scoreCardId": 123456789,
@@ -80,7 +80,7 @@
8080
{
8181
"id": "d24d4180-65aa-42ec-a945-5fd21dec0503",
8282
"score": 80.83,
83-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c9",
83+
"legacyReviewId": 1234567899,
8484
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
8585
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
8686
"scoreCardId": 123456789,
@@ -97,7 +97,7 @@
9797
{
9898
"id": "d24d4180-65aa-42ec-a945-5fd21dec0504",
9999
"score": 85.62,
100-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c8",
100+
"legacyReviewId": 1234567898,
101101
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
102102
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0502",
103103
"scoreCardId": 123456789,
@@ -114,7 +114,7 @@
114114
{
115115
"id": "d24d4180-65aa-42ec-a945-5fd21dec0505",
116116
"score": 100,
117-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c7",
117+
"legacyReviewId": 1234567897,
118118
"typeId": "f28b2725-ef90-4495-af59-ceb2bd98fc10",
119119
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
120120
"scoreCardId": 123456789,
@@ -144,7 +144,7 @@
144144
{
145145
"id": "d24d4180-65aa-42ec-a945-5fd21dec0506",
146146
"score": 65.0,
147-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c3",
147+
"legacyReviewId": 1234567893,
148148
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
149149
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
150150
"scoreCardId": 123456789,
@@ -161,7 +161,7 @@
161161
{
162162
"id": "d24d4180-65aa-42ec-a945-5fd21dec0507",
163163
"score": 68.0,
164-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c4",
164+
"legacyReviewId": 1234567894,
165165
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
166166
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0502",
167167
"scoreCardId": 123456789,
@@ -191,7 +191,7 @@
191191
{
192192
"id": "d24d4180-65aa-42ec-a945-5fd21dec0508",
193193
"score": 100,
194-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c5",
194+
"legacyReviewId": 1234567895,
195195
"typeId": "f28b2725-ef90-4495-af59-ceb2bd98fc10",
196196
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
197197
"scoreCardId": 123456789,
@@ -221,7 +221,7 @@
221221
{
222222
"id": "d24d4180-65aa-42ec-a945-5fd21dec0509",
223223
"score": 92.5,
224-
"legacyReviewId": "6b4faff1-7685-4866-a2e3-24afabf5c2c6",
224+
"legacyReviewId": 1234567896,
225225
"typeId": "c56a4180-65aa-42ec-a945-5fd21dec0503",
226226
"reviewerId": "c23a4180-65aa-42ec-a945-5fd21dec0503",
227227
"scoreCardId": 123456789,

‎src/services/ReviewService.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function* listReviews(query) {
9494

9595
const listReviewsQuerySchema = {
9696
score: joi.score(),
97-
legacyReviewId: joi.string().uuid(),
97+
legacyReviewId: joi.id(),
9898
typeId: joi.string().uuid(),
9999
reviewerId: joi.alternatives().try(joi.id(), joi.string().uuid()),
100100
scoreCardId: joi.id(),
@@ -182,9 +182,7 @@ createReview.schema = {
182182
.object()
183183
.keys({
184184
score: joi.score().required(),
185-
legacyReviewId: joi
186-
.string()
187-
.uuid(),
185+
legacyReviewId: joi.id(),
188186
typeId: joi
189187
.string()
190188
.uuid()
@@ -317,9 +315,7 @@ updateReview.schema = {
317315
.object()
318316
.keys({
319317
score: joi.score().required(),
320-
legacyReviewId: joi
321-
.string()
322-
.uuid(),
318+
legacyReviewId: joi.id(),
323319
typeId: joi
324320
.string()
325321
.uuid()
@@ -358,7 +354,7 @@ patchReview.schema = {
358354
.required(),
359355
entity: joi.object().keys({
360356
score: joi.score(),
361-
legacyReviewId: joi.string().uuid(),
357+
legacyReviewId: joi.id(),
362358
typeId: joi.string().uuid(),
363359
reviewerId: joi.alternatives().try(joi.id(), joi.string().uuid()),
364360
scoreCardId: joi.id(),

‎src/services/SubmissionService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ const listSubmissionsQuerySchema = {
205205
perPage: joi.pageSize(),
206206
orderBy: joi.sortOrder(),
207207
'review.score': joi.score(),
208-
'review.legacyReviewId': joi.string().uuid(),
208+
'review.legacyReviewId': joi.id(),
209209
'review.typeId': joi.string().uuid(),
210210
'review.reviewerId': joi.string().uuid(),
211211
'review.scoreCardId': joi.id(),

‎test/common/testData.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ const testSubmissionsES = {
185185
review: [ {
186186
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
187187
score: 92,
188-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
188+
legacyReviewId: 1234567891,
189189
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
190190
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
191191
scoreCardId: 123456789,
@@ -217,7 +217,7 @@ const testSubmissionsES = {
217217
review: [ {
218218
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
219219
score: 92,
220-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
220+
legacyReviewId: 1234567891,
221221
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
222222
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
223223
scoreCardId: 123456789,
@@ -249,7 +249,7 @@ const testSubmissionsES = {
249249
review: [ {
250250
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
251251
score: 92,
252-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
252+
legacyReviewId: 1234567891,
253253
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
254254
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
255255
scoreCardId: 123456789,
@@ -281,7 +281,7 @@ const testSubmissionsES = {
281281
review: [ {
282282
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
283283
score: 92,
284-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
284+
legacyReviewId: 1234567891,
285285
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
286286
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
287287
scoreCardId: 123456789,
@@ -313,7 +313,7 @@ const testSubmissionsES = {
313313
review: [ {
314314
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
315315
score: 92,
316-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
316+
legacyReviewId: 1234567891,
317317
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
318318
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
319319
scoreCardId: 123456789,
@@ -339,7 +339,7 @@ const testReview = {
339339
Item: {
340340
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
341341
score: 92,
342-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
342+
legacyReviewId: 1234567891,
343343
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
344344
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
345345
scoreCardId: 123456789,
@@ -356,7 +356,7 @@ const testReviewPatch = {
356356
Item: {
357357
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
358358
score: 90,
359-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
359+
legacyReviewId: 1234567891,
360360
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
361361
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
362362
scoreCardId: 123456789,
@@ -380,7 +380,7 @@ const testReviewES = {
380380
_source: {
381381
id: 'd24d4180-65aa-42ec-a945-5fd21dec0502',
382382
score: 92,
383-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c3',
383+
legacyReviewId: 1234567893,
384384
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
385385
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
386386
scoreCardId: 123456789,
@@ -405,7 +405,7 @@ const testReviewsES = {
405405
_score: 0,
406406
_source:
407407
{ score: 95.5,
408-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c1',
408+
legacyReviewId: 1234567891,
409409
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
410410
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0501',
411411
status: 'queued',
@@ -422,7 +422,7 @@ const testReviewsES = {
422422
_score: 0,
423423
_source:
424424
{ score: 65,
425-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c2',
425+
legacyReviewId: 1234567892,
426426
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
427427
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0504',
428428
updatedBy: 'admin',
@@ -439,7 +439,7 @@ const testReviewsES = {
439439
_score: 0,
440440
_source:
441441
{ score: 92,
442-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c3',
442+
legacyReviewId: 1234567893,
443443
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
444444
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0502',
445445
updatedBy: 'admin',
@@ -456,7 +456,7 @@ const testReviewsES = {
456456
_score: 0,
457457
_source:
458458
{ score: 80.83,
459-
legacyReviewId: '6b4faff1-7685-4866-a2e3-24afabf5c2c4',
459+
legacyReviewId: 1234567894,
460460
reviewerId: 'c23a4180-65aa-42ec-a945-5fd21dec0503',
461461
submissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0503',
462462
updatedBy: 'admin',

0 commit comments

Comments
 (0)