MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix public api paths

This commit is contained in:
Bernaldo Mihasi 2022-10-10 11:56:48 +03:00
parent 6720504b7b
commit 2b692fa579
4 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-backend/web/src/main/java/eu/eudat/publicapi/configurations/SwaggerConfiguration.java
View File

@ -1,29 +1,39 @@
package eu.eudat.publicapi.configurations; package eu.eudat.publicapi.configurations;
import eu.eudat.models.data.security.Principal; import eu.eudat.models.data.security.Principal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact; import springfox.documentation.service.Contact;
import springfox.documentation.service.SecurityScheme;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
@Configuration @Configuration
public class SwaggerConfiguration { public class SwaggerConfiguration {
// private static final TypeResolver resolver = new TypeResolver(); // private static final TypeResolver resolver = new TypeResolver();
@Autowired
private Environment environment;
@Bean @Bean
public Docket api() { public Docket api() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
.host(this.environment.getProperty("publicapi.host"))
.protocols(new HashSet<>(Collections.singleton(this.environment.getProperty("publicapi.schema"))))
.select() .select()
.apis(RequestHandlerSelectors.basePackage("eu.eudat.publicapi.controllers")) .apis(RequestHandlerSelectors.basePackage("eu.eudat.publicapi.controllers"))
.paths(PathSelectors.regex("/api/public/(dmps|datasets)/?.*")) .paths(PathSelectors.regex("/api/public/(dmps|datasets)/?.*"))
.build().apiInfo(apiInfo())//.ignoredParameterTypes(Principal.class) .build().apiInfo(apiInfo())//.ignoredParameterTypes(Principal.class)
.pathMapping(this.environment.getProperty("publicapi.basePath"))
.useDefaultResponseMessages(false); .useDefaultResponseMessages(false);
} }

98
dmp-backend/web/src/main/java/eu/eudat/publicapi/controllers/PublicDatasetsDescriptionDocumentation.java
View File

@ -58,56 +58,56 @@ public class PublicDatasetsDescriptionDocumentation extends BaseController {
" \"totalCount\": 2,\n" + " \"totalCount\": 2,\n" +
" \"data\": [\n" + " \"data\": [\n" +
" {\n" + " {\n" +
" \"id\": \"aefc0f61-f2a7-410d-80c6-d3737afc0cd4\",\n" + " \"id\": \"ef7dfbdc-c5c1-46a7-a37b-c8d8692f1c0e\",\n" +
" \"label\": \"Copied 27: Agrion forcipula .\",\n" + " \"label\": \"BARKAMOL RIVOJLANGAN SHAXSNI TARBIYALASHDA HARAKATLI O`YINLARNING O`RNI\",\n" +
" \"grant\": \"Advanced Nitrogen Recovery from Sludge and other Organic Waste Materials (NITRO)\",\n" + " \"grant\": \"A next generation nano media tailored to capture and recycle hazardous micropollutants in contaminated industrial wastewater.\",\n" +
" \"dmp\": \"DMP_Advanced_Nitrogen_Recovery_from_Sludge_and_other_Organic_Waste_Materials_(NITRO)_0.xml\",\n" + " \"dmp\": \"test for demo\",\n" +
" \"dmpId\": \"8a8368a5-59e9-4d53-aaab-723da2df2d3b\",\n" + " \"dmpId\": \"9dee6e72-7a4c-4fbd-b8a4-1f8cda38eb5e\",\n" +
" \"profile\": {\n" + " \"profile\": {\n" +
" \"id\": \"0b5b52f3-266a-45cf-8066-d1e5a70d65e1\",\n" + " \"id\": \"771283d7-a5be-4a93-bd3c-8b1883fe837c\",\n" +
" \"label\": \"Horizon 2020 (Devel Clone)\",\n" + " \"label\": \"Horizon Europe\",\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"createdAt\": 1652274681000,\n" + " \"createdAt\": 1662711279000,\n" +
" \"modifiedAt\": 1652275258000,\n" + " \"modifiedAt\": 1662712928000,\n" +
" \"description\": null,\n" + " \"description\": \"<p>&nbsp; &nbsp; &nbsp;Annotatsiya &nbsp;Maqolada &nbsp;bolalarni &nbsp;o`yin &nbsp;mavjud &nbsp;bo`lgan &nbsp;shakllarda &nbsp;mavjud&nbsp;<br>\\nhayot &nbsp;bilan &nbsp;kengroq &nbsp;tanishtirishga &nbsp;imkon &nbsp;beradi. &nbsp;O`yin &nbsp;bolalarning &nbsp;turli &nbsp;xil&nbsp;<br>\\nfaoliyati,o`yin &nbsp;ko`nikmalarini &nbsp;shakllantirishga &nbsp;yordam &nbsp;beradi.Ularni &nbsp;fikrlash, &nbsp;his-<br>\\ntuyg`ular, tajribalar, o`yin muammosini hal qilishning faol usullarini izlash, ularning&nbsp;<br>\\no`yin sharoitlari va sharoitlariga bo`ysunishi, o`yindagi bolalarning munosabatlari,&nbsp;<br>\\no`yin orqali bola organik rivojlanadi, &nbsp;inson madaniyatining muhim qatlami kattalar&nbsp;<br>\\no`rtasidagi &nbsp;munosabatlar &nbsp;- &nbsp;oilada, &nbsp;ularning &nbsp;kasbiy &nbsp;faoliyati &nbsp;va &nbsp;boshqalar. &nbsp;O`yin&nbsp;<br>\\no`qituvchilar barcha ta&rsquo;lim vazifalarini, shu jumladan o`rganishni hal qiladigan eng&nbsp;<br>\\nmuhim faoliyat sifatida foydalaniladi.&nbsp;</p>\",\n" +
" \"finalizedAt\": 1652275257000,\n" + " \"finalizedAt\": 1662712928000,\n" +
" \"dmpPublishedAt\": 1652276406000,\n" + " \"dmpPublishedAt\": 1662713226000,\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"users\": [\n" + " \"users\": [\n" +
" {\n" + " {\n" +
" \"id\": \"4cb5671a-0575-4a50-878a-d1bdf59648a0\",\n" + " \"id\": \"33024e48-d528-45a5-8035-ea48641bd2f2\",\n" +
" \"name\": \"George Kalampokis\",\n" + " \"name\": \"DMP author\",\n" +
" \"role\": 0,\n" + " \"role\": 0,\n" +
" \"email\": \"gkfortests@gmail.com\",\n" + " \"email\": \"kanavou.p@gmail.com\",\n" +
" \"hint\": \"UserInfoListingModel\"\n" + " \"hint\": \"UserInfoListingModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"hint\": \"datasetListingModel\"\n" + " \"hint\": \"datasetListingModel\"\n" +
" },\n" + " },\n" +
" {\n" + " {\n" +
" \"id\": \"f3b241fc-c692-4bb6-b10e-b2a4e2829f9e\",\n" + " \"id\": \"0f253ab2-18cb-4798-adc1-135b81cfad0c\",\n" +
" \"label\": \"manually 23\",\n" + " \"label\": \"A \\\"zoom-elit\\\" és a kamionosok küzdelme, avagy a meritokrácia és a populizmus összecsapása\",\n" +
" \"grant\": \"Advanced Nitrogen Recovery from Sludge and other Organic Waste Materials (NITRO)\",\n" + " \"grant\": \"Discovery Projects - Grant ID: DP140100157\",\n" +
" \"dmp\": \"DMP_Advanced_Nitrogen_Recovery_from_Sludge_and_other_Organic_Waste_Materials_(NITRO)_0.xml\",\n" + " \"dmp\": \"TEST UPDATE 2.8.2022\",\n" +
" \"dmpId\": \"8a8368a5-59e9-4d53-aaab-723da2df2d3b\",\n" + " \"dmpId\": \"1f4daa8f-4e2f-4dc9-a60b-f6b75d313400\",\n" +
" \"profile\": {\n" + " \"profile\": {\n" +
" \"id\": \"0b5b52f3-266a-45cf-8066-d1e5a70d65e1\",\n" + " \"id\": \"3d43ba45-25fa-4815-81b4-9bf22ecd8316\",\n" +
" \"label\": \"Horizon 2020 (Devel Clone)\",\n" + " \"label\": \"HE_Final\",\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"createdAt\": 1652274735000,\n" + " \"createdAt\": 1659392761000,\n" +
" \"modifiedAt\": 1652275259000,\n" + " \"modifiedAt\": 1659393655000,\n" +
" \"description\": null,\n" + " \"description\": \"<p>A kanadai kamionosok &bdquo;szabads&aacute;gmenete&rdquo; kapcs&aacute;n a&nbsp;New York Times&nbsp;has&aacute;bjain Ross Donthat publicista egy r&eacute;gi k&ouml;nyvre h&iacute;vja fel a figyelmet, amely sok &eacute;vtizeddel ezelőtt megj&oacute;solta az elit elleni hasonl&oacute; l&aacute;zad&aacute;sokat.</p>\",\n" +
" \"finalizedAt\": 1652275258000,\n" + " \"finalizedAt\": 1659393654000,\n" +
" \"dmpPublishedAt\": 1652276406000,\n" + " \"dmpPublishedAt\": 1659393698000,\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"users\": [\n" + " \"users\": [\n" +
" {\n" + " {\n" +
" \"id\": \"4cb5671a-0575-4a50-878a-d1bdf59648a0\",\n" + " \"id\": \"33024e48-d528-45a5-8035-ea48641bd2f2\",\n" +
" \"name\": \"George Kalampokis\",\n" + " \"name\": \"DMP author\",\n" +
" \"role\": 0,\n" + " \"role\": 0,\n" +
" \"email\": \"gkfortests@gmail.com\",\n" + " \"email\": \"kanavou.p@gmail.com\",\n" +
" \"hint\": \"UserInfoListingModel\"\n" + " \"hint\": \"UserInfoListingModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
@ -160,32 +160,32 @@ public class PublicDatasetsDescriptionDocumentation extends BaseController {
" \"responseType\": 0,\n" + " \"responseType\": 0,\n" +
" \"message\": null,\n" + " \"message\": null,\n" +
" \"payload\": {\n" + " \"payload\": {\n" +
" \"id\": \"aefc0f61-f2a7-410d-80c6-d3737afc0cd4\",\n" + " \"id\": \"ef7dfbdc-c5c1-46a7-a37b-c8d8692f1c0e\",\n" +
" \"label\": \"Copied 27: Agrion forcipula .\",\n" + " \"label\": \"BARKAMOL RIVOJLANGAN SHAXSNI TARBIYALASHDA HARAKATLI O`YINLARNING O`RNI\",\n" +
" \"reference\": null,\n" + " \"reference\": null,\n" +
" \"uri\": null,\n" + " \"uri\": null,\n" +
" \"description\": null,\n" + " \"description\": \"<p>&nbsp; &nbsp; &nbsp;Annotatsiya &nbsp;Maqolada &nbsp;bolalarni &nbsp;o`yin &nbsp;mavjud &nbsp;bo`lgan &nbsp;shakllarda &nbsp;mavjud&nbsp;<br>\\nhayot &nbsp;bilan &nbsp;kengroq &nbsp;tanishtirishga &nbsp;imkon &nbsp;beradi. &nbsp;O`yin &nbsp;bolalarning &nbsp;turli &nbsp;xil&nbsp;<br>\\nfaoliyati,o`yin &nbsp;ko`nikmalarini &nbsp;shakllantirishga &nbsp;yordam &nbsp;beradi.Ularni &nbsp;fikrlash, &nbsp;his-<br>\\ntuyg`ular, tajribalar, o`yin muammosini hal qilishning faol usullarini izlash, ularning&nbsp;<br>\\no`yin sharoitlari va sharoitlariga bo`ysunishi, o`yindagi bolalarning munosabatlari,&nbsp;<br>\\no`yin orqali bola organik rivojlanadi, &nbsp;inson madaniyatining muhim qatlami kattalar&nbsp;<br>\\no`rtasidagi &nbsp;munosabatlar &nbsp;- &nbsp;oilada, &nbsp;ularning &nbsp;kasbiy &nbsp;faoliyati &nbsp;va &nbsp;boshqalar. &nbsp;O`yin&nbsp;<br>\\no`qituvchilar barcha ta&rsquo;lim vazifalarini, shu jumladan o`rganishni hal qiladigan eng&nbsp;<br>\\nmuhim faoliyat sifatida foydalaniladi.&nbsp;</p>\",\n" +
" \"status\": 1,\n" + " \"status\": 1,\n" +
" \"createdAt\": 1652274681000,\n" + " \"createdAt\": 1662711279000,\n" +
" \"dmp\": {\n" + " \"dmp\": {\n" +
" \"id\": \"8a8368a5-59e9-4d53-aaab-723da2df2d3b\",\n" + " \"id\": \"9dee6e72-7a4c-4fbd-b8a4-1f8cda38eb5e\",\n" +
" \"label\": \"DMP_Advanced_Nitrogen_Recovery_from_Sludge_and_other_Organic_Waste_Materials_(NITRO)_0.xml\",\n" + " \"label\": \"test for demo\",\n" +
" \"grant\": \"Advanced Nitrogen Recovery from Sludge and other Organic Waste Materials (NITRO)\",\n" + " \"grant\": \"A next generation nano media tailored to capture and recycle hazardous micropollutants in contaminated industrial wastewater.\",\n" +
" \"createdAt\": 1652274679000,\n" + " \"createdAt\": 1662710691000,\n" +
" \"modifiedAt\": 1652276406000,\n" + " \"modifiedAt\": 1662713226000,\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"groupId\": \"5c3f8569-e3f2-4701-a5f0-8d8b2c07cc49\",\n" + " \"groupId\": \"adaa4e17-7375-45b8-b052-09edaeb6da86\",\n" +
" \"users\": [\n" + " \"users\": [\n" +
" {\n" + " {\n" +
" \"id\": \"4cb5671a-0575-4a50-878a-d1bdf59648a0\",\n" + " \"id\": \"33024e48-d528-45a5-8035-ea48641bd2f2\",\n" +
" \"name\": \"George Kalampokis\",\n" + " \"name\": \"DMP author\",\n" +
" \"role\": 0,\n" + " \"role\": 0,\n" +
" \"email\": \"gkfortests@gmail.com\",\n" + " \"email\": \"kanavou.p@gmail.com\",\n" +
" \"hint\": \"UserInfoListingModel\"\n" + " \"hint\": \"UserInfoListingModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"finalizedAt\": 1652276406000,\n" + " \"finalizedAt\": 1662713226000,\n" +
" \"publishedAt\": 1652276406000,\n" + " \"publishedAt\": 1662713226000,\n" +
" \"hint\": \"dataManagementPlanListingModel\"\n" + " \"hint\": \"dataManagementPlanListingModel\"\n" +
" },\n" + " },\n" +
" \"datasetProfileDefinition\": {\n" + " \"datasetProfileDefinition\": {\n" +
@ -199,11 +199,11 @@ public class PublicDatasetsDescriptionDocumentation extends BaseController {
" \"tags\": null,\n" + " \"tags\": null,\n" +
" \"externalDatasets\": [],\n" + " \"externalDatasets\": [],\n" +
" \"profile\": {\n" + " \"profile\": {\n" +
" \"id\": \"0b5b52f3-266a-45cf-8066-d1e5a70d65e1\",\n" + " \"id\": \"771283d7-a5be-4a93-bd3c-8b1883fe837c\",\n" +
" \"label\": \"Horizon 2020 (Devel Clone)\",\n" + " \"label\": \"Horizon Europe\",\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"modifiedAt\": 1652275258000,\n" + " \"modifiedAt\": 1662712928000,\n" +
" \"hint\": \"datasetOverviewModel\"\n" + " \"hint\": \"datasetOverviewModel\"\n" +
" }\n" + " }\n" +
"}"; "}";
@ -233,7 +233,7 @@ public class PublicDatasetsDescriptionDocumentation extends BaseController {
@ApiOperation(value = "This method is used to get the overview of a public dataset.", notes = getOverviewSinglePublicNotes) @ApiOperation(value = "This method is used to get the overview of a public dataset.", notes = getOverviewSinglePublicNotes)
@ApiResponses(value = {@ApiResponse( @ApiResponses(value = {@ApiResponse(
code = 200, code = 200,
message = "The following example is generated using id: *aefc0f61-f2a7-410d-80c6-d3737afc0cd4*", message = "The following example is generated using id: *ef7dfbdc-c5c1-46a7-a37b-c8d8692f1c0e*",
examples = @Example({@ExampleProperty( examples = @Example({@ExampleProperty(
value = getOverviewSinglePublicResponseExample, value = getOverviewSinglePublicResponseExample,
mediaType = APPLICATION_JSON_VALUE mediaType = APPLICATION_JSON_VALUE

110
dmp-backend/web/src/main/java/eu/eudat/publicapi/controllers/PublicDmpsDocumentation.java
View File

@ -57,29 +57,29 @@ public class PublicDmpsDocumentation extends BaseController {
" \"totalCount\": 2,\n" + " \"totalCount\": 2,\n" +
" \"data\": [\n" + " \"data\": [\n" +
" {\n" + " {\n" +
" \"id\": \"912d87de-fce9-48e0-84a7-d5499d10682d\",\n" + " \"id\": \"e9a73d77-adfa-4546-974f-4a4a623b53a8\",\n" +
" \"label\": \"Dmp For Project : 0/ANDRE\",\n" + " \"label\": \"Giorgos's DMP\",\n" +
" \"grant\": \"0/ANDRE\",\n" + " \"grant\": \"Novel EOSC services for Emerging Atmosphere, Underwater and Space Challenges\",\n" +
" \"createdAt\": 1554128271000,\n" + " \"createdAt\": 1579077317000,\n" +
" \"modifiedAt\": 1554128271000,\n" + " \"modifiedAt\": 1586444334000,\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"groupId\": \"764ec97d-2475-4a75-843f-d620cffbdc3f\",\n" + " \"groupId\": \"d949592d-f862-4b31-a43a-f5f70596df5e\",\n" +
" \"users\": [],\n" + " \"users\": [],\n" +
" \"finalizedAt\": 1554128271000,\n" + " \"finalizedAt\": 1586444334000,\n" +
" \"publishedAt\": 1554128271000,\n" + " \"publishedAt\": 1586444334000,\n" +
" \"hint\": \"dataManagementPlanListingModel\"\n" + " \"hint\": \"dataManagementPlanListingModel\"\n" +
" },\n" + " },\n" +
" {\n" + " {\n" +
" \"id\": \"43809706-0176-4d5c-b47c-c240ac5d874e\",\n" + " \"id\": \"e27789f1-de35-4b4a-9587-a46d131c366e\",\n" +
" \"label\": \"Dmp new version clone\",\n" + " \"label\": \"TestH2020Clone3\",\n" +
" \"grant\": \"SMAD\",\n" + " \"grant\": \"Evaluation of the Benefits of innovative Concepts of laminar nacelle and HTP installed on a business jet configuration\",\n" +
" \"createdAt\": 1539593145000,\n" + " \"createdAt\": 1600774437000,\n" +
" \"modifiedAt\": 1539593145000,\n" + " \"modifiedAt\": 1600879107000,\n" +
" \"version\": 2,\n" + " \"version\": 0,\n" +
" \"groupId\": \"536d9779-166e-4b55-ad3e-f93c06338598\",\n" + " \"groupId\": \"7b793c17-cb69-41d2-a97d-e8d1b03ddbed\",\n" +
" \"users\": [],\n" + " \"users\": [],\n" +
" \"finalizedAt\": 1539593145000,\n" + " \"finalizedAt\": 1600879107000,\n" +
" \"publishedAt\": 1539593145000,\n" + " \"publishedAt\": 1600879107000,\n" +
" \"hint\": \"dataManagementPlanListingModel\"\n" + " \"hint\": \"dataManagementPlanListingModel\"\n" +
" }\n" + " }\n" +
" ]\n" + " ]\n" +
@ -133,58 +133,58 @@ public class PublicDmpsDocumentation extends BaseController {
" \"responseType\": 0,\n" + " \"responseType\": 0,\n" +
" \"message\": null,\n" + " \"message\": null,\n" +
" \"payload\": {\n" + " \"payload\": {\n" +
" \"id\": \"912d87de-fce9-48e0-84a7-d5499d10682d\",\n" + " \"id\": \"e9a73d77-adfa-4546-974f-4a4a623b53a8\",\n" +
" \"label\": \"Dmp For Project : 0/ANDRE\",\n" + " \"label\": \"Giorgos's DMP\",\n" +
" \"profile\": null,\n" + " \"profile\": null,\n" +
" \"grant\": {\n" + " \"grant\": {\n" +
" \"id\": \"79d35744-3bf4-4178-8bb0-bbc7110788d5\",\n" + " \"id\": \"c8309ae5-4e56-43eb-aa5a-9950c24051fe\",\n" +
" \"label\": \"0/ANDRE\",\n" + " \"label\": \"Novel EOSC services for Emerging Atmosphere, Underwater and Space Challenges\",\n" +
" \"abbreviation\": null,\n" + " \"abbreviation\": null,\n" +
" \"description\": null,\n" + " \"description\": null,\n" +
" \"startDate\": null,\n" + " \"startDate\": null,\n" +
" \"endDate\": null,\n" + " \"endDate\": null,\n" +
" \"uri\": null,\n" + " \"uri\": null,\n" +
" \"funder\": {\n" + " \"funder\": {\n" +
" \"id\": \"baa92ce2-5ed8-4af0-8b9d-8eeabb8c3dbc\",\n" + " \"id\": \"25e76828-3539-4c66-9870-0ecea7a4d16e\",\n" +
" \"label\": \"0/ANDRE\",\n" + " \"label\": \"European Commission||EC\",\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"createdAt\": 1554128271000,\n" + " \"createdAt\": 1579077317000,\n" +
" \"modifiedAt\": 1554128271000,\n" + " \"modifiedAt\": 1586444334000,\n" +
" \"finalizedAt\": 1554128271000,\n" + " \"finalizedAt\": 1586444334000,\n" +
" \"organisations\": [],\n" + " \"organisations\": [],\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"groupId\": \"764ec97d-2475-4a75-843f-d620cffbdc3f\",\n" + " \"groupId\": \"d949592d-f862-4b31-a43a-f5f70596df5e\",\n" +
" \"datasets\": [\n" + " \"datasets\": [\n" +
" {\n" + " {\n" +
" \"id\": \"ac0bf9b2-5804-456c-a5eb-6f797f888a28\",\n" + " \"id\": \"853a24c3-def4-4978-985f-92e7fa57ef22\",\n" +
" \"label\": \"Dataset : Checks export order For Dmp : Dmp For Project : 0/ANDRE\",\n" + " \"label\": \"Giorgos's Dataset Desc\",\n" +
" \"reference\": null,\n" + " \"reference\": null,\n" +
" \"uri\": null,\n" + " \"uri\": null,\n" +
" \"description\": null,\n" + " \"description\": null,\n" +
" \"status\": 1,\n" + " \"status\": 1,\n" +
" \"createdAt\": 1554127718000,\n" + " \"createdAt\": 1579077532000,\n" +
" \"dmp\": {\n" + " \"dmp\": {\n" +
" \"id\": \"912d87de-fce9-48e0-84a7-d5499d10682d\",\n" + " \"id\": \"e9a73d77-adfa-4546-974f-4a4a623b53a8\",\n" +
" \"label\": \"Dmp For Project : 0/ANDRE\",\n" + " \"label\": \"Giorgos's DMP\",\n" +
" \"grant\": \"0/ANDRE\",\n" + " \"grant\": \"Novel EOSC services for Emerging Atmosphere, Underwater and Space Challenges\",\n" +
" \"createdAt\": 1554128271000,\n" + " \"createdAt\": 1579077317000,\n" +
" \"modifiedAt\": 1554128271000,\n" + " \"modifiedAt\": 1586444334000,\n" +
" \"version\": 0,\n" + " \"version\": 0,\n" +
" \"groupId\": \"764ec97d-2475-4a75-843f-d620cffbdc3f\",\n" + " \"groupId\": \"d949592d-f862-4b31-a43a-f5f70596df5e\",\n" +
" \"users\": [\n" + " \"users\": [\n" +
" {\n" + " {\n" +
" \"id\": \"e602dad2-2814-401b-b03f-ba05ba799bdc\",\n" + " \"id\": \"00476b4d-0491-44ca-b2fd-92e695062a48\",\n" +
" \"name\": \"Georgios Kolokythas\",\n" + " \"name\": \"OpenDMP OpenDMP\",\n" +
" \"role\": 0,\n" + " \"role\": 0,\n" +
" \"email\": \"iamgeorgioskolokythas@gmail.com\",\n" + " \"email\": \"opendmpeu@gmail.com\",\n" +
" \"hint\": \"UserInfoListingModel\"\n" + " \"hint\": \"UserInfoListingModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"finalizedAt\": 1554128271000,\n" + " \"finalizedAt\": 1586444334000,\n" +
" \"publishedAt\": 1554128271000,\n" + " \"publishedAt\": 1586444334000,\n" +
" \"hint\": \"dataManagementPlanListingModel\"\n" + " \"hint\": \"dataManagementPlanListingModel\"\n" +
" },\n" + " },\n" +
" \"datasetProfileDefinition\": {\n" + " \"datasetProfileDefinition\": {\n" +
@ -198,33 +198,37 @@ public class PublicDmpsDocumentation extends BaseController {
" \"tags\": null,\n" + " \"tags\": null,\n" +
" \"externalDatasets\": [],\n" + " \"externalDatasets\": [],\n" +
" \"profile\": {\n" + " \"profile\": {\n" +
" \"id\": \"01a85982-7cec-41c5-b1f1-74a646e0368b\",\n" + " \"id\": \"2a6e0835-349e-412c-9fcc-8e1298ce8a5a\",\n" +
" \"label\": \"Checks export order\",\n" + " \"label\": \"Horizon 2020\",\n" +
" \"hint\": null\n" + " \"hint\": null\n" +
" },\n" + " },\n" +
" \"modifiedAt\": 1554128182000,\n" + " \"modifiedAt\": 1579077898000,\n" +
" \"hint\": \"datasetOverviewModel\"\n" + " \"hint\": \"datasetOverviewModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"associatedProfiles\": [\n" + " \"associatedProfiles\": [\n" +
" {\n" + " {\n" +
" \"id\": \"01a85982-7cec-41c5-b1f1-74a646e0368b\",\n" + " \"id\": \"f41bd794-761d-4fe8-ab67-3a989d982c53\",\n" +
" \"label\": \"Checks export order\"\n" + " \"label\": \"Swedish Research Council\"\n" +
" },\n" +
" {\n" +
" \"id\": \"2a6e0835-349e-412c-9fcc-8e1298ce8a5a\",\n" +
" \"label\": \"Horizon 2020\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"researchers\": [],\n" + " \"researchers\": [],\n" +
" \"users\": [\n" + " \"users\": [\n" +
" {\n" + " {\n" +
" \"id\": \"e602dad2-2814-401b-b03f-ba05ba799bdc\",\n" + " \"id\": \"00476b4d-0491-44ca-b2fd-92e695062a48\",\n" +
" \"name\": \"Georgios Kolokythas\",\n" + " \"name\": \"OpenDMP OpenDMP\",\n" +
" \"role\": 0,\n" + " \"role\": 0,\n" +
" \"email\": \"iamgeorgioskolokythas@gmail.com\",\n" + " \"email\": \"opendmpeu@gmail.com\",\n" +
" \"hint\": \"UserInfoListingModel\"\n" + " \"hint\": \"UserInfoListingModel\"\n" +
" }\n" + " }\n" +
" ],\n" + " ],\n" +
" \"description\": \"Hello\",\n" + " \"description\": null,\n" +
" \"publishedAt\": 1554128271000,\n" + " \"publishedAt\": 1586444334000,\n" +
" \"doi\": null,\n" + " \"doi\": \"10.5072/zenodo.522151\",\n" +
" \"hint\": \"dataManagementPlanOverviewModel\"\n" + " \"hint\": \"dataManagementPlanOverviewModel\"\n" +
" }\n" + " }\n" +
"}"; "}";
@ -257,7 +261,7 @@ public class PublicDmpsDocumentation extends BaseController {
@ApiOperation(value = "This method is used to get the overview of a public dmp.", notes = getOverviewSinglePublicNotes) @ApiOperation(value = "This method is used to get the overview of a public dmp.", notes = getOverviewSinglePublicNotes)
@ApiResponses(value = {@ApiResponse( @ApiResponses(value = {@ApiResponse(
code = 200, code = 200,
message = "The following example is generated using id: *912d87de-fce9-48e0-84a7-d5499d10682d*", message = "The following example is generated using id: *e9a73d77-adfa-4546-974f-4a4a623b53a8*",
examples = @Example({@ExampleProperty( examples = @Example({@ExampleProperty(
value = getOverviewSinglePublicResponseExample, value = getOverviewSinglePublicResponseExample,
mediaType = APPLICATION_JSON_VALUE mediaType = APPLICATION_JSON_VALUE

5
dmp-backend/web/src/main/resources/config/application-devel.properties
View File

@ -85,6 +85,11 @@ zenodo.login.client_id=
zenodo.login.client_secret= zenodo.login.client_secret=
zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo zenodo.login.redirect_uri=http://localhost:4200/login/external/zenodo
############PUBLIC API CONFIGUARION###############
publicapi.host=devel.opendmp.eu
publicapi.basePath=/srv
publicapi.schema=https
#############CONTACT EMAIL CONFIGURATIONS######### #############CONTACT EMAIL CONFIGURATIONS#########
contact_email.mail= contact_email.mail=