@genesislcap/blank-app-seed 3.14.1 → 3.16.0

package/.genx/configure.js

@@ -1,5 +1,5 @@
 const versions = require('./versions.json');
-const { registerPartials, generateRoute, generateEmptyCsv, formatRouteData, validateRoute } = require('./utils');
+const { registerPartials, generateRoute, generateCsv, getCombinedCsvData, formatRouteData, validateRoute } = require('./utils');
 
 /**
  * Signature is `async (data: inquirer.Answers, utils: SeedConfigurationUtils)`
@@ -30,11 +30,8 @@ module.exports = async (data, utils) => {
   });
 
   data.csv
-    .map(entity => ({
-      name: entity.name.toUpperCase(),
-      fields: entity.fields.map( (field, index) => ({name: field.toUpperCase(), isLast: index === (entity.fields.length -1) }))
-    }))
-    .forEach(entity => {
-      generateEmptyCsv(entity, data.appName, utils);
+    .map((entity) => getCombinedCsvData(entity))
+    .forEach((entity) => {
+      generateCsv(entity, utils);
     });
 };

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "3.14.1",
+  "version": "3.16.0",
   "license": "Apache-2.0",
   "genxSeedConfig": {
     "exclude": [
@@ -35,6 +35,7 @@
           ".sh",
           ".json",
           ".js",
+          ".kt",
           ".kts",
           ".ts",
           ".md",

package/.genx/templates/csv.hbs

@@ -1 +1,6 @@
-{{#each entity.fields}}{{this.name}}{{#unless this.isLast }},{{/unless}}{{/each}}
+{{#each entity.fields}}{{this.name}}{{#unless this.isLast }},{{/unless}}{{/each}}
+{{#if entity.data}}
+{{#each entity.data}}
+{{#each this.rows}}{{this.name}}{{#unless this.isLast }},{{/unless}}{{/each}}
+{{/each}}
+{{/if}}

package/.genx/utils.js

@@ -1,4 +1,4 @@
-const {existsSync, mkdirSync} = require('node:fs');
+const {existsSync, mkdirSync, readFileSync} = require('node:fs');
 const { resolve } = require('node:path');
 
 const makeDirectory = (directory) => {
@@ -25,10 +25,78 @@ const generateRoute = (route, { writeFileWithData, changeCase }) => {
   writeFileWithData(resolve(__dirname, `../client/src/routes/${routeName}/${routeName}.styles.ts`), {route}, resolve(__dirname, 'templates/route.styles.hbs'));
 };
 
-const generateEmptyCsv = (entity, appName, { writeFileWithData }) => {
+const generateCsv = (entity, { writeFileWithData }) => {
   writeFileWithData(resolve(__dirname, `../server/{{appName}}-app/src/main/genesis/data/${entity.name}.csv`), {entity}, resolve(__dirname, 'templates/csv.hbs'));
 };
 
+const prepareCsvData = (entity) => {
+  if (!entity.data?.length) return null;
+
+  const data = entity.data.map((rows) => ({
+    rows: rows?.map((x, index) => ({
+      name: x,
+      isLast: index === rows.length - 1,
+    })),
+  }));
+
+  return data;
+};
+
+function csvToObject(csv) {
+  const lines = csv
+    .split('\n')
+    .map((x) => x.replaceAll('"', ''))
+    .filter((line) => line.trim() !== '');
+  const fieldsRow = lines[0].split(',').map((field) => field.trim());
+  const fields = fieldsRow.map((field, index) => ({
+    name: field.toUpperCase(),
+    isLast: index === fieldsRow.length - 1,
+  }));
+
+  const data = lines.slice(1).map((line) => {
+    const rows = line.split(',').map((value, index) => ({
+      name: value.trim(),
+      isLast: index === fieldsRow.length - 1,
+    }));
+    return { rows };
+  });
+
+  return { fields, data };
+}
+
+const getCombinedCsvData = (entity) => {
+  let csvFile;
+  const combinedCsv = {
+    name: entity.name.toUpperCase(),
+    fields: entity.fields?.map((field, index) => ({
+      name: field.toUpperCase(),
+      isLast: index === entity.fields.length - 1,
+    })),
+    data: prepareCsvData(entity),
+  };
+
+  if (entity.mode?.toLowerCase() === 'append') {
+    const path = resolve(
+      __dirname,
+      `../server/{{appName}}-app/src/main/genesis/data/${entity.name}.csv`
+    );
+
+    try {
+      csvFile = readFileSync(path, 'utf8');
+    } catch (err) {
+      console.log('File to append not found - creating a new CSV file');
+    }
+
+    if (csvFile) {
+      const existingCsv = csvToObject(csvFile);
+      combinedCsv.fields = existingCsv.fields;
+      combinedCsv.data = [...existingCsv.data, ...prepareCsvData(entity)];
+    }
+  }
+
+  return combinedCsv;
+};
+
 const formatJSONValue = (value) => {
   try {
     return value ? JSON.stringify(value, null, 2) : undefined;
@@ -137,7 +205,8 @@ module.exports = {
   registerPartials,
   generateRoute,
   validateRoute,
-  generateEmptyCsv,
+  generateCsv,
+  getCombinedCsvData,
   formatRouteData,
   parseJSONArgument,
 };

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.16.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.15.0...v3.16.0) (2024-06-20)
+
+
+### Features
+
+* Add test dependencies to server in blank-app-seed GENC-543 (#259) d87c4f9
+
+## [3.15.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.14.1...v3.15.0) (2024-06-20)
+
+
+### Features
+
+* ability to add/append data to csv files GENC-473 (#260) 7b337ff
+
 ## [3.14.1](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v3.14.0...v3.14.1) (2024-06-18)
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "3.14.1",
+  "version": "3.16.0",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"

package/server/build.gradle.kts

@@ -9,6 +9,7 @@ subprojects {
 
     dependencies {
         implementation("com.h2database:h2:2.2.224")
+        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.9.0")
     }
     tasks {
         withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -86,5 +87,12 @@ allprojects {
             from(components["java"])
         }
     }
+    tasks{
+        test {
+            systemProperty("DbLayer", "SQL")
+            systemProperty("DbHost", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1")
+            systemProperty("DbQuotedIdentifiers", "true")
+            useJUnitPlatform()
+        }
+    }
 }
-

package/server/{{appName}}-app/build.gradle.kts

@@ -1,6 +1,9 @@
 dependencies {
     compileOnly(genesis("script-dependencies"))
     genesisGeneratedCode(withTestDependency = true)
+    testImplementation(genesis("dbtest"))
+    testImplementation(genesis("testsupport"))
+    testImplementation(genesis("pal-eventhandler"))
 }
 
 description = "{{appName}}-app"

package/server/{{appName}}-app/src/test/kotlin/global/genesis/EventHandlerTest.kt

@@ -0,0 +1,27 @@
+/**
+ * Full documentation on event handler tests may be found here >> https://learn.genesis.global/docs/server/event-handler/testing/#simple-test
+ */
+
+import global.genesis.db.rx.entity.multi.AsyncEntityDb
+import global.genesis.testsupport.client.eventhandler.EventClientSync
+import global.genesis.testsupport.jupiter.GenesisJunit
+import global.genesis.testsupport.jupiter.ScriptFile
+import javax.inject.Inject
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+
+@ExtendWith(GenesisJunit::class)
+@ScriptFile("{{appName}}-eventhandler.kts")
+class EventHandlerTest {
+  @Inject
+  lateinit var client: EventClientSync
+
+  @Inject
+  lateinit var entityDb: AsyncEntityDb
+
+  @Test
+  fun `test EventHandler`(){
+    //TODO Write Test
+  }
+  
+}