- GET /api/solutions now require an organizationSlug or organizationId (

#285) - version bump - bugfix of GET /api/appusers - bugfix of GET /api/organizatons
final-hill · Jul 29, 2024 · 883a112 · 883a112
1 parent 868b0ff
commit 883a112
Show file tree

Hide file tree

Showing 25 changed files with 197 additions and 96 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@final-hill/cathedral",
-    "version": "0.10.2",
+    "version": "0.11.0",
     "description": "Requirements management system",
     "keywords": [],
     "private": true,

diff --git a/pages/o/[organization-slug]/[solution-slug]/edit-entry.client.vue b/pages/o/[organization-slug]/[solution-slug]/edit-entry.client.vue
@@ -7,7 +7,12 @@ definePageMeta({ name: 'Edit Solution' })
 const route = useRoute('Edit Solution'),
     { organizationslug, solutionslug } = route.params,
     router = useRouter(),
-    { data: solutions } = await useFetch(`/api/solutions/`, { query: { slug: solutionslug } }),
+    { data: solutions } = await useFetch(`/api/solutions/`, {
+        query: {
+            organizationSlug: organizationslug,
+            slug: solutionslug
+        }
+    }),
     solution = ref(solutions.value![0]),
     newSlug = ref(solution.value.slug);
 

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/assumptions.client.vue
@@ -6,8 +6,13 @@ import { useFetch } from 'nuxt/app';
 useHead({ title: 'Assumptions' })
 definePageMeta({ name: 'Assumptions' })
 
-const { solutionslug } = useRoute('Assumptions').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Assumptions').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            organizationSlug: organizationslug,
+            slug: solutionslug
+        }
+    }),
     solutionId = solutions.value?.at(0)?.id;
 
 type AssumptionViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/components.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Components' })
 definePageMeta({ name: 'Environment Components' })
 
