From 54e63a6a91b094a996107c7c01cf700f0d6e7350 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Fri, 1 Nov 2024 15:11:30 +0100
Subject: [PATCH 01/16] finished delete themes

---
 src/dialogs/Dialogs.vue                       |   7 ++
 .../DeletePublicationThemeDialog.vue          | 115 ++++++++++++++++++
 src/entities/publication/publication.ts       |  12 +-
 src/views/publications/PublicationDetail.vue  |  66 +++++++++-
 4 files changed, 189 insertions(+), 11 deletions(-)
 create mode 100644 src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue

diff --git a/src/dialogs/Dialogs.vue b/src/dialogs/Dialogs.vue
index d44166aa..9160f1f7 100644
--- a/src/dialogs/Dialogs.vue
+++ b/src/dialogs/Dialogs.vue
@@ -1,3 +1,7 @@
+<script setup>
+import { navigationStore } from '../store/store.js'
+</script>
+
 <template>
 	<!-- Placeholder div -->
 	<div>
@@ -15,6 +19,7 @@
 		<DeletePublicationDialog />
 		<DeletePublicationDataDialog />
 		<CopyPublicationDialog />
+		<DeletePublicationThemeDialog v-if="navigationStore.dialog === 'deletePublicationThemeDialog'" />
 		<PublishPublicationDialog />
 		<DepublishPublicationDialog />
 		<DeleteCatalogDialog />
@@ -49,6 +54,7 @@ import DeletePublicationDialog from './publication/DeletePublicationDialog.vue'
 import DepublishPublicationDialog from './publication/DepublishPublicationDialog.vue'
 import PublishPublicationDialog from './publication/PublishPublicationDialog.vue'
 import DeletePublicationDataDialog from './publicationData/DeletePublicationDataDialog.vue'
+import DeletePublicationThemeDialog from './publicationTheme/DeletePublicationThemeDialog.vue'
 import CopyThemeDialog from './theme/CopyThemeDialog.vue'
 import DeleteThemeDialog from './theme/DeleteThemeDialog.vue'
 import DownloadPublicationDialog from './publication/DownloadPublicationDialog.vue'
