Fix graphql queries

front/src/services/api/users/index.tsx

@@ -2,7 +2,7 @@ import { QueryResult, gql, useQuery } from '@apollo/client';
 import { GraphqlQueryUser } from '../../../interfaces/entities/user.interface';
 
 export const GET_CURRENT_USER = gql`
-  query GetCurrentUser($uuid: String) {
+  query getUser($uuid: String) {
     users(where: { id: { equals: $uuid } }) {
       id
       email

infra/dev/Makefile

@@ -21,13 +21,13 @@ front-test:
 	@docker-compose exec twenty-dev sh -c "cd /app/front && npm run test"
 
 front-graphql-generate:
-	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run "
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run graphql:generate"
 
 front-storybook:
 	@docker-compose exec twenty-dev sh -c "cd /app/front && npm run storybook"
 
 server-start:
-	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run start"
+	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run start:dev"
 
 server-prisma-generate:
 	@docker-compose exec twenty-dev sh -c "cd /app/server && npm run prisma:generate"

server/src/api/api.module.ts

@@ -1,14 +1,15 @@
 import { Module } from '@nestjs/common';
 import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
-import { CompanyResolvers } from './company.resolvers';
 import { PrismaClient } from '@prisma/client';
-import { CompanyRelationsResolver } from './local-graphql';
+import { CompanyRelationsResolver } from './generated-graphql';
-import { PeopleResolvers } from './people.resolver';
+import { CompanyResolver } from './resolvers/company.resolver';
-import { PersonRelationsResolver } from './people-relations.resolver';
+import { UserResolver } from './resolvers/user.resolver';
-import { UserResolvers } from './user.resolver';
+import { PeopleResolver } from './resolvers/people.resolver';
-import { UserRelationsResolver } from './user-relations.resolver';
+
-import { WorkspaceMemberRelationsResolver } from './workspace-member-relations.resolver';
+import { PersonRelationsResolver } from './resolvers/relations/people-relations.resolver';
+import { UserRelationsResolver } from './resolvers/relations/user-relations.resolver';
+import { WorkspaceMemberRelationsResolver } from './resolvers/relations/workspace-member-relations.resolver';
 
 @Module({
   imports: [
@@ -19,11 +20,13 @@ import { WorkspaceMemberRelationsResolver } from './workspace-member-relations.r
   ],
   providers: [
     PrismaClient,
-    CompanyResolvers,
+
+    CompanyResolver,
+    PeopleResolver,
+    UserResolver,
+
     CompanyRelationsResolver,
-    PeopleResolvers,
     PersonRelationsResolver,
-    UserResolvers,
     UserRelationsResolver,
     WorkspaceMemberRelationsResolver,
   ],