diff --git a/src/libaas/basyx/asset/assetinformation.h b/src/libaas/basyx/asset/assetinformation.h index 780f311..8eeb3db 100644 --- a/src/libaas/basyx/asset/assetinformation.h +++ b/src/libaas/basyx/asset/assetinformation.h @@ -4,7 +4,6 @@ #include #include #include -#include #include @@ -17,10 +16,9 @@ class AssetInformation { private: AssetKind assetKind; - util::optional asset; - util::optional globalAssetIdRef; + util::optional globalAssetId; std::vector specificAssetId; - std::vector billOfMaterial; + util::optional assetType; util::optional defaultThumbnail; public: AssetInformation(AssetKind assetkind) : assetKind(assetkind) {}; @@ -34,25 +32,18 @@ class AssetInformation AssetKind getAssetKind() const { return assetKind; }; void setAssetKind(AssetKind kind) { this->assetKind = kind; }; - void setAsset(Asset asset) { - //this->globalAssetIdRef = asset; - this->asset.emplace(std::move(asset)); - }; - const util::optional & getAsset() const { return asset; }; - - const util::optional & getGlobalAssetId() const { return this->globalAssetIdRef; }; - void setGlobalAssetId(Identifier globalAssetId) { this->globalAssetIdRef.emplace(std::move(globalAssetId)); }; - - const util::optional & getDefaultThumbnail() const { return defaultThumbnail; }; - void setDefaultThumbnail(File file) { this->defaultThumbnail.emplace(std::move(file)); }; - - void addBillOfMaterial(Reference bom) { this->billOfMaterial.emplace_back(std::move(bom)); }; - const std::vector & getBillOfMaterials() const { return this->billOfMaterial; }; - std::vector & getBillOfMaterials() { return this->billOfMaterial; }; + const util::optional & getGlobalAssetId() const { return this->globalAssetId; }; + void setGlobalAssetId(Identifier globalAssetId) { this->globalAssetId.emplace(std::move(globalAssetId)); }; void addSpecificAssetId(IdentifierKeyValuePair specificAssetId) { this->specificAssetId.emplace_back(std::move(specificAssetId)); }; const std::vector & getSpecificAssetIds() const { return this->specificAssetId; }; std::vector & getSpecificAssetIds() { return this->specificAssetId; }; + + const util::optional & getAssetType() const { return this->assetType; }; + void setAssetType(Identifier assetType) { this->assetType.emplace(std::move(assetType)); }; + + const util::optional & getDefaultThumbnail() const { return defaultThumbnail; }; + void setDefaultThumbnail(File file) { this->defaultThumbnail.emplace(std::move(file)); }; };