@@ -70,6 +76,7 @@ export default {
 		DeletePublicationDialog,
 		CopyPublicationDialog,
 		DeletePublicationDataDialog,
+		DeletePublicationThemeDialog,
 		PublishPublicationDialog,
 		DepublishPublicationDialog,
 		ArchivePublicationDialog,
diff --git a/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue b/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue
new file mode 100644
index 00000000..8b73f611
--- /dev/null
+++ b/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue
@@ -0,0 +1,115 @@
+<script setup>
+import { navigationStore, publicationStore, themeStore } from '../../store/store.js'
+</script>
+
+<template>
+	<NcDialog name="Publicatie thema verwijderen"
+		:can-close="false">
+		<div v-if="success !== null || error">
+			<NcNoteCard v-if="success" type="success">
+				<p>Publicatie thema succesvol verwijderd</p>
+			</NcNoteCard>
+			<NcNoteCard v-if="!success" type="error">
+				<p>Er is iets fout gegaan bij het verwijderen van Publicatie thema</p>
+			</NcNoteCard>
+			<NcNoteCard v-if="error" type="error">
+				<p>{{ error }}</p>
+			</NcNoteCard>
+		</div>
+		<p v-if="success === null">
+			Wil je <b>{{ themeStore.themeItem.title }}</b> definitief verwijderen? Deze actie kan niet ongedaan worden gemaakt.
+		</p>
+		<template #actions>
+			<NcButton :disabled="loading" icon="" @click="navigationStore.setDialog(false)">
+				<template #icon>
+					<Cancel :size="20" />
+				</template>
+				{{ success !== null ? 'Sluiten' : 'Annuleer' }}
+			</NcButton>
+			<NcButton
+				v-if="success === null"
+				:disabled="loading"
+				icon="Delete"
+				type="error"
+				@click="DeleteTheme()">
+				<template #icon>
+					<NcLoadingIcon v-if="loading" :size="20" />
+					<Delete v-if="!loading" :size="20" />
+				</template>
+				Verwijderen
+			</NcButton>
+		</template>
+	</NcDialog>
+</template>
+
+<script>
+import { NcButton, NcDialog, NcNoteCard, NcLoadingIcon } from '@nextcloud/vue'
+
+import Cancel from 'vue-material-design-icons/Cancel.vue'
+import Delete from 'vue-material-design-icons/Delete.vue'
+import { Publication } from '../../entities/index.js'
+
+export default {
+	name: 'DeletePublicationThemeDialog',
+	components: {
+		NcDialog,
+		NcButton,
+		NcNoteCard,
+		NcLoadingIcon,
+		// Icons
+		Cancel,
+		Delete,
+	},
+	data() {
+		return {
+			loading: false,
+			success: null,
+			error: false,
+		}
+	},
+	methods: {
+		DeleteTheme() {
+			this.loading = true
+
+			const publicationClone = { ...publicationStore.publicationItem }
+			publicationClone.themes = publicationClone.themes.filter(themeId => themeId !== themeStore.themeItem.id)
+
+			const publicationItem = new Publication({
+				...publicationClone,
+			})
+
+			publicationStore.editPublication(publicationItem)
+				.then(({ response }) => {
+					this.loading = false
+					this.success = response.ok
+
+					// Wait for the user to read the feedback then close the model
+					setTimeout(() => {
+						navigationStore.setDialog(false)
+					}, 2000)
+				})
+				.catch((err) => {
+					this.error = err
+					this.loading = false
+				})
+		},
+	},
+}
+</script>
+
+<style>
+.modal__content {
+    margin: var(--OC-margin-50);
+    text-align: center;
+}
+
+.zaakDetailsContainer {
+    margin-block-start: var(--OC-margin-20);
+    margin-inline-start: var(--OC-margin-20);
+    margin-inline-end: var(--OC-margin-20);
+}
+
+.success {
+    color: green;
+}
+</style>
diff --git a/src/entities/publication/publication.ts b/src/entities/publication/publication.ts
index a01f3d6f..dee7e62f 100644
--- a/src/entities/publication/publication.ts
+++ b/src/entities/publication/publication.ts
@@ -74,12 +74,12 @@ export class Publication implements TPublication {
 		this.themes = data.themes || []
 		this.data = (!Array.isArray(data.data) && data.data) || {}
 
-		this.anonymization = data.anonymization || {
+		this.anonymization = (!Array.isArray(data.anonymization) && data.anonymization) || {
 			anonymized: false,
 			results: '',
 		}
 
-		this.language = data.language || {
+		this.language = (!Array.isArray(data.language) && data.language) || {
 			code: '',
 			level: '',
 		}
@@ -87,16 +87,16 @@ export class Publication implements TPublication {
 		this.published = data.published || ''
 		this.modified = data.modified || ''
 		this.license = data.license || ''
-		this.archive = data.archive || {
+		this.archive = (!Array.isArray(data.archive) && data.archive) || {
 			date: '',
 		}
 
-		this.geo = data.geo || {
+		this.geo = (!Array.isArray(data.geo) && data.geo) || {
 			type: 'Point',
 			coordinates: [0, 0],
 		}
 
-		this.catalog = data.catalog || {}
+		this.catalog = (!Array.isArray(data.catalog) && data.catalog) || {}
 		this.publicationType = (data.publicationType ?? data.publicationType) || ''
 	}
 
@@ -116,7 +116,7 @@ export class Publication implements TPublication {
 			status: z.enum(['Concept', 'Published', 'Withdrawn', 'Archived', 'Revised', 'Rejected']),
 			attachments: z.union([z.string(), z.number()]).array(),
 			attachmentCount: z.number(),
-			themes: z.string().array(),
+			themes: z.array(z.union([z.string(), z.number()])),
 			data: z.record(z.string(), z.any()),
 			anonymization: z.object({
 				anonymized: z.boolean(),
diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
index d89fe77b..e9e39809 100644
--- a/src/views/publications/PublicationDetail.vue
+++ b/src/views/publications/PublicationDetail.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { catalogiStore, publicationTypeStore, navigationStore, publicationStore } from '../../store/store.js'
+import { catalogiStore, publicationTypeStore, navigationStore, publicationStore, themeStore } from '../../store/store.js'
 import { ref } from 'vue'
 
 </script>
@@ -120,10 +120,6 @@ import { ref } from 'vue'
 					<b>Afbeelding:</b>
 					<span>{{ publicationStore.publicationItem?.image }}</span>
 				</div>
-				<div>
-					<b>Thema's:</b>
-					<span>{{ publicationStore.publicationItem?.themes.join(", ") }}</span>
-				</div>
 				<div>
 					<b>Uitgelicht:</b>
 					<span>{{ publicationStore.publicationItem?.featured ? "Ja" : "Nee" }}</span>
@@ -332,6 +328,43 @@ import { ref } from 'vue'
 							Geen eigenschappen gevonden
 						</div>
 					</BTab>
+					<BTab title="Thema's">
+						<div v-if="filteredThemes?.length">
+							<NcListItem v-for="(value, key, i) in filteredThemes"
+								:key="`${value.id}${i}`"
+								:name="value.title"
+								:bold="false"
+								:force-display-actions="true"
+								:active="themeStore.themeItem?.id === value.id">
+								<template #icon>
+									<ShapeOutline
+										:class="themeStore.themeItem?.id === value.id && 'selectedZaakIcon'"
+										disable-menu
+										:size="44" />
+								</template>
+								<template #subname>
+									{{ value.summary }}
+								</template>
+								<template #actions>
+									<NcActionButton @click="themeStore.setThemeItem(value); navigationStore.setSelected('themes')">
+										<template #icon>
+											<OpenInApp :size="20" />
+										</template>
+										Bekijken
+									</NcActionButton>
+									<NcActionButton @click="themeStore.setThemeItem(value); navigationStore.setDialog('deletePublicationThemeDialog')">
+										<template #icon>
+											<Delete :size="20" />
+										</template>
+										Verwijderen
+									</NcActionButton>
+								</template>
+							</NcListItem>
+						</div>
+						<div v-if="!filteredThemes?.length" class="tabPanel">
+							Geen thema's gevonden
+						</div>
+					</BTab>
 					<BTab title="Logging">
 						<table width="100%">
 							<tr>
@@ -462,6 +495,7 @@ export default {
 			publication: [],
 			catalogi: [],
 			publicationType: [],
+			themes: [],
 			prive: false,
 			loading: false,
 			catalogiLoading: false,
@@ -490,6 +524,11 @@ export default {
 			upToDate: false,
 		}
 	},
+	computed: {
+		filteredThemes() {
+			return themeStore.themeList.filter((theme) => this.publication?.themes?.includes(theme.id))
+		},
+	},
 	watch: {
 		publicationItem: {
 			handler(newPublicationItem, oldPublicationItem) {
@@ -498,6 +537,7 @@ export default {
 					this.publication = publicationStore.publicationItem
 					this.fetchCatalogi(publicationStore.publicationItem?.catalog?.id ?? publicationStore.publicationItem.catalogi)
 					this.fetchPublicationType(publicationStore.publicationItem?.publicationType)
+					this.fetchThemes()
 					publicationStore.publicationItem?.id && this.fetchData(publicationStore.publicationItem.id)
 				}
 			},
@@ -510,6 +550,7 @@ export default {
 
 		this.fetchCatalogi(this.publication.catalog?.id ?? this.publication.catalog)
 		this.fetchPublicationType(publicationStore.publicationItem.publicationType)
+		this.fetchThemes()
 		publicationStore.publicationItem?.id && this.fetchData(publicationStore.publicationItem.id)
 
 	},
@@ -523,6 +564,7 @@ export default {
 					// this.oldZaakId = id
 					this.fetchCatalogi(data.catalog?.id ?? data.catalog)
 					this.fetchPublicationType(data.publicationType)
+					this.fetchThemes()
 					publicationStore.getPublicationAttachments(id)
 					// this.loading = false
 				})
@@ -583,6 +625,20 @@ export default {
 					})
 			}
 		},
+		fetchThemes(themes, loading) {
+			if (loading) { this.themesLoading = true }
+
+			themeStore.refreshThemeList()
+				.then(({ response, data }) => {
+					this.themes = data
+
+					if (loading) { this.themesLoading = false }
+				})
+				.catch((err) => {
+					console.error(err)
+					if (loading) { this.themesLoading = false }
+				})
+		},
 		validUrl(url) {
 			try {
 				const test = new URL(url)

From 37b701e87803b44a5f818b72f98e7f3732130ceb Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Fri, 1 Nov 2024 15:49:09 +0100
Subject: [PATCH 02/16] delete message fix

---
 src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue b/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue
index 8b73f611..a33df34d 100644
--- a/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue
+++ b/src/dialogs/publicationTheme/DeletePublicationThemeDialog.vue
@@ -17,7 +17,7 @@ import { navigationStore, publicationStore, themeStore } from '../../store/store
 			</NcNoteCard>
 		</div>
 		<p v-if="success === null">
-			Wil je <b>{{ themeStore.themeItem.title }}</b> definitief verwijderen? Deze actie kan niet ongedaan worden gemaakt.
+			Wil je <b>{{ themeStore.themeItem?.title }}</b> verwijderen van de publicatie <b>{{ publicationStore.publicationItem.title }}</b>?
 		</p>
 		<template #actions>
 			<NcButton :disabled="loading" icon="" @click="navigationStore.setDialog(false)">

From 002892c661a7801e23a1eceaf04e67aba884506c Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Fri, 1 Nov 2024 16:16:00 +0100
Subject: [PATCH 03/16] WIP - added new option

---
 src/views/search/SearchList.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/search/SearchList.vue b/src/views/search/SearchList.vue
index 78311a10..2629e23f 100644
--- a/src/views/search/SearchList.vue
+++ b/src/views/search/SearchList.vue
@@ -17,12 +17,18 @@ import { searchStore, publicationTypeStore } from '../../store/store.js'
 				<ListBoxOutline :size="44" />
 			</template>
 			<template #actions>
-				<NcActionButton v-if="result.portal" @click="openLink(result.portal)">
+				<NcActionButton v-if="result.portal" @click="openLink(result.portal, '_blank')">
 					<template #icon>
 						<OpenInNew :size="20" />
 					</template>
 					Open portal page
 				</NcActionButton>
+				<NcActionButton @click="publicationStore.setPublicationItem(result); navigationStore.setSelected('publication')">
+					<template #icon>
+						<OpenInApp :size="20" />
+					</template>
+					Bekijken
+				</NcActionButton>
 			</template>
 		</NcListItem>
 	</ul>
@@ -32,6 +38,7 @@ import { NcListItem, NcActionButton } from '@nextcloud/vue'
 
 // Icons
 import ListBoxOutline from 'vue-material-design-icons/ListBoxOutline.vue'
+import OpenInApp from 'vue-material-design-icons/OpenInApp.vue'
 import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
 
 export default {

From 0cc526f3f1eb7fddcce6f7a25085ca1f43afcf31 Mon Sep 17 00:00:00 2001
From: Thijn <thijn@conduction.nl>
Date: Fri, 1 Nov 2024 17:10:19 +0100
Subject: [PATCH 04/16] WIP - show theme IDs not in the DB anymore

---
 src/views/publications/PublicationDetail.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
index e9e39809..21e41b23 100644
--- a/src/views/publications/PublicationDetail.vue
+++ b/src/views/publications/PublicationDetail.vue
@@ -528,6 +528,9 @@ export default {
 		filteredThemes() {
 			return themeStore.themeList.filter((theme) => this.publication?.themes?.includes(theme.id))
 		},
+		missingThemes() { // themes (id's)- which are on the publication but do not exist on the themeList
+			return this.publication?.themes?.filter((themeId) => !themeStore.themeList.map((theme) => theme.id).includes(themeId))
+		},
 	},
 	watch: {
 		publicationItem: {

From 4c8df152c5dfad367e0e387fd9b893cba4da311b Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 3 Nov 2024 06:19:29 +0000
Subject: [PATCH 05/16] Bump version to 0.6.42

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6a102c82..eb985017 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -22,7 +22,7 @@ Create a [bug report](https://github.com/OpenCatalogi/.github/issues/new/choose)
 
 Create a [feature request](https://github.com/OpenCatalogi/.github/issues/new/choose)
     ]]></description>
-	<version>0.6.41</version>
+	<version>0.6.42</version>
 	<licence>agpl</licence>
 	<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
 	<author mail="info@acato.nl" homepage="https://acato.nl/">Acato</author>

From 5af45d2ab5193f9fd4496bc1a103439ad20e5244 Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Mon, 4 Nov 2024 11:52:17 +0100
Subject: [PATCH 06/16] finished search list improvement

---
 src/views/search/SearchList.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/search/SearchList.vue b/src/views/search/SearchList.vue
index 2629e23f..d5f7c199 100644
--- a/src/views/search/SearchList.vue
+++ b/src/views/search/SearchList.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { searchStore, publicationTypeStore } from '../../store/store.js'
+import { searchStore, publicationTypeStore, publicationStore, navigationStore } from '../../store/store.js'
+import _ from 'lodash'
 </script>
 
 <template>
@@ -14,20 +15,23 @@ import { searchStore, publicationTypeStore } from '../../store/store.js'
 			:force-display-actions="true"
 			:counter-number="result.attachment_count || 0">
 			<template #icon>
-				<ListBoxOutline :size="44" />
+				<ListBoxOutline v-if="_.upperFirst(result.status) === 'Published'" :size="44" />
+				<ArchiveOutline v-if="_.upperFirst(result.status) === 'Archived'" :size="44" />
+				<Pencil v-if="_.upperFirst(result.status) === 'Concept'" :size="44" />
+				<AlertOutline v-if="_.upperFirst(result.status) === 'Withdrawn'" :size="44" />
 			</template>
 			<template #actions>
-				<NcActionButton v-if="result.portal" @click="openLink(result.portal, '_blank')">
+				<NcActionButton @click="publicationStore.setPublicationItem(result); navigationStore.setSelectedCatalogus(result.catalog.toString()); navigationStore.setSelected('publication')">
 					<template #icon>
-						<OpenInNew :size="20" />
+						<OpenInApp :size="20" />
 					</template>
-					Open portal page
+					Bekijken
 				</NcActionButton>
-				<NcActionButton @click="publicationStore.setPublicationItem(result); navigationStore.setSelected('publication')">
+				<NcActionButton v-if="result.portal" @click="openLink(result.portal, '_blank')">
 					<template #icon>
-						<OpenInApp :size="20" />
+						<OpenInNew :size="20" />
 					</template>
-					Bekijken
+					Open portal page
 				</NcActionButton>
 			</template>
 		</NcListItem>
@@ -38,6 +42,9 @@ import { NcListItem, NcActionButton } from '@nextcloud/vue'
 
 // Icons
 import ListBoxOutline from 'vue-material-design-icons/ListBoxOutline.vue'
+import ArchiveOutline from 'vue-material-design-icons/ArchiveOutline.vue'
+import Pencil from 'vue-material-design-icons/Pencil.vue'
+import AlertOutline from 'vue-material-design-icons/AlertOutline.vue'
 import OpenInApp from 'vue-material-design-icons/OpenInApp.vue'
 import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
 
@@ -52,6 +59,7 @@ export default {
 	},
 	mounted() {
 		publicationTypeStore.refreshPublicationTypeList()
+		publicationStore.refreshPublicationList()
 	},
 	methods: {
 		openLink(link, type = '') {

From 065d13edea1f4fd6f1b1ddcdbef5180765a8b6da Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Mon, 4 Nov 2024 15:16:35 +0100
Subject: [PATCH 07/16] finished deleting old themes

---
 src/views/publications/PublicationDetail.vue | 38 ++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
index ded9d028..bb8b5529 100644
--- a/src/views/publications/PublicationDetail.vue
+++ b/src/views/publications/PublicationDetail.vue
@@ -360,6 +360,27 @@ import { ref } from 'vue'
 									</NcActionButton>
 								</template>
 							</NcListItem>
+							<NcListItem v-for="(value, key, i) in missingThemes"
+								:key="`${value}${i}`"
+								:name="'Thema ' + value"
+								:bold="false"
+								:force-display-actions="true">
+								<template #icon>
+									<Alert disable-menu
+										:size="44" />
+								</template>
+								<template #subname>
+									Thema {{ value }} bestaat niet, het is aan te raden om het te verwijderen van deze publicatie.
+								</template>
+								<template #actions>
+									<NcActionButton :disabled="deleteThemeLoading" @click="deleteMissingTheme(value)">
+										<template #icon>
+											<Delete :size="20" />
+										</template>
+										Verwijderen
+									</NcActionButton>
+								</template>
+							</NcListItem>
 						</div>
 						<div v-if="!filteredThemes?.length" class="tabPanel">
 							Geen thema's gevonden
@@ -458,6 +479,9 @@ import PublishOff from 'vue-material-design-icons/PublishOff.vue'
 import TimelineQuestionOutline from 'vue-material-design-icons/TimelineQuestionOutline.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import ShapeOutline from 'vue-material-design-icons/ShapeOutline.vue'
+import Alert from 'vue-material-design-icons/Alert.vue'
+
+import { Publication } from '../../entities/index.js'
 
 function onDrop() {
 	publicationStore.setAttachmentItem([])
@@ -522,6 +546,7 @@ export default {
 				}],
 			},
 			upToDate: false,
+			deleteThemeLoading: false,
 		}
 	},
 	computed: {
@@ -685,20 +710,27 @@ export default {
 		openLink(url, type = '') {
 			window.open(url, type)
 		},
-
 		setActiveAttachment(attachment) {
 			if (JSON.stringify(publicationStore.attachmentItem) === JSON.stringify(attachment)) {
 				publicationStore.setAttachmentItem(false)
 			} else { publicationStore.setAttachmentItem(attachment) }
-
 		},
 		setActiveDataKey(dataKey) {
 			if (publicationStore.publicationDataKey === dataKey) {
 				publicationStore.setPublicationDataKey(false)
 			} else { publicationStore.setPublicationDataKey(dataKey) }
-
 		},
+		deleteMissingTheme(themeId) {
+			this.deleteThemeLoading = true
 
+			const newPublication = new Publication({
+				...this.publication,
+				themes: this.publication.themes.filter((theme) => theme !== themeId),
+			})
+
+			publicationStore.editPublication(newPublication)
+				.then(() => (this.deleteThemeLoading = false))
+		},
 	},
 
 }

From 79117297834df9833b671f6da7fb2f22cfe7aa04 Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Tue, 5 Nov 2024 11:36:26 +0100
Subject: [PATCH 08/16] fixed constant loading

---
 src/store/modules/publication.ts              | 28 ++++++++-----------
 .../widgets/UnpublishedAttachmentsWidget.vue  |  4 +--
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/store/modules/publication.ts b/src/store/modules/publication.ts
index 539ae6e2..24b8fd72 100644
--- a/src/store/modules/publication.ts
+++ b/src/store/modules/publication.ts
@@ -395,22 +395,18 @@ export const usePublicationStore = defineStore('publication', {
 					return err
 				})
 		},
-		getConceptAttachments() { // @todo this might belong in a service?
-			fetch('/index.php/apps/opencatalogi/api/attachments?status=Concept',
-				{
-					method: 'GET',
-				},
-			)
-				.then((response) => {
-					response.json().then((data) => {
-						this.conceptAttachments = data.results.map((attachmentItem: TAttachment) => new Attachment(attachmentItem))
-						return data
-					})
-				})
-				.catch((err) => {
-					console.error(err)
-					return err
-				})
+		async getConceptAttachments() { // @todo this might belong in a service?
+			const response = await fetch('/index.php/apps/opencatalogi/api/attachments?status=Concept', {
+				method: 'GET',
+			})
+
+			const data = (await response.json()).results
+
+			const entities = data.map((attachmentItem: TAttachment) => new Attachment(attachmentItem))
+
+			this.conceptAttachments = entities
+
+			return { response, data, entities }
 		},
 		setPublicationDataKey(publicationDataKey: string) {
 			this.publicationDataKey = publicationDataKey
diff --git a/src/views/widgets/UnpublishedAttachmentsWidget.vue b/src/views/widgets/UnpublishedAttachmentsWidget.vue
index 7dc66265..d04388e0 100644
--- a/src/views/widgets/UnpublishedAttachmentsWidget.vue
+++ b/src/views/widgets/UnpublishedAttachmentsWidget.vue
@@ -52,7 +52,6 @@ export default {
 			},
 		}
 	},
-
 	computed: {
 		items() {
 			return publicationStore.conceptAttachments.map((attachment) => ({
@@ -66,7 +65,6 @@ export default {
 	mounted() {
 		this.fetchData()
 	},
-
 	methods: {
 		onShow(item) {
 			navigationStore.setSelected('publication'); navigationStore.setSelectedCatalogus(item.id)
@@ -75,7 +73,7 @@ export default {
 		fetchData() {
 			this.loading = true
 			publicationStore.getConceptAttachments()
-				.then(({ response, data }) => {
+				.then(() => {
 					this.loading = false
 				})
 		},

From 02bbbf25235a92f452cfe43d9d55c2ef7874cd24 Mon Sep 17 00:00:00 2001
From: Thijn <Thijn@conduction.nl>
Date: Tue, 5 Nov 2024 12:52:32 +0100
Subject: [PATCH 09/16] removed unused button

---
 .../widgets/UnpublishedAttachmentsWidget.vue     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/views/widgets/UnpublishedAttachmentsWidget.vue b/src/views/widgets/UnpublishedAttachmentsWidget.vue
index d04388e0..7cb324cb 100644
--- a/src/views/widgets/UnpublishedAttachmentsWidget.vue
+++ b/src/views/widgets/UnpublishedAttachmentsWidget.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { navigationStore, publicationStore } from '../../store/store.js'
+import { publicationStore } from '../../store/store.js'
 </script>
 
 <template>
 	<NcDashboardWidget :items="items"
 		:loading="loading"
-		:item-menu="itemMenu"
-		@show="onShow">
+		:item-menu="itemMenu">
 		<template #empty-content>
 			<NcEmptyContent :title="t('opencatalogi', 'Geen concept bijlagen gevonden')">
 				<template #icon>
@@ -44,12 +43,7 @@ export default {
 	data() {
 		return {
 			loading: false,
-			itemMenu: {
-				show: {
-					text: 'Publicatie bekijken',
-					icon: 'icon-open-in-app',
-				},
-			},
+			itemMenu: {},
 		}
 	},
 	computed: {
@@ -66,10 +60,6 @@ export default {
 		this.fetchData()
 	},
 	methods: {
-		onShow(item) {
-			navigationStore.setSelected('publication'); navigationStore.setSelectedCatalogus(item.id)
-			window.open('/index.php/apps/opencatalogi', '_self')
-		},
 		fetchData() {
 			this.loading = true
 			publicationStore.getConceptAttachments()

From 90eac44d59d8a013d48dd736c7b376c34aef0446 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Wed, 6 Nov 2024 14:05:53 +0100
Subject: [PATCH 10/16] Validate publications with json schema

---
 composer.json                     |   3 +-
 composer.lock                     | 192 +++++++++++++++++++++++++++++-
 lib/Db/PublicationType.php        |  23 ++++
 lib/Service/ObjectService.php     |  11 ++
 lib/Service/ValidationService.php | 110 ++++-------------
 5 files changed, 252 insertions(+), 87 deletions(-)

diff --git a/composer.json b/composer.json
index 89c318a1..9672442e 100644
--- a/composer.json
+++ b/composer.json
@@ -44,8 +44,9 @@
 		"adbario/php-dot-notation": "^3.3.0",
 		"bamarni/composer-bin-plugin": "^1.8",
 		"elasticsearch/elasticsearch": "^v8.14.0",
-		"guzzlehttp/guzzle": "^7.0",		
+		"guzzlehttp/guzzle": "^7.0",
 		"mpdf/mpdf": "^8.2",
+		"opis/json-schema": "^2.3",
 		"symfony/twig-bundle": "^6.4",
 		"symfony/uid": "^6.4"
 	},
diff --git a/composer.lock b/composer.lock
index 7284d015..8b03b3e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "93ceb09bbb9b85fb7d77d68d6d6eefe1",
+    "content-hash": "bd1fa2147c63c25a4c1759758bcf0fbb",
     "packages": [
         {
             "name": "adbario/php-dot-notation",
@@ -788,6 +788,196 @@
             ],
             "time": "2024-06-12T14:39:25+00:00"
         },
+        {
+            "name": "opis/json-schema",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/json-schema.git",
+                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/json-schema/zipball/c48df6d7089a45f01e1c82432348f2d5976f9bfb",
+                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "opis/string": "^2.0",
+                "opis/uri": "^1.0",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "ext-bcmath": "*",
+                "ext-intl": "*",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\JsonSchema\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                },
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                }
+            ],
+            "description": "Json Schema Validator for PHP",
+            "homepage": "https://opis.io/json-schema",
+            "keywords": [
+                "json",
+                "json-schema",
+                "schema",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/opis/json-schema/issues",
+                "source": "https://github.com/opis/json-schema/tree/2.3.0"
+            },
+            "time": "2022-01-08T20:38:03+00:00"
+        },
+        {
+            "name": "opis/string",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/string.git",
+                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/string/zipball/9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "ext-json": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\String\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "Multibyte strings as objects",
+            "homepage": "https://opis.io/string",
+            "keywords": [
+                "multi-byte",
+                "opis",
+                "string",
+                "string manipulation",
+                "utf-8"
+            ],
+            "support": {
+                "issues": "https://github.com/opis/string/issues",
+                "source": "https://github.com/opis/string/tree/2.0.1"
+            },
+            "time": "2022-01-14T15:42:23+00:00"
+        },
+        {
+            "name": "opis/uri",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/uri.git",
+                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/uri/zipball/0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+                "shasum": ""
+            },
+            "require": {
+                "opis/string": "^2.0",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\Uri\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "Build, parse and validate URIs and URI-templates",
+            "homepage": "https://opis.io",
+            "keywords": [
+                "URI Template",
+                "parse url",
+                "punycode",
+                "uri",
+                "uri components",
+                "url",
+                "validate uri"
+            ],
+            "support": {
+                "issues": "https://github.com/opis/uri/issues",
+                "source": "https://github.com/opis/uri/tree/1.1.0"
+            },
+            "time": "2021-05-22T15:57:08+00:00"
+        },
         {
             "name": "paragonie/random_compat",
             "version": "v9.99.100",
diff --git a/lib/Db/PublicationType.php b/lib/Db/PublicationType.php
index 510a1e6c..36e409d9 100644
--- a/lib/Db/PublicationType.php
+++ b/lib/Db/PublicationType.php
@@ -5,6 +5,7 @@
 use DateTime;
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
+use OCP\IURLGenerator;
 
 class PublicationType extends Entity implements JsonSerializable
 {
@@ -122,4 +123,26 @@ public function jsonSerialize(): array
 
 		return $array;
 	}
+
+	public function getSchema(IURLGenerator $urlGenerator): object
+	{
+		$schema = [];
+		$schema['$schema']  = 'https://json-schema.org/draft/2020-12/schema';
+		$schema['$id']      = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute('openregister.Schemas.show', ['id' => $this->getUuid()]));
+		$schema['type']     = 'object';
+		$schema['required'] = [];
+		$schema['properties'] = [];
+
+		foreach($this->getProperties() as $name => $property) {
+			if ($property['required'] === true) {
+				$schema['required'][] = $name;
+			}
+			unset($property['title'], $property['required']);
+
+			// Remove empty fields with array_filter(), and add it to the properties of the schema.
+			$schema['properties'][$name] = array_filter($property);
+		}
+
+		return json_decode(json_encode($schema));
+	}
 }
diff --git a/lib/Service/ObjectService.php b/lib/Service/ObjectService.php
index f0688c0b..b8084d7a 100644
--- a/lib/Service/ObjectService.php
+++ b/lib/Service/ObjectService.php
@@ -12,6 +12,7 @@
 use OCP\App\IAppManager;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\IURLGenerator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\Uid\Uuid;
@@ -34,6 +35,8 @@ class ObjectService
 	/** @var string $appName The name of the app */
 	private string $appName;
 
+	private ValidationService $validationService;
+
 	/**
 	 * Constructor for ObjectService.
 	 *
@@ -59,8 +62,11 @@ public function __construct(
 		private ContainerInterface $container,
 		private readonly IAppManager $appManager,
 		private readonly IAppConfig $config,
+		IURLGenerator $urlGenerator,
 	) {
 		$this->appName = 'opencatalogi';
+
+		$this->validationService = new ValidationService(objectService: $this, urlGenerator: $urlGenerator);
 	}
 
 	/**
@@ -300,6 +306,11 @@ public function saveObject(string $objectType, array $object, bool $updateVersio
 	{
 		// Get the appropriate mapper for the object type
 		$mapper = $this->getMapper($objectType);
+
+		if($objectType === 'publication') {
+			$object = $this->validationService->validatePublication($object);
+		}
+
 		// If the object has an id, update it; otherwise, create a new object
 		if (isset($object['id']) === true) {
 			return $mapper->updateFromArray($object['id'], $object, $updateVersion);
diff --git a/lib/Service/ValidationService.php b/lib/Service/ValidationService.php
index fd58b2b3..b3f974d0 100644
--- a/lib/Service/ValidationService.php
+++ b/lib/Service/ValidationService.php
@@ -3,9 +3,14 @@
 namespace OCA\OpenCatalogi\Service;
 
 use OCA\OpenCatalogi\Db\CatalogMapper;
+use OCA\OpenCatalogi\Db\Publication;
+use OCA\OpenCatalogi\Db\PublicationType;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\IAppConfig;
+use OCP\IURLGenerator;
+use Opis\JsonSchema\Errors\ErrorFormatter;
+use Opis\JsonSchema\Validator;
 
 /**
  * Class ValidationService
@@ -14,107 +19,42 @@
  */
 class ValidationService
 {
-	/**
-	 * @var string The name of the application.
-	 */
-	private string $appName;
-
-	/**
-	 * @var array The current MongoDB Config.
-	 */
-	private array $mongodbConfig;
 
-	/**
-	 * ValidationService constructor.
-	 *
-	 * @param IAppConfig    $config		   The application config
-	 * @param CatalogMapper $catalogMapper The catalog mapper.
-	 * @param ObjectService $objectService The object service.
-	 */
 	public function __construct(
-		private readonly IAppConfig    $config,
-		private readonly CatalogMapper $catalogMapper,
 		private readonly ObjectService $objectService,
-	) {
-		$this->appName = 'opencatalogi';
-
-		// Initialize MongoDB configuration
-		$this->mongodbConfig = [
-			'base_uri' => $this->config->getValueString(app: $this->appName, key: 'mongodbLocation'),
-			'headers' => ['api-key' => $this->config->getValueString(app: $this->appName, key: 'mongodbKey')],
-			'mongodbCluster' => $this->config->getValueString(app: $this->appName, key:'mongodbCluster')
-		];
-	}
-
-	/**
-	 * Get the MongoDB configuration.
-	 *
-	 * @return array The mongodb config.
-	 */
-	public function getMongodbConfig(): array
+		private readonly IURLGenerator $urlGenerator,
+	)
 	{
-		return $this->mongodbConfig;
 	}
 
 	/**
-	 * Fetches a catalog from either the local database or mongodb
+	 * Validate a publication to the definition defined in the PublicationType.
 	 *
-	 * @param  string $id The id of the catalog to be fetched.
-	 * @return array      The JSON Serialised catalog.
+	 * @param Publication $publication The publication to validate.
+	 * @return Publication The validated publication.
 	 *
-	 * @throws OCSNotFoundException If the catalog is not found.
-	 * @throws \GuzzleHttp\Exception\GuzzleException
+	 * @throws \OCP\AppFramework\Db\DoesNotExistException
+	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+	 * @throws \Psr\Container\ContainerExceptionInterface
+	 * @throws \Psr\Container\NotFoundExceptionInterface
 	 */
-	public function getCatalog (string $id): array
+	public function validatePublication(array $publication): array
 	{
-		// Check if MongoDB storage is enabled
-		if ($this->config->hasKey(app: $this->appName, key: 'mongoStorage') !== false
-			&& $this->config->getValueString(app: $this->appName, key: 'mongoStorage') === '1'
-		) {
-			$filter = ['id' => $id, '_schema' => 'catalog'];
+		$publicationTypeId = $publication['publicationType'];
+		$publicationType   = $this->objectService->getObject(objectType: 'publicationType', id: $publicationTypeId);
 
-            try {
-                return $this->objectService->findObject(filters: $filter, config: $this->getMongodbConfig());
-            } catch (OCSNotFoundException $exception) {
-			    throw new OCSNotFoundException(message: 'Catalog not found for id: ' . $id);
-            }
-		}
-
-		// If MongoDB storage is not enabled, fetch from local database
-		return $this->catalogMapper->find(id: $id)->jsonSerialize();
-	}
+		$publicationType = (new PublicationType())->hydrate($publicationType);
 
-	/**
-	 * Validates a publication against the rules set for the publication.
-	 *
-	 * @param  array $publication The publication to be validated.
-	 * @return array 			  The publication after it has been validated.
-	 *
-	 * @throws OCSBadRequestException Thrown if the object does not validate
-	 * @throws OCSNotFoundException   Thrown if the catalog is not found
-	 */
-	public function validatePublication(array $publication): array
-	{
-        // Check for required fields
-        $requiredFields = ['catalogi', 'publicationType'];
-        foreach ($requiredFields as $field) {
-            if (isset($publication[$field]) === false) {
-                throw new OCSBadRequestException(message: $field . ' is required but not given.');
-            }
-        }
+		$validator = new Validator();
+		$validator->setMaxErrors(100);
 
-		$catalog  = $publication['catalogi'];
-		$publicationType   = $publication['publicationType'];
+		$result = $validator->validate(data: (object) json_decode(json_encode($publication['data'])), schema:  $publicationType->getSchema($this->urlGenerator));
 
-        try {
-		    $catalog = $this->getCatalog($catalog);
-        } catch (OCSNotFoundException $exception) {
-            throw new OCSNotFoundException(message: $exception->getMessage());
-        }
+		$publication['validation'] = [];
 
-		// Check if the given publicationType is present in the catalog
-		if (in_array(needle: $publicationType, haystack: $catalog['publicationType']) === false) {
-			throw new OCSBadRequestException(message: 'Given publicationType object not present in catalog');
+		if($result->hasError()) {
+			$errors = (new ErrorFormatter())->format($result->error());
+			$publication['validation'] = $errors;
 		}
 
 		return $publication;

From 0fed242f95897a7bdf8b76c14ef8b9c5846d2363 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Wed, 6 Nov 2024 14:36:58 +0100
Subject: [PATCH 11/16] Added docblock

---
 lib/Db/PublicationType.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Db/PublicationType.php b/lib/Db/PublicationType.php
index 36e409d9..b7a5a307 100644
--- a/lib/Db/PublicationType.php
+++ b/lib/Db/PublicationType.php
@@ -124,11 +124,18 @@ public function jsonSerialize(): array
 		return $array;
 	}
 
+	/**
+	 * Generate a JSON-Schema definition for the data field of a publication.
+	 *
+	 * @param IURLGenerator $urlGenerator An URL generator to generate the identifier of the schema.
+	 *
+	 * @return object The JSON-Schema object defining the data field of a publication.
+	 */
 	public function getSchema(IURLGenerator $urlGenerator): object
 	{
 		$schema = [];
 		$schema['$schema']  = 'https://json-schema.org/draft/2020-12/schema';
-		$schema['$id']      = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute('openregister.Schemas.show', ['id' => $this->getUuid()]));
+		$schema['$id']      = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute('opencatalogi.publication_types.show', ['id' => $this->getUuid()]));
 		$schema['type']     = 'object';
 		$schema['required'] = [];
 		$schema['properties'] = [];

From 95542b2de010a6a1426cc66b4a8d4e52111859f7 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Thu, 7 Nov 2024 16:15:58 +0100
Subject: [PATCH 12/16] Fix PR comments

---
 lib/Db/PublicationType.php        |  2 +-
 lib/Service/ObjectService.php     |  2 +-
 lib/Service/ValidationService.php | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/Db/PublicationType.php b/lib/Db/PublicationType.php
index b7a5a307..68b2e6e7 100644
--- a/lib/Db/PublicationType.php
+++ b/lib/Db/PublicationType.php
@@ -140,7 +140,7 @@ public function getSchema(IURLGenerator $urlGenerator): object
 		$schema['required'] = [];
 		$schema['properties'] = [];
 
-		foreach($this->getProperties() as $name => $property) {
+		foreach ($this->getProperties() as $name => $property) {
 			if ($property['required'] === true) {
 				$schema['required'][] = $name;
 			}
diff --git a/lib/Service/ObjectService.php b/lib/Service/ObjectService.php
index b8084d7a..9a5e022f 100644
--- a/lib/Service/ObjectService.php
+++ b/lib/Service/ObjectService.php
@@ -307,7 +307,7 @@ public function saveObject(string $objectType, array $object, bool $updateVersio
 		// Get the appropriate mapper for the object type
 		$mapper = $this->getMapper($objectType);
 
-		if($objectType === 'publication') {
+		if ($objectType === 'publication') {
 			$object = $this->validationService->validatePublication($object);
 		}
 
diff --git a/lib/Service/ValidationService.php b/lib/Service/ValidationService.php
index b3f974d0..dc863d36 100644
--- a/lib/Service/ValidationService.php
+++ b/lib/Service/ValidationService.php
@@ -5,12 +5,16 @@
 use OCA\OpenCatalogi\Db\CatalogMapper;
 use OCA\OpenCatalogi\Db\Publication;
 use OCA\OpenCatalogi\Db\PublicationType;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\IAppConfig;
 use OCP\IURLGenerator;
 use Opis\JsonSchema\Errors\ErrorFormatter;
 use Opis\JsonSchema\Validator;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ValidationService
@@ -33,10 +37,10 @@ public function __construct(
 	 * @param Publication $publication The publication to validate.
 	 * @return Publication The validated publication.
 	 *
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
-	 * @throws \Psr\Container\ContainerExceptionInterface
-	 * @throws \Psr\Container\NotFoundExceptionInterface
+	 * @throws DoesNotExistException
+	 * @throws MultipleObjectsReturnedException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function validatePublication(array $publication): array
 	{
@@ -52,7 +56,7 @@ public function validatePublication(array $publication): array
 
 		$publication['validation'] = [];
 
-		if($result->hasError()) {
+		if ($result->hasError()) {
 			$errors = (new ErrorFormatter())->format($result->error());
 			$publication['validation'] = $errors;
 		}

From 3d49c7c44e73c002d6d7a9361274a46e1c493cee Mon Sep 17 00:00:00 2001
From: Ruben van der Linde <rubenvdlinde@gmail.com>
Date: Thu, 7 Nov 2024 22:23:07 +0100
Subject: [PATCH 13/16] Hot cleanup on routes

---
 appinfo/routes.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 427b3af4..c9d6d324 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -12,19 +12,19 @@
 	],
 	'routes' => [
 		// Directory
-		['name' => 'listing#synchronise', 'url' => '/api/listings/synchronise/{id?}', 'verb' => 'POST'],
+		['name' => 'listing#synchronise', 'url' => '/api/listings/synchronise/{id?}', 'verb' => 'POST', 'requirements' => ['id' => '[^/]+']],
 		['name' => 'directory#index', 'url' => '/api/directory', 'verb' => 'GET'],
-		['name' => 'directory#show', 'url' => '/api/directory/{id}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
+		['name' => 'directory#show', 'url' => '/api/directory/{id}', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
 		['name' => 'directory#update', 'url' => '/api/directory', 'verb' => 'POST'],
-		['name' => 'directory#publicationType', 'url' => '/api/directory/publication_types/{id}', 'verb' => 'GET'], // Should be in directory becouse its public
+		['name' => 'directory#publicationType', 'url' => '/api/directory/publication_types/{id}', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']], // Should be in directory becouse its public
 		// Publication
 		['name' => 'publication_types#synchronise', 'url' => '/api/publication_types/synchronise', 'verb' => 'POST'],
 		// Dashboard
 		['name' => 'dashboard#index', 'url' => '/index', 'verb' => 'GET'],
 		['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],
 		// Publications
-		['name' => 'publications#attachments', 'url' => '/api/publications/{id}/attachments', 'verb' => 'GET'],
-		['name' => 'publications#download', 'url' => '/api/publications/{id}/download', 'verb' => 'GET'],
+		['name' => 'publications#attachments', 'url' => '/api/publications/{id}/attachments', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
+		['name' => 'publications#download', 'url' => '/api/publications/{id}/download', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
 		// user Settings & Global Configuration
 		['name' => 'settings#index', 'url' => '/settings', 'verb' => 'GET'],
 		['name' => 'settings#create', 'url' => '/settings', 'verb' => 'POST'],
@@ -37,6 +37,6 @@
 		['name' => 'search#publication', 'url' => '/api/search/publications/{publicationId}', 'verb' => 'GET', 'requirements' => ['publicationId' => '[^/]+']],
 		['name' => 'search#attachments', 'url' => '/api/search/publications/{publicationId}/attachments', 'verb' => 'GET', 'requirements' => ['publicationId' => '[^/]+']],
 		['name' => 'search#themes', 'url' => '/api/search/themes', 'verb' => 'GET'],
-		['name' => 'search#theme', 'url' => '/api/search/themes/{themeId}', 'verb' => 'GET', 'requirements' => ['themeId' => '\d+']]
+		['name' => 'search#theme', 'url' => '/api/search/themes/{themeId}', 'verb' => 'GET', 'requirements' => ['themeId' => '[^/]+']]
 	]
 ];

From 90d5291381d37f4ce6cf035a69c4351714bb2953 Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Fri, 8 Nov 2024 09:22:57 +0100
Subject: [PATCH 14/16] Revert "Hot cleanup on routes"

This reverts commit 3d49c7c44e73c002d6d7a9361274a46e1c493cee.
---
 appinfo/routes.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index c9d6d324..427b3af4 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -12,19 +12,19 @@
 	],
 	'routes' => [
 		// Directory
-		['name' => 'listing#synchronise', 'url' => '/api/listings/synchronise/{id?}', 'verb' => 'POST', 'requirements' => ['id' => '[^/]+']],
+		['name' => 'listing#synchronise', 'url' => '/api/listings/synchronise/{id?}', 'verb' => 'POST'],
 		['name' => 'directory#index', 'url' => '/api/directory', 'verb' => 'GET'],
-		['name' => 'directory#show', 'url' => '/api/directory/{id}', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
+		['name' => 'directory#show', 'url' => '/api/directory/{id}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
 		['name' => 'directory#update', 'url' => '/api/directory', 'verb' => 'POST'],
-		['name' => 'directory#publicationType', 'url' => '/api/directory/publication_types/{id}', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']], // Should be in directory becouse its public
+		['name' => 'directory#publicationType', 'url' => '/api/directory/publication_types/{id}', 'verb' => 'GET'], // Should be in directory becouse its public
 		// Publication
 		['name' => 'publication_types#synchronise', 'url' => '/api/publication_types/synchronise', 'verb' => 'POST'],
 		// Dashboard
 		['name' => 'dashboard#index', 'url' => '/index', 'verb' => 'GET'],
 		['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],
 		// Publications
-		['name' => 'publications#attachments', 'url' => '/api/publications/{id}/attachments', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
-		['name' => 'publications#download', 'url' => '/api/publications/{id}/download', 'verb' => 'GET', 'requirements' => ['id' => '[^/]+']],
+		['name' => 'publications#attachments', 'url' => '/api/publications/{id}/attachments', 'verb' => 'GET'],
+		['name' => 'publications#download', 'url' => '/api/publications/{id}/download', 'verb' => 'GET'],
 		// user Settings & Global Configuration
 		['name' => 'settings#index', 'url' => '/settings', 'verb' => 'GET'],
 		['name' => 'settings#create', 'url' => '/settings', 'verb' => 'POST'],
@@ -37,6 +37,6 @@
 		['name' => 'search#publication', 'url' => '/api/search/publications/{publicationId}', 'verb' => 'GET', 'requirements' => ['publicationId' => '[^/]+']],
 		['name' => 'search#attachments', 'url' => '/api/search/publications/{publicationId}/attachments', 'verb' => 'GET', 'requirements' => ['publicationId' => '[^/]+']],
 		['name' => 'search#themes', 'url' => '/api/search/themes', 'verb' => 'GET'],
-		['name' => 'search#theme', 'url' => '/api/search/themes/{themeId}', 'verb' => 'GET', 'requirements' => ['themeId' => '[^/]+']]
+		['name' => 'search#theme', 'url' => '/api/search/themes/{themeId}', 'verb' => 'GET', 'requirements' => ['themeId' => '\d+']]
 	]
 ];

From 85b7cf0739a080bc04b4627a712b9a803fe4ef1e Mon Sep 17 00:00:00 2001
From: Robert Zondervan <robert@conduction.nl>
Date: Fri, 8 Nov 2024 09:23:05 +0100
Subject: [PATCH 15/16] Revert "Merge pull request #133 from
 ConductionNL/feature/DIMOC-274/validate-publication"

This reverts commit d673b2516c72f9bfa109d81cd27b71b0304ef976, reversing
changes made to 0d52bef29ccb4050bf63312f15caf9a518238367.
---
 composer.json                     |   3 +-
 composer.lock                     | 192 +-----------------------------
 lib/Db/PublicationType.php        |  30 -----
 lib/Service/ObjectService.php     |  11 --
 lib/Service/ValidationService.php | 114 +++++++++++++-----
 5 files changed, 87 insertions(+), 263 deletions(-)

diff --git a/composer.json b/composer.json
index 9672442e..89c318a1 100644
--- a/composer.json
+++ b/composer.json
@@ -44,9 +44,8 @@
 		"adbario/php-dot-notation": "^3.3.0",
 		"bamarni/composer-bin-plugin": "^1.8",
 		"elasticsearch/elasticsearch": "^v8.14.0",
-		"guzzlehttp/guzzle": "^7.0",
+		"guzzlehttp/guzzle": "^7.0",		
 		"mpdf/mpdf": "^8.2",
-		"opis/json-schema": "^2.3",
 		"symfony/twig-bundle": "^6.4",
 		"symfony/uid": "^6.4"
 	},
diff --git a/composer.lock b/composer.lock
index 8b03b3e9..7284d015 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bd1fa2147c63c25a4c1759758bcf0fbb",
+    "content-hash": "93ceb09bbb9b85fb7d77d68d6d6eefe1",
     "packages": [
         {
             "name": "adbario/php-dot-notation",
@@ -788,196 +788,6 @@
             ],
             "time": "2024-06-12T14:39:25+00:00"
         },
-        {
-            "name": "opis/json-schema",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/json-schema.git",
-                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/json-schema/zipball/c48df6d7089a45f01e1c82432348f2d5976f9bfb",
-                "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "opis/string": "^2.0",
-                "opis/uri": "^1.0",
-                "php": "^7.4 || ^8.0"
-            },
-            "require-dev": {
-                "ext-bcmath": "*",
-                "ext-intl": "*",
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Opis\\JsonSchema\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Sorin Sarca",
-                    "email": "sarca_sorin@hotmail.com"
-                },
-                {
-                    "name": "Marius Sarca",
-                    "email": "marius.sarca@gmail.com"
-                }
-            ],
-            "description": "Json Schema Validator for PHP",
-            "homepage": "https://opis.io/json-schema",
-            "keywords": [
-                "json",
-                "json-schema",
-                "schema",
-                "validation",
-                "validator"
-            ],
-            "support": {
-                "issues": "https://github.com/opis/json-schema/issues",
-                "source": "https://github.com/opis/json-schema/tree/2.3.0"
-            },
-            "time": "2022-01-08T20:38:03+00:00"
-        },
-        {
-            "name": "opis/string",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/string.git",
-                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/string/zipball/9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
-                "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-iconv": "*",
-                "ext-json": "*",
-                "php": "^7.4 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Opis\\String\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Marius Sarca",
-                    "email": "marius.sarca@gmail.com"
-                },
-                {
-                    "name": "Sorin Sarca",
-                    "email": "sarca_sorin@hotmail.com"
-                }
-            ],
-            "description": "Multibyte strings as objects",
-            "homepage": "https://opis.io/string",
-            "keywords": [
-                "multi-byte",
-                "opis",
-                "string",
-                "string manipulation",
-                "utf-8"
-            ],
-            "support": {
-                "issues": "https://github.com/opis/string/issues",
-                "source": "https://github.com/opis/string/tree/2.0.1"
-            },
-            "time": "2022-01-14T15:42:23+00:00"
-        },
-        {
-            "name": "opis/uri",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/uri.git",
-                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/uri/zipball/0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
-                "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
-                "shasum": ""
-            },
-            "require": {
-                "opis/string": "^2.0",
-                "php": "^7.4 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Opis\\Uri\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Marius Sarca",
-                    "email": "marius.sarca@gmail.com"
-                },
-                {
-                    "name": "Sorin Sarca",
-                    "email": "sarca_sorin@hotmail.com"
-                }
-            ],
-            "description": "Build, parse and validate URIs and URI-templates",
-            "homepage": "https://opis.io",
-            "keywords": [
-                "URI Template",
-                "parse url",
-                "punycode",
-                "uri",
-                "uri components",
-                "url",
-                "validate uri"
-            ],
-            "support": {
-                "issues": "https://github.com/opis/uri/issues",
-                "source": "https://github.com/opis/uri/tree/1.1.0"
-            },
-            "time": "2021-05-22T15:57:08+00:00"
-        },
         {
             "name": "paragonie/random_compat",
             "version": "v9.99.100",
diff --git a/lib/Db/PublicationType.php b/lib/Db/PublicationType.php
index 68b2e6e7..510a1e6c 100644
--- a/lib/Db/PublicationType.php
+++ b/lib/Db/PublicationType.php
@@ -5,7 +5,6 @@
 use DateTime;
 use JsonSerializable;
 use OCP\AppFramework\Db\Entity;
-use OCP\IURLGenerator;
 
 class PublicationType extends Entity implements JsonSerializable
 {
@@ -123,33 +122,4 @@ public function jsonSerialize(): array
 
 		return $array;
 	}
-
-	/**
-	 * Generate a JSON-Schema definition for the data field of a publication.
-	 *
-	 * @param IURLGenerator $urlGenerator An URL generator to generate the identifier of the schema.
-	 *
-	 * @return object The JSON-Schema object defining the data field of a publication.
-	 */
-	public function getSchema(IURLGenerator $urlGenerator): object
-	{
-		$schema = [];
-		$schema['$schema']  = 'https://json-schema.org/draft/2020-12/schema';
-		$schema['$id']      = $urlGenerator->getAbsoluteURL($urlGenerator->linkToRoute('opencatalogi.publication_types.show', ['id' => $this->getUuid()]));
-		$schema['type']     = 'object';
-		$schema['required'] = [];
-		$schema['properties'] = [];
-
-		foreach ($this->getProperties() as $name => $property) {
-			if ($property['required'] === true) {
-				$schema['required'][] = $name;
-			}
-			unset($property['title'], $property['required']);
-
-			// Remove empty fields with array_filter(), and add it to the properties of the schema.
-			$schema['properties'][$name] = array_filter($property);
-		}
-
-		return json_decode(json_encode($schema));
-	}
 }
diff --git a/lib/Service/ObjectService.php b/lib/Service/ObjectService.php
index 9a5e022f..f0688c0b 100644
--- a/lib/Service/ObjectService.php
+++ b/lib/Service/ObjectService.php
@@ -12,7 +12,6 @@
 use OCP\App\IAppManager;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\IURLGenerator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\Uid\Uuid;
@@ -35,8 +34,6 @@ class ObjectService
 	/** @var string $appName The name of the app */
 	private string $appName;
 
-	private ValidationService $validationService;
-
 	/**
 	 * Constructor for ObjectService.
 	 *
@@ -62,11 +59,8 @@ public function __construct(
 		private ContainerInterface $container,
 		private readonly IAppManager $appManager,
 		private readonly IAppConfig $config,
-		IURLGenerator $urlGenerator,
 	) {
 		$this->appName = 'opencatalogi';
-
-		$this->validationService = new ValidationService(objectService: $this, urlGenerator: $urlGenerator);
 	}
 
 	/**
@@ -306,11 +300,6 @@ public function saveObject(string $objectType, array $object, bool $updateVersio
 	{
 		// Get the appropriate mapper for the object type
 		$mapper = $this->getMapper($objectType);
-
-		if ($objectType === 'publication') {
-			$object = $this->validationService->validatePublication($object);
-		}
-
 		// If the object has an id, update it; otherwise, create a new object
 		if (isset($object['id']) === true) {
 			return $mapper->updateFromArray($object['id'], $object, $updateVersion);
diff --git a/lib/Service/ValidationService.php b/lib/Service/ValidationService.php
index dc863d36..fd58b2b3 100644
--- a/lib/Service/ValidationService.php
+++ b/lib/Service/ValidationService.php
@@ -3,18 +3,9 @@
 namespace OCA\OpenCatalogi\Service;
 
 use OCA\OpenCatalogi\Db\CatalogMapper;
-use OCA\OpenCatalogi\Db\Publication;
-use OCA\OpenCatalogi\Db\PublicationType;
-use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\IAppConfig;
-use OCP\IURLGenerator;
-use Opis\JsonSchema\Errors\ErrorFormatter;
-use Opis\JsonSchema\Validator;
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class ValidationService
@@ -23,42 +14,107 @@
  */
 class ValidationService
 {
+	/**
+	 * @var string The name of the application.
+	 */
+	private string $appName;
+
+	/**
+	 * @var array The current MongoDB Config.
+	 */
+	private array $mongodbConfig;
 
+	/**
+	 * ValidationService constructor.
+	 *
+	 * @param IAppConfig    $config		   The application config
+	 * @param CatalogMapper $catalogMapper The catalog mapper.
+	 * @param ObjectService $objectService The object service.
+	 */
 	public function __construct(
+		private readonly IAppConfig    $config,
+		private readonly CatalogMapper $catalogMapper,
 		private readonly ObjectService $objectService,
-		private readonly IURLGenerator $urlGenerator,
-	)
+	) {
+		$this->appName = 'opencatalogi';
+
+		// Initialize MongoDB configuration
+		$this->mongodbConfig = [
+			'base_uri' => $this->config->getValueString(app: $this->appName, key: 'mongodbLocation'),
+			'headers' => ['api-key' => $this->config->getValueString(app: $this->appName, key: 'mongodbKey')],
+			'mongodbCluster' => $this->config->getValueString(app: $this->appName, key:'mongodbCluster')
+		];
+	}
+
+	/**
+	 * Get the MongoDB configuration.
+	 *
+	 * @return array The mongodb config.
+	 */
+	public function getMongodbConfig(): array
 	{
+		return $this->mongodbConfig;
 	}
 
 	/**
-	 * Validate a publication to the definition defined in the PublicationType.
+	 * Fetches a catalog from either the local database or mongodb
 	 *
-	 * @param Publication $publication The publication to validate.
-	 * @return Publication The validated publication.
+	 * @param  string $id The id of the catalog to be fetched.
+	 * @return array      The JSON Serialised catalog.
 	 *
-	 * @throws DoesNotExistException
-	 * @throws MultipleObjectsReturnedException
-	 * @throws ContainerExceptionInterface
-	 * @throws NotFoundExceptionInterface
+	 * @throws OCSNotFoundException If the catalog is not found.
+	 * @throws \GuzzleHttp\Exception\GuzzleException
 	 */
-	public function validatePublication(array $publication): array
+	public function getCatalog (string $id): array
 	{
-		$publicationTypeId = $publication['publicationType'];
-		$publicationType   = $this->objectService->getObject(objectType: 'publicationType', id: $publicationTypeId);
+		// Check if MongoDB storage is enabled
+		if ($this->config->hasKey(app: $this->appName, key: 'mongoStorage') !== false
+			&& $this->config->getValueString(app: $this->appName, key: 'mongoStorage') === '1'
+		) {
+			$filter = ['id' => $id, '_schema' => 'catalog'];
 
-		$publicationType = (new PublicationType())->hydrate($publicationType);
+            try {
+                return $this->objectService->findObject(filters: $filter, config: $this->getMongodbConfig());
+            } catch (OCSNotFoundException $exception) {
+			    throw new OCSNotFoundException(message: 'Catalog not found for id: ' . $id);
+            }
+		}
+
+		// If MongoDB storage is not enabled, fetch from local database
+		return $this->catalogMapper->find(id: $id)->jsonSerialize();
+	}
 
-		$validator = new Validator();
-		$validator->setMaxErrors(100);
+	/**
+	 * Validates a publication against the rules set for the publication.
+	 *
+	 * @param  array $publication The publication to be validated.
+	 * @return array 			  The publication after it has been validated.
+	 *
+	 * @throws OCSBadRequestException Thrown if the object does not validate
+	 * @throws OCSNotFoundException   Thrown if the catalog is not found
+	 */
+	public function validatePublication(array $publication): array
+	{
+        // Check for required fields
+        $requiredFields = ['catalogi', 'publicationType'];
+        foreach ($requiredFields as $field) {
+            if (isset($publication[$field]) === false) {
+                throw new OCSBadRequestException(message: $field . ' is required but not given.');
+            }
+        }
 
-		$result = $validator->validate(data: (object) json_decode(json_encode($publication['data'])), schema:  $publicationType->getSchema($this->urlGenerator));
+		$catalog  = $publication['catalogi'];
+		$publicationType   = $publication['publicationType'];
 
-		$publication['validation'] = [];
+        try {
+		    $catalog = $this->getCatalog($catalog);
+        } catch (OCSNotFoundException $exception) {
+            throw new OCSNotFoundException(message: $exception->getMessage());
+        }
 
-		if ($result->hasError()) {
-			$errors = (new ErrorFormatter())->format($result->error());
-			$publication['validation'] = $errors;
+		// Check if the given publicationType is present in the catalog
+		if (in_array(needle: $publicationType, haystack: $catalog['publicationType']) === false) {
+			throw new OCSBadRequestException(message: 'Given publicationType object not present in catalog');
 		}
 
 		return $publication;

From 8622efb6454d02416aeba9fd685ebffc27697a8a Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Fri, 8 Nov 2024 08:30:50 +0000
Subject: [PATCH 16/16] Bump version to 0.6.43

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index eb985017..e9496ccd 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -22,7 +22,7 @@ Create a [bug report](https://github.com/OpenCatalogi/.github/issues/new/choose)
 
 Create a [feature request](https://github.com/OpenCatalogi/.github/issues/new/choose)
     ]]></description>
-	<version>0.6.42</version>
+	<version>0.6.43</version>
 	<licence>agpl</licence>
 	<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
 	<author mail="info@acato.nl" homepage="https://acato.nl/">Acato</author>