Skip to content
This repository was archived by the owner on Nov 8, 2024. It is now read-only.

Prevent resource ending up in previous resource group #320

Merged
merged 1 commit into from
Aug 6, 2019
Merged

Prevent resource ending up in previous resource group #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions packages/fury-adapter-swagger/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Fury Swagger Parser Changelog

## Master

### Bug Fixes

- Prevents a 'Path Item Object' from being included in a Resource Group created
by an 'Operation Object' in a previously defined 'Path Item Object'.

## 0.27.1 (2019-06-03)

### Bug Fixes
Expand Down
17 changes: 11 additions & 6 deletions packages/fury-adapter-swagger/lib/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,12 +689,6 @@ class Parser {
});
}

if (this.useResourceGroups()) {
this.updateResourceGroup(pathValue['x-group-name']);
}

this.group.content.push(resource);

const pathObjectParameters = pathValue.parameters || [];
const resourceHrefVariables = this.createHrefVariables(pathObjectParameters);

Expand Down Expand Up @@ -724,6 +718,17 @@ class Parser {

this.handleSwaggerVendorExtensions(resource, pathValue);

const operationsHaveTags = Object.values(relevantMethods).some(method => method.tags !== undefined && method.tags.length > 0);
if (operationsHaveTags) {
if (this.useResourceGroups()) {
this.updateResourceGroup(pathValue['x-group-name']);
}

this.group.content.push(resource);
} else {
this.api.push(resource);
}

return resource;
});
}
Expand Down
296 changes: 296 additions & 0 deletions packages/fury-adapter-swagger/test/fixtures/tags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
{
"element": "parseResult",
"content": [
{
"element": "category",
"meta": {
"classes": {
"element": "array",
"content": [
{
"element": "string",
"content": "api"
}
]
},
"title": {
"element": "string",
"content": "Tags on some of the operations"
}
},
"attributes": {
"version": {
"element": "string",
"content": "v1"
}
},
"content": [
{
"element": "category",
"meta": {
"title": {
"element": "string",
"content": "MyRG1"
},
"classes": {
"element": "array",
"content": [
{
"element": "string",
"content": "resourceGroup"
}
]
}
},
"content": [
{
"element": "resource",
"attributes": {
"href": {
"element": "string",
"content": "/one"
}
},
"content": [
{
"element": "transition",
"meta": {
"title": {
"element": "string",
"content": "first resource"
}
},
"content": [
{
"element": "httpTransaction",
"content": [
{
"element": "httpRequest",
"attributes": {
"method": {
"element": "string",
"content": "GET"
}
}
},
{
"element": "httpResponse",
"attributes": {
"statusCode": {
"element": "string",
"content": "200"
}
}
}
]
}
]
}
]
},
{
"element": "resource",
"attributes": {
"href": {
"element": "string",
"content": "/three"
}
},
"content": [
{
"element": "transition",
"meta": {
"title": {
"element": "string",
"content": "third resource"
}
},
"content": [
{
"element": "httpTransaction",
"content": [
{
"element": "httpRequest",
"attributes": {
"method": {
"element": "string",
"content": "GET"
}
}
},
{
"element": "httpResponse",
"attributes": {
"statusCode": {
"element": "string",
"content": "200"
}
}
}
]
}
]
}
]
}
]
},
{
"element": "resource",
"attributes": {
"href": {
"element": "string",
"content": "/two"
}
},
"content": [
{
"element": "transition",
"meta": {
"title": {
"element": "string",
"content": "second resource"
}
},
"content": [
{
"element": "httpTransaction",
"content": [
{
"element": "httpRequest",
"attributes": {
"method": {
"element": "string",
"content": "GET"
}
}
},
{
"element": "httpResponse",
"attributes": {
"statusCode": {
"element": "string",
"content": "200"
}
}
}
]
}
]
}
]
},
{
"element": "category",
"meta": {
"title": {
"element": "string",
"content": "MyRG2"
},
"classes": {
"element": "array",
"content": [
{
"element": "string",
"content": "resourceGroup"
}
]
}
},
"content": [
{
"element": "resource",
"attributes": {
"href": {
"element": "string",
"content": "/four"
}
},
"content": [
{
"element": "transition",
"meta": {
"title": {
"element": "string",
"content": "fourth resource"
}
},
"content": [
{
"element": "httpTransaction",
"content": [
{
"element": "httpRequest",
"attributes": {
"method": {
"element": "string",
"content": "GET"
}
}
},
{
"element": "httpResponse",
"attributes": {
"statusCode": {
"element": "string",
"content": "200"
}
}
}
]
}
]
}
]
}
]
},
{
"element": "resource",
"attributes": {
"href": {
"element": "string",
"content": "/five"
}
},
"content": [
{
"element": "transition",
"meta": {
"title": {
"element": "string",
"content": "fith resource"
}
},
"content": [
{
"element": "httpTransaction",
"content": [
{
"element": "httpRequest",
"attributes": {
"method": {
"element": "string",
"content": "GET"
}
}
},
{
"element": "httpResponse",
"attributes": {
"statusCode": {
"element": "string",
"content": "200"
}
}
}
]
}
]
}
]
}
]
}
]
}
42 changes: 42 additions & 0 deletions packages/fury-adapter-swagger/test/fixtures/tags.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
swagger: '2.0'
info:
version: v1
title: Tags on some of the operations
paths:
/one:
get:
summary: first resource
tags:
- MyRG1
responses:
200:
description: ""
/two:
get:
summary: second resource
responses:
200:
description: ""
/three:
get:
summary: third resource
tags:
- MyRG1
responses:
200:
description: ""
/four:
get:
summary: fourth resource
tags:
- MyRG2
responses:
200:
description: ""
/five:
get:
summary: fith resource
tags: []
responses:
200:
description: ""