refactor(backend): separate queries (#8358)

* separate all queries into one file each

* fix merge error

* fix lint

---------

Co-authored-by: mahula <lenzmath@posteo.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>

backend/src/db/seed.ts

@@ -9,15 +9,13 @@ import sample from 'lodash/sample'
 
 import CONFIG from '@config/index'
 import { categories } from '@constants/categories'
-import { createCommentMutation } from '@graphql/comments'
-import {
-  createGroupMutation,
-  joinGroupMutation,
-  changeGroupMemberRoleMutation,
-} from '@graphql/groups'
-import { createMessageMutation } from '@graphql/messages'
-import { createPostMutation } from '@graphql/posts'
-import { createRoomMutation } from '@graphql/rooms'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createCommentMutation } from '@graphql/queries/createCommentMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { createMessageMutation } from '@graphql/queries/createMessageMutation'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
+import { createRoomMutation } from '@graphql/queries/createRoomMutation'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
 import createServer from '@src/server'
 
 import Factory from './factories'

backend/src/graphql/groups.ts

@@ -1,216 +0,0 @@
-import gql from 'graphql-tag'
-
-// ------ mutations
-
-export const createGroupMutation = () => {
-  return gql`
-    mutation (
-      $id: ID
-      $name: String!
-      $slug: String
-      $about: String
-      $description: String!
-      $groupType: GroupType!
-      $actionRadius: GroupActionRadius!
-      $categoryIds: [ID]
-      $locationName: String # empty string '' sets it to null
-    ) {
-      CreateGroup(
-        id: $id
-        name: $name
-        slug: $slug
-        about: $about
-        description: $description
-        groupType: $groupType
-        actionRadius: $actionRadius
-        categoryIds: $categoryIds
-        locationName: $locationName
-      ) {
-        id
-        name
-        slug
-        createdAt
-        updatedAt
-        disabled
-        deleted
-        about
-        description
-        descriptionExcerpt
-        groupType
-        actionRadius
-        categories {
-          id
-          slug
-          name
-          icon
-        }
-        locationName
-        location {
-          name
-          nameDE
-          nameEN
-        }
-        myRole
-      }
-    }
-  `
-}
-
-export const updateGroupMutation = () => {
-  return gql`
-    mutation (
-      $id: ID!
-      $name: String
-      $slug: String
-      $about: String
-      $description: String
-      $actionRadius: GroupActionRadius
-      $categoryIds: [ID]
-      $avatar: ImageInput
-      $locationName: String # empty string '' sets it to null
-    ) {
-      UpdateGroup(
-        id: $id
-        name: $name
-        slug: $slug
-        about: $about
-        description: $description
-        actionRadius: $actionRadius
-        categoryIds: $categoryIds
-        avatar: $avatar
-        locationName: $locationName
-      ) {
-        id
-        name
-        slug
-        createdAt
-        updatedAt
-        disabled
-        deleted
-        about
-        description
-        descriptionExcerpt
-        groupType
-        actionRadius
-        categories {
-          id
-          slug
-          name
-          icon
-        }
-        # avatar # test this as result
-        locationName
-        location {
-          name
-          nameDE
-          nameEN
-        }
-        myRole
-      }
-    }
-  `
-}
-
-export const joinGroupMutation = () => {
-  return gql`
-    mutation ($groupId: ID!, $userId: ID!) {
-      JoinGroup(groupId: $groupId, userId: $userId) {
-        id
-        name
-        slug
-        myRoleInGroup
-      }
-    }
-  `
-}
-
-export const leaveGroupMutation = () => {
-  return gql`
-    mutation ($groupId: ID!, $userId: ID!) {
-      LeaveGroup(groupId: $groupId, userId: $userId) {
-        id
-        name
-        slug
-        myRoleInGroup
-      }
-    }
-  `
-}
-
-export const changeGroupMemberRoleMutation = () => {
-  return gql`
-    mutation ($groupId: ID!, $userId: ID!, $roleInGroup: GroupMemberRole!) {
-      ChangeGroupMemberRole(groupId: $groupId, userId: $userId, roleInGroup: $roleInGroup) {
-        id
-        name
-        slug
-        myRoleInGroup
-      }
-    }
-  `
-}
-
-export const removeUserFromGroupMutation = () => {
-  return gql`
-    mutation ($groupId: ID!, $userId: ID!) {
-      RemoveUserFromGroup(groupId: $groupId, userId: $userId) {
-        id
-        name
-        slug
-        myRoleInGroup
-      }
-    }
-  `
-}
-
-// ------ queries
-
-export const groupQuery = () => {
-  return gql`
-    query ($isMember: Boolean, $id: ID, $slug: String) {
-      Group(isMember: $isMember, id: $id, slug: $slug) {
-        id
-        name
-        slug
-        createdAt
-        updatedAt
-        disabled
-        deleted
-        about
-        description
-        descriptionExcerpt
-        groupType
-        actionRadius
-        categories {
-          id
-          slug
-          name
-          icon
-        }
-        avatar {
-          url
-        }
-        locationName
-        location {
-          name
-          nameDE
-          nameEN
-        }
-        myRole
-      }
-    }
-  `
-}
-
-export const groupMembersQuery = () => {
-  return gql`
-    query ($id: ID!) {
-      GroupMembers(id: $id) {
-        id
-        name
-        slug
-        myRoleInGroup
-      }
-    }
-  `
-}

