Finished settings wrapper

Source/ConfigCat/Private/Wrapper/ConfigCatPercentageOptionsWrapper.cpp

@@ -0,0 +1,4 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "Wrapper/ConfigCatPercentageOptionsWrapper.h"

Source/ConfigCat/Private/Wrapper/ConfigCatTargetingRuleWrapper.cpp

@@ -0,0 +1,9 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "Wrapper/ConfigCatTargetingRulesWrapper.h"
+
+UConfigCatTargetingRulesWrapper* UConfigCatTargetingRulesWrapper::CreateTargetingRules(const configcat::TargetingRules& InPercentageOptions)
+{
+	return {};
+}

Source/ConfigCat/Private/Wrapper/ConfigCatSettingsWrapper.cpp → Source/ConfigCat/Private/Wrappers/ConfigCatSettingsWrapper.cpp

@@ -1,6 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "Wrapper/ConfigCatSettingsWrapper.h"
+#include "Wrappers/ConfigCatSettingsWrapper.h"
+
+#include "Wrapper/ConfigCatPercentageOptionsWrapper.h"
+#include "Wrapper/ConfigCatTargetingRulesWrapper.h"
+#include "Wrappers/ConfigCatValueWrapper.h"
 
 using namespace configcat;
 
@@ -41,10 +45,25 @@ FString UConfigCatSettingWrapper::GetVariationId() const
 	return {};
 }
 
+UConfigCatValueWrapper* UConfigCatSettingWrapper::GetValue() const
+{
+	return UConfigCatValueWrapper::CreateValue(Setting.value);
+}
+
+UConfigCatTargetingRulesWrapper* UConfigCatSettingWrapper::GetTargetingRules() const
+{
+	return UConfigCatTargetingRulesWrapper::CreateTargetingRules(Setting.targetingRules);
+}
+
+UConfigCatPercentageOptionsWrapper* UConfigCatSettingWrapper::GetPercentageOptions() const
+{
+	return UConfigCatPercentageOptionsWrapper::CreatePercentageOptions(Setting.percentageOptions);
+}
+
 UConfigCatSettingsWrapper* UConfigCatSettingsWrapper::CreateSettings(const std::shared_ptr<const configcat::Settings>& InSettings)
 {
 	UConfigCatSettingsWrapper* Result = NewObject<UConfigCatSettingsWrapper>();
-	Result->SetSettings(InSettings);
+	Result->Settings = InSettings;
 	return Result;
 }
 
@@ -63,9 +82,4 @@ TMap<FString, UConfigCatSettingWrapper*> UConfigCatSettingsWrapper::GetSettings(
 	}
 
 	return Result;
-}
-
-void UConfigCatSettingsWrapper::SetSettings(const std::shared_ptr<const configcat::Settings>& InSettings)
-{
-	Settings = InSettings;
 }

Source/ConfigCat/Public/Wrapper/ConfigCatPercentageOptionsWrapper.h

@@ -0,0 +1,22 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "ConfigCatCppSDK/Include/config.h"
+#include "UObject/Object.h"
+#include "ConfigCatPercentageOptionsWrapper.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class CONFIGCAT_API UConfigCatPercentageOptionsWrapper : public UObject
+{
+	GENERATED_BODY()
+
+
+public:
+	static UConfigCatPercentageOptionsWrapper* CreatePercentageOptions(const configcat::PercentageOptions& InPercentageOptions);
+
+};

Source/ConfigCat/Public/Wrapper/ConfigCatTargetingRulesWrapper.h

@@ -0,0 +1,21 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "ConfigCatCppSDK/Include/config.h"
+#include "UObject/Object.h"
+#include "ConfigCatTargetingRulesWrapper.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class CONFIGCAT_API UConfigCatTargetingRulesWrapper : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	static UConfigCatTargetingRulesWrapper* CreateTargetingRules(const configcat::TargetingRules& InPercentageOptions);
+};
+

Source/ConfigCat/Public/Wrapper/ConfigCatSettingsWrapper.h → Source/ConfigCat/Public/Wrappers/ConfigCatSettingsWrapper.h

@@ -8,45 +8,53 @@
 
 #include "ConfigCatSettingsWrapper.generated.h"
 
-UENUM()
-enum EConfigCatSettingTypeWrapper
+class UConfigCatPercentageOptionsWrapper;
+class UConfigCatTargetingRulesWrapper;
+class UConfigCatValueWrapper;
+
+UENUM(BlueprintType)
+enum EConfigCatSettingTypeWrapper : uint8
 {
 	Boolean = 0,
 	String = 1,
 	Int = 2,
 	Double = 3,
 };
 
-UCLASS(DisplayName="Config Cat Settings", Hidden)
+UCLASS(DisplayName="Config Cat Setting", Hidden)
 class UConfigCatSettingWrapper : public UObject 
 {
 	GENERATED_BODY()
 
 public:
 	static UConfigCatSettingWrapper* CreateSetting(const configcat::Setting& InSetting);
 
+	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
+	FString GetVariationId() const;
+
+	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
+	FString GetPercentageOptionsAttribute() const;
+
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
 	bool HasInvalidType() const;
 
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
 	EConfigCatSettingTypeWrapper GetType() const;
 
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
-	FString GetPercentageOptionsAttribute() const;
+	UConfigCatValueWrapper* GetValue() const;
 
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
-	FString GetVariationId() const;
+	UConfigCatTargetingRulesWrapper* GetTargetingRules() const;
 
-	//TODO: add these:
-	// TargetingRules targetingRules;
-	// PercentageOptions percentageOptions;
-	// SettingValue value;
+	UFUNCTION(BlueprintPure, Category = "ConfigCat|Setting")
+	UConfigCatPercentageOptionsWrapper* GetPercentageOptions() const;
 
 	configcat::Setting Setting;
 };
 
 UCLASS(DisplayName="Config Cat Settings", Hidden)
-class CONFIGCAT_API UConfigCatSettingsWrapper : public UObject
+class UConfigCatSettingsWrapper : public UObject
 {
 	GENERATED_BODY()
 
@@ -56,8 +64,5 @@ class CONFIGCAT_API UConfigCatSettingsWrapper : public UObject
 	UFUNCTION(BlueprintPure, Category = "ConfigCat|Settings")
 	TMap<FString, UConfigCatSettingWrapper*> GetSettings() const;
 
-	void SetSettings(const std::shared_ptr<const configcat::Settings>& InSettings);
-
-private:
 	std::shared_ptr<const configcat::Settings> Settings;
 };