Issue 37140 - new getters and setters

Author: gabc-cpp

src/app/InteractionModelEngine.cpp

@@ -1745,7 +1745,7 @@ Protocols::InteractionModel::Status InteractionModelEngine::CheckCommandAccess(c
                                      .requestType = Access::RequestType::kCommandInvokeRequest,
                                      .entityId    = aRequest.path.mCommandId };
 
-    CHIP_ERROR err = Access::GetAccessControl().Check(*aRequest.subjectDescriptor, requestPath, entry.invokePrivilege);
+    CHIP_ERROR err = Access::GetAccessControl().Check(*aRequest.subjectDescriptor, requestPath, entry.GetInvokePrivilege());
     if (err != CHIP_NO_ERROR)
     {
         if ((err != CHIP_ERROR_ACCESS_DENIED) && (err != CHIP_ERROR_ACCESS_RESTRICTED_BY_ARL))

src/app/data-model-provider/MetadataTypes.h

@@ -99,13 +99,15 @@ struct AttributeEntry
     BitFlags<AttributeQualityFlags> flags;
 
 
+    // Constructor
+    AttributeEntry() : readPrivilege(0), writePrivilege(0) {}
 
     void SetReadPrivilege(Access::Privilege r)
     {
         readPrivilege = chip::to_underlying(r);
     }
 
-    Access::Privilege GetReadPrivilege()
+    Access::Privilege GetReadPrivilege() const
     {
         return static_cast< Access::Privilege >(readPrivilege);
     }
@@ -115,7 +117,7 @@ struct AttributeEntry
         writePrivilege = chip::to_underlying(w);
     }
 
-    Access::Privilege GetWritePrivilege()
+    Access::Privilege GetWritePrivilege() const
     {
         return static_cast< Access::Privilege >(writePrivilege);
     }
@@ -148,7 +150,26 @@ struct AcceptedCommandEntry
     // TODO: this can be more compact (use some flags for privilege)
     //       to make this compact, add a compact enum and make flags/invokePrivilege getters (to still be type safe)
     BitFlags<CommandQualityFlags> flags;
-    Access::Privilege invokePrivilege = Access::Privilege::kOperate;
+
+
+    // Constructor
+    AcceptedCommandEntry() : 
+        invokePrivilege(chip::to_underlying(Access::Privilege::kOperate)) {}
+ 
+        
+    Access::Privilege GetInvokePrivilege() const
+    {
+        return static_cast< Access::Privilege >(invokePrivilege);
+    }
+    
+    void SetInvokePrivilege(Access::Privilege i)
+    {
+        invokePrivilege = chip::to_underlying(i);
+    }
+
+    
+    private:
+    std::underlying_type_t<Access::Privilege> invokePrivilege : 5 ;
 };
 
 /// Represents a device type that resides on an endpoint

src/data-model-providers/codegen/CodegenDataModelProvider.cpp

@@ -58,7 +58,7 @@ DataModel::AcceptedCommandEntry AcceptedCommandEntryFor(const ConcreteCommandPat
     DataModel::AcceptedCommandEntry entry;
 
     entry.commandId       = path.mCommandId;
-    entry.invokePrivilege = RequiredPrivilege::ForInvokeCommand(path);
+    entry.SetInvokePrivilege( RequiredPrivilege::ForInvokeCommand(path) );
     entry.flags.Set(DataModel::CommandQualityFlags::kTimed, CommandNeedsTimedInvoke(path.mClusterId, commandId));
     entry.flags.Set(DataModel::CommandQualityFlags::kFabricScoped, CommandIsFabricScoped(path.mClusterId, commandId));
     entry.flags.Set(DataModel::CommandQualityFlags::kLargeMessage, CommandHasLargePayload(path.mClusterId, commandId));