diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts index 8267b1bde980a848737eb17b64cf953fae209b9c..ffed50e6467832491d03cf51cab35d6cc2292173 100644 --- a/api/src/engine/engine.resolver.ts +++ b/api/src/engine/engine.resolver.ts @@ -29,7 +29,7 @@ export class EngineResolver { } @Query(() => ListExperiments) - async experiments( + async experimentList( @Args('page', { nullable: true, defaultValue: 0 }) page: number, @Args('name', { nullable: true, defaultValue: '' }) name: string, ) { diff --git a/api/src/engine/models/experiment/experiment.model.ts b/api/src/engine/models/experiment/experiment.model.ts index 6de688fa6ad57fd7fa6c1d49389375373919f145..7f2d51e68b3e17c05d68257dd3deeb1967b703c6 100644 --- a/api/src/engine/models/experiment/experiment.model.ts +++ b/api/src/engine/models/experiment/experiment.model.ts @@ -5,8 +5,11 @@ import { Author } from './author.model'; @ObjectType() export class Experiment { - @Field({ nullable: true }) - id?: string; + @Field() + id: string; + + @Field() + name: string; @Field(() => Author, { nullable: true, defaultValue: '' }) author?: Author; @@ -52,9 +55,6 @@ export class Experiment { @Field() algorithm: Algorithm; - - @Field() - name: string; } @ObjectType() diff --git a/api/src/schema.gql b/api/src/schema.gql index b65f3ddecdec0bf77e408d71caa595c732a61dd2..3dbbe609ee638ab5b9663d5a1ebaf8e837df7bfa 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -132,7 +132,8 @@ type Author { } type Experiment { - id: String + id: String! + name: String! author: Author createdAt: Float updateAt: Float @@ -148,11 +149,11 @@ type Experiment { coVariables: [String!] filterVariables: [String!] algorithm: Algorithm! - name: String! } type PartialExperiment { id: String + name: String author: Author createdAt: Float updateAt: Float @@ -168,7 +169,6 @@ type PartialExperiment { coVariables: [String!] filterVariables: [String!] algorithm: Algorithm - name: String } type ListExperiments { @@ -180,7 +180,7 @@ type ListExperiments { type Query { domains(ids: [String!] = []): [Domain!]! - experiments(name: String = "", page: Float = 0): ListExperiments! + experimentList(name: String = "", page: Float = 0): ListExperiments! experiment(id: String!): Experiment! algorithms: [Algorithm!]! }