From 77394950df4139ffbd83a69b335645a8d541f82f Mon Sep 17 00:00:00 2001 From: Keerthi B L Date: Wed, 22 Jan 2025 11:19:56 +0530 Subject: [PATCH] fix(rest) : Add licenseInfoHeaderText in summaryAdministration api response --- .../sw360/rest/resourceserver/project/ProjectController.java | 4 +++- .../sw360/rest/resourceserver/restdocs/ProjectSpecTest.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java index 9050770317..634a68f8d6 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java @@ -2949,6 +2949,9 @@ public ResponseEntity> getAdministration( ) throws TException { User sw360User = restControllerHelper.getSw360UserFromAuthentication(); Project sw360Project = projectService.getProjectForUserById(id, sw360User); + if(sw360Project.getLicenseInfoHeaderText().isEmpty()){ + sw360Project.setLicenseInfoHeaderText(projectService.getLicenseInfoHeaderText()); + } Map sortedExternalURLs = CommonUtils.getSortedMap(sw360Project.getExternalUrls(), true); sw360Project.setExternalUrls(sortedExternalURLs); sw360Project.setReleaseIdToUsage(null); @@ -2961,7 +2964,6 @@ public ResponseEntity> getAdministration( sw360Project.unsetReleaseIdToUsage(); sw360Project.unsetProjectResponsible(); sw360Project.unsetSecurityResponsibles(); - sw360Project.unsetLicenseInfoHeaderText(); return new ResponseEntity<>(userHalResource, HttpStatus.OK); } diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java index c7910f8b3a..c30df66f91 100644 --- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java +++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java @@ -2451,6 +2451,7 @@ public void should_document_create_summary_administration() throws Exception { fieldWithPath("state").description("The project active status, possible values are: " + Arrays.asList(ProjectState.values())), fieldWithPath("phaseOutSince").description("The project phase-out date"), fieldWithPath("clearingRequestId").description("Clearing Request id associated with project."), + fieldWithPath("licenseInfoHeaderText").description("LicenseInfoHeaderText associated with project."), subsectionWithPath("externalUrls").description("A place to store additional data used by external URLs"), subsectionWithPath("_embedded.createdBy").description("The user who created this project"), subsectionWithPath("_embedded.projectResponsible").description("The project responsible displayed").type(JsonFieldType.OBJECT).optional(),