diff --git a/api/src/engine/connectors/datashield/main.connector.ts b/api/src/engine/connectors/datashield/main.connector.ts index 643cd6dadd4955e6a85a875dc2819f5dc208db29..bcffa4122950331c28ab9267f2d2387ae67eb61e 100644 --- a/api/src/engine/connectors/datashield/main.connector.ts +++ b/api/src/engine/connectors/datashield/main.connector.ts @@ -4,6 +4,10 @@ import { IEngineOptions, IEngineService } from "src/engine/engine.interfaces"; export default class DataShieldService implements IEngineService { constructor(private readonly options: IEngineOptions, private readonly httpService: HttpService) { } + + getExperiments(): Observable<string> { + throw new Error("Method not implemented."); + } getAlgorithms(): Observable<string> { 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 10aa6527111885ca57e7898d85b69d47f03ede18..ccad44c232a568f2904ef8e5c6d2af95092a7640 100644 --- a/api/src/engine/connectors/exareme/main.connector.ts +++ b/api/src/engine/connectors/exareme/main.connector.ts @@ -5,6 +5,14 @@ import { IEngineOptions, IEngineService } from "src/engine/engine.interfaces"; export default class ExaremeService implements IEngineService { constructor(private readonly options: IEngineOptions, private readonly httpService: HttpService) { } + getExperiments(): Observable<string> { + const path = this.options.baseurl + "experiments"; + + return this.httpService.get<string>(path).pipe( + map(response => response.data) + ); + } + getAlgorithms(): Observable<string> { const path = this.options.baseurl + "algorithms"; diff --git a/api/src/engine/engine.controller.ts b/api/src/engine/engine.controller.ts index a5bae286a29e3894151772cf53ffcc44b4901f7f..1d158d345d3279b0eab0b48a548beb55fde28085 100644 --- a/api/src/engine/engine.controller.ts +++ b/api/src/engine/engine.controller.ts @@ -1,12 +1,13 @@ import { HttpService } from '@nestjs/axios'; -import { Controller, Get, Inject } from '@nestjs/common'; +import { Controller, Get, Inject, Req } from '@nestjs/common'; +import { Request } from 'express'; import { Observable } from 'rxjs'; import { ENGINE_SERVICE } from './engine.constants'; import { IEngineService } from './engine.interfaces'; @Controller() export class EngineController { - constructor(@Inject(ENGINE_SERVICE) private readonly engineService: IEngineService, private readonly httpService: HttpService) { } + constructor(@Inject(ENGINE_SERVICE) private readonly engineService: IEngineService) { } @Get("/test") getTest(): string { @@ -14,7 +15,13 @@ export class EngineController { } @Get('/algorithms') - getAlgorithms(): Observable<string> { - return this.engineService.getAlgorithms(); + getAlgorithms(@Req() request: Request): Observable<string> { + return this.engineService.getAlgorithms(request); } + + @Get('/experiments') + getExperiments(@Req() request: Request): Observable<string> { + return this.engineService.getExperiments(request); + } + } diff --git a/api/src/engine/engine.interfaces.ts b/api/src/engine/engine.interfaces.ts index f9cbacc686ab0c60abc5321904aa25e00f304618..84c0a55edb9dbd4ea95ae74c8fe16d849df504dc 100644 --- a/api/src/engine/engine.interfaces.ts +++ b/api/src/engine/engine.interfaces.ts @@ -1,3 +1,4 @@ +import { Request } from "express"; import { Observable } from "rxjs"; export interface IEngineOptions { @@ -8,5 +9,7 @@ export interface IEngineOptions { export interface IEngineService { demo(): string; - getAlgorithms(): Observable<string>; + getAlgorithms(request: Request): Observable<string>; + + getExperiments(request: Request): Observable<string>; } \ No newline at end of file