template rest: return template content on list, add ownerResourceId

liimaorg · Jul 22, 2021 · afcae50 · afcae50
1 parent 63ae39d
commit afcae50
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/TemplateDTO.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/dtos/TemplateDTO.java
@@ -40,6 +40,7 @@ public class TemplateDTO {
 
     private Integer id;
     private String relatedResourceIdentifier;
+    private Integer ownerResourceId;
     private String name;
     private String targetPath;
     private Set<String> targetPlatforms;
@@ -48,10 +49,13 @@ public class TemplateDTO {
     public TemplateDTO(TemplateDescriptorEntity template){
         this.id = template.getId();
         this.relatedResourceIdentifier = template.getRelatedResourceIdentifier();
+        if (template.getOwnerResource() != null) {
+            this.ownerResourceId = template.getOwnerResource().getId();
+        }
         this.name = template.getName();
         this.targetPath = template.getTargetPath();
         targetPlatforms = new HashSet<>();
-        if(template.getTargetPlatforms() != null) {
+        if (template.getTargetPlatforms() != null) {
             for (ResourceGroupEntity pf : template.getTargetPlatforms()) {
                 targetPlatforms.add(pf.getName());
             }

diff --git a/...rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java b/...rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceRelationTemplatesRest.java
@@ -78,7 +78,6 @@ public List<TemplateDTO> getResourceRelationTemplates(@PathParam("resourceGroupN
         List<TemplateDTO> templateDTOs = new ArrayList<>();
         for (TemplateDescriptorEntity template : templates) {
             TemplateDTO temp = new TemplateDTO(template);
-            temp.setFileContent(null);
             templateDTOs.add(temp);
         }
         return templateDTOs;

diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/resources/ResourceTemplatesRest.java
@@ -73,7 +73,6 @@ public List<TemplateDTO> getResourceTemplates(@PathParam("resourceGroupName") St
 
         for (TemplateDescriptorEntity template : templates) {
             TemplateDTO temp = new TemplateDTO(template);
-            temp.setFileContent(null);
             templateDTOs.add(temp);
         }
         return templateDTOs;