Merge pull request #993 from Human-Connection/user_role_not_nullable

User role not nullable

backend/src/bootstrap/neode.js

@@ -1,88 +1,9 @@
 import Neode from 'neode'
-import uuid from 'uuid/v4'
+import models from '../models'
 
 export default function setupNeode(options) {
   const { uri, username, password } = options
   const neodeInstance = new Neode(uri, username, password)
-  neodeInstance.model('InvitationCode', {
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    token: { type: 'string', primary: true, token: true },
-    generatedBy: {
-      type: 'relationship',
-      relationship: 'GENERATED',
-      target: 'User',
-      direction: 'in',
-    },
-    activated: {
-      type: 'relationship',
-      relationship: 'ACTIVATED',
-      target: 'EmailAddress',
-      direction: 'out',
-    },
-  })
-  neodeInstance.model('EmailAddress', {
-    email: { type: 'string', primary: true, lowercase: true, email: true },
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    verifiedAt: { type: 'string', isoDate: true },
-    nonce: { type: 'string', token: true },
-    belongsTo: {
-      type: 'relationship',
-      relationship: 'BELONGS_TO',
-      target: 'User',
-      direction: 'out',
-    },
-  })
-  neodeInstance.model('User', {
-    id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
-    actorId: { type: 'string', allow: [null] },
-    name: { type: 'string', min: 3 },
-    email: { type: 'string', lowercase: true, email: true },
-    slug: 'string',
-    encryptedPassword: 'string',
-    avatar: { type: 'string', allow: [null] },
-    coverImg: { type: 'string', allow: [null] },
-    deleted: { type: 'boolean', default: false },
-    disabled: { type: 'boolean', default: false },
-    role: 'string',
-    publicKey: 'string',
-    privateKey: 'string',
-    wasInvited: 'boolean',
-    wasSeeded: 'boolean',
-    locationName: { type: 'string', allow: [null] },
-    about: { type: 'string', allow: [null] },
-    primaryEmail: {
-      type: 'relationship',
-      relationship: 'PRIMARY_EMAIL',
-      target: 'EmailAddress',
-      direction: 'out',
-    },
-    following: {
-      type: 'relationship',
-      relationship: 'FOLLOWS',
-      target: 'User',
-      direction: 'out',
-    },
-    followedBy: {
-      type: 'relationship',
-      relationship: 'FOLLOWS',
-      target: 'User',
-      direction: 'in',
-    },
-    friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
-    disabledBy: {
-      type: 'relationship',
-      relationship: 'DISABLED',
-      target: 'User',
-      direction: 'in',
-    },
-    invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
-    createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
-    updatedAt: {
-      type: 'string',
-      isoDate: true,
-      required: true,
-      default: () => new Date().toISOString(),
-    },
-  })
+  neodeInstance.with(models)
   return neodeInstance
 }

backend/src/models/EmailAddress.js

@@ -0,0 +1,12 @@
+module.exports = {
+  email: { type: 'string', primary: true, lowercase: true, email: true },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  verifiedAt: { type: 'string', isoDate: true },
+  nonce: { type: 'string', token: true },
+  belongsTo: {
+    type: 'relationship',
+    relationship: 'BELONGS_TO',
+    target: 'User',
+    direction: 'out',
+  },
+}

backend/src/models/InvitationCode.js

@@ -0,0 +1,16 @@
+module.exports = {
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  token: { type: 'string', primary: true, token: true },
+  generatedBy: {
+    type: 'relationship',
+    relationship: 'GENERATED',
+    target: 'User',
+    direction: 'in',
+  },
+  activated: {
+    type: 'relationship',
+    relationship: 'ACTIVATED',
+    target: 'EmailAddress',
+    direction: 'out',
+  },
+}

backend/src/models/User.js

@@ -0,0 +1,54 @@
+import uuid from 'uuid/v4'
+
+module.exports = {
+  id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
+  actorId: { type: 'string', allow: [null] },
+  name: { type: 'string', min: 3 },
+  email: { type: 'string', lowercase: true, email: true },
+  slug: 'string',
+  encryptedPassword: 'string',
+  avatar: { type: 'string', allow: [null] },
+  coverImg: { type: 'string', allow: [null] },
+  deleted: { type: 'boolean', default: false },
+  disabled: { type: 'boolean', default: false },
+  role: { type: 'string', default: 'user' },
+  publicKey: 'string',
+  privateKey: 'string',
+  wasInvited: 'boolean',
+  wasSeeded: 'boolean',
+  locationName: { type: 'string', allow: [null] },
+  about: { type: 'string', allow: [null] },
+  primaryEmail: {
+    type: 'relationship',
+    relationship: 'PRIMARY_EMAIL',
+    target: 'EmailAddress',
+    direction: 'out',
+  },
+  following: {
+    type: 'relationship',
+    relationship: 'FOLLOWS',
+    target: 'User',
+    direction: 'out',
+  },
+  followedBy: {
+    type: 'relationship',
+    relationship: 'FOLLOWS',
+    target: 'User',
+    direction: 'in',
+  },
+  friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
+  disabledBy: {
+    type: 'relationship',
+    relationship: 'DISABLED',
+    target: 'User',
+    direction: 'in',
+  },
+  invitedBy: { type: 'relationship', relationship: 'INVITED', target: 'User', direction: 'in' },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  updatedAt: {
+    type: 'string',
+    isoDate: true,
+    required: true,
+    default: () => new Date().toISOString(),
+  },
+}

backend/src/models/User.spec.js

@@ -0,0 +1,20 @@
+import Factory from '../seed/factories'
+import { neode } from '../bootstrap/neo4j'
+
+const factory = Factory()
+const instance = neode()
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('role', () => {
+  it('defaults to `user`', async () => {
+    const user = await instance.create('User', { name: 'John' })
+    await expect(user.toJson()).resolves.toEqual(
+      expect.objectContaining({
+        role: 'user',
+      }),
+    )
+  })
+})

backend/src/models/index.js

@@ -0,0 +1,7 @@
+// NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
+// module that is not browser-compatible. Node's `fs` module is server-side only
+export default {
+  User: require('./User.js'),
+  InvitationCode: require('./InvitationCode.js'),
+  EmailAddress: require('./EmailAddress.js'),
+}

backend/src/schema/types/type/User.gql

@@ -9,7 +9,7 @@ type User {
   deleted: Boolean
   disabled: Boolean
   disabledBy: User @relation(name: "DISABLED", direction: "IN")
-  role: UserGroup
+  role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")
   invited: [User] @relation(name: "INVITED", direction: "OUT")