DRY sanitizeRelationshipTypes

Author: roschaefer

backend/src/graphql/resolvers/images/imagesLocal.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/require-await */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -15,6 +15,7 @@ import { UserInputError } from 'apollo-server'
 import slug from 'slug'
 import { v4 as uuid } from 'uuid'
 
+import { sanitizeRelationshipType } from './sanitizeRelationshipTypes'
 import { wrapTransaction } from './wrapTransaction'
 
 import type { Images, FileDeleteCallback, FileUploadCallback } from './images'
@@ -116,14 +117,6 @@ const uploadImageFile = async (
   return uploadCallback({ createReadStream, uniqueFilename, mimetype })
 }
 
-const sanitizeRelationshipType = (relationshipType) => {
-  // Cypher query language does not allow to parameterize relationship types
-  // See: https://github.com/neo4j/neo4j/issues/340
-  if (!['HERO_IMAGE', 'AVATAR_IMAGE'].includes(relationshipType)) {
-    throw new Error(`Unknown relationship type ${relationshipType}`)
-  }
-}
-
 const localFileUpload: FileUploadCallback = ({ createReadStream, uniqueFilename }) => {
   const destination = `/uploads/${uniqueFilename}`
   return new Promise((resolve, reject) =>

backend/src/graphql/resolvers/images/imagesS3.ts

@@ -8,6 +8,7 @@ import { v4 as uuid } from 'uuid'
 
 import { S3Configured } from '@config/index'
 
+import { sanitizeRelationshipType } from './sanitizeRelationshipTypes'
 import { wrapTransaction } from './wrapTransaction'
 
 import type { Image, Images, FileDeleteCallback, FileUploadCallback } from './images'
@@ -112,14 +113,6 @@ export const images = (config: S3Configured) => {
     return publicLocation.href
   }
 
-  const sanitizeRelationshipType = (relationshipType: string) => {
-    // Cypher query language does not allow to parameterize relationship types
-    // See: https://github.com/neo4j/neo4j/issues/340
-    if (!['HERO_IMAGE', 'AVATAR_IMAGE'].includes(relationshipType)) {
-      throw new Error(`Unknown relationship type ${relationshipType}`)
-    }
-  }
-
   const s3Upload: FileUploadCallback = async ({ createReadStream, uniqueFilename, mimetype }) => {
     const s3Location = `original/${uniqueFilename}`
     const params = {

backend/src/graphql/resolvers/images/sanitizeRelationshipTypes.ts

@@ -0,0 +1,7 @@
+export const sanitizeRelationshipType = (relationshipType: string) => {
+  // Cypher query language does not allow to parameterize relationship types
+  // See: https://github.com/neo4j/neo4j/issues/340
+  if (!['HERO_IMAGE', 'AVATAR_IMAGE'].includes(relationshipType)) {
+    throw new Error(`Unknown relationship type ${relationshipType}`)
+  }
+}