From 9d417ff61b1d09ae930472c0f74d6dec59472a93 Mon Sep 17 00:00:00 2001 From: Gabriel Rosa Date: Fri, 25 Nov 2022 18:21:43 -0300 Subject: [PATCH] FIX: treating new connectors upload reponse --- docsfera.json | 33 +--- src/modules/connector/client.service.ts | 176 ++---------------- src/modules/connector/connector.controller.ts | 2 +- 3 files changed, 30 insertions(+), 181 deletions(-) diff --git a/docsfera.json b/docsfera.json index 3642ccc..d55f290 100644 --- a/docsfera.json +++ b/docsfera.json @@ -505,18 +505,16 @@ "schema": { "type": "string" } - } - ], - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/DeleteConnectorDto" - } + }, + { + "name": "version", + "required": true, + "in": "query", + "schema": { + "type": "string" } } - }, + ], "responses": { "200": { "description": "" @@ -3216,9 +3214,9 @@ } }, "info": { - "title": "Maestro - feat/incremental-table", + "title": "Maestro - main", "description": "Documentation for Maestro gateway", - "version": "16.11.2022 - 16:46", + "version": "25.11.2022 - 18:20", "contact": {} }, "tags": [], @@ -3486,17 +3484,6 @@ "tags" ] }, - "DeleteConnectorDto": { - "type": "object", - "properties": { - "version": { - "type": "string" - } - }, - "required": [ - "version" - ] - }, "PermissionGroupPermission": { "type": "object", "properties": { diff --git a/src/modules/connector/client.service.ts b/src/modules/connector/client.service.ts index fdd1cdb..bac423c 100644 --- a/src/modules/connector/client.service.ts +++ b/src/modules/connector/client.service.ts @@ -83,163 +83,30 @@ export class ConnectorClientService implements OnModuleInit { ); }); const responseParsed = JSON.parse(res.message); - const connectorErrors = responseParsed.items - .filter((i) => i.update._index === 'connectors' && i.update.error) + const connectorsResponse = responseParsed.items.filter( + (i) => i.update._index === process.env.CONNECTORS_INDEX, + ); + const connectorErrors = connectorsResponse + .filter((i) => i.update.error) .map((i) => ({ id: i.update._id, reason: i.update.error, status: i.error.status, })); - const connectionControlsErrors = responseParsed.items - .filter( - (i) => i.update._index === 'connection_controls' && i.update.error, - ) - .map((i) => ({ - id: i.update._id, - reason: i.update.error, - status: i.error.status, - })); - const connectionStepsErrors = responseParsed.items - .filter((i) => i.update._index === 'connection_steps' && i.update.error) - .map((i) => ({ - id: i.update._id, - reason: i.update.error, - status: i.error.status, - })); - const configControlsErrors = responseParsed.items - .filter((i) => i.update._index === 'config_controls' && i.update.error) - .map((i) => ({ - id: i.update._id, - reason: i.update.error, - status: i.error.status, - })); - const connectorCreated = responseParsed.items - .filter( - (i) => - i.update._index === 'connectors' && i.update.result === 'created', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionControlsCreated = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_controls' && - i.update.result === 'created', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionStepsCreated = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_steps' && - i.update.result === 'created', - ) - .map((i) => ({ - id: i.update._id, - })); - const configControlsCreated = responseParsed.items - .filter( - (i) => - i.update._index === 'config_controls' && - i.update.result === 'created', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectorUpdated = responseParsed.items - .filter( - (i) => - i.update._index === 'connectors' && i.update.result === 'updated', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionControlsUpdated = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_controls' && - i.update.result === 'updated', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionStepsUpdated = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_steps' && - i.update.result === 'updated', - ) - .map((i) => ({ - id: i.update._id, - })); - const configControlsUpdated = responseParsed.items - .filter( - (i) => - i.update._index === 'config_controls' && - i.update.result === 'updated', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectorNoop = responseParsed.items - .filter( - (i) => i.update._index === 'connectors' && i.update.result === 'noop', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionControlsNoop = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_controls' && - i.update.result === 'noop', - ) - .map((i) => ({ - id: i.update._id, - })); - const connectionStepsNoop = responseParsed.items - .filter( - (i) => - i.update._index === 'connection_steps' && i.update.result === 'noop', - ) - .map((i) => ({ - id: i.update._id, - })); - const configControlsNoop = responseParsed.items - .filter( - (i) => - i.update._index === 'config_controls' && i.update.result === 'noop', - ) - .map((i) => ({ - id: i.update._id, - })); + const connectorCreated = connectorsResponse + .filter((i) => i.update.result === 'created') + .map((i) => i.update._id); + const connectorUpdated = connectorsResponse + .filter((i) => i.update.result === 'updated') + .map((i) => i.update._id); + const connectorNoop = connectorsResponse + .filter((i) => i.update.result === 'noop') + .map((i) => i.update._id); return { - errors: { - connectors: connectorErrors, - connection_controls: connectionControlsErrors, - connection_steps: connectionStepsErrors, - config_controls: configControlsErrors, - }, - created: { - connectors: connectorCreated, - connection_controls: connectionControlsCreated, - connection_steps: connectionStepsCreated, - config_controls: configControlsCreated, - }, - updated: { - connectors: connectorUpdated, - connection_controls: connectionControlsUpdated, - connection_steps: connectionStepsUpdated, - config_controls: configControlsUpdated, - }, - noop: { - connectors: connectorNoop, - connection_controls: connectionControlsNoop, - connection_steps: connectionStepsNoop, - config_controls: configControlsNoop, - }, + errors: connectorErrors, + created: connectorCreated, + updated: connectorUpdated, + noop: connectorNoop, }; } @@ -318,12 +185,7 @@ export class ConnectorClientService implements OnModuleInit { version, plugin, }), - ).catch((err) => { - throw new HttpException( - err.details, - err.code === 6 ? HttpStatus.CONFLICT : 400, - ); - }); + ); } async updateConnector({ plugin, changes }) { diff --git a/src/modules/connector/connector.controller.ts b/src/modules/connector/connector.controller.ts index 89efd1c..5b55be8 100644 --- a/src/modules/connector/connector.controller.ts +++ b/src/modules/connector/connector.controller.ts @@ -274,7 +274,7 @@ export class ConnectorController { @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE) async deleteConnector( @Param('plugin') plugin: string, - @Body() { version }: DeleteConnectorDto, + @Query('version') version: string, ) { this.logger.info('/upload - Upload Connector Route');