Some refactor

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

Author: ardatan

.npmrc

@@ -1 +1 @@
-save_exact=true
+save-exact=true

package.json

@@ -8,9 +8,11 @@
   "license": "MIT",
   "scripts": {
     "generate": "gql-gen --template graphql-codegen-typescript-mongodb-template --out ./src/generated-models.ts -r ts-node/register/transpile-only -r tsconfig-paths/register --schema \"./src/schema.ts\"",
-    "dev": "nodemon --exec yarn start",
-    "prestart": "yarn generate",
-    "start": "ts-node -r tsconfig-paths/register src/index.ts",
+    "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",
+    "dev": "concurrently \"yarn generate:watch\" \"yarn start:server:watch\"",
+    "start": "yarn generate && yarn start:server",
     "build": "tsc"
   },
   "dependencies": {
@@ -26,6 +28,7 @@
     "typescript": "3.1.3"
   },
   "devDependencies": {
+    "concurrently": "4.0.1",
     "@types/graphql": "14.0.3",
     "graphql-code-generator": "0.13.0",
     "graphql-codegen-typescript-mongodb-template": "0.13.0",

src/index.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { appModule } from './modules/app';
+import { AppModule } from './modules/app';
 import { ApolloServer } from 'apollo-server';
 
 const chats = [
@@ -40,7 +40,7 @@ const messages = [
   },
 ];
 
-const { schema, context } = appModule.forRoot({
+const { schema, context } = AppModule.forRoot({
   chats,
   messages,
 });

src/modules/app.ts

@@ -1,18 +1,16 @@
 import { GraphQLModule } from "@graphql-modules/core";
 
-import { commonModule } from "./common";
+import { CommonModule } from "./common";
+import { ChatsModule } from "./chats";
+import { MessagesModule } from "./messages";
 
-import { chatsModule } from "./chats";
-
-import { messagesModule } from "./messages";
-
-export const appModule = new GraphQLModule({
+export const AppModule = new GraphQLModule({
     imports: ({ chats, messages}) => [
-        commonModule.forRoot({
+        CommonModule.forRoot({
             chats,
             messages,
         }),
-        chatsModule,
-        messagesModule,
+        ChatsModule,
+        MessagesModule,
     ],
 });

src/modules/chats/index.ts

@@ -1,14 +1,14 @@
 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 { MessagesModule } from "@modules/messages";
+import { CommonModule } from "@modules/common";
 import { ChatsProvider } from "@modules/chats/providers/chats.provider";
 
-export const chatsModule = new GraphQLModule({
+export const ChatsModule = new GraphQLModule({
   imports: () => [
-    commonModule.forChild(),
-    messagesModule,
+    CommonModule.forChild(),
+    MessagesModule,
   ],
   providers: [
     ChatsProvider,

src/modules/chats/resolvers/chats.resolver.ts

@@ -5,6 +5,6 @@ import { MessageDbObject } from "@models";
 export default {
   Chat: {
     messages: (chat: any, args, { injector }: ModuleContext): MessageDbObject[] =>
-      injector.get<MessagesProvider>(MessagesProvider).getMessages(chat.id),
+      injector.get(MessagesProvider).getMessages(chat.id),
   },
 };

src/modules/chats/resolvers/mutation.resolver.ts

@@ -5,8 +5,8 @@ import { ChatDbObject, CreateChatMutationArgs, DeleteChatMutationArgs } from "@m
 export default {
   Mutation: {
     createChat: (root, {title, description}: CreateChatMutationArgs, { injector }: ModuleContext): ChatDbObject =>
-      injector.get<ChatsProvider>(ChatsProvider).createChat({title, description}),
+      injector.get(ChatsProvider).createChat({title, description}),
     deleteChat: (root, {id}: DeleteChatMutationArgs, { injector }: ModuleContext): number =>
-      injector.get<ChatsProvider>(ChatsProvider).deleteChat(id),
+      injector.get(ChatsProvider).deleteChat(id),
   },
 };

src/modules/chats/resolvers/query.resolver.ts

@@ -5,8 +5,8 @@ import { ChatDbObject } from "@models";
 export default {
   Query: {
     chats: (root, args, { injector }: ModuleContext): ChatDbObject[] =>
-      injector.get<ChatsProvider>(ChatsProvider).getChats(),
+      injector.get(ChatsProvider).getChats(),
     chat: (root, {id}: any, { injector }: ModuleContext): ChatDbObject =>
-      injector.get<ChatsProvider>(ChatsProvider).getChat(id),
+      injector.get(ChatsProvider).getChat(id),
   },
 };

src/modules/common/index.ts

@@ -12,7 +12,7 @@ export interface CommonModuleConfig {
   messages: MessageDbObject[];
 }
 
-export const commonModule = new GraphQLModule<CommonModuleConfig>({
+export const CommonModule = new GraphQLModule<CommonModuleConfig>({
   providers: ({chats, messages}) => [
     { provide: CHATS, useValue: chats },
     { provide: MESSAGES, useValue: messages },

src/modules/messages/index.ts

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

src/modules/messages/resolvers/messages.resolver.ts

@@ -5,6 +5,6 @@ import { ChatDbObject } from "@models";
 export default {
   Message: {
     chat: (message: any, args, { injector }: ModuleContext): ChatDbObject =>
-      injector.get<ChatsProvider>(ChatsProvider).getChat(message.chatId),
+      injector.get(ChatsProvider).getChat(message.chatId),
   },
 };

src/modules/messages/resolvers/mutation.resolver.ts

@@ -5,8 +5,8 @@ import { CreateMessageMutationArgs, DeleteMessageMutationArgs, MessageDbObject }
 export default {
   Mutation: {
     createMessage: (root, {content, chatId}: CreateMessageMutationArgs, { injector }: ModuleContext): MessageDbObject =>
-      injector.get<MessagesProvider>(MessagesProvider).createMessage(content, chatId),
+      injector.get(MessagesProvider).createMessage(content, chatId),
     deleteMessage: (root, {id}: DeleteMessageMutationArgs, { injector }: ModuleContext): number =>
-      injector.get<MessagesProvider>(MessagesProvider).deleteMessage(id),
+      injector.get(MessagesProvider).deleteMessage(id),
   },
 };

src/modules/messages/resolvers/query.resolver.ts

@@ -5,8 +5,8 @@ import { MessageDbObject } from "@models";
 export default {
   Query: {
     messages: (root, {chatId}: any, { injector }: ModuleContext): MessageDbObject[] =>
-      injector.get<MessagesProvider>(MessagesProvider).getMessages(chatId),
+      injector.get(MessagesProvider).getMessages(chatId),
     message: (root, {id}: any, { injector }: ModuleContext): MessageDbObject =>
-      injector.get<MessagesProvider>(MessagesProvider).getMessage(id),
+      injector.get(MessagesProvider).getMessage(id),
   },
 };

src/schema.ts

@@ -1,8 +1,9 @@
 import 'reflect-metadata';
 import { makeExecutableSchema } from 'graphql-tools';
-import { appModule } from '@modules/app';
+import { AppModule } from '@modules/app';
 
-const { typeDefs } = appModule;
+// Ask for typeDefs without all schema with business logi
+const { typeDefs } = AppModule;
 export default makeExecutableSchema({
   typeDefs
 });