Add createDataStream, unit tests

Author: MichaelElmore1

CSAPI-lib/CSAPI-lib.vcxproj

@@ -136,15 +136,18 @@
     <ClInclude Include="APIResponse.h" />
     <ClInclude Include="ConnectedSystemsAPI.h" />
     <ClInclude Include="DataModels\Component\Boolean.h" />
+    <ClInclude Include="DataModels\Component\BooleanBuilder.h" />
     <ClInclude Include="DataModels\Component\Category.h" />
     <ClInclude Include="DataModels\Component\CategoryRange.h" />
     <ClInclude Include="DataModels\Component\Count.h" />
     <ClInclude Include="DataModels\Component\CountRange.h" />
     <ClInclude Include="DataModels\Component\DataArray.h" />
     <ClInclude Include="DataModels\Component\DataChoice.h" />
     <ClInclude Include="DataModels\Component\DataComponent.h" />
+    <ClInclude Include="DataModels\Component\DataComponentBuilder.h" />
     <ClInclude Include="DataModels\Component\DataComponentRegistry.h" />
     <ClInclude Include="DataModels\Component\DataRecord.h" />
+    <ClInclude Include="DataModels\Component\DataRecordBuilder.h" />
     <ClInclude Include="DataModels\Component\NilValue.h" />
     <ClInclude Include="DataModels\Component\Quantity.h" />
     <ClInclude Include="DataModels\Component\QuantityRange.h" />
@@ -156,8 +159,10 @@
     <ClInclude Include="DataModels\Component\UnitOfMeasure.h" />
     <ClInclude Include="DataModels\Component\Vector.h" />
     <ClInclude Include="DataModels\DataStream.h" />
+    <ClInclude Include="DataModels\DataStreamBuilder.h" />
     <ClInclude Include="DataModels\Link.h" />
     <ClInclude Include="DataModels\ObservationSchema.h" />
+    <ClInclude Include="DataModels\ObservationSchemaBuilder.h" />
     <ClInclude Include="DataModels\ObservedProperty.h" />
     <ClInclude Include="DataModels\Properties.h" />
     <ClInclude Include="DataModels\PropertiesBuilder.h" />

CSAPI-lib/CSAPI-lib.vcxproj.filters

@@ -153,5 +153,20 @@
     <ClInclude Include="Util\JsonUtils.h">
       <Filter>Header Files\Util</Filter>
     </ClInclude>
+    <ClInclude Include="DataModels\DataStreamBuilder.h">
+      <Filter>Header Files\DataModels</Filter>
+    </ClInclude>
+    <ClInclude Include="DataModels\ObservationSchemaBuilder.h">
+      <Filter>Header Files\DataModels</Filter>
+    </ClInclude>
+    <ClInclude Include="DataModels\Component\DataComponentBuilder.h">
+      <Filter>Header Files\DataModels\Component</Filter>
+    </ClInclude>
+    <ClInclude Include="DataModels\Component\DataRecordBuilder.h">
+      <Filter>Header Files\DataModels\Component</Filter>
+    </ClInclude>
+    <ClInclude Include="DataModels\Component\BooleanBuilder.h">
+      <Filter>Header Files\DataModels\Component</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

CSAPI-lib/DataModels/Component/BooleanBuilder.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <optional>
+
+#include "Boolean.h"
+#include "DataComponentBuilder.h"
+
+namespace ConnectedSystemsAPI {
+	namespace DataModels {
+		namespace Component {
+			class BooleanBuilder : public DataComponentBuilder<BooleanBuilder, Boolean> {
+			private:
+				std::optional<bool> value;
+
+				void validate() const {
+					this->validateBase();
+				}
+
+			public:
+				BooleanBuilder() = default;
+
+				BooleanBuilder& withValue(std::optional<bool> v) { value = std::move(v); return *this; }
+				BooleanBuilder& withValue(bool v) { value = v; return *this; }
+				BooleanBuilder& clearValue() { value.reset(); return *this; }
+
+				Boolean build() {
+					validate();
+
+					Boolean b;
+					this->applyBase(b);
+
+					if (value) b.setValue(value);
+
+					return b;
+				}
+			};
+		}
+	}
+}

