Update

Signed-off-by: Arda TANRIKULU <[email protected]>

Author: ardatan

Diff for: codegen.yml

@@ -6,6 +6,13 @@ require:
 generates:
   ./src/generated-models.ts:
     plugins:
+      - add: /* tslint:ignore */
       - typescript-common
-      - typescript-server
       - typescript-mongodb
+      - typescript-server
+      - typescript-resolvers
+    config:
+      contextType: "@graphql-modules/core#ModuleContext"
+      mappers:
+        Chat: ChatDbObject
+        Message: MessageDbObject

Diff for: package.json

@@ -7,7 +7,7 @@
   "author": "Niccolò Belli <[email protected]>",
   "license": "MIT",
   "scripts": {
-    "generate": "gql-gen --config ./codegen.yml",
+    "generate": "gql-gen",
     "generate:watch": "nodemon --exec yarn generate -e graphql",
     "start:server": "ts-node -r tsconfig-paths/register src/index.ts",
     "start:server:watch": "nodemon --exec yarn start:server -e ts",
@@ -16,25 +16,26 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@graphql-modules/core": "0.2.0",
-    "@graphql-modules/epoxy": "0.2.0",
-    "@graphql-modules/logger": "0.2.0",
-    "@graphql-modules/sonar": "0.2.0",
-    "apollo-server": "2.1.0",
+    "@graphql-modules/core": "0.2.18",
+    "@graphql-modules/epoxy": "0.2.18",
+    "@graphql-modules/sonar": "0.2.18",
+    "apollo-server": "2.3.1",
     "graphql": "14.0.2",
     "reflect-metadata": "0.1.12",
     "ts-node": "7.0.1",
-    "tsconfig-paths": "3.6.0",
-    "typescript": "3.1.3"
+    "tsconfig-paths": "3.7.0",
+    "typescript": "3.2.2"
   },
   "devDependencies": {
-    "concurrently": "4.0.1",
-    "@types/graphql": "14.0.3",
-    "graphql-code-generator": "0.14.0-alpha.d97d93cd",
-    "graphql-codegen-plugin-helpers": "0.14.0-alpha.d97d93cd",
-    "graphql-codegen-typescript-common": "0.14.0-alpha.d97d93cd",
-    "graphql-codegen-typescript-mongodb": "0.14.0-alpha.d97d93cd",
-    "graphql-codegen-typescript-server": "0.14.0-alpha.d97d93cd",
-    "nodemon": "1.18.5"
+    "concurrently": "4.1.0",
+    "@types/graphql": "14.0.4",
+    "graphql-code-generator": "0.15.2",
+    "graphql-codegen-plugin-helpers": "0.15.2",
+    "graphql-codegen-add": "0.15.2",
+    "graphql-codegen-typescript-common": "0.15.2",
+    "graphql-codegen-typescript-mongodb": "0.15.2",
+    "graphql-codegen-typescript-server": "0.15.2",
+    "graphql-codegen-typescript-resolvers": "0.15.2",
+    "nodemon": "1.18.9"
   }
 }

Diff for: src/modules/app.ts

