Skip to content

Commit edadf41

Browse files
authored
Remove dev feature flag for GET /requests API (#2151)
* chore: remove feature flag for GET /requests API * chore: remove empty query from GET /requests middleware test
1 parent 63e945c commit edadf41

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

controllers/requests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const getRequestsController = async (req: any, res: any) => {
5757
}
5858

5959
if (page) {
60-
const pageLink = `/requests?page=${page}&dev=${query.dev}`;
60+
const pageLink = `/requests?page=${page}`;
6161
return res.status(200).json({
6262
message: REQUEST_FETCHED_SUCCESSFULLY,
6363
data: allRequests,

middlewares/validators/requests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const updateRequestsMiddleware = async (
8383

8484
export const getRequestsMiddleware = async (req: OooRequestCreateRequest, res: OooRequestResponse, next: NextFunction) => {
8585
const schema = joi.object().keys({
86-
dev: joi.bool().sensitive(), // TODO: Remove this validator once feature is tested and ready to be used
86+
dev: joi.bool().sensitive().optional(), // TODO: Remove this validator once feature is tested and ready to be used
8787
id: joi.string().optional(),
8888
type: joi
8989
.string()

test/integration/requests.test.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ describe("/requests OOO", function () {
288288
it("should return all requests", function (done) {
289289
chai
290290
.request(app)
291-
.get("/requests?dev=true")
291+
.get("/requests")
292292
.end(function (err, res) {
293293
expect(res).to.have.status(200);
294294
expect(res.body.data).to.have.lengthOf(2);
@@ -304,7 +304,7 @@ describe("/requests OOO", function () {
304304
it("should return all requests by specific user", function (done) {
305305
chai
306306
.request(app)
307-
.get(`/requests?dev=true&requestedBy=${userData[16].username}`)
307+
.get(`/requests?requestedBy=${userData[16].username}`)
308308
.end(function (err, res) {
309309
expect(res).to.have.status(200);
310310
expect(res.body.data.every((request: any) => request.requestedBy === testUserId));
@@ -315,7 +315,7 @@ describe("/requests OOO", function () {
315315
it("should return all requests by specific user and state", function (done) {
316316
chai
317317
.request(app)
318-
.get(`/requests?dev=true&state=APPROVED&requestedBy=${userData[16].username}`)
318+
.get(`/requests?state=APPROVED&requestedBy=${userData[16].username}`)
319319
.end(function (err, res) {
320320
expect(res).to.have.status(200);
321321
expect(res.body.data.every((e: any) => e.state === "APPROVED"));
@@ -327,7 +327,7 @@ describe("/requests OOO", function () {
327327
it("should return request of type OOO", function (done) {
328328
chai
329329
.request(app)
330-
.get("/requests?dev=true&type=OOO")
330+
.get("/requests?type=OOO")
331331
.end(function (err, res) {
332332
expect(res).to.have.status(200);
333333
expect(res.body.data.every((e: any) => e.type === "OOO"));
@@ -338,7 +338,7 @@ describe("/requests OOO", function () {
338338
it("should return empty array is no data is found, for specific state and user", function (done) {
339339
chai
340340
.request(app)
341-
.get("/requests?dev=true&requestedBy=testUser2&state=APPROVED")
341+
.get("/requests?requestedBy=testUser2&state=APPROVED")
342342
.end(function (err, res) {
343343
expect(res).to.have.status(204);
344344
done();
@@ -348,7 +348,7 @@ describe("/requests OOO", function () {
348348
it("should return empty array is no data is found", function (done) {
349349
chai
350350
.request(app)
351-
.get("/requests?dev=true&requestedBy=testUserRandom")
351+
.get("/requests?requestedBy=testUserRandom")
352352
.end(function (err, res) {
353353
expect(res).to.have.status(204);
354354
done();
@@ -358,7 +358,7 @@ describe("/requests OOO", function () {
358358
it("should throw error if request id doesn't match", function (done) {
359359
chai
360360
.request(app)
361-
.get("/requests?dev=true&id=ramdonId1")
361+
.get("/requests?id=ramdonId1")
362362
.end(function (err, res) {
363363
expect(res).to.have.status(204);
364364
done();
@@ -368,7 +368,7 @@ describe("/requests OOO", function () {
368368
it("should return error if not a valid state is passed", function (done) {
369369
chai
370370
.request(app)
371-
.get("/requests?dev=true&state=ACTIVE")
371+
.get("/requests?state=ACTIVE")
372372
.end(function (err, res) {
373373
expect(res).to.have.status(400);
374374
expect(res.body.error).to.equal("Bad Request");
@@ -380,7 +380,7 @@ describe("/requests OOO", function () {
380380
it("should return error if not a valid type is passed", function (done) {
381381
chai
382382
.request(app)
383-
.get("/requests?dev=true&type=RANDOM")
383+
.get("/requests?type=RANDOM")
384384
.end(function (err, res) {
385385
expect(res).to.have.status(400);
386386
expect(res.body.error).to.equal("Bad Request");

test/unit/middlewares/requests.test.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,7 @@ describe("Create Request Validators", function () {
9292

9393
describe("Get Request Validator", function () {
9494
it("Should pass validation for a valid get request", async function () {
95-
req = {
96-
query: {
97-
dev: "true",
98-
},
99-
};
95+
req = {};
10096
res = {};
10197
await getRequestsMiddleware(req as any, res as any, nextSpy);
10298
expect(nextSpy.calledOnce).to.equal(true);
@@ -105,7 +101,6 @@ describe("Create Request Validators", function () {
105101
it("Should throw an error for an invalid get request", async function () {
106102
req = {
107103
query: {
108-
dev: "true",
109104
type: "RANDOM",
110105
state: "RANDOM",
111106
},

0 commit comments

Comments
 (0)