Refactors endpoint's url on Dataset Template criteria used by DMP listing.

dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java

@@ -94,13 +94,6 @@ public class Admin extends BaseController {
 		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
 	}
 
-	@RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/using/paged"}, produces = "application/json")
-	public @ResponseBody
-	ResponseEntity<ResponseItem<DataTableData<DatasetProfileListingModel>>> getUsingDatasetProfilesPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) throws Exception {
-		DataTableData<DatasetProfileListingModel> datasetProfileTableData = this.datasetProfileManager.getDatasetProfilesUsedByDMP(datasetProfileTableRequestItem, principal);
-		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
-	}
-
 	@RequestMapping(method = RequestMethod.POST, value = {"/preview"}, consumes = "application/json", produces = "application/json")
 	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
 		eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());

dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java

@@ -6,6 +6,7 @@ import eu.eudat.criteria.DMPCriteria;
 import eu.eudat.data.dao.criteria.DynamicFieldsCriteria;
 import eu.eudat.data.dao.criteria.RequestItem;
 import eu.eudat.data.entities.DMP;
+import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
@@ -15,6 +16,7 @@ import eu.eudat.logic.managers.DatasetManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
+import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
 import eu.eudat.models.data.dmp.DataManagementPlan;
 import eu.eudat.models.data.helpermodels.Tuple;
 import eu.eudat.models.data.helpers.common.DataTableData;
@@ -95,6 +97,13 @@ public class DMPs extends BaseController {
 		}
 	}
 
+	@RequestMapping(method = RequestMethod.POST, value = {"/datasetProfilesUsedByDmps/paged"}, produces = "application/json")
+	public @ResponseBody
+	ResponseEntity<ResponseItem<DataTableData<DatasetProfileListingModel>>> getUsingDatasetProfilesPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
+		DataTableData<DatasetProfileListingModel> datasetProfileTableData = this.dataManagementPlanManager.getDatasetProfilesUsedByDMP(datasetProfileTableRequestItem, principal);
+		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
+	}
+
 	@RequestMapping(method = RequestMethod.GET, value = {"rda/{id}"})
 	public @ResponseBody
 	ResponseEntity getRDAJsonDocument(@PathVariable String id, Principal principal) throws IOException {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java

@@ -9,6 +9,7 @@ import eu.eudat.data.entities.Organisation;
 import eu.eudat.data.entities.Researcher;
 import eu.eudat.data.entities.*;
 import eu.eudat.data.query.items.item.dmp.DataManagementPlanCriteriaRequest;
+import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest;
 import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
@@ -25,6 +26,7 @@ import eu.eudat.logic.utilities.documents.types.ParagraphStyle;
 import eu.eudat.logic.utilities.documents.word.WordBuilder;
 import eu.eudat.logic.utilities.documents.xml.ExportXmlBuilder;
 import eu.eudat.models.HintedModelFactory;
+import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
 import eu.eudat.models.data.dmp.*;
 import eu.eudat.models.data.dynamicfields.DynamicFieldWithValue;
@@ -883,4 +885,18 @@ public class DataManagementPlanManager {
 
         return dataManagementPlans;
     }
+
+    public DataTableData<DatasetProfileListingModel> getDatasetProfilesUsedByDMP(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
+        datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
+        datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
+
+        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
+
+        DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
+        data.setData(listingModels);
+        data.setTotalCount((long) listingModels.size());
+
+        return data;
+    }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java

@@ -188,19 +188,4 @@ public class DatasetProfileManager {
             throw new DatasetProfileNewVersionException("Version to update not the latest.");
         }
     }
-
-    public DataTableData<DatasetProfileListingModel> getDatasetProfilesUsedByDMP(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) {
-
-        datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
-        datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
-
-        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
-        List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
-
-        DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
-        data.setData(listingModels);
-        data.setTotalCount((long) listingModels.size());
-
-        return data;
-    }
 }

dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts

@@ -39,10 +39,6 @@ export class DatasetProfileService {
 		return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetprofiles/getPaged', dataTableRequest);
 	}
 
-	getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest<DatasetProfileCriteria>) {
-		return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetprofiles/using/paged', dataTableRequest);
-	}
-
 	preview(data: DatasetProfile): Observable<DatasetProfileDefinitionModel> {
 		return this.http.post<DatasetProfileDefinitionModel>(this.actionUrl + 'preview', data);
 	}

dmp-frontend/src/app/core/services/dmp/dmp.service.ts

@@ -17,6 +17,7 @@ import { BaseHttpParams } from '../../../common/http/base-http-params';
 import { InterceptorType } from '../../../common/http/interceptors/interceptor-type';
 import { ExploreDmpCriteriaModel } from '../../query/explore-dmp/explore-dmp-criteria';
 import { DmpOverviewModel } from '../../model/dmp/dmp-overview';
+import { DatasetListingModel } from '../../model/dataset/dataset-listing';
 
 @Injectable()
 export class DmpService {
@@ -124,4 +125,8 @@ export class DmpService {
 	getPublicPaged(dataTableRequest: DataTableRequest<ExploreDmpCriteriaModel>, fieldsGroup?: string): Observable<DataTableData<DmpListingModel>> {
 		return this.http.post<DataTableData<DmpListingModel>>(this.actionUrl + 'public/paged?fieldsGroup=' + fieldsGroup, dataTableRequest, { headers: this.headers });
 	}
+
+	getDatasetProfilesUsedPaged(dataTableRequest: DataTableRequest<DatasetProfileCriteria>) {
+		return this.http.post<DataTableData<DatasetListingModel>>(this.actionUrl + 'datasetProfilesUsedByDmps/paged', dataTableRequest);
+	}
 }

dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts

@@ -168,7 +168,7 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		const datasetTemplateRequestItem: DataTableRequest<DatasetProfileCriteria> = new DataTableRequest(0, null, { fields: fields });
 		datasetTemplateRequestItem.criteria = new DatasetProfileCriteria();
 		datasetTemplateRequestItem.criteria.like = query;
-		return this.datasetProfileService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data);
+		return this.dmpService.getDatasetProfilesUsedPaged(datasetTemplateRequestItem).map(x => x.data);
 	}
 
 	fileSave(event) {