From 22c1f936c3a770a82dc1a1e6aa136e183d308aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 13 Dec 2022 08:25:18 +0100 Subject: [PATCH 1/2] feat(api-gateway): switch to fetching revisions from reivsions server --- packages/api-gateway/src/Controller/v1/RevisionsController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-gateway/src/Controller/v1/RevisionsController.ts b/packages/api-gateway/src/Controller/v1/RevisionsController.ts index 0fad29b22..b70645014 100644 --- a/packages/api-gateway/src/Controller/v1/RevisionsController.ts +++ b/packages/api-gateway/src/Controller/v1/RevisionsController.ts @@ -12,7 +12,7 @@ export class RevisionsController extends BaseHttpController { @httpGet('/') async getRevisions(request: Request, response: Response): Promise { - await this.httpService.callSyncingServer(request, response, `items/${request.params.item_id}/revisions`) + await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`) } @httpGet('/:id') From 60b3dd6138ef9b8e9a717873548afc2d3924a0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Mon, 16 Jan 2023 09:40:07 +0100 Subject: [PATCH 2/2] feat(api-gateway): add all revisions endpoints on v2 --- .../src/Controller/v1/RevisionsController.ts | 2 +- .../Controller/v2/RevisionsControllerV2.ts | 25 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/api-gateway/src/Controller/v1/RevisionsController.ts b/packages/api-gateway/src/Controller/v1/RevisionsController.ts index b70645014..0fad29b22 100644 --- a/packages/api-gateway/src/Controller/v1/RevisionsController.ts +++ b/packages/api-gateway/src/Controller/v1/RevisionsController.ts @@ -12,7 +12,7 @@ export class RevisionsController extends BaseHttpController { @httpGet('/') async getRevisions(request: Request, response: Response): Promise { - await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`) + await this.httpService.callSyncingServer(request, response, `items/${request.params.item_id}/revisions`) } @httpGet('/:id') diff --git a/packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts b/packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts index d2d930b67..31df756ec 100644 --- a/packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts +++ b/packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts @@ -1,10 +1,11 @@ import { Request, Response } from 'express' import { inject } from 'inversify' -import { BaseHttpController, controller, httpGet } from 'inversify-express-utils' +import { BaseHttpController, controller, httpDelete, httpGet } from 'inversify-express-utils' + import TYPES from '../../Bootstrap/Types' import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface' -@controller('/v2/items/:item_id/revisions', TYPES.AuthMiddleware) +@controller('/v2/items/:itemUuid/revisions', TYPES.AuthMiddleware) export class RevisionsControllerV2 extends BaseHttpController { constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) { super() @@ -12,6 +13,24 @@ export class RevisionsControllerV2 extends BaseHttpController { @httpGet('/') async getRevisions(request: Request, response: Response): Promise { - await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`) + await this.httpService.callRevisionsServer(request, response, `items/${request.params.itemUuid}/revisions`) + } + + @httpGet('/:id') + async getRevision(request: Request, response: Response): Promise { + await this.httpService.callRevisionsServer( + request, + response, + `items/${request.params.itemUuid}/revisions/${request.params.id}`, + ) + } + + @httpDelete('/:id') + async deleteRevision(request: Request, response: Response): Promise { + await this.httpService.callRevisionsServer( + request, + response, + `items/${request.params.itemUuid}/revisions/${request.params.id}`, + ) } }