From df5012db56c834214e03c6313e1fc4fcc662fef2 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Tue, 26 Jun 2018 17:24:56 +0200
Subject: [PATCH] Added properties field to UserDto and GroupDto

Previously, properties weren't mapped by mapstruct
---
 .../src/main/java/sonia/scm/api/v2/resources/GroupDto.java  | 6 +++++-
 .../src/main/java/sonia/scm/api/v2/resources/UserDto.java   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
index b3a54cf379..65dae5f5f1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/GroupDto.java
@@ -4,13 +4,15 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Links;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
-@Data @NoArgsConstructor
+@Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true)
 public class GroupDto extends HalRepresentation {
 
   private Instant creationDate;
@@ -19,6 +21,8 @@ public class GroupDto extends HalRepresentation {
   private Optional<Instant> lastModified;
   private String name;
   private String type;
+  private Map<String, String> properties;
+  private List<String> members;
 
   @Override
   protected HalRepresentation add(Links links) {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
index c79df01570..3a5b1271fd 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserDto.java
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.time.Instant;
+import java.util.Map;
 import java.util.Optional;
 
 @AllArgsConstructor @NoArgsConstructor
@@ -24,6 +25,7 @@ public class UserDto extends HalRepresentation {
   private String name;
   private String password;
   private String type;
+  private Map<String, String> properties;
 
   @Override
   @SuppressWarnings("squid:S1185") // We want to have this method available in this package