diff --git a/src/controllers/ScanController.ts b/src/controllers/ScanController.ts index 272a9ee..259727c 100644 --- a/src/controllers/ScanController.ts +++ b/src/controllers/ScanController.ts @@ -1,9 +1,10 @@ -import { Authorized, Body, Get, JsonController, OnUndefined, Param, Post } from 'routing-controllers'; +import { Authorized, Body, Delete, Get, JsonController, OnUndefined, Param, Post, QueryParam } from 'routing-controllers'; import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { ScanNotFoundError } from '../errors/ScanErrors'; import { CreateScan } from '../models/actions/CreateScan'; import { Scan } from '../models/entities/Scan'; +import { ResponseEmpty } from '../models/responses/ResponseEmpty'; import { ResponseScan } from '../models/responses/ResponseScan'; import { ResponseTrackScan } from '../models/responses/ResponseTrackScan'; @@ -77,24 +78,18 @@ export class ScanController { // return new ResponseDonor(await this.donorRepository.findOne({ id: id })); // } - // @Delete('/:id') - // @Authorized("DONOR:DELETE") - // @ResponseSchema(ResponseDonor) - // @ResponseSchema(ResponseEmpty, { statusCode: 204 }) - // @OnUndefined(204) - // @OpenAPI({ description: 'Delete the runner whose id you provided.
If no runner with this id exists it will just return 204(no content).' }) - // async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { - // let donor = await this.donorRepository.findOne({ id: id }); - // if (!donor) { return null; } - // const responseDonor = await this.donorRepository.findOne(donor); + @Delete('/:id') + @Authorized("SCAN:DELETE") + @ResponseSchema(ResponseScan) + @ResponseSchema(ResponseEmpty, { statusCode: 204 }) + @OnUndefined(204) + @OpenAPI({ description: 'Delete the runner whose id you provided.
If no runner with this id exists it will just return 204(no content).' }) + async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { + let scan = await this.scanRepository.findOne({ id: id }); + if (!scan) { return null; } + const responseScan = await this.scanRepository.findOne({ id: scan.id }, { relations: ["runner"] }); - // if (!donor) { - // throw new DonorNotFoundError(); - // } - - // //TODO: DELETE DONATIONS AND WARN FOR FORCE (https://git.odit.services/lfk/backend/issues/66) - - // await this.donorRepository.delete(donor); - // return new ResponseDonor(responseDonor); - // } + await this.scanRepository.delete(scan); + return responseScan.toResponse(); + } }