Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions src/components/versions/__tests__/controller.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,24 @@ describe("VersionController ", () => {
let request: any = {};
let response: any = {};
let nextFunction: any = {};
const keys = "keys";
const values: any[] = [];
const escapes = "escapes";

beforeAll(() => {
tableName = "versions";
controller = new VersionController(tableName);
request = {
params: {
batchId: "1",
id: "1"
},
};
response = {
status: jest.fn().mockImplementation(() => ({
json: jest.fn(),
send: jest.fn(),
end: jest.fn()
})),
};
nextFunction = jest.fn();
Expand All @@ -40,4 +45,49 @@ describe("VersionController ", () => {
await controller.getVersionsByBatch(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(500);
});

it("patchVersion success", async () => {
const rows = ["TEST"];
controller.readById = jest.fn().mockResolvedValue({ rowCount: 1 });
controller.splitObjectKeyVals = jest.fn().mockReturnValue({ keys, values, escapes});
controller.buildUpdateString = jest.fn().mockResolvedValue({ query: "", idx: 1});
controller.update = jest.fn().mockResolvedValue({});
await controller.patchVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(204);
});

it("patchVersion error", async () => {
const rows = ["TEST"];
controller.readById = jest.fn().mockResolvedValue({ rowCount: 1 });
controller.splitObjectKeyVals = jest.fn().mockReturnValue({ keys, values, escapes});
controller.buildUpdateString = jest.fn().mockResolvedValue({ query: "", idx: 1});
controller.update = jest.fn().mockRejectedValue({});
await controller.patchVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(500);
});

it("patchVersion not found", async () => {
controller.readById = jest.fn().mockResolvedValue({ rowCount: 0 });
controller.splitObjectKeyVals = jest.fn().mockReturnValue({ keys, values, escapes});
await controller.patchVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(404);
});

it("deleteVersion success", async () => {
controller.deleteById = jest.fn().mockResolvedValue({ rowCount: 1 });
await controller.deleteVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(200);
});

it("deleteVersion error", async () => {
controller.deleteById = jest.fn().mockRejectedValue({});
await controller.deleteVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(response.status).toHaveBeenCalledWith(500);
});

it("deleteVersion not found", async () => {
controller.deleteById = jest.fn().mockResolvedValue({ rowCount: 0 });
await controller.deleteVersion(request as Request, response as Response, nextFunction as NextFunction);
expect(nextFunction).toHaveBeenCalled();
});
});
61 changes: 60 additions & 1 deletion src/components/versions/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { IPostgresController, PostgresController } from "../../dal/postgres";

export interface IVersionController extends IPostgresController {
getVersionsByBatch: RequestHandler;
patchVersion: RequestHandler;
deleteVersion: RequestHandler;
}

/**
Expand All @@ -22,7 +24,7 @@ export class VersionController extends PostgresController implements IVersionCon
}

/**
* Returns all versions from the cooresponding batch
* Returns all versions from the coresponding batch
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
Expand All @@ -39,4 +41,61 @@ export class VersionController extends PostgresController implements IVersionCon
}
}

/**
* Patches an existing version.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @memberof VersionController
*/
public async patchVersion(req: Request, res: Response, next: NextFunction) {
// Find current entity
const results = await this.readById(req.params.id);

const { keys, values, escapes } = this.splitObjectKeyVals(req.body);

// if the item does not exist
if (results.rowCount === 0) {
res.status(404).end();
} else {
try {
// set an update
const { query, idx } = await this.buildUpdateString(keys);
values.push(req.params.id);

// update the entity
await this.update(query, `id = \$${idx}`, values);

res.status(204).end();
} catch (err) {
res.status(500).send(Boom.badRequest(err));
}
}
}

/**
* Deletes a version.
* @param {Request} req
* @param {Response} res
* @param {NextFunction} next
* @memberof VersionController
*/
public async deleteVersion(req: Request, res: Response, next: NextFunction) {
try {
// remove the version
const version = await this.deleteById(req.params.id);

if (version.rowCount > 0) {
res.status(200).json({
deletedVersions: version.rowCount,
msg: "Success",
});
} else {
next();
}
} catch (err) {
res.status(500).send(Boom.badImplementation(err));
}
}

}
9 changes: 8 additions & 1 deletion src/components/versions/routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Boom from "boom";
import { NextFunction, Request, Response, Router } from "express";
import { IVersionController, VersionController } from "./controller";
import { requireAuthentication } from "../../middleware/auth";

// tslint:disable: no-unsafe-any

Expand All @@ -19,9 +20,15 @@ export function routes(): Router {
// [GET] section
router.get("/batch/:batchId", async (req, res, next) => controller.getVersionsByBatch(req, res, next));

// [PATCH] section
router.patch("/id/:id", requireAuthentication, async (req, res, next) => controller.patchVersion(req, res, next));

// [DELETE] section
router.delete("/id/:id", requireAuthentication, async (req, res, next) => controller.deleteVersion(req, res, next));

router.use(
"*",
(req: Request, res: Response) => res.status(400).send(Boom.badRequest(`${req.originalUrl} doesn't exist`)),
(req: Request, res: Response) => res.status(404).send(Boom.badRequest(`${req.originalUrl} doesn't exist`)),
);

return router;
Expand Down