Workaround to return non-string values, according to the specified DataType.

Summary

Workaround to return non-string values, according to the specified DataType.

Focus

The code has many if-then instructions, which makes it complicated to read. The most important question is: Have I gotten them all correctly?

Test Environment

• ./bin/cxxcaosdbcli -> should return a valid Double for the price.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related Issues https://gitlab.indiscale.com/caosdb/customers/lfpb/management/-/issues/397
• Up-to-date CHANGELOG.md
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

include/caosdb/entity.h

@@ -454,7 +454,9 @@ class Property {
 public:
   explicit inline Property(ProtoProperty *other)
     : value(Value(other->mutable_value())), data_type(DataType(other->mutable_data_type())),
-      wrapped(other){};
+      wrapped(other) {
+    FixValue();
+  };
   Property();
 
   /**
@@ -551,6 +553,12 @@ public:
   friend class RepeatedPtrFieldWrapper<Property, ProtoProperty>;
 
 private:
+  /**
+   * Workaround until non-string values are supported by the server.
+   *
+   * Only has an effect if there is a DataType.
+   */
+  auto FixValue() -> void;
   static auto CreateProtoProperty() -> ProtoProperty *;
   Value value;
   DataType data_type;
@@ -602,6 +610,7 @@ public:
     errors.wrapped = CreateMessagesField();
     warnings.wrapped = CreateMessagesField();
     infos.wrapped = CreateMessagesField();
+    FixValue();
   };
   explicit Entity(IdResponse *id_response);
   explicit Entity(ProtoEntity *other)
@@ -614,11 +623,13 @@ public:
     errors.wrapped = CreateMessagesField();
     warnings.wrapped = CreateMessagesField();
     infos.wrapped = CreateMessagesField();
+    FixValue();
   };
   explicit inline Entity(EntityResponse *response) : Entity(response->release_entity()) {
     errors.wrapped->Swap(response->mutable_errors());
     warnings.wrapped->Swap(response->mutable_warnings());
     infos.wrapped->Swap(response->mutable_infos());
+    FixValue();
   };
 
   [[nodiscard]] inline auto GetId() const noexcept -> const std::string & { return wrapped->id(); };
@@ -744,6 +755,13 @@ private:
   auto SetId(const std::string &id) -> void;
   auto SetVersionId(const std::string &id) -> void;
 
+  /**
+   * Workaround until non-string values are supported by the server.
+   *
+   * Only has an effect if there is a DataType.
+   */
+  auto FixValue() -> void;
+
 private:
   FileDescriptor file_descriptor;
   ProtoEntity *wrapped;

[Daniel Hornung]

I call FixValue() in every constructor. It should quit gracefully if there are no values or datatypes.