Fix schemata updates

src/main/frontend/src/api/SchemataRepository.js

@@ -8,7 +8,8 @@ const resources = {
     categories: () => '/schema/categories',
     scopes: () => '/schema/scopes',
     schemata: (o, u, c) => `/organizations/${o}/units/${u}/contexts/${c}/schemas`,
-    versions: (o, u, c, s) => `/organizations/${o}/units/${u}/contexts/${c}/schemas/${s}/versions`
+    versions: (o, u, c, s) => `/organizations/${o}/units/${u}/contexts/${c}/schemas/${s}/versions`,
+    schemaSpecification: (o, u, c, s, v) => `/organizations/${o}/units/${u}/contexts/${c}/schemas/${s}/versions/${v}/specification`
 }
 
 function ensure(response, status) {
@@ -128,4 +129,20 @@ export default {
             .then(ensureCreated)
             .then(response => response.data)
     },
+    saveSchemaVersionSpecification(
+        organization, unit, context, schema, version, specification) {
+        let config = {
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            responseType: 'text'
+        };
+        return Repository.patch(
+            resources.schemaSpecification(organization, unit, context, schema, version),
+            specification,
+            config
+        )
+            .then(ensureOk)
+            .then(response => response.data)
+    },
 }

src/main/frontend/src/components/Properties.vue

@@ -1,23 +1,34 @@
 <template>
     <v-card height="45vh" id="schemata-properties">
         <v-card-text>
-            <v-alert v-if="status && status !== 'Published'" :value="true" type="warning" outlined>
+            <v-alert v-if="status && status !== 'Published'" :value="true" type="warning" dense outlined>
                 Status <b>{{status}}</b>. Do not use in production.
             </v-alert>
             <v-tabs>
                 <v-tab>Specification</v-tab>
                 <v-tab>Description</v-tab>
 
                 <v-tab-item>
-                    <code>{{ specification }}</code>
+                    <editor
+                            id="specification-editor"
+                            v-model="currentSpecification"
+                            theme="vs-dark"
+                            language="javascript"
+                            height="200"
+                            :options="editorOptions"
+                    ></editor>
+                    <br>
+                    <v-btn color="info"
+                           :disabled="status !== 'Draft'"
+                           @click="saveSpecification">Save
+                    </v-btn>
                 </v-tab-item>
 
                 <v-tab-item>
                     <div v-html="compiledDescription()"></div>
                 </v-tab-item>
             </v-tabs>
         </v-card-text>
-
     </v-card>
 
 
@@ -26,14 +37,30 @@
 <script>
     import {mapFields} from 'vuex-map-fields';
     import marked from 'marked'
+    import editor from 'monaco-editor-vue';
+    import Repository from '@/api/SchemataRepository'
 
     export default {
+        components: {editor},
+        data: function () {
+            return {
+                currentSpecification: undefined,
+            }
+        },
+
         computed: {
             ...mapFields([
                 'schema',
                 'version'
             ]),
 
+            editorOptions() {
+                return {
+                    readOnly: this.status !== 'Draft',
+                    automaticLayout: true,
+                }
+            },
+
             specification() {
                 return this.version?.specification ?? ''
             },
@@ -44,22 +71,40 @@
                 return this.version?.status ?? ''
             },
         },
+        watch: {
+            specification(val) {
+                this.currentSpecification = val
+            }
+        },
         methods: {
             compiledDescription: function () {
                 return marked(this.description)
+            },
+            saveSpecification: function () {
+                let vm = this
+                Repository.saveSchemaVersionSpecification(
+                    this.version.organizationId,
+                    this.version.unitId,
+                    this.version.contextId,
+                    this.version.schemaId,
+                    this.version.schemaVersionId,
+                    this.currentSpecification
+                )
+                    .then(() => {
+                            vm.$store.commit('raiseNotification', {
+                                message: `Specification for ${vm.schema.name} v${vm.version.currentVersion} updated.`,
+                                type: 'success'
+                            })
+                        }
+                    )
+                    .catch(function (err) {
+                        let response = err.response ? err.response.data + ' - ' : ''
+                        vm.$store.commit('raiseError', {message: response + err})
+                    })
             }
         }
     }
 </script>
 
 <style>
