Merge branch '2-fix-api-calls' into 'master'

Resolve "Fix API calls"

Closes #2

See merge request !3

VERSION.txt

+14.0.1 Update API routes
 14.0.0 Initial clustering library version
 

projects/kypo-trainings-clustering-viz-lib/src/lib/visualization/api/visualization-data-default-api.service.ts

@@ -41,7 +41,7 @@ export class VisualizationDataDefaultApi extends VisualizationDataApi {
     return this.http
       .get<VisualizationDataDTO>(
         this.configService.config.trainingServiceUrl +
-          `visualizations/training-definitions/${trainingDefinitionId}/${featureType}`,
+          `clusters/training-definitions/${trainingDefinitionId}/${featureType}`,
         { params: this.addParams(numberOfClusters, instanceIds, level) }
       )
       .pipe(map((response) => ClusterVisualizationDataMapper.fromDTO(response)));
@@ -59,7 +59,7 @@ export class VisualizationDataDefaultApi extends VisualizationDataApi {
     return this.http
       .get<VisualizationDataDTO>(
         this.configService.config.trainingServiceUrl +
-          `visualizations/training-definitions/${trainingDefinitionId}/radar-chart`,
+          `clusters/training-definitions/${trainingDefinitionId}/n-dimensional`,
         { params: this.addParams(numberOfClusters, instanceIds, level) }
       )
       .pipe(map((response) => RadarChartDataMapper.fromDTO(response)));
@@ -75,7 +75,7 @@ export class VisualizationDataDefaultApi extends VisualizationDataApi {
     return this.http
       .get<SseDTO>(
         this.configService.config.trainingServiceUrl +
-          `visualizations/training-definitions/${trainingDefinitionId}/${featureType}/sse`,
+          `clusters/training-definitions/${trainingDefinitionId}/${featureType}/sse`,
         { params: this.addParams(numberOfClusters, instanceIds, level) }
       )
       .pipe(map((response) => SseDataMapper.fromDTO(response)));

projects/kypo-trainings-clustering-viz-lib/src/lib/visualization/services/visualizations-data-concrete.service.ts

@@ -38,7 +38,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
     switch (this._selectedFeature) {
       case Clusterables.WrongFlags:
         return this.visualizationApi
-          .getVisualizationData(trainingDefinitionId, 'wrong-flags', numOfClusters, instanceIds, level)
+          .getVisualizationData(trainingDefinitionId, 'wrong-answers', numOfClusters, instanceIds, level)
           .pipe(
             map((data: any) => ClusterVisualizationDataMapper.fromDTO(data)),
             catchError((error) => {
@@ -47,7 +47,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
           );
       case Clusterables.TimeAfterHint:
         return this.visualizationApi
-          .getVisualizationData(trainingDefinitionId, 'time-after-hint', numOfClusters, instanceIds, level)
+          .getVisualizationData(trainingDefinitionId, 'hints', numOfClusters, instanceIds, level)
           .pipe(
             map((data: any) => ClusterVisualizationDataMapper.fromDTO(data)),
             catchError((error) => {
@@ -82,7 +82,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
     switch (this._selectedFeature) {
       case Clusterables.WrongFlags:
         return this.visualizationApi
-          .getFeatureSSE(trainingDefinitionId, 'wrong-flags', numOfClusters, instanceIds, level)
+          .getFeatureSSE(trainingDefinitionId, 'wrong-answers', numOfClusters, instanceIds, level)
           .pipe(
             map((data: any) => SseDataMapper.fromDTO(data)),
             catchError((error) => {
@@ -91,7 +91,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
           );
       case Clusterables.TimeAfterHint:
         return this.visualizationApi
-          .getFeatureSSE(trainingDefinitionId, 'time-after-hint', numOfClusters, instanceIds, level)
+          .getFeatureSSE(trainingDefinitionId, 'hints', numOfClusters, instanceIds, level)
           .pipe(
             map((data: any) => SseDataMapper.fromDTO(data)),
             catchError((error) => {
@@ -147,7 +147,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
   getXLabel(feature = this._selectedFeature): string {
     switch (feature) {
       case Clusterables.WrongFlags:
-        return 'Wrong flags submitted';
+        return 'Wrong answers submitted';
       case Clusterables.TimeAfterHint:
         return 'Time spent after using hint';
     }
@@ -159,7 +159,7 @@ export class VisualizationsDataConcreteService extends VisualizationsDataService
       case Clusterables.WrongFlags:
         return 'Time played';
       case Clusterables.TimeAfterHint:
-        return 'Wrong flags after using hint';
+        return 'Wrong answers after using hint';
     }
     return 'Feature Y';
   }

utils/json-server/routes.json

 {
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/wrong-flags:params": "/clusters",
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/time-after-hint:params": "/clusters2",
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/radar-chart:params": "/radarChart",
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/wrong-flags/sse?numberOfClusters=15": "/sse1",
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/time-after-hint/sse?numberOfClusters=15": "/sse2",
-  "/kypo-rest-training/api/v1/visualizations/training-definitions/:id/n-dimensional/sse?numberOfClusters=15": "/sseNDim"
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/wrong-answers:params": "/clusters",
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/hints:params": "/clusters2",
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/n-dimensional:params": "/radarChart",
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/wrong-answers/sse?numberOfClusters=15": "/sse1",
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/hints/sse?numberOfClusters=15": "/sse2",
+  "/kypo-rest-training/api/v1/clusters/training-definitions/:id/n-dimensional/sse?numberOfClusters=15": "/sseNDim"
 }