Skip to content

Commit a6814b6

Browse files
samarpan1738samarpan1738
authored
Remove dev feature flag for POST /requests and PUT /requests/:id APIs (#2153)
* chore: remove feature flag for POST /requests API * chore: remove feature flag for PUT /requests/:id API * chore: remove dev query param from request query type * chore: remove empty query from POST /requests API middleware test
1 parent edadf41 commit a6814b6

File tree

4 files changed

+35
-78
lines changed

4 files changed

+35
-78
lines changed

‎middlewares/validators/requests.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ export const createRequestsMiddleware = async (
1616
next: NextFunction
1717
) => {
1818
const type = req.body.type;
19-
// TODO: Remove this check once feature is tested and ready to be used
20-
if ( req.query.dev !== "true") {
21-
return res.boom.badRequest("Please use feature flag to make this requests");
22-
}
2319

2420
try {
2521
switch (type) {
@@ -49,10 +45,6 @@ export const updateRequestsMiddleware = async (
4945
res: CustomResponse,
5046
next: NextFunction
5147
) => {
52-
// TODO: Remove this check once feature is tested and ready to be used
53-
if ( req.query.dev !== "true") {
54-
return res.boom.badRequest("Please use feature flag to make this requests");
55-
}
5648
const schema = joi
5749
.object()
5850
.strict()

‎test/integration/requests.test.ts‎

Lines changed: 35 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe("/requests OOO", function () {
7171
it("should return 401 if user is not logged in", function (done) {
7272
chai
7373
.request(app)
74-
.post("/requests?dev=true")
74+
.post("/requests")
7575
.send(validOooStatusRequests)
7676
.end(function (err, res) {
7777
expect(res).to.have.status(401);
@@ -82,7 +82,7 @@ describe("/requests OOO", function () {
8282
it("should create a new request", function (done) {
8383
chai
8484
.request(app)
85-
.post("/requests?dev=true")
85+
.post("/requests")
8686
.set("cookie", `${cookieName}=${authToken}`)
8787
.send(validOooStatusRequests)
8888
.end(function (err, res) {
@@ -96,12 +96,12 @@ describe("/requests OOO", function () {
9696
it("should return 400, if already created request is created again", async function () {
9797
await chai
9898
.request(app)
99-
.post("/requests?dev=true")
99+
.post("/requests")
100100
.set("cookie", `${cookieName}=${authToken}`)
101101
.send(validOooStatusRequests);
102102
const response = await chai
103103
.request(app)
104-
.post("/requests?dev=true")
104+
.post("/requests")
105105
.set("cookie", `${cookieName}=${authToken}`)
106106
.send(validOooStatusRequests);
107107
expect(response).to.have.status(400);
@@ -112,7 +112,7 @@ describe("/requests OOO", function () {
112112
it("should create a new request and have all the required fields in the response", function (done) {
113113
chai
114114
.request(app)
115-
.post("/requests?dev=true")
115+
.post("/requests")
116116
.set("cookie", `${cookieName}=${authToken}`)
117117
.send(validOooStatusRequests)
118118
.end(function (err, res) {
@@ -128,24 +128,10 @@ describe("/requests OOO", function () {
128128
});
129129
});
130130

131-
it("should return error if feature flag is not used", function (done) {
132-
chai
133-
.request(app)
134-
.post("/requests")
135-
.set("cookie", `${cookieName}=${authToken}`)
136-
.send(validOooStatusRequests)
137-
.end(function (err, res) {
138-
expect(res).to.have.status(400);
139-
expect(res.body).to.have.property("message");
140-
expect(res.body.message).to.equal("Please use feature flag to make this requests");
141-
done();
142-
});
143-
});
144-
145131
it("should create a new request", function (done) {
146132
chai
147133
.request(app)
148-
.post("/requests?dev=true")
134+
.post("/requests")
149135
.set("cookie", `${cookieName}=${authToken}`)
150136
.send(validOooStatusRequests)
151137
.end(function (err, res) {
@@ -160,7 +146,7 @@ describe("/requests OOO", function () {
160146
const type = "ACTIVE";
161147
chai
162148
.request(app)
163-
.post("/requests?dev=true")
149+
.post("/requests")
164150
.set("cookie", `${cookieName}=${authToken}`)
165151
.send({ ...validOooStatusRequests, type })
166152
.end(function (err, res) {
@@ -174,7 +160,7 @@ describe("/requests OOO", function () {
174160
it("should return error if message is not present in body", function (done) {
175161
chai
176162
.request(app)
177-
.post("/requests?dev=true")
163+
.post("/requests")
178164
.set("cookie", `${cookieName}=${authToken}`)
179165
.send(_.omit(validOooStatusRequests, "message"))
180166
.end(function (err, res) {
@@ -188,7 +174,7 @@ describe("/requests OOO", function () {
188174
it("should return error if state in the body is not PENDING", function (done) {
189175
chai
190176
.request(app)
191-
.post("/requests?dev=true")
177+
.post("/requests")
192178
.set("cookie", `${cookieName}=${authToken}`)
193179
.send({ ...validOooStatusRequests, state: REQUEST_STATE.APPROVED })
194180
.end(function (err, res) {
@@ -204,7 +190,7 @@ describe("/requests OOO", function () {
204190
it("should return 401 if user is not logged in", function (done) {
205191
chai
206192
.request(app)
207-
.put(`/requests/${oooRequestId}?dev=true`)
193+
.put(`/requests/${oooRequestId}`)
208194
.send(validOooStatusUpdate)
209195
.end(function (err, res) {
210196
expect(res).to.have.status(401);
@@ -215,7 +201,7 @@ describe("/requests OOO", function () {
215201
it("should approved a request", function (done) {
216202
chai
217203
.request(app)
218-
.put(`/requests/${pendingOooRequestId}?dev=true`)
204+
.put(`/requests/${pendingOooRequestId}`)
219205
.set("cookie", `${cookieName}=${superUserToken}`)
220206
.send(validOooStatusUpdate)
221207
.end(function (err, res) {
@@ -226,25 +212,11 @@ describe("/requests OOO", function () {
226212
});
227213
});
228214

229-
it("should update a request", function (done) {
230-
chai
231-
.request(app)
232-
.put(`/requests/${pendingOooRequestId}`)
233-
.set("cookie", `${cookieName}=${superUserToken}`)
234-
.send(validOooStatusUpdate)
235-
.end(function (err, res) {
236-
expect(res).to.have.status(400);
237-
expect(res.body).to.have.property("message");
238-
expect(res.body.message).to.equal("Please use feature flag to make this requests");
239-
done();
240-
});
241-
});
242-
243215
it("should return error if wrong type is passed", function (done) {
244216
const type = "ACTIVE";
245217
chai
246218
.request(app)
247-
.put(`/requests/${pendingOooRequestId}?dev=true`)
219+
.put(`/requests/${pendingOooRequestId}`)
248220
.set("cookie", `${cookieName}=${superUserToken}`)
249221
.send({ ...validOooStatusUpdate, type })
250222
.end(function (err, res) {
@@ -258,7 +230,7 @@ describe("/requests OOO", function () {
258230
it("should return 404 if request does not exist", function (done) {
259231
chai
260232
.request(app)
261-
.put(`/requests/invalidoooRequestId?dev=true`)
233+
.put(`/requests/invalidoooRequestId`)
262234
.set("cookie", `${cookieName}=${superUserToken}`)
263235
.send(validOooStatusUpdate)
264236
.end(function (err, res) {
@@ -272,7 +244,7 @@ describe("/requests OOO", function () {
272244
it("should return 400 if request is already approved", function (done) {
273245
chai
274246
.request(app)
275-
.put(`/requests/${approvedOooRequestId}?dev=true`)
247+
.put(`/requests/${approvedOooRequestId}`)
276248
.set("cookie", `${cookieName}=${superUserToken}`)
277249
.send(validOooStatusUpdate)
278250
.end(function (err, res) {
@@ -455,7 +427,7 @@ describe("/requests Extension", function () {
455427
it("should return 401(Unauthorized) if user is not logged in", function (done) {
456428
chai
457429
.request(app)
458-
.post("/requests?dev=true")
430+
.post("/requests")
459431
.send(extensionRequest)
460432
.end(function (err, res) {
461433
expect(res).to.have.status(401);
@@ -469,7 +441,7 @@ describe("/requests Extension", function () {
469441
};
470442
chai
471443
.request(app)
472-
.post("/requests?dev=true")
444+
.post("/requests")
473445
.set("cookie", `${cookieName}=${userJwtToken1}`)
474446
.send(extensionRequestObj)
475447
.end(function (err, res) {
@@ -487,7 +459,7 @@ describe("/requests Extension", function () {
487459
};
488460
chai
489461
.request(app)
490-
.post("/requests?dev=true")
462+
.post("/requests")
491463
.set("cookie", `${cookieName}=${superUserJwtToken}`)
492464
.send(extensionRequestObj)
493465
.end(function (err, res) {
@@ -505,7 +477,7 @@ describe("/requests Extension", function () {
505477
};
506478
chai
507479
.request(app)
508-
.post("/requests?dev=true")
480+
.post("/requests")
509481
.set("cookie", `${cookieName}=${userJwtToken2}`)
510482
.send(extensionRequestObj)
511483
.end(function (err, res) {
@@ -523,7 +495,7 @@ describe("/requests Extension", function () {
523495
};
524496
chai
525497
.request(app)
526-
.post("/requests?dev=true")
498+
.post("/requests")
527499
.set("cookie", `${cookieName}=${userJwtToken1}`)
528500
.send(extensionRequestObj)
529501
.end(function (err, res) {
@@ -541,7 +513,7 @@ describe("/requests Extension", function () {
541513
};
542514
chai
543515
.request(app)
544-
.post("/requests?dev=true")
516+
.post("/requests")
545517
.set("cookie", `${cookieName}=${userJwtToken1}`)
546518
.send(extensionRequestObj)
547519
.end(function (err, res) {
@@ -560,7 +532,7 @@ describe("/requests Extension", function () {
560532
};
561533
chai
562534
.request(app)
563-
.post("/requests?dev=true")
535+
.post("/requests")
564536
.set("cookie", `${cookieName}=${userJwtToken1}`)
565537
.send(extensionRequestObj)
566538
.end(function (err, res) {
@@ -578,7 +550,7 @@ describe("/requests Extension", function () {
578550
};
579551
chai
580552
.request(app)
581-
.post("/requests?dev=true")
553+
.post("/requests")
582554
.set("cookie", `${cookieName}=${userJwtToken1}`)
583555
.send(extensionRequestObj)
584556
.end(async function (err, res) {
@@ -592,7 +564,7 @@ describe("/requests Extension", function () {
592564
};
593565
const response = await chai
594566
.request(app)
595-
.post("/requests?dev=true")
567+
.post("/requests")
596568
.set("cookie", `${cookieName}=${userJwtToken1}`)
597569
.send(extensionRequestObj2);
598570
expect(response).to.have.status(400);
@@ -642,7 +614,7 @@ describe("/requests Extension", function () {
642614
it("should return 401(Unauthorized) if user is not logged in", function (done) {
643615
chai
644616
.request(app)
645-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
617+
.put(`/requests/${pendingExtensionRequestId}`)
646618
.send(approvedExtensionRequest)
647619
.end(function (err, res) {
648620
expect(res).to.have.status(401);
@@ -655,7 +627,7 @@ describe("/requests Extension", function () {
655627
it("should return 401 if user is not super user", function (done) {
656628
chai
657629
.request(app)
658-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
630+
.put(`/requests/${pendingExtensionRequestId}`)
659631
.set("cookie", `${cookieName}=${userJwtToken1}`)
660632
.send(approvedExtensionRequest)
661633
.end(function (err, res) {
@@ -669,7 +641,7 @@ describe("/requests Extension", function () {
669641
it("should return 400(Bad Request) if request is already approved", function (done) {
670642
chai
671643
.request(app)
672-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
644+
.put(`/requests/${pendingExtensionRequestId}`)
673645
.set("cookie", `${cookieName}=${superUserJwtToken}`)
674646
.send(approvedExtensionRequest)
675647
.end(function (err, res) {
@@ -680,7 +652,7 @@ describe("/requests Extension", function () {
680652

681653
chai
682654
.request(app)
683-
.put(`/requests/${id}?dev=true`)
655+
.put(`/requests/${id}`)
684656
.set("cookie", `${cookieName}=${superUserJwtToken}`)
685657
.send(approvedExtensionRequest)
686658
.end(function (err, res) {
@@ -695,7 +667,7 @@ describe("/requests Extension", function () {
695667
it("should return 400(Bad Request) if request is already rejected", function (done) {
696668
chai
697669
.request(app)
698-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
670+
.put(`/requests/${pendingExtensionRequestId}`)
699671
.set("cookie", `${cookieName}=${superUserJwtToken}`)
700672
.send(rejectedExtensionRequest)
701673
.end(function (err, res) {
@@ -706,7 +678,7 @@ describe("/requests Extension", function () {
706678

707679
chai
708680
.request(app)
709-
.put(`/requests/${id}?dev=true`)
681+
.put(`/requests/${id}`)
710682
.set("cookie", `${cookieName}=${superUserJwtToken}`)
711683
.send(rejectedExtensionRequest)
712684
.end(function (err, res) {
@@ -721,7 +693,7 @@ describe("/requests Extension", function () {
721693
it("should approve an extension request", function (done) {
722694
chai
723695
.request(app)
724-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
696+
.put(`/requests/${pendingExtensionRequestId}`)
725697
.set("cookie", `${cookieName}=${superUserJwtToken}`)
726698
.send(approvedExtensionRequest)
727699
.end(function (err, res) {
@@ -733,7 +705,7 @@ describe("/requests Extension", function () {
733705
it("should return 400(Bad Request) if invalid state is passed", function (done) {
734706
chai
735707
.request(app)
736-
.put(`/requests/${pendingExtensionRequestId}?dev=true`)
708+
.put(`/requests/${pendingExtensionRequestId}`)
737709
.set("cookie", `${cookieName}=${superUserJwtToken}`)
738710
.send(invalidExtensionRequest)
739711
.end(function (err, res) {
@@ -747,7 +719,7 @@ describe("/requests Extension", function () {
747719
it("should return 404(Not Found) if request does not exist", function (done) {
748720
chai
749721
.request(app)
750-
.put(`/requests/randomId?dev=true`)
722+
.put(`/requests/randomId`)
751723
.set("cookie", `${cookieName}=${superUserJwtToken}`)
752724
.send(approvedExtensionRequest)
753725
.end(function (err, res) {
@@ -779,7 +751,7 @@ describe("/requests Task", function () {
779751
it("should return 401(Unauthorized) if user is not logged in", function (done) {
780752
chai
781753
.request(app)
782-
.post("/requests?dev=true")
754+
.post("/requests")
783755
.send(validTaskCreqtionRequest)
784756
.end(function (err, res) {
785757
expect(res).to.have.status(401);
@@ -793,7 +765,7 @@ describe("/requests Task", function () {
793765
taskRequestObj.userId = userId1;
794766
chai
795767
.request(app)
796-
.post("/requests?dev=true")
768+
.post("/requests")
797769
.set("cookie", `${cookieName}=${userJwtToken1}`)
798770
.send(taskRequestObj)
799771
.end(function (err, res) {
@@ -809,7 +781,7 @@ describe("/requests Task", function () {
809781
delete taskRequestObj.taskId;
810782
chai
811783
.request(app)
812-
.post("/requests?dev=true")
784+
.post("/requests")
813785
.set("cookie", `${cookieName}=${userJwtToken1}`)
814786
.send(taskRequestObj)
815787
.end(function (err, res) {

‎test/unit/middlewares/requests.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ describe("Create Request Validators", function () {
3131
it("should pass validation for a valid create request", async function () {
3232
req = {
3333
body: validOooStatusRequests,
34-
query: {
35-
dev: "true",
36-
},
3734
};
3835
res = {};
3936
await createRequestsMiddleware(req as OooRequestCreateRequest, res as OooRequestResponse, nextSpy);
@@ -43,9 +40,6 @@ describe("Create Request Validators", function () {
4340
it("should throw an error for an invalid create request", async function () {
4441
req = {
4542
body: invalidOooStatusRequests,
46-
query: {
47-
dev: "true",
48-
},
4943
};
5044
res = {
5145
boom: {

‎types/requests.d.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export type UpdateRequestBody = {
99
};
1010

1111
export type RequestQuery = {
12-
dev?: string;
1312
type?: string;
1413
requestedBy?: string;
1514
state?: REQUEST_STATE.APPROVED | REQUEST_STATE.PENDING | REQUEST_STATE.REJECTED;

0 commit comments

Comments
 (0)