fix(savedViews): Update QuerySavedViewProcess for single-view mode to also add quick-view attributes to the found view (namely, to replace its label)

Author: darinkelkhoff

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/savedviews/QuerySavedViewProcess.java

@@ -110,9 +110,13 @@ public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput ru
                throw (new QNotFoundException("The requested view was not found."));
             }
 
-            runBackendStepOutput.addRecord(output.getRecord());
-            runBackendStepOutput.addValue("savedView", output.getRecord());
-            runBackendStepOutput.addValue("savedViewList", (Serializable) List.of(output.getRecord()));
+            List<QRecord> recordList = List.of(output.getRecord());
+
+            lookupQuickViews(runBackendStepInput, recordList);
+
+            runBackendStepOutput.addRecord(recordList.get(0));
+            runBackendStepOutput.addValue("savedView", recordList.get(0));
+            runBackendStepOutput.addValue("savedViewList", (Serializable) recordList);
          }
          else
          {

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/savedviews/QuerySavedViewProcessTest.java

@@ -29,6 +29,7 @@
 import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
@@ -49,7 +50,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -82,6 +85,64 @@ void afterEach()
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   void testSingleViewFetch() throws Exception
+   {
+      QInstance qInstance = QContext.getQInstance();
+      new SavedViewsMetaDataProvider()
+         .withIsQuickSavedViewEnabled(true)
+         .defineAll(qInstance, TestUtils.MEMORY_BACKEND_NAME, null);
+      String tableName = TestUtils.TABLE_NAME_PERSON_MEMORY;
+
+      ///////////////////////////////////////////////////
+      // make sure a not-found view throws as expected //
+      ///////////////////////////////////////////////////
+      {
+         assertThatThrownBy(() -> runQuerySavedViewsProcessForSingleView(tableName, -1))
+            .isInstanceOf(QNotFoundException.class);
+      }
+
+      /////////////////////////////////////////////////////
+      // insert one saved view, but no quick saved views //
+      /////////////////////////////////////////////////////
+      Integer savedViewId;
+      {
+         savedViewId = new InsertAction().execute(new InsertInput(SavedView.TABLE_NAME).withRecordEntity(
+            new SavedView().withTableName(tableName).withLabel("one").withUserId(QContext.getQSession().getUser().getIdReference()))).getRecords().get(0).getValueInteger("id");
+
+         QRecord savedView = runQuerySavedViewsProcessForSingleView(tableName, savedViewId);
+
+         assertNotNull(savedView);
+         assertEquals("one", savedView.getValue("label"));
+         assertNull(savedView.getValue("type"));
+      }
+
+      ///////////////////////////////////////////////////////////
+      // insert a quick saved view referencing that saved view //
+      ///////////////////////////////////////////////////////////
+      {
+         new InsertAction().execute(new InsertInput(QuickSavedView.TABLE_NAME).withRecordEntity(
+            new QuickSavedView().withLabel("Quickly").withSavedViewId(savedViewId).withDoCount(true).withSortOrder(17)));
+
+         QRecord savedView = runQuerySavedViewsProcessForSingleView(tableName, savedViewId);
+         assertNotNull(savedView);
+
+         //////////////////////////////////////////////////////
+         // attributes should come from the quick-saved view //
+         //////////////////////////////////////////////////////
+         assertEquals("quickView", savedView.getValue("type"));
+         assertEquals("Quickly", savedView.getValue("label"));
+         assertTrue(savedView.getValueBoolean("doCount"));
+         assertEquals(17, savedView.getValue("sortOrder"));
+      }
+
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -305,6 +366,22 @@ void testUserIdLock() throws Exception
 
 
 
+   /***************************************************************************
+    *
+    ***************************************************************************/
+   private static QRecord runQuerySavedViewsProcessForSingleView(String tableName, Integer id) throws QException
+   {
+      RunProcessInput runProcessInput = new RunProcessInput();
+      runProcessInput.setProcessName(QuerySavedViewProcess.getProcessMetaData().getName());
+      runProcessInput.addValue("tableName", tableName);
+      runProcessInput.addValue("id", id);
+      RunProcessOutput runProcessOutput = new RunProcessAction().execute(runProcessInput);
+      QRecord          savedView        = (QRecord) runProcessOutput.getValue("savedView");
+      return savedView;
+   }
+
+
+
    /***************************************************************************
     *
     ***************************************************************************/