Merge pull request #12 from Kingsrook/feature/sprint-7-integration

Feature/sprint 7 integration
This commit is contained in:
2022-07-28 09:34:02 -05:00
committed by GitHub
4 changed files with 28 additions and 21 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
target/ target/
*.iml *.iml
.env
############################################# #############################################

15
pom.xml
View File

@ -49,32 +49,27 @@
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-core</artifactId> <artifactId>qqq-backend-core</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.0-20220726.214150-15</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-module-rdbms</artifactId> <artifactId>qqq-backend-module-rdbms</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.0-20220726.214633-12</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-backend-module-filesystem</artifactId> <artifactId>qqq-backend-module-filesystem</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.0-20220726.215110-8</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-middleware-javalin</artifactId> <artifactId>qqq-middleware-javalin</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.0-20220726.215233-6</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.kingsrook.qqq</groupId> <groupId>com.kingsrook.qqq</groupId>
<artifactId>qqq-middleware-picocli</artifactId> <artifactId>qqq-middleware-picocli</artifactId>
<version>0.2.0-SNAPSHOT</version> <version>0.2.0-20220726.215232-6</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- 3rd party deps specifically for this module --> <!-- 3rd party deps specifically for this module -->

View File

@ -28,7 +28,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.exceptions.QValueException; import com.kingsrook.qqq.backend.core.exceptions.QValueException;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
@ -43,6 +43,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMe
import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData;
import com.kingsrook.qqq.backend.core.processes.implementations.general.LoadInitialRecordsStep; import com.kingsrook.qqq.backend.core.processes.implementations.general.LoadInitialRecordsStep;
import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality;
@ -50,6 +51,7 @@ import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFor
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData;
import io.github.cdimascio.dotenv.Dotenv;
/******************************************************************************* /*******************************************************************************
@ -60,6 +62,10 @@ public class SampleMetaDataProvider
public static final String MYSQL_BACKEND_NAME = "mysql"; public static final String MYSQL_BACKEND_NAME = "mysql";
public static final String FILESYSTEM_BACKEND_NAME = "filesystem"; public static final String FILESYSTEM_BACKEND_NAME = "filesystem";
public static final String AUTH0_AUTHENTICATION_MODULE_NAME = "auth0";
// public static final String AUTH0_BASE_URL = "https://kingsrook.us.auth0.com/";
public static final String AUTH0_BASE_URL = "https://nutrifresh-one-development.us.auth0.com/";
public static final String PROCESS_NAME_GREET = "greet"; public static final String PROCESS_NAME_GREET = "greet";
public static final String PROCESS_NAME_GREET_INTERACTIVE = "greetInteractive"; public static final String PROCESS_NAME_GREET_INTERACTIVE = "greetInteractive";
public static final String PROCESS_NAME_SIMPLE_SLEEP = "simpleSleep"; public static final String PROCESS_NAME_SIMPLE_SLEEP = "simpleSleep";
@ -103,9 +109,9 @@ public class SampleMetaDataProvider
*******************************************************************************/ *******************************************************************************/
private static QAuthenticationMetaData defineAuthentication() private static QAuthenticationMetaData defineAuthentication()
{ {
return new QAuthenticationMetaData() return (new QAuthenticationMetaData()
.withName("Anonymous") .withName("mock")
.withType("fullyAnonymous"); .withType(QAuthenticationType.MOCK));
} }
@ -115,13 +121,14 @@ public class SampleMetaDataProvider
*******************************************************************************/ *******************************************************************************/
public static QBackendMetaData defineMysqlBackend() public static QBackendMetaData defineMysqlBackend()
{ {
Dotenv dotenv = Dotenv.configure().load();
return new RDBMSBackendMetaData() return new RDBMSBackendMetaData()
.withVendor("mysql") .withVendor("mysql")
.withHostName("127.0.0.1") .withHostName("127.0.0.1")
.withPort(3306) .withPort(3306)
.withDatabaseName("qqq") .withDatabaseName("qqq")
.withUsername("root") .withUsername("root")
.withPassword("") .withPassword(dotenv.get("RDBMS_PASSWORD"))
.withName(MYSQL_BACKEND_NAME); .withName(MYSQL_BACKEND_NAME);
} }
@ -151,13 +158,16 @@ public class SampleMetaDataProvider
table.addField(new QFieldMetaData("id", QFieldType.INTEGER)); table.addField(new QFieldMetaData("id", QFieldType.INTEGER));
table.addField(new QFieldMetaData("name", QFieldType.STRING)); table.addField(new QFieldMetaData("name", QFieldType.STRING)
.withIsRequired(true));
table.addField(new QFieldMetaData("company_code", QFieldType.STRING) // todo enum table.addField(new QFieldMetaData("company_code", QFieldType.STRING) // todo enum
.withLabel("Company") .withLabel("Company")
.withIsRequired(true)
.withBackendName("comp_code")); .withBackendName("comp_code"));
table.addField(new QFieldMetaData("service_level", QFieldType.STRING)); // todo enum table.addField(new QFieldMetaData("service_level", QFieldType.STRING)
.withIsRequired(true)); // todo enum
return (table); return (table);
} }

View File

@ -25,8 +25,8 @@ package com.kingsrook.sampleapp;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction; import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction;
import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
@ -34,6 +34,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.model.session.QSession;
import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQueryAction; import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQueryAction;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@ -112,8 +113,8 @@ class SampleMetaDataProviderTest
QueryOutput queryOutput = new QueryAction().execute(queryInput); QueryOutput queryOutput = new QueryAction().execute(queryInput);
request.setRecords(queryOutput.getRecords()); request.setRecords(queryOutput.getRecords());
request.addValue("greetingPrefix", "Hello"); request.addValue(MockBackendStep.FIELD_GREETING_PREFIX, "Hello");
request.addValue("greetingSuffix", "sir"); request.addValue(MockBackendStep.FIELD_GREETING_SUFFIX, "sir");
RunProcessOutput result = new RunProcessAction().execute(request); RunProcessOutput result = new RunProcessAction().execute(request);
assertNotNull(result); assertNotNull(result);