🚀Bumped version to v0.9.1
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Nicolai Ort 2021-03-29 17:48:53 +02:00
parent 0290b0e5f5
commit a139554e05
4 changed files with 1816 additions and 1816 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@odit/lfk-backend", "name": "@odit/lfk-backend",
"version": "0.9.0", "version": "0.9.1",
"main": "src/app.ts", "main": "src/app.ts",
"repository": "https://git.odit.services/lfk/backend", "repository": "https://git.odit.services/lfk/backend",
"author": { "author": {

View File

@ -1,130 +1,130 @@
import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers'; import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, Put, QueryParam } from 'routing-controllers';
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
import { getConnectionManager, Repository } from 'typeorm'; import { getConnectionManager, Repository } from 'typeorm';
import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors'; import { RunnerCardHasScansError, RunnerCardIdsNotMatchingError, RunnerCardNotFoundError } from '../errors/RunnerCardErrors';
import { RunnerNotFoundError } from '../errors/RunnerErrors'; import { RunnerNotFoundError } from '../errors/RunnerErrors';
import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard'; import { CreateRunnerCard } from '../models/actions/create/CreateRunnerCard';
import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard'; import { UpdateRunnerCard } from '../models/actions/update/UpdateRunnerCard';
import { RunnerCard } from '../models/entities/RunnerCard'; import { RunnerCard } from '../models/entities/RunnerCard';
import { ResponseEmpty } from '../models/responses/ResponseEmpty'; import { ResponseEmpty } from '../models/responses/ResponseEmpty';
import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard'; import { ResponseRunnerCard } from '../models/responses/ResponseRunnerCard';
import { ScanController } from './ScanController'; import { ScanController } from './ScanController';
@JsonController('/cards') @JsonController('/cards')
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] }) @OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
export class RunnerCardController { export class RunnerCardController {
private cardRepository: Repository<RunnerCard>; private cardRepository: Repository<RunnerCard>;
/** /**
* Gets the repository of this controller's model/entity. * Gets the repository of this controller's model/entity.
*/ */
constructor() { constructor() {
this.cardRepository = getConnectionManager().get().getRepository(RunnerCard); this.cardRepository = getConnectionManager().get().getRepository(RunnerCard);
} }
@Get() @Get()
@Authorized("CARD:GET") @Authorized("CARD:GET")
@ResponseSchema(ResponseRunnerCard, { isArray: true }) @ResponseSchema(ResponseRunnerCard, { isArray: true })
@OpenAPI({ description: 'Lists all card.' }) @OpenAPI({ description: 'Lists all card.' })
async getAll() { async getAll() {
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); const cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
cards.forEach(card => { cards.forEach(card => {
responseCards.push(new ResponseRunnerCard(card)); responseCards.push(new ResponseRunnerCard(card));
}); });
return responseCards; return responseCards;
} }
@Get('/:id') @Get('/:id')
@Authorized("CARD:GET") @Authorized("CARD:GET")
@ResponseSchema(ResponseRunnerCard) @ResponseSchema(ResponseRunnerCard)
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) @ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
@OnUndefined(RunnerCardNotFoundError) @OnUndefined(RunnerCardNotFoundError)
@OpenAPI({ description: "Lists all information about the card whose id got provided." }) @OpenAPI({ description: "Lists all information about the card whose id got provided." })
async getOne(@Param('id') id: number) { async getOne(@Param('id') id: number) {
let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); let card = await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
if (!card) { throw new RunnerCardNotFoundError(); } if (!card) { throw new RunnerCardNotFoundError(); }
return card.toResponse(); return card.toResponse();
} }
@Post('/bulk') @Post('/bulk')
@Authorized("CARD:CREATE") @Authorized("CARD:CREATE")
@ResponseSchema(ResponseEmpty, { statusCode: 200 }) @ResponseSchema(ResponseEmpty, { statusCode: 200 })
@OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response. <br> You can provide the 'returnCards' query param if you want to receive the RESPONSERUNNERCARD objects in the response." }) @OpenAPI({ description: "Create blank cards in bulk. <br> Just provide the count as a query param and wait for the 200 response. <br> You can provide the 'returnCards' query param if you want to receive the RESPONSERUNNERCARD objects in the response." })
async postBlancoBulk(@QueryParam("count") count: number, @QueryParam("returnCards") returnCards: boolean = false) { async postBlancoBulk(@QueryParam("count") count: number, @QueryParam("returnCards") returnCards: boolean = false) {
let createPromises = new Array<any>(); let createPromises = new Array<any>();
for (let index = 0; index < count; index++) { for (let index = 0; index < count; index++) {
createPromises.push(this.cardRepository.save({ runner: null, enabled: true })) createPromises.push(this.cardRepository.save({ runner: null, enabled: true }))
} }
const cards = await Promise.all(createPromises); const cards = await Promise.all(createPromises);
if (returnCards) { if (returnCards) {
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
cards.forEach(card => { cards.forEach(card => {
responseCards.push(new ResponseRunnerCard(card)); responseCards.push(new ResponseRunnerCard(card));
}); });
return responseCards; return responseCards;
} }
let response = new ResponseEmpty(); let response = new ResponseEmpty();
response.response = `Created ${count} new blanco cards.` response.response = `Created ${count} new blanco cards.`
return response; return response;
} }
@Post() @Post()
@Authorized("CARD:CREATE") @Authorized("CARD:CREATE")
@ResponseSchema(ResponseRunnerCard) @ResponseSchema(ResponseRunnerCard)
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) @ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
@OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." }) @OpenAPI({ description: "Create a new card. <br> You can provide a associated runner by id but you don't have to." })
async post(@Body({ validate: true }) createCard: CreateRunnerCard) { async post(@Body({ validate: true }) createCard: CreateRunnerCard) {
let card = await createCard.toEntity(); let card = await createCard.toEntity();
card = await this.cardRepository.save(card); card = await this.cardRepository.save(card);
return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); return (await this.cardRepository.findOne({ id: card.id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
} }
@Put('/:id') @Put('/:id')
@Authorized("CARD:UPDATE") @Authorized("CARD:UPDATE")
@ResponseSchema(ResponseRunnerCard) @ResponseSchema(ResponseRunnerCard)
@ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 }) @ResponseSchema(RunnerCardNotFoundError, { statusCode: 404 })
@ResponseSchema(RunnerNotFoundError, { statusCode: 404 }) @ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
@ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 }) @ResponseSchema(RunnerCardIdsNotMatchingError, { statusCode: 406 })
@OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." }) @OpenAPI({ description: "Update the card whose id you provided. <br> Scans created via this card will still be associated with the old runner. <br> Please remember that ids can't be changed." })
async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) { async put(@Param('id') id: number, @Body({ validate: true }) card: UpdateRunnerCard) {
let oldCard = await this.cardRepository.findOne({ id: id }); let oldCard = await this.cardRepository.findOne({ id: id });
if (!oldCard) { if (!oldCard) {
throw new RunnerCardNotFoundError(); throw new RunnerCardNotFoundError();
} }
if (oldCard.id != card.id) { if (oldCard.id != card.id) {
throw new RunnerCardIdsNotMatchingError(); throw new RunnerCardIdsNotMatchingError();
} }
await this.cardRepository.save(await card.update(oldCard)); await this.cardRepository.save(await card.update(oldCard));
return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse(); return (await this.cardRepository.findOne({ id: id }, { relations: ['runner', 'runner.group', 'runner.group.parentGroup'] })).toResponse();
} }
@Delete('/:id') @Delete('/:id')
@Authorized("CARD:DELETE") @Authorized("CARD:DELETE")
@ResponseSchema(ResponseRunnerCard) @ResponseSchema(ResponseRunnerCard)
@ResponseSchema(ResponseEmpty, { statusCode: 204 }) @ResponseSchema(ResponseEmpty, { statusCode: 204 })
@ResponseSchema(RunnerCardHasScansError, { statusCode: 406 }) @ResponseSchema(RunnerCardHasScansError, { statusCode: 406 })
@OnUndefined(204) @OnUndefined(204)
@OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." }) @OpenAPI({ description: "Delete the card whose id you provided. <br> If no card with this id exists it will just return 204(no content). <br> If the card still has scans associated you have to provide the force=true query param (warning: this deletes all scans associated with by this card - please disable it instead or just remove the runner association)." })
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
let card = await this.cardRepository.findOne({ id: id }); let card = await this.cardRepository.findOne({ id: id });
if (!card) { return null; } if (!card) { return null; }
const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans; const cardScans = (await this.cardRepository.findOne({ id: id }, { relations: ["scans"] })).scans;
if (cardScans.length != 0 && !force) { if (cardScans.length != 0 && !force) {
throw new RunnerCardHasScansError(); throw new RunnerCardHasScansError();
} }
const scanController = new ScanController; const scanController = new ScanController;
for (let scan of cardScans) { for (let scan of cardScans) {
await scanController.remove(scan.id, force); await scanController.remove(scan.id, force);
} }
await this.cardRepository.delete(card); await this.cardRepository.delete(card);
return card.toResponse(); return card.toResponse();
} }
} }

