diff --git a/src/graphql/models/groupModel.ts b/src/graphql/models/groupModel.ts index 9a909fcd13c91c44f05c633bbfdf7191f765f12e..fe5467bffbbb067e58103968ab70956167c6221b 100644 --- a/src/graphql/models/groupModel.ts +++ b/src/graphql/models/groupModel.ts @@ -4,9 +4,9 @@ * @memberof GraphQL */ -import { Group, SimpleGroup, MetaGroup } from "../resolvers/groups"; -import { Request } from "../resolvers/requests"; -import { User } from "../resolvers/users"; +import { Group, SimpleGroup, MetaGroup } from "../object_resolvers/groups"; +import { Request } from "../object_resolvers/requests"; +import { User } from "../object_resolvers/users"; import knex from "../../../db/knex_router" import { GroupCollection, GroupSet, Tools } from "./tools"; import { createSubgroupArgs, editGroupArgs } from "../typeDefs/queries"; diff --git a/src/graphql/models/messageModel.ts b/src/graphql/models/messageModel.ts index 79d9525f8450829261a289cd17df2a543eafc0ce..cde6f59b54b3d6e671168675bd08614e338b0bc5 100644 --- a/src/graphql/models/messageModel.ts +++ b/src/graphql/models/messageModel.ts @@ -4,7 +4,7 @@ * @memberof GraphQL */ -import { Announcement, Event, PrivatePost, Question, Answer, Message } from "../resolvers/messages"; +import { Announcement, Event, PrivatePost, Question, Answer, Message } from "../object_resolvers/messages"; import knex from "../../../db/knex_router" import { GroupCollection, GroupSet } from "./tools"; diff --git a/src/graphql/models/requestModel.ts b/src/graphql/models/requestModel.ts index e8ea6c0736ed048ea4f1bd2d02175d2ab9d489a5..8a2568e5f2e6c9b0d0b8caeef4a095ef75a9322a 100644 --- a/src/graphql/models/requestModel.ts +++ b/src/graphql/models/requestModel.ts @@ -4,9 +4,9 @@ * @memberof GraphQL */ -import { Group, SimpleGroup, MetaGroup } from "../resolvers/groups"; -import { Request, UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent } from "../resolvers/requests"; -import { User } from "../resolvers/users"; +import { Group, SimpleGroup, MetaGroup } from "../object_resolvers/groups"; +import { Request, UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent } from "../object_resolvers/requests"; +import { User } from "../object_resolvers/users"; import knex from "../../../db/knex_router" import { GroupCollection, GroupSet } from "./tools"; import { createSubgroupArgs, editGroupArgs } from "../typeDefs/queries"; diff --git a/src/graphql/models/userModel.ts b/src/graphql/models/userModel.ts index 3d4149202d8ae8f2ac308c6a4f79666d7a94fd37..e9f551754aca227ca09352492d7286a95be174dd 100644 --- a/src/graphql/models/userModel.ts +++ b/src/graphql/models/userModel.ts @@ -4,7 +4,7 @@ * @memberof GraphQL */ -import { User } from "../resolvers/users"; +import { User } from "../object_resolvers/users"; import { User as UT, userData } from "../../ldap/export/user" import { searchTOLArgs, editProfileArgs } from "../typeDefs/queries"; import { ApolloError } from "apollo-server-core"; diff --git a/src/graphql/resolvers/groups.ts b/src/graphql/object_resolvers/groups.ts similarity index 100% rename from src/graphql/resolvers/groups.ts rename to src/graphql/object_resolvers/groups.ts diff --git a/src/graphql/resolvers/messages.ts b/src/graphql/object_resolvers/messages.ts similarity index 100% rename from src/graphql/resolvers/messages.ts rename to src/graphql/object_resolvers/messages.ts diff --git a/src/graphql/resolvers/requests.ts b/src/graphql/object_resolvers/requests.ts similarity index 100% rename from src/graphql/resolvers/requests.ts rename to src/graphql/object_resolvers/requests.ts diff --git a/src/graphql/resolvers/users.ts b/src/graphql/object_resolvers/users.ts similarity index 100% rename from src/graphql/resolvers/users.ts rename to src/graphql/object_resolvers/users.ts diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts index f591c5fc3d5f25ab99cab357b2ece9adde8d1f50..9957468df762ab6375958bd712d4dc581d880a15 100644 --- a/src/graphql/resolvers.ts +++ b/src/graphql/resolvers.ts @@ -6,10 +6,10 @@ import { AuthenticationError } from "apollo-server-core"; import { Context } from "./typeDefs/queries"; -import { User } from "./resolvers/users"; -import { Group, SimpleGroup, MetaGroup } from "./resolvers/groups"; -import { Announcement, Event, PrivatePost, Question, Answer, Message } from "./resolvers/messages"; -import { UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent, Request } from "./resolvers/requests"; +import { User } from "./object_resolvers/users"; +import { Group, SimpleGroup, MetaGroup } from "./object_resolvers/groups"; +import { Announcement, Event, PrivatePost, Question, Answer, Message } from "./object_resolvers/messages"; +import { UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent, Request } from "./object_resolvers/requests"; import { GroupCollection, GroupSet } from "./models/tools"; /** @@ -22,7 +22,7 @@ import { GroupCollection, GroupSet } from "./models/tools"; * https://www.apollographql.com/docs/apollo-server/v2/essentials/data.html#default * * Dans notre cas, le type de retour de chaque resolver est un objet JS (Group, Message, Request ou User) - * défini dans un des fichiers de `./resolvers/` ; donc les méthodes des classes Group, Message, Request et User + * défini dans un des fichiers de `./object_resolvers/` ; donc les méthodes des classes Group, Message, Request et User * dont le prototype est (parent, args, context: Context, info) sont utilisées comme resolvers de l'objet GraphQL respectif. */