-    .v-card {
-        overflow-y: auto
-    }
-
-    code {
-        width: 100%;
-        font-size: larger;
-        font-weight: lighter;
-    }
 </style>

src/main/java/io/vlingo/schemata/infra/persistence/HSQLDBSchemataObjectStore.java

@@ -20,11 +20,10 @@ protected void createOrganizationStateTable() {
               "organizationId VARCHAR (50) NOT NULL, " +
               "name VARCHAR(128) NOT NULL, " +
               "description VARCHAR(8000) " +
-
-//              "UNIQUE (name) " +
               ")");
 
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS ORG_ALL_INDEX ON TBL_ORGANIZATIONS (organizationId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS ORG_ALL_INDEX ON TBL_ORGANIZATIONS (organizationId)");
+      jdbi.handle().execute("ALTER TABLE TBL_ORGANIZATIONS ADD CONSTRAINT IF NOT EXISTS ORGANIZATION_UNIQUE UNIQUE (name)");
   }
 
   @Override
@@ -37,12 +36,11 @@ protected void createUnitStateTable() {
               "organizationId VARCHAR (50) NOT NULL, " +
               "name VARCHAR(128) NOT NULL, " +
               "description VARCHAR(8000) " +
-
-//              "UNIQUE (organizationId, name) " +
               ")");
 
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS UNIT_PARENT_INDEX ON TBL_UNITS (organizationId)");
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS UNIT_ALL_INDEX ON TBL_UNITS (organizationId, unitId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS UNIT_PARENT_INDEX ON TBL_UNITS (organizationId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS UNIT_ALL_INDEX ON TBL_UNITS (organizationId, unitId)");
+      jdbi.handle().execute("ALTER TABLE TBL_UNITS ADD CONSTRAINT IF NOT EXISTS UNIT_ALL_UNIQUE UNIQUE (organizationId, name)");
   }
 
   @Override
@@ -56,12 +54,12 @@ protected void createContextStateTable() {
               "organizationId VARCHAR (50) NOT NULL, " +
               "namespace VARCHAR(256) NOT NULL, " +
               "description VARCHAR(8000) " +
-
-//              "UNIQUE (unitId, namespace) " +
               ")");
 
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS CONTEXT_PARENT_INDEX ON TBL_CONTEXTS (organizationId, unitId)");
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS CONTEXT_ALL_INDEX ON TBL_CONTEXTS (organizationId, unitId, contextId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS CONTEXT_PARENT_INDEX ON TBL_CONTEXTS (organizationId, unitId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS CONTEXT_ALL_INDEX ON TBL_CONTEXTS (organizationId, unitId, contextId)");
+
+      jdbi.handle().execute("ALTER TABLE TBL_CONTEXTS ADD CONSTRAINT IF NOT EXISTS CONTEXT_ALL_UNIQUE UNIQUE (organizationId, unitId, namespace)");
   }
 
   @Override
@@ -78,12 +76,11 @@ protected void createSchemaStateTable() {
               "scope VARCHAR(25) NOT NULL, " +
               "name VARCHAR(128) NOT NULL, " +
               "description VARCHAR(8000) " +
-
-//              "UNIQUE (contextId, category, name) " +
               ")");
 
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMA_PARENT_INDEX ON TBL_SCHEMAS (organizationId, unitId, contextId)");
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMA_ALL_INDEX ON TBL_SCHEMAS (organizationId, unitId, contextId, schemaId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMA_PARENT_INDEX ON TBL_SCHEMAS (organizationId, unitId, contextId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMA_ALL_INDEX ON TBL_SCHEMAS (organizationId, unitId, contextId, schemaId)");
+      jdbi.handle().execute("ALTER TABLE TBL_SCHEMAS ADD CONSTRAINT IF NOT EXISTS SCHEMA_ALL_UNIQUE UNIQUE (organizationId, unitId, contextId, category, name)");
   }
 
   @Override
@@ -120,8 +117,9 @@ protected void createSchemaVersionStateTable() {
 //              "UNIQUE (schemaId, currentVersion) " +
               ")");
 
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMAVERSION_PARENT_INDEX ON TBL_SCHEMAVERSIONS (organizationId, unitId, contextId, schemaId)");
-//      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMAVERSION_ALL_INDEX ON TBL_SCHEMAVERSIONS (organizationId, unitId, contextId, schemaId, schemaVersionId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMAVERSION_PARENT_INDEX ON TBL_SCHEMAVERSIONS (organizationId, unitId, contextId, schemaId)");
+      jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMAVERSION_ALL_INDEX ON TBL_SCHEMAVERSIONS (organizationId, unitId, contextId, schemaId, schemaVersionId)");
+      jdbi.handle().execute("ALTER TABLE TBL_SCHEMAVERSIONS ADD CONSTRAINT IF NOT EXISTS SCHEMAVERSIION_ALL_UNIQUE UNIQUE (organizationId, unitId, contextId, schemaId, currentVersion)");
   }
 
   @Override

src/main/java/io/vlingo/schemata/infra/persistence/PostgresSchemataObjectStore.java

@@ -26,9 +26,8 @@ protected void createOrganizationStateTable() {
       jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS ORG_ALL_INDEX ON TBL_ORGANIZATIONS (organizationId)");
 
       /*
-      Dropping the constraint and recreating it afterwards is not an optimal solution once we have actual data.
-
-      TODO: Refactor to find out if constraint already exists or switch to a schema migration tool like flyway or liquibase
+       * Dropping the constraint and recreating it afterwards is not an optimal solution once we have actual data.
+       * TODO: Refactor to find out if constraint already exists or switch to a schema migration tool like flyway or liquibase
        */
       jdbi.handle().execute("ALTER TABLE TBL_ORGANIZATIONS DROP CONSTRAINT IF EXISTS ORGANIZATION_UNIQUE");
       jdbi.handle().execute("ALTER TABLE TBL_ORGANIZATIONS ADD CONSTRAINT ORGANIZATION_UNIQUE UNIQUE (name)");
@@ -96,7 +95,7 @@ protected void createSchemaStateTable() {
       jdbi.handle().execute("CREATE UNIQUE INDEX IF NOT EXISTS SCHEMA_ALL_INDEX ON TBL_SCHEMAS (organizationId, unitId, contextId, schemaId)");
 
       jdbi.handle().execute("ALTER TABLE TBL_SCHEMAS DROP CONSTRAINT IF EXISTS SCHEMA_ALL_UNIQUE");
-      jdbi.handle().execute("ALTER TABLE TBL_SCHEMAS ADD CONSTRAINT SCHEMA_ALL_UNIQUE UNIQUE (organizationId, unitId, contextId, name)");
+      jdbi.handle().execute("ALTER TABLE TBL_SCHEMAS ADD CONSTRAINT SCHEMA_ALL_UNIQUE UNIQUE (organizationId, unitId, contextId, category, name)");
 
   }
 

src/test/e2e/cypress/integration/browse-schemata.spec.ts

@@ -85,11 +85,101 @@ describe('Schemata View Tests', function () {
         cy.contains('.v-list-item__title', currentVersion).click()
 
         // Assert spec & desc
-        cy.contains('code','event SalutationHappened')
-        cy.contains('code','type eventType')
+        cy.editorContent('#specification-editor').should('contain','event SalutationHappened')
+        cy.editorContent('#specification-editor').should('contain','type eventType')
+
+
         cy.contains('.v-tab', 'Description').click()
         cy.contains('.v-window-item--active',desc)
 
     });
 
+    it('can update schema version specification', function () {
+        // Setup
+        let orgName = faker.company.companyName()
+        let unitName = faker.lorem.word()
+        let namespace = faker.internet.domainName()
+        let schema = faker.company.catchPhraseNoun()
+        let majorMinorVersion = faker.random.number(9) + '.' + faker.random.number(9)
+        let patchVersion = faker.random.number(9)
+        let prevVersion = majorMinorVersion + '.' + patchVersion
+        let currentVersion = majorMinorVersion + '.' + (patchVersion + 1)
+        let spec = 'event SalutationHappened {\n' +
+            '    type eventType'
+        let desc = faker.lorem.sentence()
+
+        // Create Entities
+        cy.visit('/#/organization')
+        cy.fillField('Name', orgName)
+        cy.fillField('Description', 'foo')
+        cy.contains('button', 'Create').click()
+        cy.contains('a', 'Create Unit').click()
+
+        cy.selectOption('Organization', orgName)
+        cy.fillField('Name', unitName)
+        cy.fillField('Description', 'foo')
+        cy.contains('button', 'Create').click()
+        cy.contains('a', 'Create Context').click()
+
+        cy.selectOption('Organization', orgName)
+        cy.selectOption('Unit', unitName)
+        cy.fillField('Namespace', namespace)
+        cy.fillField('Description', 'foo')
+        cy.contains('button', 'Create').click()
+        cy.contains('a', 'Create Schema').click()
+
+        cy.fieldContent('SchemaID').should('be.empty')
+        cy.selectOption('Organization', orgName)
+        cy.selectOption('Unit', unitName)
+        cy.selectOption('Context', namespace)
+        cy.fillField('Name', schema)
+        cy.selectOption('Category', faker.random.arrayElement(['Command', 'Data', 'Document', 'Envelope', 'Event', 'Unknown']))
+        cy.selectOption('Scope', faker.random.arrayElement(['Public', 'Private']))
+        cy.fillField('Description', faker.lorem.sentence())
+        cy.contains('button', 'Create').click()
+        cy.contains('a', 'Create Schema Version').click()
+
+        cy.fieldContent('SchemaVersionID').should('be.empty')
+        cy.selectOption('Organization', orgName)
+        cy.selectOption('Unit', unitName)
+        cy.selectOption('Context', namespace)
+        cy.selectOption('Schema', schema)
+        cy.fillField('Previous Version', prevVersion)
+        cy.fillField('Current Version', currentVersion)
+        cy.selectOption('Status', 'Draft')
+        cy.fillEditor('#description-editor', desc)
+        cy.fillEditor('#specification-editor', spec)
+        cy.contains('button', 'Create').click()
+
+        // Assert visibility in treeview
+        // Filter for Org
+        cy.visit("/#/schemata")
+            .fillField('Search', orgName)
+
+        // Expand Tree
+        cy.contains('.v-treeview-node__label', orgName).click()
+        cy.contains('.v-treeview-node__label', unitName).click()
+        cy.contains('.v-treeview-node__label', namespace).click()
+        cy.contains('.v-treeview-node__label', schema).click()
+
+        // Select version
+        cy.contains('.v-list-item__title', currentVersion).click()
+
+        // Change spec
+        cy.fillEditor('#specification-editor', 'foo bar baz')
+        cy.contains('button', 'Save').click()
+
+        // Reload and navigate to schema version
+        cy.reload()
+        cy.visit("/#/schemata")
+            .fillField('Search', orgName)
+        cy.contains('.v-treeview-node__label', orgName).click()
+        cy.contains('.v-treeview-node__label', unitName).click()
+        cy.contains('.v-treeview-node__label', namespace).click()
+        cy.contains('.v-treeview-node__label', schema).click()
+        cy.contains('.v-list-item__title', currentVersion).click()
+
+        cy.editorContent('#specification-editor').should('contain','foo bar baz')
+    });
+
 });

src/test/e2e/cypress/support/commands.ts

@@ -26,6 +26,15 @@ Cypress.Commands.add("fieldContent", (label: string) => {
         .next('input,textarea').invoke('val')
 })
 
+Cypress.Commands.add("editorContent", (id: string) => {
+    cy.get(id)
+        .get('.monaco-editor .lines-content')
+        .then(content => content.text()
+            .replace(/\s+/g, ' ')
+            .trim()
+        )
+})
+
 Cypress.Commands.add("selectOption", (label: string, optionLabel: string) => {
     cy.contains('label', new RegExp("^" + label + "$"))
         .next('input')

src/test/e2e/cypress/support/index.d.ts

@@ -14,6 +14,14 @@ declare namespace Cypress {
          */
         fillEditor(label: string, text: string): Chainable<Element>
 
+        /**
+         * Get the contents of a vue-monaco-editor field identified by its id.
+         * Note that whitespace is simplified, all consecutive whitespaces are reduced to one
+         * and leading and trailing whitespace is removed.
+         * @example cy.editorContent('#specification-editor')
+         */
+        editorContent(id: string): Chainable<Element>
+
         /**
          * Return the value a Vuetify text(area) field identified by its label
          * @example cy.fieldContent('Name')