From b58f93e627c188191ce19a7a0f1b37e15997596b Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Thu, 15 Jun 2023 08:19:04 -0500
Subject: [PATCH] Revert a few changes, to help with stability of generated api
 specs

---
 .../actions/GenerateOpenApiSpecAction.java    | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
index 4e51f8ce..6fde1064 100644
--- a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
+++ b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GenerateOpenApiSpecAction.java
@@ -302,10 +302,12 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
       List<Tag>   tagList          = new ArrayList<>();
       Set<String> usedProcessNames = new HashSet<>();
 
-      ///////////////////
-      // foreach table //
-      ///////////////////
-      for(QTableMetaData table : qInstance.getTables().values())
+      /////////////////////////////////////
+      // foreach table (sorted by label) //
+      /////////////////////////////////////
+      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();
 
@@ -557,34 +559,6 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
                   .withSchema(new Schema().withRef("#/components/schemas/" + tableApiName)))))
             .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()
             .withSummary("Update one " + tableLabel)
             .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 //
          ////////////////