Merge pull request #1518 from serlo/migrate-add-role

Migrate add role incl. user description bugfix and test updates

__fixtures__/uuid/user.ts

@@ -7,7 +7,7 @@ export const user: Model<'User'> = {
   trashed: false,
   alias: '/user/1/admin',
   username: 'admin',
-  date: '2014-03-01T20:36:21Z',
+  date: '2014-03-01T20:36:21.000Z',
   lastLogin: '2020-03-24T09:40:55Z',
   description: null,
   roles: ['login', 'german_horizonhelper', 'sysadmin'],
@@ -17,10 +17,9 @@ export const user2: Model<'User'> = {
   __typename: DiscriminatorType.User,
   id: 23,
   trashed: false,
-  alias: '/user/23/sandra',
-  username: 'sandra',
-  date: '2015-02-01T20:35:21Z',
-  lastLogin: '2019-03-23T09:20:55Z',
+  alias: '/user/23/1229902f',
+  username: '1229902f',
+  date: '2014-03-01T20:36:32.000Z',
   description: null,
   roles: ['login'],
 }

__tests__/__utils__/assertions.ts

@@ -6,8 +6,6 @@ import { DocumentNode } from 'graphql'
 import gql from 'graphql-tag'
 import * as R from 'ramda'
 
-import { given, nextUuid } from '.'
-import { user } from '../../__fixtures__'
 import { Context } from '~/context'
 import { Service } from '~/context/service'
 import { ModelDataSource } from '~/internals/data-source'
@@ -98,16 +96,37 @@ export class Query<
     return new Query(new Client(context), this.query)
   }
 
-  forLoginUser(...additionalRoles: string[]) {
-    const loginUser = {
-      ...user,
-      id: nextUuid(user.id),
-      roles: [...additionalRoles, 'login'],
+  async forUser(...additionalRoles: string[]) {
+    const userWithoutRolesId = 35478
+
+    for (const role of additionalRoles) {
+      const result = await databaseForTests.fetchOptional<{ id: number }>(
+        'select id from role where name = ?',
+        [role],
+      )
+
+      let roleId = result?.id
+
+      if (roleId == null) {
+        const result = await databaseForTests.mutate(
+          'insert into role (name) values (?)',
+          [role],
+        )
+
+        roleId = result.insertId
+      }
+
+      await databaseForTests.mutate(
+        'insert into role_user (user_id, role_id) values (?, ?)',
+        [userWithoutRolesId, roleId],
+      )
     }
 
-    given('UuidQuery').for(loginUser)
+    return this.withContext({ userId: userWithoutRolesId })
+  }
 
-    return this.withContext({ userId: loginUser.id })
+  forLoginUser() {
+    return this.withContext({ userId: 9 })
   }
 
   forUnauthenticatedUser() {

__tests__/__utils__/query.ts

@@ -35,6 +35,25 @@ export const taxonomyTermQuery = new Client().prepareQuery({
   `,
 })
 
+export const userQuery = new Client().prepareQuery({
+  query: gql`
+    query ($id: Int!) {
+      uuid(id: $id) {
+        id
+        __typename
+        ... on User {
+          roles {
+            nodes {
+              role
+              scope
+            }
+          }
+        }
+      }
+    }
+  `,
+})
+
 export const threadsQuery = new Client().prepareQuery({
   query: gql`
     query thread($id: Int!, $archived: Boolean) {

__tests__/schema/ai.ts

@@ -130,7 +130,8 @@ test('successfully generate content for student (not logged in) - staging', asyn
 })
 
 test('successfully generate content for architect - staging', async () => {
-  await query.forLoginUser('de_architect').shouldReturnData({
+  const newQuery = await query.forUser('de_architect')
+  await newQuery.shouldReturnData({
     ai: {
       executePrompt: {
         success: true,
@@ -152,7 +153,8 @@ test('fails for unauthenticated user in production', async () => {
 test('fails for unauthorized user (wrong role) in production', async () => {
   const previousEnvironment = process.env.ENVIRONMENT
   process.env.ENVIRONMENT = 'production'
-  await query.forLoginUser('de_architect').shouldFailWithError('FORBIDDEN')
+  const newQuery = await query.forUser('de_moderator')
+  await newQuery.shouldFailWithError('FORBIDDEN')
   process.env.ENVIRONMENT = previousEnvironment
 })
 

__tests__/schema/authorization.ts

@@ -1,8 +1,7 @@
 import { Scope, Thread } from '@serlo/authorization'
 import gql from 'graphql-tag'
 
-import { user } from '../../__fixtures__'
-import { given, Client } from '../__utils__'
+import { Client } from '../__utils__'
 import { resolveRolesPayload, RolesPayload } from '~/schema/authorization/roles'
 import { Role } from '~/types'
 
@@ -22,9 +21,7 @@ describe('authorization', () => {
   })
 
   test('Authenticated Users (no special roles)', async () => {
-    given('UuidQuery').for({ ...user, roles: ['login'] })
-
-    await new Client({ userId: user.id })
+    await new Client({ userId: 20 })
       .prepareQuery({
         query: gql`
           {
@@ -38,9 +35,7 @@ describe('authorization', () => {
   })
 
   test('Authenticated Users (filter old legacy roles)', async () => {
-    given('UuidQuery').for({ ...user, roles: ['login', 'german_moderator'] })
-
-    await new Client({ userId: user.id })
+    await new Client({ userId: 33931 })
       .prepareQuery({
         query: gql`
           {
@@ -54,9 +49,15 @@ describe('authorization', () => {
   })
 
   test('Authenticated Users (map new legacy roles)', async () => {
-    given('UuidQuery').for({ ...user, roles: ['login', 'de_moderator'] })
+    const { insertId } = await databaseForTests.mutate(
+      "insert into role (name) values ('de_moderator')",
+    )
+    await databaseForTests.mutate(
+      `insert into role_user (user_id, role_id) values (33931, ?)`,
+      [insertId],
+    )
 
-    await new Client({ userId: user.id })
+    await new Client({ userId: 33931 })
       .prepareQuery({
         query: gql`
           {

__tests__/schema/entity/checkout-revision.ts

@@ -168,7 +168,8 @@ test('fails when user is not authenticated', async () => {
 })
 
 test('fails when user does not have role "reviewer"', async () => {
-  await mutation.forLoginUser('de_moderator').shouldFailWithError('FORBIDDEN')
+  const newMutation = await mutation.forUser('de_moderator')
+  await newMutation.shouldFailWithError('FORBIDDEN')
 })
 
 test('fails when database layer returns a 400er response', async () => {

__tests__/schema/entity/reject-revision.ts

@@ -128,7 +128,8 @@ test('fails when user is not authenticated', async () => {
 })
 
 test('fails when user does not have role "reviewer"', async () => {
-  await mutation.forLoginUser('de_moderator').shouldFailWithError('FORBIDDEN')
+  const newMutation = await mutation.forUser('de_moderator')
+  await newMutation.shouldFailWithError('FORBIDDEN')
 })
 
 test('fails when database layer returns a 400er response', async () => {