finish PR clean up

Author: mkardous-silabs

src/app/ReadHandler.cpp

@@ -821,7 +821,7 @@ void ReadHandler::PersistSubscription()
     auto * subscriptionResumptionStorage = mManagementCallback.GetInteractionModelEngine()->GetSubscriptionResumptionStorage();
     VerifyOrReturn(subscriptionResumptionStorage != nullptr);
 
-    // TODO(#31873): We need to store the CAT information to enable better interaction with ICDs
+    // TODO(#31873): We need to store the CAT information to enable better interactions with ICDs
     SubscriptionResumptionStorage::SubscriptionInfo subscriptionInfo = { .mNodeId         = GetInitiatorNodeId(),
                                                                          .mFabricIndex    = GetAccessingFabricIndex(),
                                                                          .mSubscriptionId = mSubscriptionId,

src/app/icd/server/BUILD.gn

@@ -75,9 +75,6 @@ source_set("manager") {
     ":configuration-data",
     ":notifier",
     ":observer",
-
-    # TODO : can this be in checkin?
-    "${chip_root}/src/app:subscription-manager",
     "${chip_root}/src/credentials:credentials",
     "${chip_root}/src/messaging",
   ]
@@ -87,6 +84,7 @@ source_set("manager") {
       ":monitoring-table",
       ":sender",
       "${chip_root}/src/app:app_config",
+      "${chip_root}/src/app:subscription-manager",
     ]
   }
 }

src/app/icd/server/ICDManager.h

@@ -38,9 +38,6 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <system/SystemClock.h>
 
-#define CHIP_CONFIG_ENABLE_ICD_CIP 1
-#define CHIP_CONFIG_ENABLE_ICD_LIT 1
-
 namespace chip {
 namespace Crypto {
 using SymmetricKeystore = SessionKeystore;

src/app/server/Server.cpp

@@ -526,11 +526,11 @@ bool Server::CheckInWouldBeSentAtBootVerifier(FabricIndex aFabricIndex, NodeId s
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
     // At least one registration has a persisted entry. Do not send Check-In message.
     // This is to cover the use-case where the subscription resumption feature is used with the Check-In message.
-    VerifyOrReturnValue(chip::app::InteractionModelEngine::GetInstance()->SubjectHasPersistedSubscription(aFabricIndex, subjectID),
-                        true);
+    VerifyOrReturnValue(!chip::app::InteractionModelEngine::GetInstance()->SubjectHasPersistedSubscription(aFabricIndex, subjectID),
+                        false);
 #endif // CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
 
-    return false;
+    return true;
 }
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 

src/app/tests/TestInteractionModelEngine.cpp

@@ -259,6 +259,9 @@ void TestInteractionModelEngine::TestRemoveDuplicateConcreteAttribute(nlTestSuit
     InteractionModelEngine::GetInstance()->ReleaseAttributePathList(attributePathParamsList);
 }
 
+/**
+ * @brief Test verifies the SubjectHasActiveSubscription with a single subscription with a single entry
+ */
 void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSingleSubOneEntry(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(apContext);
@@ -300,6 +303,10 @@ void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSingleSubOneEnt
     NL_TEST_ASSERT(apSuite, engine->SubjectHasActiveSubscription(bobFabricIndex, bobNodeId) == false);
 }
 
+/**
+ * @brief Test verifies that the SubjectHasActiveSubscription will continue iterating till it fines at least one valid active
+ * subscription
+ */
 void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSingleSubMultipleEntries(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(apContext);
@@ -354,6 +361,9 @@ void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSingleSubMultip
     engine->GetReadHandlerPool().ReleaseAll();
 }
 
+/**
+ * @brief Test validates that the SubjectHasActiveSubscription can support multiple subscriptions from different clients
+ */
 void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionMultipleSubsSingleEntry(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(apContext);
@@ -427,6 +437,10 @@ void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionMultipleSubsSin
     NL_TEST_ASSERT(apSuite, engine->SubjectHasActiveSubscription(aliceFabricIndex, aliceNodeId) == false);
 }
 
+/**
+ * @brief Test validates that the SubjectHasActiveSubscription can find the active subscription even if there are multiple
+ * subscriptions for each client
+ */
 void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionMultipleSubsMultipleEntries(nlTestSuite * apSuite,
                                                                                              void * apContext)
 {
@@ -516,6 +530,9 @@ void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionMultipleSubsMul
     NL_TEST_ASSERT(apSuite, engine->SubjectHasActiveSubscription(aliceFabricIndex, aliceNodeId) == false);
 }
 
+/**
+ * @brief Verifies that SubjectHasActiveSubscription support CATs as a subject-id
+ */
 void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSubWithCAT(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx               = *reinterpret_cast<TestContext *>(apContext);
@@ -569,6 +586,9 @@ void TestInteractionModelEngine::TestSubjectHasActiveSubscriptionSubWithCAT(nlTe
 
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
 
+/**
+ * @brief Test verifies the SubjectHasPersistedSubscription with single and multiple persisted subscriptions.
+ */
 void TestInteractionModelEngine::TestSubjectHasPersistedSubscription(nlTestSuite * apSuite, void * apContext)
 {
     TestContext & ctx = *static_cast<TestContext *>(apContext);