backend/src/graphql/messages.ts

@@ -1,50 +0,0 @@
-import gql from 'graphql-tag'
-
-export const createMessageMutation = () => {
-  return gql`
-    mutation ($roomId: ID!, $content: String!) {
-      CreateMessage(roomId: $roomId, content: $content) {
-        id
-        content
-        senderId
-        username
-        avatar
-        date
-        saved
-        distributed
-        seen
-      }
-    }
-  `
-}
-
-export const messageQuery = () => {
-  return gql`
-    query ($roomId: ID!, $first: Int, $offset: Int) {
-      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
-        _id
-        id
-        indexId
-        content
-        senderId
-        author {
-          id
-        }
-        username
-        avatar
-        date
-        saved
-        distributed
-        seen
-      }
-    }
-  `
-}
-
-export const markMessagesAsSeen = () => {
-  return gql`
-    mutation ($messageIds: [String!]) {
-      MarkMessagesAsSeen(messageIds: $messageIds)
-    }
-  `
-}

backend/src/graphql/notifications.ts

@@ -1,65 +0,0 @@
-import gql from 'graphql-tag'
-
-// ------ mutations
-
-export const markAsReadMutation = () => {
-  return gql`
-    mutation ($id: ID!) {
-      markAsRead(id: $id) {
-        from {
-          __typename
-          ... on Post {
-            content
-          }
-          ... on Comment {
-            content
-          }
-        }
-        read
-        createdAt
-      }
-    }
-  `
-}
-
-export const markAllAsReadMutation = () => {
-  return gql`
-    mutation {
-      markAllAsRead {
-        from {
-          __typename
-          ... on Post {
-            content
-          }
-          ... on Comment {
-            content
-          }
-        }
-        read
-        createdAt
-      }
-    }
-  `
-}
-
-// ------ queries
-
-export const notificationQuery = () => {
-  return gql`
-    query ($read: Boolean, $orderBy: NotificationOrdering) {
-      notifications(read: $read, orderBy: $orderBy) {
-        from {
-          __typename
-          ... on Post {
-            content
-          }
-          ... on Comment {
-            content
-          }
-        }
-        read
-        createdAt
-      }
-    }
-  `
-}

backend/src/graphql/posts.ts

@@ -1,113 +0,0 @@
-import gql from 'graphql-tag'
-
-// ------ mutations
-
-export const createPostMutation = () => {
-  return gql`
-    mutation (
-      $id: ID
-      $title: String!
-      $slug: String
-      $content: String!
-      $categoryIds: [ID]
-      $groupId: ID
-      $postType: PostType
-      $eventInput: _EventInput
-    ) {
-      CreatePost(
-        id: $id
-        title: $title
-        slug: $slug
-        content: $content
-        categoryIds: $categoryIds
-        groupId: $groupId
-        postType: $postType
-        eventInput: $eventInput
-      ) {
-        id
-        slug
-        title
-        content
-        disabled
-        deleted
-        postType
-        author {
-          name
-        }
-        categories {
-          id
-        }
-        eventStart
-        eventEnd
-        eventLocationName
-        eventVenue
-        eventIsOnline
-        eventLocation {
-          lng
-          lat
-        }
-        isObservedByMe
-        observingUsersCount
-      }
-    }
-  `
-}
-
-// ------ queries
-
-export const postQuery = () => {
-  return gql`
-    query Post($id: ID!) {
-      Post(id: $id) {
-        id
-        title
-        content
-      }
-    }
-  `
-}
-
-export const filterPosts = () => {
-  return gql`
-    query Post($filter: _PostFilter, $first: Int, $offset: Int, $orderBy: [_PostOrdering]) {
-      Post(filter: $filter, first: $first, offset: $offset, orderBy: $orderBy) {
-        id
-        title
-        content
-        eventStart
-      }
-    }
-  `
-}
-
-export const profilePagePosts = () => {
-  return gql`
-    query profilePagePosts(
-      $filter: _PostFilter
-      $first: Int
-      $offset: Int
-      $orderBy: [_PostOrdering]
-    ) {
-      profilePagePosts(filter: $filter, first: $first, offset: $offset, orderBy: $orderBy) {
-        id
-        title
-        content
-      }
-    }
-  `
-}
-
-export const searchPosts = () => {
-  return gql`
-    query ($query: String!, $firstPosts: Int, $postsOffset: Int) {
-      searchPosts(query: $query, firstPosts: $firstPosts, postsOffset: $postsOffset) {
-        postCount
-        posts {
-          id
-          title
-          content
-        }
-      }
-    }
-  `
-}

