QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert a few changes, to help with stability of generated api specs

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-15 08:19:04 -05:00
parent 1c1a0f99e8
commit b58f93e627
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
View File

@ -302,10 +302,12 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
List<Tag> tagList = new ArrayList<>(); List<Tag> tagList = new ArrayList<>();
Set<String> usedProcessNames = new HashSet<>(); Set<String> usedProcessNames = new HashSet<>();
/////////////////// /////////////////////////////////////
// foreach table // // foreach table (sorted by label) //
/////////////////// /////////////////////////////////////
for(QTableMetaData table : qInstance.getTables().values()) List<QTableMetaData> tables = new ArrayList<>(qInstance.getTables().values());
tables.sort(Comparator.comparing(t -> ObjectUtils.requireNonNullElse(t.getLabel(), t.getName(), "")));
for(QTableMetaData table : tables)
{ {
String tableName = table.getName(); String tableName = table.getName();
@ -557,34 +559,6 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
.withSchema(new Schema().withRef("#/components/schemas/" + tableApiName))))) .withSchema(new Schema().withRef("#/components/schemas/" + tableApiName)))))
.withSecurity(getSecurity(apiInstanceMetaData, tableReadPermissionName)); .withSecurity(getSecurity(apiInstanceMetaData, tableReadPermissionName));
Method slashPost = new Method()
.withSummary("Create one " + tableLabel)
.withDescription(INSERT_DESCRIPTION)
.withOperationId("create" + tableApiNameUcFirst)
.withRequestBody(new RequestBody()
.withRequired(true)
.withDescription("Values for the " + tableLabel + " record to create.")
.withContent(MapBuilder.of("application/json", new Content()
.withSchema(new Schema().withRef("#/components/schemas/" + tableApiName))
)))
.withResponses(buildStandardErrorResponses(apiInstanceMetaData))
.withResponse(HttpStatus.CREATED.getCode(), new Response()
.withDescription("Successfully created the requested " + tableLabel)
.withContent(MapBuilder.of("application/json", new Content()
.withSchema(new Schema()
.withType("object")
.withProperties(MapBuilder.of(primaryKeyApiName, new Schema()
.withType(getFieldType(primaryKeyField))
.withExample("47")))))))
.withTags(ListBuilder.of(tableLabel))
.withSecurity(getSecurity(apiInstanceMetaData, tableInsertPermissionName));
if(insertEnabled)
{
openAPI.getPaths().put(basePath + tableApiName + "/", new Path()
.withPost(slashPost));
}
Method idPatch = new Method() Method idPatch = new Method()
.withSummary("Update one " + tableLabel) .withSummary("Update one " + tableLabel)
.withDescription(UPDATE_DESCRIPTION) .withDescription(UPDATE_DESCRIPTION)
@ -633,6 +607,34 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
); );
} }
Method slashPost = new Method()
.withSummary("Create one " + tableLabel)
.withDescription(INSERT_DESCRIPTION)
.withOperationId("create" + tableApiNameUcFirst)
.withRequestBody(new RequestBody()
.withRequired(true)
.withDescription("Values for the " + tableLabel + " record to create.")
.withContent(MapBuilder.of("application/json", new Content()
.withSchema(new Schema().withRef("#/components/schemas/" + tableApiName))
)))
.withResponses(buildStandardErrorResponses(apiInstanceMetaData))
.withResponse(HttpStatus.CREATED.getCode(), new Response()
.withDescription("Successfully created the requested " + tableLabel)
.withContent(MapBuilder.of("application/json", new Content()
.withSchema(new Schema()
.withType("object")
.withProperties(MapBuilder.of(primaryKeyApiName, new Schema()
.withType(getFieldType(primaryKeyField))
.withExample("47")))))))
.withTags(ListBuilder.of(tableLabel))
.withSecurity(getSecurity(apiInstanceMetaData, tableInsertPermissionName));
if(insertEnabled)
{
openAPI.getPaths().put(basePath + tableApiName + "/", new Path()
.withPost(slashPost));
}
//////////////// ////////////////
// bulk paths // // bulk paths //
//////////////// ////////////////