Merge pull request #797 from lblod/fix/handle-non-200

Fix publish service to handle non-200 success status codes
lblod · Jan 2, 2025 · 42874e3 · 42874e3
2 parents e2f5414 + 4166e84
commit 42874e3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.changeset/breezy-eyes-refuse.md b/.changeset/breezy-eyes-refuse.md
@@ -0,0 +1,5 @@
+---
+'frontend-gelinkt-notuleren': patch
+---
+
+Fix publish service to handle non-200 success status codes
diff --git a/app/controllers/meetings/publish/besluitenlijst.js b/app/controllers/meetings/publish/besluitenlijst.js
@@ -64,7 +64,7 @@ export default class MeetingsPublishBesluitenlijstController extends Controller
       maxIterations--;
     } while (resp.status === 404 && maxIterations > 0);
 
-    if (resp.status !== 200) {
+    if (!resp.ok) {
       throw new Error(await resp.text());
     } else {
       return await resp.json();

diff --git a/app/controllers/meetings/publish/notulen.js b/app/controllers/meetings/publish/notulen.js
@@ -363,8 +363,8 @@ export default class MeetingsPublishNotulenController extends Controller {
       const previewHtml = json.data.attributes.html;
       this.preview = previewHtml;
     } catch (e) {
-      console.error(e);
-      this.errors = [JSON.stringify(e)];
+      console.error('Error generating notulen preview', e);
+      this.errors = [e.message];
     }
   });
 

diff --git a/app/services/publish.js b/app/services/publish.js
@@ -83,7 +83,7 @@ export default class PublishService extends Service {
         maxIterations--;
       } while (resp.status === 404 && maxIterations > 0);
 
-      if (resp.status !== 200) {
+      if (!resp.ok) {
         let errors;
         try {
           const json = await resp.json();

diff --git a/app/services/template-fetcher.js b/app/services/template-fetcher.js
@@ -51,7 +51,7 @@ export default class TemplateFetcher extends Service {
     `;
 
     const response = await this.sendQuery(sparqlEndpoint, sparqlQuery);
-    if (response.status === 200) {
+    if (!response.ok) {
       const json = await response.json();
       const bindings = json.results.bindings;
       const templates = bindings.map(this.bindingToTemplate(fileEndpoint));
@@ -99,7 +99,7 @@ export default class TemplateFetcher extends Service {
     `;
 
     const response = await this.sendQuery(sparqlEndpoint, sparqlQuery);
-    if (response.status === 200) {
+    if (!response.ok) {
       const json = await response.json();
       const bindings = json.results.bindings;
       const templates = bindings.map(this.bindingToTemplate(fileEndpoint));
@@ -145,7 +145,7 @@ export default class TemplateFetcher extends Service {
       ORDER BY LCASE(REPLACE(STR(?title), '^ +| +$', ''))
     `;
     const response = await this.sendQuery(sparqlEndpoint, sparqlQuery);
-    if (response.status === 200) {
+    if (!response.ok) {
       const json = await response.json();
       const bindings = json.results.bindings;
       const templates = bindings.map(this.bindingToTemplate(fileEndpoint));