CSAPI-lib/DataModels/Component/DataComponentBuilder.h

@@ -0,0 +1,59 @@
+#pragma once
+
+#include <string>
+#include <optional>
+#include <stdexcept>
+
+#include "DataComponent.h"
+
+namespace ConnectedSystemsAPI {
+	namespace DataModels {
+		namespace Component {
+			template<typename Derived, typename Target>
+			class DataComponentBuilder {
+			protected:
+				std::string type;
+				std::optional<std::string> id;
+				std::optional<std::string> name;
+				std::optional<std::string> label;
+				std::optional<std::string> description;
+				std::optional<bool> updatable;
+				std::optional<bool> optional;
+				std::optional<std::string> definition;
+
+				Derived& self() noexcept { return *reinterpret_cast<Derived*>(this); }
+				const Derived& self() const noexcept { return *reinterpret_cast<const Derived*>(this); }
+
+			public:
+				DataComponentBuilder() = default;
+
+				// Fluent setters for DataComponent base properties
+				Derived& withType(const std::string& v) { type = v; return self(); }
+				Derived& withId(const std::string& v) { id = v; return self(); }
+				Derived& withName(const std::string& v) { name = v; return self(); }
+				Derived& withLabel(const std::string& v) { label = v; return self(); }
+				Derived& withDescription(const std::string& v) { description = v; return self(); }
+				Derived& withUpdatable(bool v) { updatable = v; return self(); }
+				Derived& withOptional(bool v) { optional = v; return self(); }
+				Derived& withDefinition(const std::string& v) { definition = v; return self(); }
+
+			protected:
+				void validateBase() const {
+					if (type.empty())
+						throw std::runtime_error("DataComponentBuilder: type is required.");
+				}
+
+				void applyBase(Target& target) const {
+					if (!type.empty()) target.setType(type);
+					if (name) target.setName(name);
+					if (id) target.setId(id);
+					if (label) target.setLabel(label);
+					if (description) target.setDescription(description);
+					if (updatable) target.setUpdatable(updatable);
+					if (optional) target.setOptional(optional);
+					if (definition) target.setDefinition(definition);
+				}
+			};
+		}
+	}
+}

CSAPI-lib/DataModels/Component/DataComponentRegistry.h

@@ -1,8 +1,10 @@
 #pragma once
 
+#include <iostream>
 #include <string>
 #include <unordered_map>
 #include <nlohmann/json.hpp>
+
 #include "DataComponent.h"
 
 namespace ConnectedSystemsAPI {

CSAPI-lib/DataModels/Component/DataRecordBuilder.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <vector>
+#include <memory>
+#include <stdexcept>
+
+#include "DataRecord.h"
+#include "DataComponentBuilder.h"
+
+namespace ConnectedSystemsAPI {
+	namespace DataModels {
+		namespace Component {
+			class DataRecordBuilder : public DataComponentBuilder<DataRecordBuilder, DataRecord> {
+			private:
+				std::vector<std::unique_ptr<DataComponent>> fields;
+
+				void validate() const {
+					this->validateBase();
+
+					for (const auto& field : fields) {
+						if (field)
+							field->validate();
+						else
+							throw std::runtime_error("DataRecordBuilder: fields cannot contain null pointers.");
+					}
+				}
+
+			public:
+				DataRecordBuilder() = default;
+
+				DataRecordBuilder& withFields(std::vector<std::unique_ptr<DataComponent>> f) { fields = std::move(f); return *this; }
+				DataRecordBuilder& addField(std::unique_ptr<DataComponent> field) { if (field) fields.push_back(std::move(field)); return *this; }
+				DataRecordBuilder& clearFields() { fields.clear(); return *this; }
+
+				DataRecord build() {
+					validate();
+
+					DataRecord r;
+					this->applyBase(r);
+					r.setFields(std::move(fields));
+
+					return r;
+				}
+			};
+		}
+	}
+}