From 2a544376a3d940b3a5726b24f0139376bf969705 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 3 Sep 2019 21:35:06 +0200
Subject: [PATCH] Delete post.image

In contrast to the other errors, it's better to send `null` for an
image. That way, the browser won't even try to load that url.
---
 backend/src/middleware/softDeleteMiddleware.js      | 2 +-
 backend/src/middleware/softDeleteMiddleware.spec.js | 2 +-
 backend/src/schema/resolvers/posts.js               | 2 +-
 backend/src/schema/resolvers/posts.spec.js          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/middleware/softDeleteMiddleware.js b/backend/src/middleware/softDeleteMiddleware.js
index 29898c216..d3fd13cfc 100644
--- a/backend/src/middleware/softDeleteMiddleware.js
+++ b/backend/src/middleware/softDeleteMiddleware.js
@@ -19,10 +19,10 @@ const obfuscate = async (resolve, root, args, context, info) => {
     root.contentExcerpt = 'UNAVAILABLE'
     root.title = 'UNAVAILABLE'
     root.slug = 'UNAVAILABLE'
-    root.image = 'UNAVAILABLE'
     root.avatar = 'UNAVAILABLE'
     root.about = 'UNAVAILABLE'
     root.name = 'UNAVAILABLE'
+    root.image = null // avoid unecessary 500 errors
   }
   return resolve(root, args, context, info)
 }
diff --git a/backend/src/middleware/softDeleteMiddleware.spec.js b/backend/src/middleware/softDeleteMiddleware.spec.js
index b77a7355a..a749de819 100644
--- a/backend/src/middleware/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDeleteMiddleware.spec.js
@@ -240,7 +240,7 @@ describe('softDeleteMiddleware', () => {
         it('obfuscates slug', () => expect(subject.slug).toEqual('UNAVAILABLE'))
         it('obfuscates content', () => expect(subject.content).toEqual('UNAVAILABLE'))
         it('obfuscates contentExcerpt', () => expect(subject.contentExcerpt).toEqual('UNAVAILABLE'))
-        it('obfuscates image', () => expect(subject.image).toEqual('UNAVAILABLE'))
+        it('obfuscates image', () => expect(subject.image).toEqual(null))
       })
 
       describe('Comment', () => {
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 5cab8c601..7f466d0e0 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -149,11 +149,11 @@ export default {
         MATCH (post:Post {id: $postId})
         OPTIONAL MATCH (post)<-[:COMMENTS]-(comment:Comment)
         SET post.deleted        = TRUE
-        SET post.image          = 'UNAVAILABLE'
         SET post.content        = 'UNAVAILABLE'
         SET post.contentExcerpt = 'UNAVAILABLE'
         SET post.title          = 'UNAVAILABLE'
         SET comment.deleted     = TRUE
+        REMOVE post.image
         RETURN post
       `,
         { postId: args.id },
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 399602a42..7c5e88d69 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -470,7 +470,7 @@ describe('DeletePost', () => {
             deleted: true,
             content: 'UNAVAILABLE',
             contentExcerpt: 'UNAVAILABLE',
-            image: 'UNAVAILABLE',
+            image: null,
             comments: [],
           },
         },
@@ -497,7 +497,7 @@ describe('DeletePost', () => {
               deleted: true,
               content: 'UNAVAILABLE',
               contentExcerpt: 'UNAVAILABLE',
-              image: 'UNAVAILABLE',
+              image: null,
               comments: [
                 {
                   deleted: true,