View File

@ -1,186 +1,186 @@
import axios from 'axios'; import axios from 'axios';
import { config } from '../../config'; import { config } from '../../config';
const base = "http://localhost:" + config.internal_port const base = "http://localhost:" + config.internal_port
let access_token; let access_token;
let axios_config; let axios_config;
beforeAll(async () => { beforeAll(async () => {
jest.setTimeout(20000); jest.setTimeout(20000);
const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" }); const res = await axios.post(base + '/api/auth/login', { username: "demo", password: "demo" });
access_token = res.data["access_token"]; access_token = res.data["access_token"];
axios_config = { axios_config = {
headers: { "authorization": "Bearer " + access_token }, headers: { "authorization": "Bearer " + access_token },
validateStatus: undefined validateStatus: undefined
}; };
}); });
describe('POST /api/cards illegally', () => { describe('POST /api/cards illegally', () => {
it('non-existant runner input should return 404', async () => { it('non-existant runner input should return 404', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"runner": 999999999999999999999999 "runner": 999999999999999999999999
}, axios_config); }, axios_config);
expect(res.status).toEqual(404); expect(res.status).toEqual(404);
expect(res.headers['content-type']).toContain("application/json") expect(res.headers['content-type']).toContain("application/json")
}); });
}); });
// --------------- // ---------------
describe('POST /api/cards successfully (without runner)', () => { describe('POST /api/cards successfully (without runner)', () => {
it('creating a card with the minimum amount of parameters should return 200', async () => { it('creating a card with the minimum amount of parameters should return 200', async () => {
const res = await axios.post(base + '/api/cards', null, axios_config); const res = await axios.post(base + '/api/cards', null, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": null, "runner": null,
"enabled": true, "enabled": true,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
it('creating a disabled card should return 200', async () => { it('creating a disabled card should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"enabled": false "enabled": false
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": null, "runner": null,
"enabled": false, "enabled": false,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
it('creating a enabled card should return 200', async () => { it('creating a enabled card should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"enabled": true "enabled": true
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": null, "runner": null,
"enabled": true, "enabled": true,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
}); });
// --------------- // ---------------
describe('POST /api/cards successfully (with runner)', () => { describe('POST /api/cards successfully (with runner)', () => {
let added_org; let added_org;
let added_runner; let added_runner;
it('creating a new org with just a name should return 200', async () => { it('creating a new org with just a name should return 200', async () => {
const res1 = await axios.post(base + '/api/organizations', { const res1 = await axios.post(base + '/api/organizations', {
"name": "test123" "name": "test123"
}, axios_config); }, axios_config);
added_org = res1.data added_org = res1.data
expect(res1.status).toEqual(200); expect(res1.status).toEqual(200);
expect(res1.headers['content-type']).toContain("application/json") expect(res1.headers['content-type']).toContain("application/json")
}); });
it('creating a new runner with only needed params should return 200', async () => { it('creating a new runner with only needed params should return 200', async () => {
const res2 = await axios.post(base + '/api/runners', { const res2 = await axios.post(base + '/api/runners', {
"firstname": "first", "firstname": "first",
"lastname": "last", "lastname": "last",
"group": added_org.id "group": added_org.id
}, axios_config); }, axios_config);
added_runner = res2.data; added_runner = res2.data;
expect(res2.status).toEqual(200); expect(res2.status).toEqual(200);
expect(res2.headers['content-type']).toContain("application/json") expect(res2.headers['content-type']).toContain("application/json")
}); });
it('creating a card with the minimum amount of parameters should return 200', async () => { it('creating a card with the minimum amount of parameters should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"runner": added_runner.id "runner": added_runner.id
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": added_runner, "runner": added_runner,
"enabled": true, "enabled": true,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
it('creating a card with runner (no optional params) should return 200', async () => { it('creating a card with runner (no optional params) should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"runner": added_runner.id "runner": added_runner.id
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": added_runner, "runner": added_runner,
"enabled": true, "enabled": true,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
it('creating a enabled card with runner should return 200', async () => { it('creating a enabled card with runner should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"runner": added_runner.id, "runner": added_runner.id,
"enabled": true "enabled": true
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": added_runner, "runner": added_runner,
"enabled": true, "enabled": true,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
it('creating a disabled card with runner should return 200', async () => { it('creating a disabled card with runner should return 200', async () => {
const res = await axios.post(base + '/api/cards', { const res = await axios.post(base + '/api/cards', {
"runner": added_runner.id, "runner": added_runner.id,
"enabled": false "enabled": false
}, axios_config); }, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
delete res.data.id; delete res.data.id;
delete res.data.code; delete res.data.code;
expect(res.data).toEqual({ expect(res.data).toEqual({
"runner": added_runner, "runner": added_runner,
"enabled": false, "enabled": false,
"responseType": "RUNNERCARD" "responseType": "RUNNERCARD"
}); });
}); });
}); });
// --------------- // ---------------
describe('POST /api/cards/bulk successfully', () => { describe('POST /api/cards/bulk successfully', () => {
it('creating a single new bulk card should return 200', async () => { it('creating a single new bulk card should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=1', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
}); });
it('creating a single new bulk card and letting the system return it should return 200', async () => { it('creating a single new bulk card and letting the system return it should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=1&returnCards=true', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=1&returnCards=true', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
expect(res.data[0].id).toBeDefined(); expect(res.data[0].id).toBeDefined();
}); });
it('creating 50 new bulk card should return 200', async () => { it('creating 50 new bulk card should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=50', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
}); });
it('creating 50 new bulk cards and letting the system return it should return 200', async () => { it('creating 50 new bulk cards and letting the system return it should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=50&returnCards=true', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=50&returnCards=true', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
expect(res.data.length).toEqual(50); expect(res.data.length).toEqual(50);
}); });
it('creating 250 new bulk card should return 200', async () => { it('creating 250 new bulk card should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=250', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
}); });
it('creating 2000 new bulk card should return 200', async () => { it('creating 2000 new bulk card should return 200', async () => {
const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config); const res = await axios.post(base + '/api/cards/bulk?count=2000', {}, axios_config);
expect(res.status).toEqual(200); expect(res.status).toEqual(200);
expect(res.headers['content-type']).toContain("application/json"); expect(res.headers['content-type']).toContain("application/json");
}); });
}); });