Adding color, description in labels graphql apis

kamaleshnneerasa · kamaleshnneerasa · commit 199486c6ce3c · 2021-11-16T12:29:12.000+05:30
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java
@@ -1,5 +1,6 @@
 package org.hypertrace.graphql.label.dao;
 
+import java.util.Objects;
 import org.hypertrace.graphql.label.request.LabelCreateRequest;
 import org.hypertrace.graphql.label.request.LabelUpdateRequest;
 import org.hypertrace.label.config.service.v1.CreateLabelRequest;
@@ -8,15 +9,27 @@
 
 public class LabelRequestConverter {
   CreateLabelRequest convertCreationRequest(LabelCreateRequest creationRequest) {
-    return CreateLabelRequest.newBuilder()
-        .setData(LabelData.newBuilder().setKey(creationRequest.label().key()).build())
-        .build();
+    LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(creationRequest.label().key());
+    if (Objects.nonNull(creationRequest.label().color())) {
+      dataBuilder.setColor(Objects.requireNonNull(creationRequest.label().color()));
+    }
+    if (Objects.nonNull(creationRequest.label().description())) {
+      dataBuilder.setDescription(Objects.requireNonNull(creationRequest.label().description()));
+    }
+    return CreateLabelRequest.newBuilder().setData(dataBuilder.build()).build();
   }
 
   UpdateLabelRequest convertUpdateRequest(LabelUpdateRequest updateRequest) {
+    LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(updateRequest.label().key());
+    if (Objects.nonNull(updateRequest.label().color())) {
+      dataBuilder.setColor(Objects.requireNonNull(updateRequest.label().color()));
+    }
+    if (Objects.nonNull(updateRequest.label().description())) {
+      dataBuilder.setDescription(Objects.requireNonNull(updateRequest.label().description()));
+    }
     return UpdateLabelRequest.newBuilder()
         .setId(updateRequest.label().id())
-        .setData(LabelData.newBuilder().setKey(updateRequest.label().key()).build())
+        .setData(dataBuilder.build())
         .build();
   }
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java
@@ -25,18 +25,40 @@ Single<LabelResultSet> convert(GetLabelsResponse response) {
   Single<List<Label>> convertToLabelList(GetLabelsResponse response) {
     return Single.just(
         response.getLabelsList().stream()
-            .map(label -> new DefaultLabel(label.getId(), label.getData().getKey()))
+            .map(
+                label ->
+                    new DefaultLabel(
+                        label.getId(),
+                        label.getData().getKey(),
+                        label.getData().hasColor() ? label.getData().getColor() : null,
+                        label.getData().hasDescription() ? label.getData().getDescription() : null))
             .collect(Collectors.toUnmodifiableList()));
   }
 
   Single<Label> convertLabel(CreateLabelResponse response) {
     return Single.just(
-        new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
+        new DefaultLabel(
+            response.getLabel().getId(),
+            response.getLabel().getData().getKey(),
+            response.getLabel().getData().hasColor()
+                ? response.getLabel().getData().getColor()
+                : null,
+            response.getLabel().getData().hasDescription()
+                ? response.getLabel().getData().getDescription()
+                : null));
   }
 
   Single<Label> convertUpdateLabel(UpdateLabelResponse response) {
     return Single.just(
-        new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
+        new DefaultLabel(
+            response.getLabel().getId(),
+            response.getLabel().getData().getKey(),
+            response.getLabel().getData().hasColor()
+                ? response.getLabel().getData().getColor()
+                : null,
+            response.getLabel().getData().hasDescription()
+                ? response.getLabel().getData().getDescription()
+                : null));
   }
 
   @Value
@@ -52,5 +74,7 @@ private static class DefaultLabelResultSet implements LabelResultSet {
   private static class DefaultLabel implements Label {
     String id;
     String key;
+    String color;
+    String description;
   }
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java
@@ -33,5 +33,11 @@ public List<Module> jacksonModules() {
   private static class CreateLabelArgument implements CreateLabel {
     @JsonProperty(KEY)
     String key;
+
+    @JsonProperty(COLOR_KEY)
+    String color;
+
+    @JsonProperty(DESCRIPTION_KEY)
+    String description;
   }
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java
@@ -36,5 +36,11 @@ private static class LabelArgument implements Label {
 
     @JsonProperty(KEY)
     String key;
+
+    @JsonProperty(COLOR_KEY)
+    String color;
+
+    @JsonProperty(DESCRIPTION_KEY)
+    String description;
   }
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/Label.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/Label.java
@@ -3,16 +3,29 @@
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
+import javax.annotation.Nullable;
 import org.hypertrace.core.graphql.common.schema.id.Identifiable;
 
 @GraphQLName(Label.TYPE_NAME)
 public interface Label extends Identifiable {
   String TYPE_NAME = "Label";
   String ARGUMENT_NAME = "label";
   String KEY = "key";
+  String COLOR_KEY = "color";
+  String DESCRIPTION_KEY = "description";
 
   @GraphQLField
   @GraphQLNonNull
   @GraphQLName(KEY)
   String key();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(COLOR_KEY)
+  String color();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(DESCRIPTION_KEY)
+  String description();
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java
@@ -3,15 +3,28 @@
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
+import javax.annotation.Nullable;
 
 @GraphQLName(CreateLabel.TYPE_NAME)
 public interface CreateLabel {
   String TYPE_NAME = "CreateLabel";
   String ARGUMENT_NAME = "label";
   String KEY = "key";
+  String COLOR_KEY = "color";
+  String DESCRIPTION_KEY = "description";
 
   @GraphQLField
   @GraphQLNonNull
   @GraphQLName(KEY)
   String key();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(COLOR_KEY)
+  String color();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(DESCRIPTION_KEY)
+  String description();
 }

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,11 @@ public List<Module> jacksonModules() {`
`33`	`33`	`private static class CreateLabelArgument implements CreateLabel {`
`34`	`34`	`@JsonProperty(KEY)`
`35`	`35`	`String key;`
	`36`	`+`
	`37`	`+ @JsonProperty(COLOR_KEY)`
	`38`	`+ String color;`
	`39`	`+`
	`40`	`+ @JsonProperty(DESCRIPTION_KEY)`
	`41`	`+ String description;`
`36`	`42`	`}`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,11 @@ private static class LabelArgument implements Label {`
`36`	`36`
`37`	`37`	`@JsonProperty(KEY)`
`38`	`38`	`String key;`
	`39`	`+`
	`40`	`+ @JsonProperty(COLOR_KEY)`
	`41`	`+ String color;`
	`42`	`+`
	`43`	`+ @JsonProperty(DESCRIPTION_KEY)`
	`44`	`+ String description;`
`39`	`45`	`}`
`40`	`46`	`}`