QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-19 05:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto-adorn PVS tables with link-to-record; change query to fetch instants, not LocalDateTimes

Browse Source
This commit is contained in:
darin.kelkhoff
2022-09-27 18:59:58 -05:00
parent 3587cc0676
commit 4d16bc0fc7
6 changed files with 130 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricherTest.java
View File

@ -25,9 +25,13 @@ package com.kingsrook.qqq.backend.core.instances;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.fields.AdornmentType;
import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldAdornment;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QFieldSection;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.tables.Tier;
@ -39,6 +43,7 @@ import static com.kingsrook.qqq.backend.core.utils.TestUtils.APP_NAME_PEOPLE;
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;
/*******************************************************************************
@ -59,7 +64,7 @@ class QInstanceEnricherTest
QTableMetaData personTable = qInstance.getTable("person");
personTable.setLabel(null);
assertNull(personTable.getLabel());
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertEquals("Person", personTable.getLabel());
}
@ -79,7 +84,7 @@ class QInstanceEnricherTest
personTable.setName(null);
assertNull(personTable.getLabel());
assertNull(personTable.getName());
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertNull(personTable.getLabel());
assertNull(personTable.getName());
}
@ -97,7 +102,7 @@ class QInstanceEnricherTest
QFieldMetaData idField = qInstance.getTable("person").getField("id");
idField.setLabel(null);
assertNull(idField.getLabel());
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertEquals("Id", idField.getLabel());
}
@ -118,7 +123,7 @@ class QInstanceEnricherTest
.withFieldNames(new ArrayList<>(personTable.getFields().keySet()))
));
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertEquals("Test", personTable.getSections().get(0).getLabel());
}
@ -198,7 +203,7 @@ class QInstanceEnricherTest
void testGenerateAppSections()
{
QInstance qInstance = TestUtils.defineInstance();
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertNotNull(qInstance.getApp(APP_NAME_GREETINGS).getSections());
assertEquals(1, qInstance.getApp(APP_NAME_GREETINGS).getSections().size(), "App should automatically have one section");
assertEquals(0, qInstance.getApp(APP_NAME_GREETINGS).getSections().get(0).getTables().size(), "Section should not have tables");
@ -228,18 +233,57 @@ class QInstanceEnricherTest
{
QInstance qInstance = TestUtils.defineInstance();
QTableMetaData table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields(new ArrayList<>());
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertNull(table.getRecordLabelFormat());
qInstance = TestUtils.defineInstance();
table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName");
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertEquals("%s", table.getRecordLabelFormat());
qInstance = TestUtils.defineInstance();
table = qInstance.getTable("person").withRecordLabelFormat(null).withRecordLabelFields("firstName", "lastName");
new QInstanceEnricher().enrich(qInstance);
new QInstanceEnricher(qInstance).enrich();
assertEquals("%s %s", table.getRecordLabelFormat());
}
/*******************************************************************************
**
*******************************************************************************/
@Test
void testAddTablePvsAdornment()
{
///////////////////////////////////////////////////////////////////////////////////////////////////////
// first make sure the adornment doesn't get added for favoriteShapeId, because it isn't in any apps //
///////////////////////////////////////////////////////////////////////////////////////////////////////
{
QInstance qInstance = TestUtils.defineInstance();
QTableMetaData personTable = qInstance.getTable("person");
QFieldMetaData favoriteShapeId = personTable.getField("favoriteShapeId");
new QInstanceEnricher(qInstance).enrich();
assertNull(favoriteShapeId.getAdornments());
}
////////////////////////////////////////////////////////////////////
// then put shape table in an app, re-run, and see it get adorned //
////////////////////////////////////////////////////////////////////
{
QInstance qInstance = TestUtils.defineInstance();
QTableMetaData shapeTable = qInstance.getTable(TestUtils.TABLE_NAME_SHAPE);
QAppMetaData miscApp = qInstance.getApp(APP_NAME_MISCELLANEOUS);
miscApp.addChild(shapeTable);
QTableMetaData personTable = qInstance.getTable("person");
QFieldMetaData favoriteShapeId = personTable.getField("favoriteShapeId");
new QInstanceEnricher(qInstance).enrich();
assertNotNull(favoriteShapeId.getAdornments());
Optional<FieldAdornment> optionalAdornment = favoriteShapeId.getAdornments().stream().filter(a -> a.getType().equals(AdornmentType.LINK)).findFirst();
assertTrue(optionalAdornment.isPresent());
FieldAdornment adornment = optionalAdornment.get();
assertEquals("shape", adornment.getValues().get(AdornmentType.LinkValues.TO_RECORD_FROM_TABLE));
}
}
}