-const { solutionslug } = useRoute('Environment Components').params,
-    { data: solutions } = await useFetch('/api/solutions', { query: { slug: solutionslug } }),
+const { solutionslug, organizationslug } = useRoute('Environment Components').params,
+    { data: solutions } = await useFetch('/api/solutions', {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id,
     { data: environmentComponents, status, refresh } = await useFetch('/api/environment-components', {
         query: { solutionId }

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/constraints.client.vue
@@ -7,8 +7,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Constraints' })
 definePageMeta({ name: 'Constraints' })
 
-const { solutionslug } = useRoute('Constraints').params,
-    { data: solutions } = await useFetch('/api/solutions', { query: { slug: solutionslug } }),
+const { solutionslug, organizationslug } = useRoute('Constraints').params,
+    { data: solutions } = await useFetch('/api/solutions', {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solution = (solutions.value ?? [])[0],
     solutionId = solution.id,
     { data: constraints, status, refresh } = await useFetch('/api/constraints', {

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/effects.client.vue
@@ -5,9 +5,12 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Effects' })
 definePageMeta({ name: 'Effects' })
 
-const { solutionslug } = useRoute('Effects').params,
+const { solutionslug, organizationslug } = useRoute('Effects').params,
     { data: solutions } = await useFetch('/api/solutions', {
-        query: { slug: solutionslug }
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
     }),
     solutionId = solutions.value?.[0].id!
 

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/glossary.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Glossary' })
 definePageMeta({ name: 'Glossary' })
 
-const { solutionslug } = useRoute('Glossary').params,
-    { data: solutions } = await useFetch('/api/solutions', { query: { slug: solutionslug } }),
+const { solutionslug, organizationslug } = useRoute('Glossary').params,
+    { data: solutions } = await useFetch('/api/solutions', {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type GlossaryTermViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue b/pages/o/[organization-slug]/[solution-slug]/environment/invariants.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Invariants' })
 definePageMeta({ name: 'Invariants' })
 
-const { solutionslug } = useRoute('Invariants').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Invariants').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id
 
 type InvariantViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/functionality.client.vue
@@ -6,8 +6,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Functionality' })
 definePageMeta({ name: 'Goals Functionality' })
 
-const { solutionslug } = useRoute('Functionality').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Functionality').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id
 
 type FunctionalBehaviorViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/limitations.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Limitations' })
 definePageMeta({ name: 'Limitations' })
 
-const { solutionslug } = useRoute('Limitations').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Limitations').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id
 
 type LimitViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/obstacles.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Obstacles' })
 definePageMeta({ name: 'Obstacles' })
 
-const {solutionslug} = useRoute('Obstacles').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Obstacles').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type ObstacleViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/outcomes.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Outcomes' })
 definePageMeta({ name: 'Outcomes' })
 
-const { solutionslug } = useRoute('Outcomes').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Outcomes').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type OutcomeViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/rationale.client.vue
@@ -4,8 +4,13 @@ import debounce from '~/lib/debounce';
 useHead({ title: 'Rationale' })
 definePageMeta({ name: 'Rationale' })
 
-const { solutionslug } = useRoute('Rationale').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Rationale').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type JustificationModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/scenarios.client.vue
@@ -7,7 +7,12 @@ useHead({ title: 'Scenarios' })
 definePageMeta({ name: 'Goal Scenarios' })
 
 const { solutionslug, organizationslug } = useRoute('Scenarios').params,
-    { data: solutions } = await useFetch(`/api/solutions/?slug=${solutionslug}`),
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type UserStoryViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/stakeholders.client.vue
@@ -9,8 +9,13 @@ useHead({ title: 'Stakeholders' })
 definePageMeta({ name: 'Stakeholders' })
 
 const config = useAppConfig(),
-    { solutionslug } = useRoute('Stakeholders').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+    { solutionslug, organizationslug } = useRoute('Stakeholders').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type StakeHolderViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/index.client.vue b/pages/o/[organization-slug]/[solution-slug]/index.client.vue
@@ -7,7 +7,10 @@ definePageMeta({ name: 'Solution' })
 const { solutionslug, organizationslug } = useRoute('Solution').params,
     router = useRouter(),
     { data: solutions } = await useFetch('/api/solutions', {
-        query: { slug: solutionslug }
+        query: {
+            organizationSlug: organizationslug,
+            slug: solutionslug
+        }
     }),
     solution = solutions.value![0],
     confirm = useConfirm()

diff --git a/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue b/pages/o/[organization-slug]/[solution-slug]/project/roles-personnel.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Roles & Personnel' })
 definePageMeta({ name: 'Roles & Personnel' })
 
-const { solutionslug } = useRoute('Roles & Personnel').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Roles & Personnel').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id
 
 type PersonViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/components.client.vue
@@ -5,8 +5,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Components' })
 definePageMeta({ name: 'System Components' })
 
-const { solutionslug } = useRoute('System Components').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('System Components').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id;
 
 type SystemComponentViewModel = {

diff --git a/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/functionality.client.vue
@@ -6,8 +6,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Functionality' })
 definePageMeta({ name: 'Functionality' })
 
-const { solutionslug } = useRoute('Functionality').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Functionality').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solution = solutions.value?.[0]!,
     solutionId = solution.id;
 

diff --git a/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue b/pages/o/[organization-slug]/[solution-slug]/system/scenarios.client.vue
@@ -6,8 +6,13 @@ import { NIL as emptyUuid } from 'uuid';
 useHead({ title: 'Scenarios' })
 definePageMeta({ name: 'Scenarios' })
 
-const { solutionslug } = useRoute('Scenarios').params,
-    { data: solutions } = await useFetch(`/api/solutions?slug=${solutionslug}`),
+const { solutionslug, organizationslug } = useRoute('Scenarios').params,
+    { data: solutions } = await useFetch(`/api/solutions`, {
+        query: {
+            slug: solutionslug,
+            organizationSlug: organizationslug
+        }
+    }),
     solutionId = solutions.value?.[0].id!;
 
 type UserStoryViewModel = {

diff --git a/pages/o/[organization-slug]/index.client.vue b/pages/o/[organization-slug]/index.client.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import Organization from '~/server/domain/application/Organization';
 import type { Properties } from '~/server/domain/Properties';
 
 useHead({ title: 'Organization' })
@@ -12,7 +11,7 @@ const { organizationslug } = useRoute('Organization').params,
     }),
     organization = organizations.value![0],
     { refresh, status, data: solutions } = await useFetch('/api/solutions', {
-        query: { slug: organizationslug }
+        query: { organizationSlug: organizationslug }
     }),
     confirm = useConfirm()
 
@@ -25,7 +24,7 @@ type SolutionModel = {
 
 const handleOrganizationDelete = async () => {
     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',

diff --git a/server/api/appusers/index.get.ts b/server/api/appusers/index.get.ts
@@ -41,11 +41,11 @@ export default defineEventHandler(async (event) => {
 
     // If the user is not associated with the organization
     // or is not a system admin, return a 403
-    if (!sessionUserOrg || !sessionUser.isSystemAdmin)
+    if (!sessionUserOrg && !sessionUser.isSystemAdmin)
         throw createError({
             statusCode: 403,
             statusMessage: "Forbidden",
-            message: "You are not associated with the organization"
+            message: "You are not associated with the organization."
         })
 
     type ResponseType = {