diff --git a/packages/backend/src/graphql/graphql-schema.ts b/packages/backend/src/graphql/graphql-schema.ts index a169235c..764b170a 100644 --- a/packages/backend/src/graphql/graphql-schema.ts +++ b/packages/backend/src/graphql/graphql-schema.ts @@ -2,8 +2,7 @@ import { buildSchema } from 'graphql'; const graphQLSchema = buildSchema(` type Query { - getApps: [String!] - getAppsByName(name: String!): [String!] + getApps(name: String): [String!] } `); diff --git a/packages/backend/src/graphql/queries/get-apps-by-name.ts b/packages/backend/src/graphql/queries/get-apps-by-name.ts deleted file mode 100644 index 17f00fef..00000000 --- a/packages/backend/src/graphql/queries/get-apps-by-name.ts +++ /dev/null @@ -1,11 +0,0 @@ -import App from '../../models/app'; - -type Params = { - name: string -} - -const getAppsByName = (params: Params) => { - return App.findAllByName(params.name) -} - -export default getAppsByName; diff --git a/packages/backend/src/graphql/queries/get-apps.ts b/packages/backend/src/graphql/queries/get-apps.ts index 7546b4b8..52a118fd 100644 --- a/packages/backend/src/graphql/queries/get-apps.ts +++ b/packages/backend/src/graphql/queries/get-apps.ts @@ -1,7 +1,11 @@ import App from '../../models/app'; -const getApps = () => { - return App.findAll() +type Params = { + name: string +} + +const getApps = (params: Params) => { + return App.findAll(params.name) } export default getApps; diff --git a/packages/backend/src/graphql/root-resolver.ts b/packages/backend/src/graphql/root-resolver.ts index 8eae43db..9ecc7dec 100644 --- a/packages/backend/src/graphql/root-resolver.ts +++ b/packages/backend/src/graphql/root-resolver.ts @@ -1,9 +1,7 @@ import getApps from './queries/get-apps'; -import getAppsByName from './queries/get-apps-by-name'; const rootResolver = { - getApps: getApps, - getAppsByName: getAppsByName + getApps: getApps }; export default rootResolver; diff --git a/packages/backend/src/models/app.ts b/packages/backend/src/models/app.ts index 0d248f5e..1e6eb37e 100644 --- a/packages/backend/src/models/app.ts +++ b/packages/backend/src/models/app.ts @@ -4,11 +4,8 @@ class App { static folderPath = __dirname + '/../apps' static list = fs.readdirSync(this.folderPath); - static findAll(): string[] { - return this.list; - } - - static findAllByName(name: string): string[] { + static findAll(name?: string): string[] { + if(!name) return this.list; return this.list.filter((app) => app.includes(name.toLowerCase())); } }