From 3c22a432e694d743aa520957fcb10996c755bd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Tue, 21 May 2019 03:08:32 +0200 Subject: [PATCH] Fix lint --- backend/src/middleware/validation/index.js | 2 +- backend/src/resolvers/fileUpload/index.js | 18 +++++++++--------- backend/src/resolvers/fileUpload/spec.js | 14 +++++++------- backend/src/resolvers/posts.js | 4 ++-- backend/src/resolvers/users.js | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js index ded509b44..5bc8fd02d 100644 --- a/backend/src/middleware/validation/index.js +++ b/backend/src/middleware/validation/index.js @@ -3,7 +3,7 @@ import { UserInputError } from 'apollo-server' const USERNAME_MIN_LENGTH = 3 const validateUsername = async (resolve, root, args, context, info) => { - if (!('name' in args) || args.name && args.name.length >= USERNAME_MIN_LENGTH) { + if (!('name' in args) || (args.name && args.name.length >= USERNAME_MIN_LENGTH)) { /* eslint-disable-next-line no-return-await */ return await resolve(root, args, context, info) } else { diff --git a/backend/src/resolvers/fileUpload/index.js b/backend/src/resolvers/fileUpload/index.js index 65a48a34d..85bdf920b 100644 --- a/backend/src/resolvers/fileUpload/index.js +++ b/backend/src/resolvers/fileUpload/index.js @@ -2,22 +2,22 @@ import { createWriteStream } from 'fs' import path from 'path' import slug from 'slug' -const storeUpload = ({ createReadStream, fileLocation}) => +const storeUpload = ({ createReadStream, fileLocation }) => new Promise((resolve, reject) => - createReadStream() - .pipe(createWriteStream(`public${fileLocation}`)) - .on("finish", resolve) - .on("error", reject) - ); + createReadStream() + .pipe(createWriteStream(`public${fileLocation}`)) + .on('finish', resolve) + .on('error', reject) + ) -export default async function fileUpload(params, { file, url}, uploadCallback = storeUpload) { +export default async function fileUpload (params, { file, url }, uploadCallback = storeUpload) { const upload = params[file] if (upload) { - const { createReadStream, filename } = await upload; + const { createReadStream, filename } = await upload const { name } = path.parse(filename) const fileLocation = `/uploads/${Date.now()}-${slug(name)}` - await uploadCallback({ createReadStream, fileLocation }); + await uploadCallback({ createReadStream, fileLocation }) delete params[file] params[url] = fileLocation diff --git a/backend/src/resolvers/fileUpload/spec.js b/backend/src/resolvers/fileUpload/spec.js index 93e98adfc..798e4f9c5 100644 --- a/backend/src/resolvers/fileUpload/spec.js +++ b/backend/src/resolvers/fileUpload/spec.js @@ -17,25 +17,25 @@ describe('fileUpload', () => { }) it('calls uploadCallback', async () => { - await fileUpload(params, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) expect(uploadCallback).toHaveBeenCalled() }) describe('file name', () => { it('saves the upload url in params[url]', async () => { - await fileUpload(params, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) expect(params.attribute).toMatch(/^\/uploads\/\d+-avatar$/) }) it('uses the name without file ending', async () => { params.uploadAttribute.filename = 'somePng.png' - await fileUpload(params, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) expect(params.attribute).toMatch(/^\/uploads\/\d+-somePng/) }) it('creates a url safe name', async () => { params.uploadAttribute.filename = '/path/to/awkward?/ file-location/?foo- bar-avatar.jpg?foo- bar' - await fileUpload(params, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + await fileUpload(params, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) expect(params.attribute).toMatch(/^\/uploads\/\d+-foo-bar-avatar$/) }) @@ -43,12 +43,12 @@ describe('fileUpload', () => { it('creates unique names to avoid overwriting existing files', async () => { const { attribute: first } = await fileUpload({ ...params - }, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + }, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) - await new Promise(resolve => setTimeout(resolve, 1000)); + await new Promise(resolve => setTimeout(resolve, 1000)) const { attribute: second } = await fileUpload({ ...params - }, { file: 'uploadAttribute', url: 'attribute'}, uploadCallback) + }, { file: 'uploadAttribute', url: 'attribute' }, uploadCallback) expect(first).not.toEqual(second) }) }) diff --git a/backend/src/resolvers/posts.js b/backend/src/resolvers/posts.js index 02239eebb..128a83fc3 100644 --- a/backend/src/resolvers/posts.js +++ b/backend/src/resolvers/posts.js @@ -4,12 +4,12 @@ import fileUpload from './fileUpload' export default { Mutation: { UpdatePost: async (object, params, context, resolveInfo) => { - params = await fileUpload(params, { file: 'imageUpload', url: 'image'}) + params = await fileUpload(params, { file: 'imageUpload', url: 'image' }) return neo4jgraphql(object, params, context, resolveInfo, false) }, CreatePost: async (object, params, context, resolveInfo) => { - params = await fileUpload(params, { file: 'imageUpload', url: 'image'}) + params = await fileUpload(params, { file: 'imageUpload', url: 'image' }) const result = await neo4jgraphql(object, params, context, resolveInfo, false) const session = context.driver.session() diff --git a/backend/src/resolvers/users.js b/backend/src/resolvers/users.js index 838f45138..01beae522 100644 --- a/backend/src/resolvers/users.js +++ b/backend/src/resolvers/users.js @@ -4,12 +4,12 @@ import fileUpload from './fileUpload' export default { Mutation: { UpdateUser: async (object, params, context, resolveInfo) => { - params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar'}) - return await neo4jgraphql(object, params, context, resolveInfo, false) + params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar' }) + return neo4jgraphql(object, params, context, resolveInfo, false) }, CreateUser: async (object, params, context, resolveInfo) => { - params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar'}) - return await neo4jgraphql(object, params, context, resolveInfo, false) + params = await fileUpload(params, { file: 'avatarUpload', url: 'avatar' }) + return neo4jgraphql(object, params, context, resolveInfo, false) } } -}; +}