diff --git a/src/modules/category/schema.ts b/src/modules/category.ts similarity index 69% rename from src/modules/category/schema.ts rename to src/modules/category.ts index 670358d..7a90a7d 100644 --- a/src/modules/category/schema.ts +++ b/src/modules/category.ts @@ -1,18 +1,11 @@ -import * as url from "url"; +import { getPrismaClient } from "@/infrastructure/primaClient"; +import { gql } from "@elysiajs/apollo"; import type { Prisma } from "@prisma/client"; -import { createModule } from "graphql-modules"; - -import { getPrismaClient } from "../../infrastructure/primaClient"; -import { typeDefs } from "./typeDef"; +import { createModule } from "./createModule"; type FoodFilters = Pick; -const __dirname = url.fileURLToPath(new URL(".", import.meta.url)); - export const categoryModule = createModule({ - id: "category-module", - dirname: __dirname, - typeDefs: typeDefs, resolvers: { Query: { getAllCategories: async ( @@ -56,4 +49,23 @@ export const categoryModule = createModule({ }, }, }, + typeDefs: [ + gql` + type Category { + id: Int! + name: String! + foods: [Food]! + } + `, + gql` + input GetCategoryByIdOpts { + foodFilters: PrismaQueryOptions + } + + type Query { + getAllCategories(opts: GetCategoryByIdOpts): [Category]! + getCategoryById(id: Int!, opts: GetCategoryByIdOpts): Category + } + `, + ], }); diff --git a/src/modules/category/index.ts b/src/modules/category/index.ts deleted file mode 100644 index 686fbd9..0000000 --- a/src/modules/category/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./schema"; diff --git a/src/modules/category/typeDef.ts b/src/modules/category/typeDef.ts deleted file mode 100644 index 3371ce0..0000000 --- a/src/modules/category/typeDef.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { gql } from "graphql-modules"; - -const categoryTypeDef = gql` - type Category { - id: Int! - name: String! - foods: [Food]! - } -`; - -const queryTypeDef = gql` - input GetCategoryByIdOpts { - foodFilters: PrismaQueryOptions - } - - extend type Query { - getAllCategories(opts: GetCategoryByIdOpts): [Category]! - getCategoryById(id: Int!, opts: GetCategoryByIdOpts): Category - } -`; - -export const typeDefs = [categoryTypeDef, queryTypeDef]; diff --git a/src/modules/index.ts b/src/modules/index.ts index 2b18bd5..6656b13 100644 --- a/src/modules/index.ts +++ b/src/modules/index.ts @@ -1,4 +1,5 @@ import { aminoAcidModule } from "./aminoAcid"; +import { categoryModule } from "./category"; import { createModule } from "./createModule"; import { foodModule } from "./food"; import { nutrientModule } from "./nutrient"; @@ -10,11 +11,13 @@ export const config = createModule({ ...nutrientModule.typeDefs, ...foodModule.typeDefs, ...aminoAcidModule.typeDefs, + ...categoryModule.typeDefs, ], resolvers: { ...unitModule.resolvers, ...nutrientModule.resolvers, ...foodModule.resolvers, ...aminoAcidModule.resolvers, + ...categoryModule.resolvers, }, });