From 900484c01cf6811b697cf35938fcd1dc3abf2b98 Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Wed, 21 Jun 2023 16:17:32 -0500
Subject: [PATCH] More consistent behavior of field labels & descriptions
 everywhere

---
 .../actions/GenerateOpenApiSpecAction.java    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 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 9908775f..9fbb0663 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
@@ -913,7 +913,13 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
             ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(bodyField);
             ApiFieldMetaData          apiFieldMetaData          = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName());
 
-            String bodyDescription = "Value for the " + bodyField.getLabel();
+            String fieldLabel = bodyField.getLabel();
+            if(!StringUtils.hasContent(fieldLabel))
+            {
+               fieldLabel = QInstanceEnricher.nameToLabel(bodyField.getName());
+            }
+
+            String bodyDescription = "Value for the " + fieldLabel;
             if(apiFieldMetaData != null && StringUtils.hasContent(apiFieldMetaData.getDescription()))
             {
                bodyDescription = apiFieldMetaData.getDescription();
@@ -1070,7 +1076,18 @@ public class GenerateOpenApiSpecAction extends AbstractQActionFunction<GenerateO
       ApiFieldMetaDataContainer apiFieldMetaDataContainer = ApiFieldMetaDataContainer.ofOrNew(field);
       ApiFieldMetaData          apiFieldMetaData          = apiFieldMetaDataContainer.getApiFieldMetaData(apiInstanceMetaData.getName());
 
-      String description = "Value for the " + field.getLabel() + " field.";
+      String fieldLabel = field.getLabel();
+      if(!StringUtils.hasContent(fieldLabel))
+      {
+         fieldLabel = QInstanceEnricher.nameToLabel(field.getName());
+      }
+
+      String description = "Value for the " + fieldLabel + " field.";
+      if(apiFieldMetaData.getDescription() != null)
+      {
+         description = apiFieldMetaData.getDescription();
+      }
+
       if(field.getDefaultValue() != null)
       {
          description += " Default value is " + field.getDefaultValue() + ", if not given.";