@@ -5,12 +5,13 @@ import { ChatsModule } from "./chats";
 import { MessagesModule } from "./messages";
 
 export const AppModule = new GraphQLModule({
-    imports: ({ chats, messages}) => [
+    imports: ({ config: { chats, messages} }) => [
         CommonModule.forRoot({
             chats,
             messages,
         }),
         ChatsModule,
         MessagesModule,
     ],
+    configRequired: true,
 });

Diff for: src/modules/chats/index.ts

@@ -1,14 +1,12 @@
 import { GraphQLModule } from '@graphql-modules/core';
 import { loadResolversFiles, loadSchemaFiles } from '@graphql-modules/sonar';
 import { mergeGraphQLSchemas, mergeResolvers } from '@graphql-modules/epoxy';
-import { MessagesModule } from "@modules/messages";
 import { CommonModule } from "@modules/common";
 import { ChatsProvider } from "@modules/chats/providers/chats.provider";
 
 export const ChatsModule = new GraphQLModule({
-  imports: () => [
-    CommonModule.forChild(),
-    MessagesModule,
+  imports: [
+    CommonModule.forChild()
   ],
   providers: [
     ChatsProvider,

Diff for: src/modules/chats/providers/chats.provider.ts

@@ -1,4 +1,4 @@
-import { Injectable, Inject } from '@graphql-modules/core';
+import { Injectable, Inject } from '@graphql-modules/di';
 import { ChatDbObject, MessageDbObject } from "@models";
 import { CHATS, MESSAGES } from "@modules/common";
 

Diff for: src/modules/chats/resolvers/chats.resolver.ts

@@ -1,12 +1,11 @@
-import { ModuleContext } from '@graphql-modules/core';
 import { ChatsProvider } from "../providers/chats.provider";
-import { ChatDbObject, CreateChatMutationArgs, DeleteChatMutationArgs } from "@models";
+import { IResolvers } from "@models";
 
 export default {
   Mutation: {
-    createChat: (root, {title, description}: CreateChatMutationArgs, { injector }: ModuleContext): ChatDbObject =>
+    createChat: (root, {title, description}, { injector }) =>
       injector.get(ChatsProvider).createChat({title, description}),
-    deleteChat: (root, {id}: DeleteChatMutationArgs, { injector }: ModuleContext): number =>
+    deleteChat: (root, {id}, { injector }) =>
       injector.get(ChatsProvider).deleteChat(id),
   },
-};
+} as IResolvers;

Diff for: src/modules/chats/resolvers/mutation.resolver.ts

@@ -1,12 +1,11 @@
-import { ModuleContext } from '@graphql-modules/core';
 import { ChatsProvider } from "../providers/chats.provider";
-import { ChatDbObject } from "@models";
+import { IResolvers } from "@models";
 
 export default {
   Query: {
-    chats: (root, args, { injector }: ModuleContext): ChatDbObject[] =>
+    chats: (root, args, { injector }) =>
       injector.get(ChatsProvider).getChats(),
-    chat: (root, {id}: any, { injector }: ModuleContext): ChatDbObject =>
+    chat: (root, {id}: any, { injector }) =>
       injector.get(ChatsProvider).getChat(id),
   },
-};
+} as IResolvers;

Diff for: src/modules/chats/resolvers/query.resolver.ts

@@ -2,5 +2,4 @@ type Chat @entity {
     id: Int! @column
     title: String! @column
     description: String! @column
-    messages: [Message] @column(overrideType: "Int") @map(path: "messageIds")
 }

Diff for: src/modules/chats/schema/chat.graphql

@@ -13,13 +13,14 @@ export interface CommonModuleConfig {
 }
 
 export const CommonModule = new GraphQLModule<CommonModuleConfig>({
-  providers: ({chats, messages}) => [
+  providers: ({ config: {chats, messages} }) => [
     { provide: CHATS, useValue: chats },
     { provide: MESSAGES, useValue: messages },
   ],
-  typeDefs: mergeGraphQLSchemas([
+  typeDefs: [
     ...loadSchemaFiles(__dirname + '/schema/'),
     DIRECTIVES,
-  ]),
+  ],
   resolvers: mergeResolvers(loadResolversFiles(__dirname + '/resolvers/')),
+  configRequired: true
 });

Diff for: src/modules/common/index.ts

@@ -1,18 +1,18 @@
 import { GraphQLModule } from '@graphql-modules/core';
 import { loadResolversFiles, loadSchemaFiles } from '@graphql-modules/sonar';
-import { mergeGraphQLSchemas, mergeResolvers } from '@graphql-modules/epoxy';
+import { mergeResolvers } from '@graphql-modules/epoxy';
 import { MessagesProvider } from "@modules/messages/providers/messages.provider";
 import { CommonModule } from "@modules/common";
 import { ChatsModule } from "@modules/chats";
 
 export const MessagesModule = new GraphQLModule({
-  imports: () => [
+  imports: [
     CommonModule.forChild(),
     ChatsModule,
   ],
   providers: [
     MessagesProvider,
   ],
-  typeDefs: mergeGraphQLSchemas(loadSchemaFiles(__dirname + '/schema/')),
+  typeDefs: loadSchemaFiles(__dirname + '/schema/'),
   resolvers: mergeResolvers(loadResolversFiles(__dirname + '/resolvers/')),
 });

Diff for: src/modules/messages/index.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@graphql-modules/core';
+import { Inject, Injectable } from '@graphql-modules/di';
 import { ChatDbObject, MessageDbObject } from "@models";
 import { CHATS, MESSAGES } from "@modules/common";
 
@@ -27,7 +27,7 @@ export class MessagesProvider {
 
     this.chats = this.chats.map(chat => chat.id !== chatId ? chat : {
       ...chat,
-      messageIds: [...chat.messageIds, newMessage.id],
+      messageIds: [...this.messages.filter(message => message.chatId === chat.id).map(message => message.id), newMessage.id],
     });
 
     return newMessage;
@@ -38,7 +38,7 @@ export class MessagesProvider {
     this.messages.filter(message => message.id !== id);
     this.chats = this.chats.map(chat => chat.id !== chatId ? chat : {
       ...chat,
-      messages: chat.messageIds.filter(messageId => messageId !== id),
+      messages: this.messages.filter(message => message.chatId === chat.id).map(message => message.id),
     });
 
     return id;

Diff for: src/modules/messages/providers/messages.provider.ts

@@ -0,0 +1,9 @@
+import { MessagesProvider } from "@modules/messages/providers/messages.provider";
+import { IResolvers } from "@models";
+
+export default {
+  Chat: {
+    messages: (chat: any, args, { injector }) =>
+      injector.get(MessagesProvider).getMessages(chat.id),
+  },
+} as IResolvers;

Diff for: src/modules/messages/resolvers/chats.resolver.ts

@@ -1,10 +1,9 @@
-import { ModuleContext } from "@graphql-modules/core";
 import { ChatsProvider } from "@modules/chats/providers/chats.provider";
-import { ChatDbObject } from "@models";
+import { IResolvers } from "@models";
 
 export default {
   Message: {
-    chat: (message: any, args, { injector }: ModuleContext): ChatDbObject =>
+    chat: (message, args, { injector }) =>
       injector.get(ChatsProvider).getChat(message.chatId),
   },
-};
+} as IResolvers;

Diff for: src/modules/messages/resolvers/messages.resolver.ts

@@ -1,12 +1,11 @@
-import { ModuleContext } from '@graphql-modules/core';
 import { MessagesProvider } from "../providers/messages.provider";
-import { CreateMessageMutationArgs, DeleteMessageMutationArgs, MessageDbObject } from "@models";
+import { IResolvers } from "@models";
 
 export default {
   Mutation: {
-    createMessage: (root, {content, chatId}: CreateMessageMutationArgs, { injector }: ModuleContext): MessageDbObject =>
+    createMessage: (root, {content, chatId}, { injector }) =>
       injector.get(MessagesProvider).createMessage(content, chatId),
-    deleteMessage: (root, {id}: DeleteMessageMutationArgs, { injector }: ModuleContext): number =>
+    deleteMessage: (root, {id}, { injector }) =>
       injector.get(MessagesProvider).deleteMessage(id),
   },
-};
+} as IResolvers;

Diff for: src/modules/messages/resolvers/mutation.resolver.ts

@@ -1,12 +1,11 @@
-import { ModuleContext } from '@graphql-modules/core';
 import { MessagesProvider } from "../providers/messages.provider";
-import { MessageDbObject } from "@models";
+import { IResolvers } from "@models";
 
 export default {
   Query: {
-    messages: (root, {chatId}: any, { injector }: ModuleContext): MessageDbObject[] =>
+    messages: (root, {chatId}, { injector }) =>
       injector.get(MessagesProvider).getMessages(chatId),
-    message: (root, {id}: any, { injector }: ModuleContext): MessageDbObject =>
+    message: (root, {id}, { injector }) =>
       injector.get(MessagesProvider).getMessage(id),
   },
-};
+} as IResolvers;

Diff for: src/modules/messages/resolvers/query.resolver.ts

@@ -2,4 +2,8 @@ type Message @entity {
     id: Int! @column
     content: String! @column
     chat: Chat! @column(overrideType: "Int") @map(path: "chatId")
-}
+}
+
+extend type Chat {
+    messages: [Message]
+}

Diff for: src/modules/messages/schema/message.graphql

@@ -2,4 +2,4 @@ import 'reflect-metadata';
 import { AppModule } from '@modules/app';
 
 // Ask for typeDefs without all schema with business logic
-export default AppModule.typeDefs;
+export default AppModule.forRoot({ chats: [], messages: []}).typeDefs;