- optimized page middleware

- bugfixed organization delete message
- bugfixed org landing page solution list after delete
- refactored domain to export from index file to avoid circular dependency errors
- Organization now explicitly references solutions
- Solution now explicitly references associated requirements
- Justifications now created w/ Solution instead of lazily on rationale page

middleware/org-solution-check.global.ts

@@ -4,21 +4,21 @@
  */
 export default defineNuxtRouteMiddleware(async (to, from) => {
     if (to.params.organizationslug) {
-        const { data: organizations } = await useFetch('/api/organizations', {
+        const organizations = await $fetch('/api/organizations', {
             query: { slug: to.params.organizationslug }
         })
 
-        if (!(organizations?.value ?? []).length) {
+        if (!(organizations ?? []).length) {
             return navigateTo('/')
         } else if (to.params.solutionslug) {
-            const { data: solutions } = await useFetch('/api/solutions', {
+            const solutions = await $fetch('/api/solutions', {
                 query: {
                     organizationSlug: to.params.organizationslug,
                     slug: to.params.solutionslug
                 }
             })
 
-            if (!(solutions?.value ?? []).length)
+            if (!(solutions ?? []).length)
                 return navigateTo(`/o/${to.params.organizationslug}`)
         }
     }

migrations/.snapshot-cathedral.json

@@ -321,7 +321,7 @@
             "id"
           ],
           "referencedTableName": "public.organization",
-          "deleteRule": "cascade"
+          "updateRule": "cascade"
         }
       },
       "nativeEnums": {}

migrations/Migration20240831162504.ts

@@ -0,0 +1,17 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20240831162504 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql('alter table "solution" drop constraint "solution_organization_id_foreign";');
+
+    this.addSql('alter table "solution" add constraint "solution_organization_id_foreign" foreign key ("organization_id") references "organization" ("id") on update cascade;');
+  }
+
+  override async down(): Promise<void> {
+    this.addSql('alter table "solution" drop constraint "solution_organization_id_foreign";');
+
+    this.addSql('alter table "solution" add constraint "solution_organization_id_foreign" foreign key ("organization_id") references "organization" ("id") on delete cascade;');
+  }
+
+}

pages/index.client.vue

@@ -1,7 +1,4 @@
 <script lang="ts" setup>
-import Organization from '~/server/domain/application/Organization';
-import type { Properties } from '~/server/domain/Properties';
-
 definePageMeta({ name: 'Home' })
 
 const router = useRouter(),
@@ -12,9 +9,9 @@ const router = useRouter(),
 if (getOrgError.value)
     $eventBus.$emit('page-error', getOrgError.value)
 
-const handleDelete = async (organization: Properties<Organization>) => {
+const handleDelete = async (organization: { id: string, name: string }) => {
     confirm.require({
-        message: `Are you sure you want to delete ${Organization.name}? This will also delete all associated solutions.`,
+        message: `Are you sure you want to delete ${organization.name}? This will also delete all associated solutions.`,
         header: 'Delete Confirmation',
         icon: 'pi pi-exclamation-triangle',
         rejectLabel: 'Cancel',
@@ -29,11 +26,11 @@ const handleDelete = async (organization: Properties<Organization>) => {
     })
 }
 
-const handleEdit = (organization: Organization) => {
+const handleEdit = (organization: { slug: string }) => {
     router.push({ name: 'Edit Organization', params: { organizationslug: organization.slug } });
 }
 
-const handleUsers = (organization: Organization) => {
+const handleUsers = (organization: { slug: string }) => {
     router.push({ name: 'Organization Users', params: { organizationslug: organization.slug } });
 }
 </script>
@@ -64,12 +61,12 @@ const handleUsers = (organization: Organization) => {
                 {{ organization.description }}
             </template>
             <template #footer>
-                <Button icon="pi pi-pencil" class="edit-button mr-2" @click="handleEdit(organization as Organization)"
+                <Button icon="pi pi-pencil" class="edit-button mr-2" @click="handleEdit(organization)"
                     title="Edit Organization" />
-                <Button icon="pi pi-users" class="edit-button mr-2" @click="handleUsers(organization as Organization)"
+                <Button icon="pi pi-users" class="edit-button mr-2" @click="handleUsers(organization)"
                     title="Manage Users" />
-                <Button icon="pi pi-trash" class="delete-button" @click="handleDelete(organization as Organization)"
-                    severity="danger" title="Delete Organization" />
+                <Button icon="pi pi-trash" class="delete-button" @click="handleDelete(organization)" severity="danger"
+                    title="Delete Organization" />
             </template>
         </Card>
     </div>

pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useFetch } from 'nuxt/app';
 import { FilterMatchMode } from 'primevue/api';
-import ConstraintCategory from '~/server/domain/requirements/ConstraintCategory';
+import { ConstraintCategory } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Constraints' })

pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Functionality' })

pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue

@@ -22,10 +22,10 @@ type JustificationModel = {
 }
 
 const [
-    { data: visionJustifications, refresh: refreshVision, error: getVisionError },
-    { data: missionJustifications, refresh: refreshMission, error: getMissionError },
-    { data: situationJustifications, refresh: refreshSituation, error: getSituationError },
-    { data: objectiveJustifications, refresh: refreshObjective, error: getObjectiveError }
+    { data: visionJustifications, error: getVisionError },
+    { data: missionJustifications, error: getMissionError },
+    { data: situationJustifications, error: getSituationError },
+    { data: objectiveJustifications, error: getObjectiveError }
 ] = await Promise.all([
     useFetch(`/api/justifications?solutionId=${solutionId}&name=Vision`),
     useFetch(`/api/justifications?solutionId=${solutionId}&name=Mission`),
@@ -42,41 +42,6 @@ if (getSituationError.value)
 if (getObjectiveError.value)
     $eventBus.$emit('page-error', getObjectiveError.value);
 
-if (!visionJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Vision', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!missionJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Mission', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!situationJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Situation', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-if (!objectiveJustifications.value?.length) {
-    useFetch(`/api/justifications`, {
-        method: 'POST',
-        body: { solutionId, name: 'Objective', statement: '' }
-    }).catch((e) => $eventBus.$emit('page-error', e));
-}
-
-await Promise.all([
-    refreshVision(),
-    refreshMission(),
-    refreshSituation(),
-    refreshObjective()
-]);
-
 const visionStatement = ref(visionJustifications.value?.[0].statement!),
     missionStatement = ref(missionJustifications.value?.[0].statement!),
     situationStatement = ref(situationJustifications.value?.[0].statement!),

pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Scenarios' })

pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue

@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
 import mermaid from 'mermaid';
-import StakeholderCategory from '~/server/domain/requirements/StakeholderCategory';
-import StakeholderSegmentation from '~/server/domain/requirements/StakeholderSegmentation';
+import { StakeholderCategory, StakeholderSegmentation } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Stakeholders' })

pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Functionality' })

pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
-import MoscowPriority from '~/server/domain/requirements/MoscowPriority';
+import { MoscowPriority } from '~/server/domain/requirements/index';
 import { NIL as emptyUuid } from 'uuid';
 
 useHead({ title: 'Scenarios' })

pages/o/[organization-slug]/index.client.vue

@@ -11,7 +11,7 @@ const { $eventBus } = useNuxtApp(),
         query: { slug: organizationslug }
     }),
     organization = organizations.value![0],
-    { refresh, status, data: solutions, error: getSolutionError } = await useFetch('/api/solutions', {
+    { refresh: refreshSolutions, status, data: solutions, error: getSolutionError } = await useFetch('/api/solutions', {
         query: { organizationSlug: organizationslug }
     }),
     confirm = useConfirm()
@@ -65,7 +65,7 @@ const handleSolutionDelete = async (solution: Properties<SolutionModel>) => {
             await $fetch(`/api/solutions/${solution.id}`, {
                 method: 'delete'
             }).catch((e) => $eventBus.$emit('page-error', e))
-            router.push({ name: 'Organization', params: { organizationslug } });
+            await refreshSolutions()
         },
         reject: () => { }
     })

server/api/assumptions/[id].delete.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 /**
  * Delete an assumption by id.

server/api/assumptions/[id].get.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 /**
  * Returns an assumption by id

server/api/assumptions/[id].put.ts

@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({

server/api/assumptions/index.get.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),

server/api/assumptions/index.post.ts

@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Assumption from "~/server/domain/requirements/Assumption"
+import { Assumption } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({

server/api/constraints/[id].delete.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint } from "~/server/domain/requirements/index"
 
 /**
  * Delete constraint by id.

server/api/constraints/[id].get.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint } from "~/server/domain/requirements/index"
 
 /**
  * Returns a constraint by id

server/api/constraints/[id].put.ts

@@ -1,6 +1,5 @@
 import { z } from "zod"
-import Constraint from "~/server/domain/requirements/Constraint"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
 

server/api/constraints/index.get.ts

@@ -1,7 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),

server/api/constraints/index.post.ts

@@ -1,8 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Constraint from "~/server/domain/requirements/Constraint"
+import { Constraint, ConstraintCategory } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
-import ConstraintCategory from "~/server/domain/requirements/ConstraintCategory"
 
 const bodySchema = z.object({
     name: z.string().min(1),

server/api/effects/[id].delete.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 /**
  * Delete an effect by id.

server/api/effects/[id].get.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 /**
  * Returns an effect by id

server/api/effects/[id].put.ts

@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({

server/api/effects/index.get.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),

server/api/effects/index.post.ts

@@ -1,6 +1,6 @@
 import { fork } from "~/server/data/orm"
 import { z } from "zod"
-import Effect from "~/server/domain/requirements/Effect"
+import { Effect } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({

server/api/environment-components/[id].delete.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 /**
  * Delete an environment component by id.

server/api/environment-components/[id].get.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 /**
  * Returns an environment component by id

server/api/environment-components/[id].put.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 import Solution from "~/server/domain/application/Solution"
 
 const bodySchema = z.object({

server/api/environment-components/index.get.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 const querySchema = z.object({
     name: z.string().optional(),

server/api/environment-components/index.post.ts

@@ -1,7 +1,7 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm"
 import Solution from "~/server/domain/application/Solution"
-import EnvironmentComponent from "~/server/domain/requirements/EnvironmentComponent"
+import { EnvironmentComponent } from "~/server/domain/requirements/index"
 
 const bodySchema = z.object({
     name: z.string(),

server/api/functional-behaviors/[id].delete.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Delete an functional behavior by id.

server/api/functional-behaviors/[id].get.ts

@@ -1,5 +1,5 @@
 import { fork } from "~/server/data/orm"
-import FunctionalBehavior from "~/server/domain/requirements/FunctionalBehavior"
+import { FunctionalBehavior } from "~/server/domain/requirements/index"
 
 /**
  * Returns a functional behavior by id