diff --git a/api/src/engine/connectors/csv/main.connector.ts b/api/src/engine/connectors/csv/main.connector.ts index 05864adb55c7141de3ec49bd6854b5fdcdb793ee..c9c2b6fd71a69082dbfc95d670c0a8d7a9d4ee87 100644 --- a/api/src/engine/connectors/csv/main.connector.ts +++ b/api/src/engine/connectors/csv/main.connector.ts @@ -41,18 +41,16 @@ export default class CSVService implements IEngineService { throw new Error('Method not implemented.'); } - getExperiment(uuid: string): Experiment | Promise<Experiment> { + getExperiment(id: string): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); } - removeExperiment( - uuid: string, - ): PartialExperiment | Promise<PartialExperiment> { + removeExperiment(id: string): PartialExperiment | Promise<PartialExperiment> { throw new Error('Method not implemented.'); } editExperient( - uuid: string, + id: string, expriment: ExperimentEditInput, ): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); diff --git a/api/src/engine/connectors/datashield/main.connector.ts b/api/src/engine/connectors/datashield/main.connector.ts index 4df8aa14bf1fda0bdec3a4d21c98cc79277cdd83..10be78362330877ad2fd21f664f18527758b2028 100644 --- a/api/src/engine/connectors/datashield/main.connector.ts +++ b/api/src/engine/connectors/datashield/main.connector.ts @@ -33,18 +33,16 @@ export default class DataShieldService implements IEngineService { throw new Error('Method not implemented.'); } - getExperiment(uuid: string): Experiment | Promise<Experiment> { + getExperiment(id: string): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); } - removeExperiment( - uuid: string, - ): PartialExperiment | Promise<PartialExperiment> { + removeExperiment(id: string): PartialExperiment | Promise<PartialExperiment> { throw new Error('Method not implemented.'); } editExperient( - uuid: string, + id: string, expriment: ExperimentEditInput, ): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); diff --git a/api/src/engine/connectors/exareme/main.connector.ts b/api/src/engine/connectors/exareme/main.connector.ts index dc9b74ea9107c40f69719813d4c62ba1d41c8ad1..51e8eac5baf5658a1fe2ea842984285b0e0cb171 100644 --- a/api/src/engine/connectors/exareme/main.connector.ts +++ b/api/src/engine/connectors/exareme/main.connector.ts @@ -86,8 +86,8 @@ export default class ExaremeService implements IEngineService { return dataToAlgorithms(resultAPI.data); } - async getExperiment(uuid: string): Promise<Experiment> { - const path = this.options.baseurl + `experiments/${uuid}`; + async getExperiment(id: string): Promise<Experiment> { + const path = this.options.baseurl + `experiments/${id}`; const resultAPI = await firstValueFrom( this.httpService.get<ExperimentData>(path), @@ -97,10 +97,10 @@ export default class ExaremeService implements IEngineService { } async editExperient( - uuid: string, + id: string, expriment: ExperimentEditInput, ): Promise<Experiment> { - const path = this.options.baseurl + `experiments/${uuid}`; + const path = this.options.baseurl + `experiments/${id}`; const resultAPI = await firstValueFrom( this.httpService.patch<ExperimentData>(path, expriment), @@ -109,16 +109,16 @@ export default class ExaremeService implements IEngineService { return dataToExperiment(resultAPI.data); } - async removeExperiment(uuid: string): Promise<PartialExperiment> { - const path = this.options.baseurl + `experiments/${uuid}`; + async removeExperiment(id: string): Promise<PartialExperiment> { + const path = this.options.baseurl + `experiments/${id}`; try { await firstValueFrom(this.httpService.delete(path)); return { - uuid: uuid, + id: id, }; } catch (error) { - throw new BadRequestException(`${uuid} does not exists`); + throw new BadRequestException(`${id} does not exists`); } } @@ -170,22 +170,22 @@ export default class ExaremeService implements IEngineService { .pipe(map((response) => response.data)); } - getExperimentREST(uuid: string): Observable<string> { - const path = this.options.baseurl + `experiments/${uuid}`; + getExperimentREST(id: string): Observable<string> { + const path = this.options.baseurl + `experiments/${id}`; return this.httpService .get<string>(path) .pipe(map((response) => response.data)); } - deleteExperiment(uuid: string): Observable<string> { - const path = this.options.baseurl + `experiments/${uuid}`; + deleteExperiment(id: string): Observable<string> { + const path = this.options.baseurl + `experiments/${id}`; return this.httpService.delete(path).pipe(map((response) => response.data)); } - editExperimentREST(uuid: string): Observable<string> { - const path = this.options.baseurl + `experiments/${uuid}`; + editExperimentREST(id: string): Observable<string> { + const path = this.options.baseurl + `experiments/${id}`; return this.httpService .patch(path, this.req.body) diff --git a/api/src/engine/connectors/exareme/transformations.ts b/api/src/engine/connectors/exareme/transformations.ts index 2fc8039f0a656b1bc1dac8a9632ffc6d9088ed3c..55bb054c8cdda588fd6eccfeb08f1700e6e801e4 100644 --- a/api/src/engine/connectors/exareme/transformations.ts +++ b/api/src/engine/connectors/exareme/transformations.ts @@ -36,7 +36,7 @@ export const transformToExperiment = jsonata(` { "name": name, - "uuid": uuid, + "id": uuid, "author": createdBy, "viewed": viewed, "status": status, diff --git a/api/src/engine/connectors/local/main.connector.ts b/api/src/engine/connectors/local/main.connector.ts index cb472d927f571c9553c0115624a9981f2be653c6..003b3c8cc2927a84dda52f8efe97b7d44edb8ab8 100644 --- a/api/src/engine/connectors/local/main.connector.ts +++ b/api/src/engine/connectors/local/main.connector.ts @@ -33,18 +33,16 @@ export default class LocalService implements IEngineService { throw new Error('Method not implemented.'); } - getExperiment(uuid: string): Experiment | Promise<Experiment> { + getExperiment(id: string): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); } - removeExperiment( - uuid: string, - ): PartialExperiment | Promise<PartialExperiment> { + removeExperiment(id: string): PartialExperiment | Promise<PartialExperiment> { throw new Error('Method not implemented.'); } editExperient( - uuid: string, + id: string, expriment: ExperimentEditInput, ): Experiment | Promise<Experiment> { throw new Error('Method not implemented.'); diff --git a/api/src/engine/engine.controller.ts b/api/src/engine/engine.controller.ts index d7f34d493e03ae0f08401baf9aab1b888851b9f9..bcda8102f1117deae9b5c79703e7cf187ee50501 100644 --- a/api/src/engine/engine.controller.ts +++ b/api/src/engine/engine.controller.ts @@ -30,19 +30,19 @@ export class EngineController { return this.engineService.getExperiments(); } - @Get('/experiments/:uuid') - getExperiment(@Param('uuid') uuid: string): Observable<string> | string { - return this.engineService.getExperimentREST(uuid); + @Get('/experiments/:id') + getExperiment(@Param('id') id: string): Observable<string> | string { + return this.engineService.getExperimentREST(id); } - @Delete('/experiments/:uuid') - deleteExperiment(@Param('uuid') uuid: string): Observable<string> | string { - return this.engineService.deleteExperiment(uuid); + @Delete('/experiments/:id') + deleteExperiment(@Param('id') id: string): Observable<string> | string { + return this.engineService.deleteExperiment(id); } - @Patch('/experiments/:uuid') - editExperiment(@Param('uuid') uuid: string): Observable<string> | string { - return this.engineService.editExperimentREST(uuid); + @Patch('/experiments/:id') + editExperiment(@Param('id') id: string): Observable<string> | string { + return this.engineService.editExperimentREST(id); } @Post('experiments/transient') diff --git a/api/src/engine/engine.interfaces.ts b/api/src/engine/engine.interfaces.ts index 29e57f161a8dc2a69c747d415fa529b4c986002a..cb033ef5f7f02fd606a270cd9536e2572bcb53a5 100644 --- a/api/src/engine/engine.interfaces.ts +++ b/api/src/engine/engine.interfaces.ts @@ -28,14 +28,12 @@ export interface IEngineService { name: string, ): Promise<ListExperiments> | ListExperiments; - getExperiment(uuid: string): Promise<Experiment> | Experiment; + getExperiment(id: string): Promise<Experiment> | Experiment; - removeExperiment( - uuid: string, - ): Promise<PartialExperiment> | PartialExperiment; + removeExperiment(id: string): Promise<PartialExperiment> | PartialExperiment; editExperient( - uuid: string, + id: string, expriment: ExperimentEditInput, ): Promise<Experiment> | Experiment; @@ -46,11 +44,11 @@ export interface IEngineService { getExperiments(): Observable<string> | string; - getExperimentREST(uuid: string): Observable<string> | string; + getExperimentREST(id: string): Observable<string> | string; - deleteExperiment(uuid: string): Observable<string> | string; + deleteExperiment(id: string): Observable<string> | string; - editExperimentREST(uuid: string): Observable<string> | string; + editExperimentREST(id: string): Observable<string> | string; startExperimentTransient(): Observable<string> | string; diff --git a/api/src/engine/engine.resolver.ts b/api/src/engine/engine.resolver.ts index 8b5485de9c0f844308ddb3bf1a40c692cf1a4209..8267b1bde980a848737eb17b64cf953fae209b9c 100644 --- a/api/src/engine/engine.resolver.ts +++ b/api/src/engine/engine.resolver.ts @@ -37,8 +37,8 @@ export class EngineResolver { } @Query(() => Experiment) - async experiment(@Args('uuid') uuid: string) { - return this.engineService.getExperiment(uuid); + async experiment(@Args('id') id: string) { + return this.engineService.getExperiment(id); } @Query(() => [Algorithm]) @@ -60,16 +60,14 @@ export class EngineResolver { @Mutation(() => Experiment) async editExperiment( - @Args('uuid') uuid: string, + @Args('id') id: string, @Args('data') experiment: ExperimentEditInput, ) { - return this.engineService.editExperient(uuid, experiment); + return this.engineService.editExperient(id, experiment); } @Mutation(() => PartialExperiment) - async removeExperiment( - @Args('uuid') uuid: string, - ): Promise<PartialExperiment> { - return this.engineService.removeExperiment(uuid); + async removeExperiment(@Args('id') id: string): Promise<PartialExperiment> { + return this.engineService.removeExperiment(id); } } diff --git a/api/src/engine/models/experiment/experiment.model.ts b/api/src/engine/models/experiment/experiment.model.ts index 0a76e9d9a3b4ba51447dfced1de8c71b40310d74..2d0f1e43885232bbdd54f41647162bfad2f17b76 100644 --- a/api/src/engine/models/experiment/experiment.model.ts +++ b/api/src/engine/models/experiment/experiment.model.ts @@ -5,7 +5,7 @@ import { Algorithm } from './algorithm.model'; @ObjectType() export class Experiment { @Field({ nullable: true }) - uuid?: string; + id?: string; @Field({ nullable: true, defaultValue: '' }) author?: string; diff --git a/api/src/schema.gql b/api/src/schema.gql index 095d1476b1e1008d66d36e4aa1a3b397ab306002..1b4951c49fca8d2989f019c1e4b053c3b545617f 100644 --- a/api/src/schema.gql +++ b/api/src/schema.gql @@ -127,7 +127,7 @@ type Header { } type Experiment { - uuid: String + id: String author: String createdAt: Float updateAt: Float @@ -146,7 +146,7 @@ type Experiment { } type PartialExperiment { - uuid: String + id: String author: String createdAt: Float updateAt: Float @@ -174,14 +174,14 @@ type ListExperiments { type Query { domains(ids: [String!] = []): [Domain!]! experiments(name: String = "", page: Float = 0): ListExperiments! - experiment(uuid: String!): Experiment! + experiment(id: String!): Experiment! algorithms: [Algorithm!]! } type Mutation { createExperiment(isTransient: Boolean = false, data: ExperimentCreateInput!): Experiment! - editExperiment(data: ExperimentEditInput!, uuid: String!): Experiment! - removeExperiment(uuid: String!): PartialExperiment! + editExperiment(data: ExperimentEditInput!, id: String!): Experiment! + removeExperiment(id: String!): PartialExperiment! } input ExperimentCreateInput {