backend/src/graphql/queries/changeGroupMemberRoleMutation.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const changeGroupMemberRoleMutation = () => {
+  return gql`
+    mutation ($groupId: ID!, $userId: ID!, $roleInGroup: GroupMemberRole!) {
+      ChangeGroupMemberRole(groupId: $groupId, userId: $userId, roleInGroup: $roleInGroup) {
+        id
+        name
+        slug
+        myRoleInGroup
+      }
+    }
+  `
+}

backend/src/graphql/queries/createCommentMutation.ts

@@ -1,7 +1,5 @@
 import gql from 'graphql-tag'
 
-// ------ mutations
-
 export const createCommentMutation = gql`
   mutation ($id: ID, $postId: ID!, $content: String!) {
     CreateComment(id: $id, postId: $postId, content: $content) {
@@ -9,7 +7,3 @@ export const createCommentMutation = gql`
     }
   }
 `
-
-// ------ queries
-
-// fill queries in here

backend/src/graphql/queries/createGroupMutation.ts

@@ -0,0 +1,55 @@
+import gql from 'graphql-tag'
+
+export const createGroupMutation = () => {
+  return gql`
+    mutation (
+      $id: ID
+      $name: String!
+      $slug: String
+      $about: String
+      $description: String!
+      $groupType: GroupType!
+      $actionRadius: GroupActionRadius!
+      $categoryIds: [ID]
+      $locationName: String # empty string '' sets it to null
+    ) {
+      CreateGroup(
+        id: $id
+        name: $name
+        slug: $slug
+        about: $about
+        description: $description
+        groupType: $groupType
+        actionRadius: $actionRadius
+        categoryIds: $categoryIds
+        locationName: $locationName
+      ) {
+        id
+        name
+        slug
+        createdAt
+        updatedAt
+        disabled
+        deleted
+        about
+        description
+        descriptionExcerpt
+        groupType
+        actionRadius
+        categories {
+          id
+          slug
+          name
+          icon
+        }
+        locationName
+        location {
+          name
+          nameDE
+          nameEN
+        }
+        myRole
+      }
+    }
+  `
+}

backend/src/graphql/queries/createMessageMutation.ts

@@ -0,0 +1,19 @@
+import gql from 'graphql-tag'
+
+export const createMessageMutation = () => {
+  return gql`
+    mutation ($roomId: ID!, $content: String!) {
+      CreateMessage(roomId: $roomId, content: $content) {
+        id
+        content
+        senderId
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
+      }
+    }
+  `
+}

backend/src/graphql/queries/createPostMutation.ts

@@ -0,0 +1,52 @@
+import gql from 'graphql-tag'
+
+export const createPostMutation = () => {
+  return gql`
+    mutation (
+      $id: ID
+      $title: String!
+      $slug: String
+      $content: String!
+      $categoryIds: [ID]
+      $groupId: ID
+      $postType: PostType
+      $eventInput: _EventInput
+    ) {
+      CreatePost(
+        id: $id
+        title: $title
+        slug: $slug
+        content: $content
+        categoryIds: $categoryIds
+        groupId: $groupId
+        postType: $postType
+        eventInput: $eventInput
+      ) {
+        id
+        slug
+        title
+        content
+        disabled
+        deleted
+        postType
+        author {
+          name
+        }
+        categories {
+          id
+        }
+        eventStart
+        eventEnd
+        eventLocationName
+        eventVenue
+        eventIsOnline
+        eventLocation {
+          lng
+          lat
+        }
+        isObservedByMe
+        observingUsersCount
+      }
+    }
+  `
+}

backend/src/graphql/queries/createRoomMutation.ts

@@ -0,0 +1,24 @@
+import gql from 'graphql-tag'
+
+export const createRoomMutation = () => {
+  return gql`
+    mutation ($userId: ID!) {
+      CreateRoom(userId: $userId) {
+        id
+        roomId
+        roomName
+        lastMessageAt
+        unreadCount
+        #avatar
+        users {
+          _id
+          id
+          name
+          avatar {
+            url
+          }
+        }
+      }
+    }
+  `
+}

backend/src/graphql/queries/filterPosts.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const filterPosts = () => {
+  return gql`
+    query Post($filter: _PostFilter, $first: Int, $offset: Int, $orderBy: [_PostOrdering]) {
+      Post(filter: $filter, first: $first, offset: $offset, orderBy: $orderBy) {
+        id
+        title
+        content
+        eventStart
+      }
+    }
+  `
+}

backend/src/graphql/queries/groupMembersQuery.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const groupMembersQuery = () => {
+  return gql`
+    query ($id: ID!) {
+      GroupMembers(id: $id) {
+        id
+        name
+        slug
+        myRoleInGroup
+      }
+    }
+  `
+}

backend/src/graphql/queries/groupQuery.ts

@@ -0,0 +1,38 @@
+import gql from 'graphql-tag'
+
+export const groupQuery = () => {
+  return gql`
+    query ($isMember: Boolean, $id: ID, $slug: String) {
+      Group(isMember: $isMember, id: $id, slug: $slug) {
+        id
+        name
+        slug
+        createdAt
+        updatedAt
+        disabled
+        deleted
+        about
+        description
+        descriptionExcerpt
+        groupType
+        actionRadius
+        categories {
+          id
+          slug
+          name
+          icon
+        }
+        avatar {
+          url
+        }
+        locationName
+        location {
+          name
+          nameDE
+          nameEN
+        }
+        myRole
+      }
+    }
+  `
+}

backend/src/graphql/queries/joinGroupMutation.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const joinGroupMutation = () => {
+  return gql`
+    mutation ($groupId: ID!, $userId: ID!) {
+      JoinGroup(groupId: $groupId, userId: $userId) {
+        id
+        name
+        slug
+        myRoleInGroup
+      }
+    }
+  `
+}

backend/src/graphql/queries/leaveGroupMutation.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const leaveGroupMutation = () => {
+  return gql`
+    mutation ($groupId: ID!, $userId: ID!) {
+      LeaveGroup(groupId: $groupId, userId: $userId) {
+        id
+        name
+        slug
+        myRoleInGroup
+      }
+    }
+  `
+}

backend/src/graphql/queries/loginMutation.ts

@@ -1,13 +1,7 @@
 import gql from 'graphql-tag'
 
-// ------ mutations
-
 export const loginMutation = gql`
   mutation ($email: String!, $password: String!) {
     login(email: $email, password: $password)
   }
 `
-
-// ------ queries
-
-// fill queries in here

backend/src/graphql/queries/markAllAsReadMutation.ts

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag'
+
+export const markAllAsReadMutation = () => {
+  return gql`
+    mutation {
+      markAllAsRead {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}

backend/src/graphql/queries/markAsReadMutation.ts

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag'
+
+export const markAsReadMutation = () => {
+  return gql`
+    mutation ($id: ID!) {
+      markAsRead(id: $id) {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}

backend/src/graphql/queries/markMessagesAsSeen.ts

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const markMessagesAsSeen = () => {
+  return gql`
+    mutation ($messageIds: [String!]) {
+      MarkMessagesAsSeen(messageIds: $messageIds)
+    }
+  `
+}

backend/src/graphql/queries/messageQuery.ts

@@ -0,0 +1,24 @@
+import gql from 'graphql-tag'
+
+export const messageQuery = () => {
+  return gql`
+    query ($roomId: ID!, $first: Int, $offset: Int) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
+        _id
+        id
+        indexId
+        content
+        senderId
+        author {
+          id
+        }
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
+      }
+    }
+  `
+}

backend/src/graphql/queries/notificationQuery.ts

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag'
+
+export const notificationQuery = () => {
+  return gql`
+    query ($read: Boolean, $orderBy: NotificationOrdering) {
+      notifications(read: $read, orderBy: $orderBy) {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}

backend/src/graphql/queries/postQuery.ts

@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const postQuery = () => {
+  return gql`
+    query Post($id: ID!) {
+      Post(id: $id) {
+        id
+        title
+        content
+      }
+    }
+  `
+}

backend/src/graphql/queries/profilePagePosts.ts

@@ -0,0 +1,18 @@
+import gql from 'graphql-tag'
+
+export const profilePagePosts = () => {
+  return gql`
+    query profilePagePosts(
+      $filter: _PostFilter
+      $first: Int
+      $offset: Int
+      $orderBy: [_PostOrdering]
+    ) {
+      profilePagePosts(filter: $filter, first: $first, offset: $offset, orderBy: $orderBy) {
+        id
+        title
+        content
+      }
+    }
+  `
+}

backend/src/graphql/queries/removeUserFromGroupMutation.ts

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const removeUserFromGroupMutation = () => {
+  return gql`
+    mutation ($groupId: ID!, $userId: ID!) {
+      RemoveUserFromGroup(groupId: $groupId, userId: $userId) {
+        id
+        name
+        slug
+        myRoleInGroup
+      }
+    }
+  `
+}

backend/src/graphql/queries/roomQuery.ts

@@ -1,28 +1,5 @@
 import gql from 'graphql-tag'
 
-export const createRoomMutation = () => {
-  return gql`
-    mutation ($userId: ID!) {
-      CreateRoom(userId: $userId) {
-        id
-        roomId
-        roomName
-        lastMessageAt
-        unreadCount
-        #avatar
-        users {
-          _id
-          id
-          name
-          avatar {
-            url
-          }
-        }
-      }
-    }
-  `
-}
-
 export const roomQuery = () => {
   return gql`
     query Room($first: Int, $offset: Int, $id: ID) {
@@ -57,11 +34,3 @@ export const roomQuery = () => {
     }
   `
 }
-
-export const unreadRoomsQuery = () => {
-  return gql`
-    query {
-      UnreadRooms
-    }
-  `
-}

backend/src/graphql/queries/searchPosts.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const searchPosts = () => {
+  return gql`
+    query ($query: String!, $firstPosts: Int, $postsOffset: Int) {
+      searchPosts(query: $query, firstPosts: $firstPosts, postsOffset: $postsOffset) {
+        postCount
+        posts {
+          id
+          title
+          content
+        }
+      }
+    }
+  `
+}

backend/src/graphql/queries/signupVerificationMutation.ts

@@ -1,7 +1,5 @@
 import gql from 'graphql-tag'
 
-// ------ mutations
-
 export const signupVerificationMutation = gql`
   mutation (
     $password: String!
@@ -24,7 +22,3 @@ export const signupVerificationMutation = gql`
     }
   }
 `
-
-// ------ queries
-
-// fill queries in here

backend/src/graphql/queries/unreadRoomsQuery.ts

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const unreadRoomsQuery = () => {
+  return gql`
+    query {
+      UnreadRooms
+    }
+  `
+}

backend/src/graphql/queries/updateGroupMutation.ts

@@ -0,0 +1,56 @@
+import gql from 'graphql-tag'
+
+export const updateGroupMutation = () => {
+  return gql`
+    mutation (
+      $id: ID!
+      $name: String
+      $slug: String
+      $about: String
+      $description: String
+      $actionRadius: GroupActionRadius
+      $categoryIds: [ID]
+      $avatar: ImageInput
+      $locationName: String # empty string '' sets it to null
+    ) {
+      UpdateGroup(
+        id: $id
+        name: $name
+        slug: $slug
+        about: $about
+        description: $description
+        actionRadius: $actionRadius
+        categoryIds: $categoryIds
+        avatar: $avatar
+        locationName: $locationName
+      ) {
+        id
+        name
+        slug
+        createdAt
+        updatedAt
+        disabled
+        deleted
+        about
+        description
+        descriptionExcerpt
+        groupType
+        actionRadius
+        categories {
+          id
+          slug
+          name
+          icon
+        }
+        # avatar # test this as result
+        locationName
+        location {
+          name
+          nameDE
+          nameEN
+        }
+        myRole
+      }
+    }
+  `
+}

backend/src/middleware/notifications/notificationsMiddleware.emails.spec.ts

@@ -9,7 +9,8 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createGroupMutation, joinGroupMutation } from '@graphql/groups'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
 import CONFIG from '@src/config'
 import createServer from '@src/server'
 

backend/src/middleware/notifications/notificationsMiddleware.followed-users.spec.ts

@@ -8,7 +8,7 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createGroupMutation } from '@graphql/groups'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
 import CONFIG from '@src/config'
 import createServer from '@src/server'
 

backend/src/middleware/notifications/notificationsMiddleware.mentions-in-groups.spec.ts

@@ -9,11 +9,9 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import {
-  createGroupMutation,
-  joinGroupMutation,
-  changeGroupMemberRoleMutation,
-} from '@graphql/groups'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
 import CONFIG from '@src/config'
 import createServer from '@src/server'
 

backend/src/middleware/notifications/notificationsMiddleware.posts-in-groups.spec.ts

@@ -9,11 +9,9 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import {
-  createGroupMutation,
-  joinGroupMutation,
-  changeGroupMemberRoleMutation,
-} from '@graphql/groups'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
 import CONFIG from '@src/config'
 import createServer from '@src/server'
 

backend/src/middleware/notifications/notificationsMiddleware.spec.ts

@@ -9,15 +9,13 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import {
-  createGroupMutation,
-  joinGroupMutation,
-  leaveGroupMutation,
-  changeGroupMemberRoleMutation,
-  removeUserFromGroupMutation,
-} from '@graphql/groups'
-import { createMessageMutation } from '@graphql/messages'
-import { createRoomMutation } from '@graphql/rooms'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { createMessageMutation } from '@graphql/queries/createMessageMutation'
+import { createRoomMutation } from '@graphql/queries/createRoomMutation'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
+import { leaveGroupMutation } from '@graphql/queries/leaveGroupMutation'
+import { removeUserFromGroupMutation } from '@graphql/queries/removeUserFromGroupMutation'
 import createServer, { pubsub } from '@src/server'
 
 const sendMailMock = jest.fn()

backend/src/middleware/slugifyMiddleware.spec.ts

@@ -6,9 +6,10 @@ import { createTestClient } from 'apollo-server-testing'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { signupVerificationMutation } from '@graphql/authentications'
-import { createGroupMutation, updateGroupMutation } from '@graphql/groups'
-import { createPostMutation } from '@graphql/posts'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
+import { signupVerificationMutation } from '@graphql/queries/signupVerificationMutation'
+import { updateGroupMutation } from '@graphql/queries/updateGroupMutation'
 import createServer from '@src/server'
 
 let authenticatedUser

backend/src/schema/resolvers/filter-posts.spec.ts

@@ -6,7 +6,8 @@ import { createTestClient } from 'apollo-server-testing'
 import CONFIG from '@config/index'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { filterPosts, createPostMutation } from '@graphql/posts'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
+import { filterPosts } from '@graphql/queries/filterPosts'
 import createServer from '@src/server'
 
 CONFIG.CATEGORIES_ACTIVE = false

backend/src/schema/resolvers/groups.spec.ts

@@ -8,16 +8,14 @@ import { createTestClient } from 'apollo-server-testing'
 import CONFIG from '@config/index'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import {
-  createGroupMutation,
-  updateGroupMutation,
-  joinGroupMutation,
-  leaveGroupMutation,
-  changeGroupMemberRoleMutation,
-  removeUserFromGroupMutation,
-  groupMembersQuery,
-  groupQuery,
-} from '@graphql/groups'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { groupMembersQuery } from '@graphql/queries/groupMembersQuery'
+import { groupQuery } from '@graphql/queries/groupQuery'
+import { joinGroupMutation } from '@graphql/queries/joinGroupMutation'
+import { leaveGroupMutation } from '@graphql/queries/leaveGroupMutation'
+import { removeUserFromGroupMutation } from '@graphql/queries/removeUserFromGroupMutation'
+import { updateGroupMutation } from '@graphql/queries/updateGroupMutation'
 import createServer from '@src/server'
 
 const driver = getDriver()

backend/src/schema/resolvers/messages.spec.ts

@@ -7,8 +7,11 @@ import { createTestClient } from 'apollo-server-testing'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createMessageMutation, messageQuery, markMessagesAsSeen } from '@graphql/messages'
-import { createRoomMutation, roomQuery } from '@graphql/rooms'
+import { createMessageMutation } from '@graphql/queries/createMessageMutation'
+import { createRoomMutation } from '@graphql/queries/createRoomMutation'
+import { markMessagesAsSeen } from '@graphql/queries/markMessagesAsSeen'
+import { messageQuery } from '@graphql/queries/messageQuery'
+import { roomQuery } from '@graphql/queries/roomQuery'
 import createServer, { pubsub } from '@src/server'
 
 const driver = getDriver()

backend/src/schema/resolvers/notifications.spec.ts

@@ -8,11 +8,9 @@ import gql from 'graphql-tag'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getDriver } from '@db/neo4j'
-import {
-  markAsReadMutation,
-  markAllAsReadMutation,
-  notificationQuery,
-} from '@graphql/notifications'
+import { markAllAsReadMutation } from '@graphql/queries/markAllAsReadMutation'
+import { markAsReadMutation } from '@graphql/queries/markAsReadMutation'
+import { notificationQuery } from '@graphql/queries/notificationQuery'
 import createServer from '@src/server'
 
 const driver = getDriver()

backend/src/schema/resolvers/observePosts.spec.ts

@@ -7,7 +7,7 @@ import gql from 'graphql-tag'
 import CONFIG from '@config/index'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createPostMutation } from '@graphql/posts'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
 import createServer from '@src/server'
 
 CONFIG.CATEGORIES_ACTIVE = false

backend/src/schema/resolvers/posts.spec.ts

@@ -9,7 +9,7 @@ import gql from 'graphql-tag'
 import CONFIG from '@config/index'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createPostMutation } from '@graphql/posts'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
 import createServer from '@src/server'
 
 CONFIG.CATEGORIES_ACTIVE = true

backend/src/schema/resolvers/postsInGroups.spec.ts

@@ -7,20 +7,16 @@ import { createTestClient } from 'apollo-server-testing'
 import CONFIG from '@config/index'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { signupVerificationMutation } from '@graphql/authentications'
-import { createCommentMutation } from '@graphql/comments'
-import {
-  createGroupMutation,
-  changeGroupMemberRoleMutation,
-  leaveGroupMutation,
-} from '@graphql/groups'
-import {
-  createPostMutation,
-  postQuery,
-  filterPosts,
-  profilePagePosts,
-  searchPosts,
-} from '@graphql/posts'
+import { changeGroupMemberRoleMutation } from '@graphql/queries/changeGroupMemberRoleMutation'
+import { createCommentMutation } from '@graphql/queries/createCommentMutation'
+import { createGroupMutation } from '@graphql/queries/createGroupMutation'
+import { createPostMutation } from '@graphql/queries/createPostMutation'
+import { filterPosts } from '@graphql/queries/filterPosts'
+import { leaveGroupMutation } from '@graphql/queries/leaveGroupMutation'
+import { postQuery } from '@graphql/queries/postQuery'
+import { profilePagePosts } from '@graphql/queries/profilePagePosts'
+import { searchPosts } from '@graphql/queries/searchPosts'
+import { signupVerificationMutation } from '@graphql/queries/signupVerificationMutation'
 import createServer from '@src/server'
 
 CONFIG.CATEGORIES_ACTIVE = false

backend/src/schema/resolvers/rooms.spec.ts

@@ -5,8 +5,10 @@ import { createTestClient } from 'apollo-server-testing'
 
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { createMessageMutation } from '@graphql/messages'
-import { createRoomMutation, roomQuery, unreadRoomsQuery } from '@graphql/rooms'
+import { createMessageMutation } from '@graphql/queries/createMessageMutation'
+import { createRoomMutation } from '@graphql/queries/createRoomMutation'
+import { roomQuery } from '@graphql/queries/roomQuery'
+import { unreadRoomsQuery } from '@graphql/queries/unreadRoomsQuery'
 import createServer from '@src/server'
 
 const driver = getDriver()

backend/src/schema/resolvers/user_management.spec.ts

@@ -12,7 +12,7 @@ import CONFIG from '@config/index'
 import { categories } from '@constants/categories'
 import Factory, { cleanDatabase } from '@db/factories'
 import { getNeode, getDriver } from '@db/neo4j'
-import { loginMutation } from '@graphql/userManagement'
+import { loginMutation } from '@graphql/queries/loginMutation'
 import encode from '@jwt/encode'
 import createServer, { context } from '@src/server'