Re-add comment test

client/cypress/integration/frontend/rooms/article-page.spec.js

@@ -16,8 +16,7 @@ describe('Article page', () => {
     RoomEntryQuery: {
       roomEntry,
     },
-    AddComment(input) {
-      console.log(input);
+    AddComment({input}) {
       return {
         addComment: {
           success: true,
@@ -38,7 +37,7 @@ describe('Article page', () => {
     cy.setup();
   });
 
-  it.skip('goes to article and leaves a comment', () => {
+  it('goes to article and leaves a comment', () => {
     cy.mockGraphqlOps({
       operations,
     });

client/src/components/rooms/CommentInput.vue

@@ -7,11 +7,12 @@
       data-cy="comment-textarea"
       class="comment-input__textarea"
       placeholder="Kommentar erfassen"
+      @input="updateValue($event.target.value)"
     />
     <a
       data-cy="submit-comment"
       class="button button--primary"
-      @click="$emit('input', $event.target.value)">Kommentar teilen</a>
+      @click="$emit('submit', text)">Kommentar teilen</a>
   </div>
 </template>
 
@@ -28,6 +29,16 @@
     components: {
       EmojiBar,
     },
+    data() {
+      return {
+        text: ''
+      };
+    },
+    methods: {
+      updateValue(text) {
+        this.text = text;
+      }
+    },
   };
 </script>
 

client/src/graphql/client.js

@@ -92,6 +92,7 @@ export default function (uri, networkErrorCallback) {
       switch (obj.__typename) {
         case 'InstrumentNode':
         case 'ModuleNode':
+        case 'RoomEntryNode':
           return `${obj.__typename}:${obj.slug}`;
         default:
           return defaultDataIdFromObject(obj);

client/src/graphql/gql/mutations/addComment.gql

@@ -1,5 +1,14 @@
 mutation AddComment($input: AddCommentInput!) {
   addComment(input: $input) {
     success
+    comment {
+      text
+      id
+      owner {
+        firstName
+        lastName
+      }
+      created
+    }
   }
 }

client/src/graphql/gql/queries/roomEntryQuery.gql

@@ -2,5 +2,17 @@
 query RoomEntryQuery($slug: String!) {
   roomEntry(slug: $slug) {
     ...RoomEntryParts
+    comments {
+      edges {
+        node {
+          text
+          owner {
+            firstName
+            lastName
+          }
+          created
+        }
+      }
+    }
   }
 }

client/src/main.js

@@ -131,7 +131,7 @@ function redirectUsersWithoutValidLicense(to) {
 function redirectStudentsWithoutClass() {
   return privateApolloClient.query({
     query: ME_QUERY,
-  }).then(({data}) => data.me.schoolClasses.edges.length === 0 && data.me.permissions.length === 0);
+  }).then(({data}) => data.me.schoolClasses.edges.length === 0 && !data.me.isTeacher);
 }
 
 function redirectUsersToOnboarding(to) {
@@ -169,21 +169,27 @@ router.beforeEach(async (to, from, next) => {
       localStorage.setItem(postLoginRedirectUrlKey, postLoginRedirectionUrl);
     }
 
+    Vue.$log.debug('redirecting to hello', to);
     next(redirectUrl);
     return;
   }
 
   if (to.name && to.name !== 'licenseActivation' && loginRequired(to) && await redirectUsersWithoutValidLicense()) {
+    Vue.$log.debug('redirecting to licenseActivation', to, null);
+    console.log('redirecting to licenseActivation', to, null);
     next({name: 'licenseActivation'});
     return;
   }
 
   if (!joiningClass(to) && loginRequired(to) && await redirectStudentsWithoutClass()) {
+    Vue.$log.debug('redirecting to join-class', to);
+    Vue.$log.debug('await redirectStudentsWithoutClass()', await redirectStudentsWithoutClass());
     next({name: 'join-class'});
     return;
   }
 
   if ((to.name && to.name.indexOf('onboarding') === -1) && !joiningClass(to) && loginRequired(to) && await redirectUsersToOnboarding()) {
+    Vue.$log.debug('redirecting to onboarding-start', to);
     next({name: 'onboarding-start'});
     return;
   }

server/schema.graphql

@@ -3,6 +3,18 @@ schema {
   mutation: CustomMutation
 }
 
+input AddCommentInput {
+  comment: String!
+  roomEntry: ID!
+  clientMutationId: String
+}
+
+type AddCommentPayload {
+  success: Boolean
+  comment: CommentNode
+  clientMutationId: String
+}
+
 input AddContentBlockInput {
   contentBlock: ContentBlockInput
   parent: ID
@@ -255,6 +267,23 @@ type ClassMemberNode {
   isMe: Boolean
 }
 
+type CommentNode implements Node {
+  text: String!
+  owner: PublicUserNode
+  created: DateTime!
+  id: ID!
+}
+
+type CommentNodeConnection {
+  pageInfo: PageInfo!
+  edges: [CommentNodeEdge]!
+}
+
+type CommentNodeEdge {
+  node: CommentNode
+  cursor: String!
+}
+
 type ContentBlockBookmarkNode implements Node {
   id: ID!
   user: PrivateUserNode!
@@ -411,6 +440,7 @@ type CustomMutation {
   addRoomEntry(input: AddRoomEntryInput!): AddRoomEntryPayload
   deleteRoomEntry(input: DeleteRoomEntryInput!): DeleteRoomEntryPayload
   updateRoomEntry(input: UpdateRoomEntryInput!): UpdateRoomEntryPayload
+  addComment(input: AddCommentInput!): AddCommentPayload
   mutateContentBlock(input: MutateContentBlockInput!): MutateContentBlockPayload
   addContentBlock(input: AddContentBlockInput!): AddContentBlockPayload
   deleteContentBlock(input: DeleteContentBlockInput!): DeleteContentBlockPayload
@@ -854,6 +884,7 @@ type ProjectNode implements Node {
   appearance: String!
   student: PrivateUserNode!
   final: Boolean!
+  schoolClass: SchoolClassNode
   entries(offset: Int, before: String, after: String, first: Int, last: Int): ProjectEntryNodeConnection!
   pk: Int
   entriesCount: Int
@@ -886,6 +917,7 @@ type RoomEntryNode implements Node {
   room: RoomNode!
   author: PublicUserNode
   contents: GenericStreamFieldType
+  comments(offset: Int, before: String, after: String, first: Int, last: Int, owner: ID): CommentNodeConnection
   pk: Int
 }
 
@@ -928,20 +960,9 @@ input SchoolClassInput {
 }
 
 type SchoolClassNode implements Node {
-  id: ID!
   name: String!
-  isDeleted: Boolean!
   code: String
-  users(offset: Int, before: String, after: String, first: Int, last: Int, username: String, email: String): PrivateUserNodeConnection!
-  moduleSet(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, slug_Icontains: String, slug_In: [String], title: String, title_Icontains: String, title_In: [String]): ModuleNodeConnection!
-  hiddenChapterTitles(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, title: String): ChapterNodeConnection!
-  hiddenChapterDescriptions(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, title: String): ChapterNodeConnection!
-  hiddenContentBlocks(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, title: String): ContentBlockNodeConnection!
-  visibleContentBlocks(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, title: String): ContentBlockNodeConnection!
-  hiddenObjectiveGroups(offset: Int, before: String, after: String, first: Int, last: Int, title: String, module_Slug: String): ObjectiveGroupNodeConnection!
-  hiddenObjectives(offset: Int, before: String, after: String, first: Int, last: Int, text: String): ObjectiveNodeConnection!
-  visibleObjectives(offset: Int, before: String, after: String, first: Int, last: Int, text: String): ObjectiveNodeConnection!
-  rooms(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, appearance: String): RoomNodeConnection!
+  id: ID!
   pk: Int
   members: [ClassMemberNode]
   readOnly: Boolean
@@ -1128,9 +1149,9 @@ type SyncModuleVisibilityPayload {
 
 type TeamNode implements Node {
   name: String!
-  isDeleted: Boolean!
   code: String
   id: ID!
+  isDeleted: Boolean!
   creator: PrivateUserNode
   members: [PublicUserNode]
   pk: Int

server/users/schema.py

@@ -24,6 +24,7 @@ class SchoolClassNode(DjangoObjectType):
 
     class Meta:
         model = SchoolClass
+        only_fields = ['name', 'code', 'members', 'pk', 'read_only']
         filter_fields = ['name']
         interfaces = (relay.Node,)