fix json map conversion in http proxy (ydb-platform#8508)

siarheivesialou · Sep 2, 2024 · 453fd76 · 453fd76
1 parent e1a64d9
commit 453fd76
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 16 deletions.
diff --git a/ydb/core/http_proxy/json_proto_conversion.h b/ydb/core/http_proxy/json_proto_conversion.h
@@ -147,59 +147,78 @@ inline void AddJsonObjectToProtoAsMap(
         const google::protobuf::Reflection* reflection,
         grpc::protobuf::Message* message,
         const JSON& jsonObject,
+        ui32 depth,
         std::function<const MAP(const JSON&)> extractMap,
-        std::function<const TString(const JSON&)> valueToString
+        std::function<const TString(const JSON&)> valueToString,
+        std::function<void(const JSON&, grpc::protobuf::Message*, ui32)> jsonObjectToMessage
 ) {
     const auto& protoMap = reflection->GetMutableRepeatedFieldRef<google::protobuf::Message>(message, fieldDescriptor);
     for (const auto& [key, value] : extractMap(jsonObject)) {
-        std::unique_ptr<google::protobuf::Message> stringStringEntry(
+        std::unique_ptr<google::protobuf::Message> mapEntry(
             google::protobuf::MessageFactory::generated_factory()
                 ->GetPrototype(fieldDescriptor->message_type())
                 ->New(message->GetArena())
         );
-        stringStringEntry
+        mapEntry
             ->GetReflection()
-            ->SetString(stringStringEntry.get(), fieldDescriptor->message_type()->field(0), key);
-        stringStringEntry
-            ->GetReflection()
-            ->SetString(stringStringEntry.get(), fieldDescriptor->message_type()->field(1), valueToString(value));
-        protoMap.Add(*stringStringEntry);
+            ->SetString(mapEntry.get(), fieldDescriptor->message_type()->field(0), key);
+
+        auto valueField = fieldDescriptor->message_type()->field(1);
+        if (valueField->cpp_type() == google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
+            auto *msg = mapEntry->GetReflection()->MutableMessage(mapEntry.get(), valueField);
+            jsonObjectToMessage(value, msg, depth);
+        } else if (valueField->cpp_type() == google::protobuf::FieldDescriptor::CPPTYPE_STRING) {
+            mapEntry->GetReflection()->SetString(mapEntry.get(), valueField, valueToString(value));
+        } else {
+            throw NKikimr::NSQS::TSQSException(NKikimr::NSQS::NErrors::INVALID_PARAMETER_VALUE)
+                << "Only String and Object can be converted to protobuf map";
+        }
+        protoMap.Add(std::move(*mapEntry));
     }
 }
 
+void JsonToProto(const NJson::TJsonValue& jsonValue, NProtoBuf::Message* message, ui32 depth = 0);
+
 inline void AddJsonObjectToProtoAsMap(
         const google::protobuf::FieldDescriptor* fieldDescriptor,
         const google::protobuf::Reflection* reflection,
         grpc::protobuf::Message* message,
-        const NJson::TJsonValue& jsonObject
+        const NJson::TJsonValue& jsonObject,
+        ui32 depth
 ) {
     AddJsonObjectToProtoAsMap<NJson::TJsonValue, NJson::TJsonValue::TMapType>(
         fieldDescriptor,
         reflection,
         message,
         jsonObject,
+        depth,
         [](auto& json) { return json.GetMap(); },
-        [](auto& value) -> const TString { return value.GetString(); }
+        [](auto& value) -> const TString { return value.GetString(); },
+        [](auto& json, auto message, auto depth) { JsonToProto(json, message, depth);  }
     );
 }
+void NlohmannJsonToProto(const nlohmann::json& jsonValue, NProtoBuf::Message* message, ui32 depth = 0);
 
 inline void AddJsonObjectToProtoAsMap(
     const google::protobuf::FieldDescriptor* fieldDescriptor,
     const google::protobuf::Reflection* reflection,
     grpc::protobuf::Message* message,
-    const nlohmann::basic_json<>& jsonObject
+    const nlohmann::basic_json<>& jsonObject,
+    ui32 depth
 ) {
     AddJsonObjectToProtoAsMap<nlohmann::basic_json<>, std::map<TString, nlohmann::basic_json<>>>(
         fieldDescriptor,
         reflection,
         message,
         jsonObject,
+        depth,
         [](auto& json) { return json.template get<std::map<TString, nlohmann::basic_json<>>>(); },
-        [](auto& value) -> const TString { return value.template get<TString>(); }
+        [](auto& value) -> const TString { return value.template get<TString>(); },
+        [](auto& json, auto message, auto depth) { NlohmannJsonToProto(json, message, depth);  }
     );
 }
 
-inline void JsonToProto(const NJson::TJsonValue& jsonValue, NProtoBuf::Message* message, ui32 depth = 0) {
+inline void JsonToProto(const NJson::TJsonValue& jsonValue, NProtoBuf::Message* message, ui32 depth) {
     Y_ENSURE(depth < 101, "Json depth is > 100");
     Y_ENSURE_EX(
         !jsonValue.IsNull(),
@@ -348,7 +367,7 @@ inline void JsonToProto(const NJson::TJsonValue& jsonValue, NProtoBuf::Message*
                             break;
                         case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
                             if (fieldDescriptor->is_map()) {
-                                AddJsonObjectToProtoAsMap(fieldDescriptor, reflection, message, value);
+                                AddJsonObjectToProtoAsMap(fieldDescriptor, reflection, message, value, depth + 1);
                             } else {
                                 auto *msg = reflection->MutableMessage(message, fieldDescriptor);
                                 JsonToProto(value, msg, depth + 1);
@@ -366,7 +385,7 @@ inline void JsonToProto(const NJson::TJsonValue& jsonValue, NProtoBuf::Message*
     }
 }
 
-inline void NlohmannJsonToProto(const nlohmann::json& jsonValue, NProtoBuf::Message* message, ui32 depth = 0) {
+inline void NlohmannJsonToProto(const nlohmann::json& jsonValue, NProtoBuf::Message* message, ui32 depth) {
     Y_ENSURE(depth < 101, "Json depth is > 100");
     Y_ENSURE_EX(
         !jsonValue.is_null(),
@@ -518,7 +537,7 @@ inline void NlohmannJsonToProto(const nlohmann::json& jsonValue, NProtoBuf::Mess
                             break;
                         case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: {
                             if (fieldDescriptor->is_map()) {
-                                AddJsonObjectToProtoAsMap(fieldDescriptor, reflection, message, value);
+                                AddJsonObjectToProtoAsMap(fieldDescriptor, reflection, message, value, depth);
                             } else {
                                 auto *msg = reflection->MutableMessage(message, fieldDescriptor);
                                 NlohmannJsonToProto(value, msg, depth + 1);

diff --git a/ydb/core/http_proxy/ut/http_proxy_ut.h b/ydb/core/http_proxy/ut/http_proxy_ut.h
@@ -1885,6 +1885,15 @@ Y_UNIT_TEST_SUITE(TestHttpProxy) {
         message0["MessageBody"] = "MessageBody-0";
         message0["MessageDeduplicationId"] = "MessageDeduplicationId-0";
 
+        NJson::TJsonValue delaySeconds;
+        delaySeconds["StringValue"] = "1";
+        delaySeconds["DataType"] = "String";
+
+        NJson::TJsonValue attributes;
+        attributes["DelaySeconds"] = delaySeconds;
+
+        message0["MessageAttributes"] = attributes;
+
         NJson::TJsonValue message1;
         message1["Id"] = "Id-1";
         message1["MessageBody"] = "MessageBody-1";
@@ -1902,6 +1911,7 @@ Y_UNIT_TEST_SUITE(TestHttpProxy) {
         UNIT_ASSERT(json["Successful"].GetArray().size() == 2);
         auto succesful0 = json["Successful"][0];
         UNIT_ASSERT(succesful0["Id"] == "Id-0");
+        UNIT_ASSERT(!GetByPath<TString>(succesful0, "Md5OfMessageAttributes").empty());
         UNIT_ASSERT(!GetByPath<TString>(succesful0, "Md5OfMessageBody").empty());
         UNIT_ASSERT(!GetByPath<TString>(succesful0, "MessageId").empty());
     }

diff --git a/ydb/services/ymq/ymq_proxy.cpp b/ydb/services/ymq/ymq_proxy.cpp
@@ -819,6 +819,7 @@ namespace NKikimr::NYmq::V1 {
                 } else {
                     auto currentSuccessful = result.Addsuccessful();
                     currentSuccessful->Setid(entry.GetId());
+                    currentSuccessful->Setmd5_of_message_attributes(entry.GetMD5OfMessageAttributes());
                     currentSuccessful->Setmd5_of_message_body(entry.GetMD5OfMessageBody());
                     currentSuccessful->Setmessage_id(entry.GetMessageId());
                     currentSuccessful->Setsequence_number(std::to_string(entry.GetSequenceNumber()));