From eda2ea34fcb00d12f9879a97e9b3baf4dcd67b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Thu, 21 Feb 2019 20:00:35 +0100 Subject: [PATCH] Incorporate @appinteractive's feedback @appinteractive can we merge this soon? --- src/middleware/permissionsMiddleware.js | 6 +++--- src/seed/factories/badges.js | 17 +++++++++-------- src/seed/factories/categories.js | 12 ++++++------ src/seed/factories/comments.js | 5 +++-- src/seed/factories/index.js | 2 +- src/seed/factories/organizations.js | 5 +++-- src/seed/factories/posts.js | 5 +++-- src/seed/factories/tags.js | 4 ++-- src/seed/factories/users.js | 9 +++++---- 9 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/middleware/permissionsMiddleware.js b/src/middleware/permissionsMiddleware.js index 0bd88b274..1a3f04ceb 100644 --- a/src/middleware/permissionsMiddleware.js +++ b/src/middleware/permissionsMiddleware.js @@ -16,7 +16,7 @@ const isModerator = rule()(async (parent, args, ctx, info) => { }) */ -const myself = rule({ cache: 'no_cache' })(async (parent, args, ctx, info) => { +const isMyOwn = rule({ cache: 'no_cache' })(async (parent, args, ctx, info) => { return ctx.user.id === parent.id }) @@ -36,8 +36,8 @@ const permissions = shield({ // CreateUser: allow, }, User: { - email: myself, - password: myself + email: isMyOwn, + password: isMyOwn } // Post: isAuthenticated }) diff --git a/src/seed/factories/badges.js b/src/seed/factories/badges.js index 2aabe2014..b34442521 100644 --- a/src/seed/factories/badges.js +++ b/src/seed/factories/badges.js @@ -1,8 +1,8 @@ -import faker from 'faker' +import uuid from 'uuid/v4' export default function (params) { const { - id = `cat${faker.random.number()}`, + id = uuid(), key, type = 'crowdfunding', status = 'permanent', @@ -11,12 +11,13 @@ export default function (params) { return ` mutation { - ${id}: CreateBadge( - id: "${id}", - key: "${key}", - type: ${type}, - status: ${status}, - icon: "${icon}") { id } + CreateBadge( + id: "${id}", + key: "${key}", + type: ${type}, + status: ${status}, + icon: "${icon}" + ) { id } } ` } diff --git a/src/seed/factories/categories.js b/src/seed/factories/categories.js index 287aac5e0..a4b448f4b 100644 --- a/src/seed/factories/categories.js +++ b/src/seed/factories/categories.js @@ -1,8 +1,8 @@ -import faker from 'faker' +import uuid from 'uuid/v4' export default function (params) { const { - id = `cat${faker.random.number()}`, + id = uuid(), name, slug, icon @@ -11,10 +11,10 @@ export default function (params) { return ` mutation { CreateCategory( - id: "${id}", - name: "${name}", - slug: "${slug}", - icon: "${icon}" + id: "${id}", + name: "${name}", + slug: "${slug}", + icon: "${icon}" ) { id, name } } ` diff --git a/src/seed/factories/comments.js b/src/seed/factories/comments.js index b4e25c482..acf493f6d 100644 --- a/src/seed/factories/comments.js +++ b/src/seed/factories/comments.js @@ -1,8 +1,9 @@ import faker from 'faker' +import uuid from 'uuid/v4' export default function (params) { const { - id = `c${faker.random.number()}`, + id = uuid(), content = [ faker.lorem.sentence(), faker.lorem.sentence() @@ -13,7 +14,7 @@ export default function (params) { return ` mutation { - ${id}: CreateComment( + CreateComment( id: "${id}", content: "${content}", disabled: ${disabled}, diff --git a/src/seed/factories/index.js b/src/seed/factories/index.js index fef83ff55..a107fc6b7 100644 --- a/src/seed/factories/index.js +++ b/src/seed/factories/index.js @@ -51,7 +51,7 @@ export const cleanDatabase = async (options = {}) => { driver = getDriver() } = options const session = driver.session() - const cypher = 'MATCH (n) OPTIONAL MATCH (n)-[r]-() DELETE n,r' + const cypher = 'MATCH (n) DETACH DELETE n' try { return await session.run(cypher) } catch (error) { diff --git a/src/seed/factories/organizations.js b/src/seed/factories/organizations.js index c0329d55d..0ab73beb8 100644 --- a/src/seed/factories/organizations.js +++ b/src/seed/factories/organizations.js @@ -1,8 +1,9 @@ import faker from 'faker' +import uuid from 'uuid/v4' export default function create (params) { const { - id = `o${faker.random.number()}`, + id = uuid(), name = faker.comany.companyName(), description = faker.company.catchPhrase(), disabled = false, @@ -11,7 +12,7 @@ export default function create (params) { return ` mutation { - ${id}: CreateOrganization( + CreateOrganization( id: "${id}", name: "${name}", description: "${description}", diff --git a/src/seed/factories/posts.js b/src/seed/factories/posts.js index eaa616b2b..80f5e289d 100644 --- a/src/seed/factories/posts.js +++ b/src/seed/factories/posts.js @@ -1,8 +1,9 @@ import faker from 'faker' +import uuid from 'uuid/v4' export default function (params) { const { - id = `p${faker.random.number()}`, + id = uuid(), title = faker.lorem.sentence(), content = [ faker.lorem.sentence(), @@ -19,7 +20,7 @@ export default function (params) { return ` mutation { - ${id}: CreatePost( + CreatePost( id: "${id}", title: "${title}", content: "${content}", diff --git a/src/seed/factories/tags.js b/src/seed/factories/tags.js index 0854cc0cd..c603c5629 100644 --- a/src/seed/factories/tags.js +++ b/src/seed/factories/tags.js @@ -1,8 +1,8 @@ -import faker from 'faker' +import uuid from 'uuid/v4' export default function (params) { const { - id = `t${faker.random.number()}`, + id = uuid(), name } = params diff --git a/src/seed/factories/users.js b/src/seed/factories/users.js index 2e94b5ebe..b3a6e83c1 100644 --- a/src/seed/factories/users.js +++ b/src/seed/factories/users.js @@ -1,8 +1,9 @@ import faker from 'faker' +import uuid from 'uuid/v4' export default function create (params) { const { - id = `u${faker.random.number()}`, + id = uuid(), name = faker.name.findName(), email = faker.internet.email(), password = '1234', @@ -14,7 +15,7 @@ export default function create (params) { return ` mutation { - ${id}: CreateUser( + CreateUser( id: "${id}", name: "${name}", password: "${password}", @@ -22,8 +23,8 @@ export default function create (params) { avatar: "${avatar}", role: ${role}, disabled: ${disabled}, - deleted: ${deleted}) { - id + deleted: ${deleted} + ) { name email avatar