From b9e19b915dab361309eed690dd12d5a96b7ba707 Mon Sep 17 00:00:00 2001 From: stevereis <stevereis93@gmail.com> Date: Mon, 6 Dec 2021 18:02:54 +0100 Subject: [PATCH] Edit : update model graphql --- api/src/engine/engine.resolver.ts | 2 +- api/src/engine/models/experiment/experiment.model.ts | 10 +++++----- api/src/schema.gql | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts index 8267b1b..ffed50e 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 6de688f..7f2d51e 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 b65f3dd..3dbbe60 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!]! } -- GitLab