Merge pull request eclipse-sw360#1980 from siemens/fix/projDescription

fix(rest): Add Description field for myProjects and myComponents. Reviewed by: [email protected] Tested by: [email protected]
Siemens-Healthineers · Jun 12, 2023 · 444d214 · 444d214
2 parents 9c8b759 + bada732
commit 444d214
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...erver/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java b/...erver/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java
@@ -252,7 +252,6 @@ static abstract class EmbeddedProjectMixin extends ProjectMixin {
             abstract public boolean isEnableVulnerabilitiesDisplay();
 
             @Override
-            @JsonIgnore
             abstract public ProjectState getState();
         }
 

diff --git a/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -501,7 +501,11 @@ public Project convertToEmbeddedProject(Project project) {
         Project embeddedProject = new EmbeddedProject();
         embeddedProject.setName(project.getName());
         embeddedProject.setId(project.getId());
+        embeddedProject.setDescription(project.getDescription());
+        embeddedProject.setProjectResponsible(project.getProjectResponsible());
         embeddedProject.setProjectType(project.getProjectType());
+        embeddedProject.setState(project.getState());
+        embeddedProject.setClearingState(project.getClearingState());
         embeddedProject.setVersion(project.getVersion());
         embeddedProject.setVisbility(project.getVisbility());
         embeddedProject.setType(null);
@@ -521,6 +525,7 @@ public Component convertToEmbeddedComponent(Component component) {
         Component embeddedComponent = new Component();
         embeddedComponent.setId(component.getId());
         embeddedComponent.setName(component.getName());
+        embeddedComponent.setDescription(component.getDescription());
         embeddedComponent.setComponentType(component.getComponentType());
         embeddedComponent.setVisbility(component.getVisbility());
         embeddedComponent.setMainLicenseIds(component.getMainLicenseIds());