Merge pull request #1492 from FIWARE/bug/pernot-lookup

Fixed a bug in pernotSubCacheLookup
FIWARE · Dec 9, 2023 · 238ac6c · 238ac6c
2 parents 886ae2a + 270ecd9
commit 238ac6c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -17,3 +17,4 @@ Fixed issues:
   * #1418 - Performance - Faster startup when there are GeoProperties in DB
   * #1478 - Fixed issue
   * #1479 - Fixed problem with "operations" in registrations
+  * #280  - Fixed a bug in the lookup of pernot subscriptions
diff --git a/src/lib/orionld/pernot/pernotSubCacheLookup.cpp b/src/lib/orionld/pernot/pernotSubCacheLookup.cpp
@@ -35,8 +35,8 @@
 //
 PernotSubscription* pernotSubCacheLookup
 (
-  const char* subscriptionId,
-  const char* tenant
+  const char* tenant,
+  const char* subscriptionId
 )
 {
   for (PernotSubscription* pSubP = pernotSubCache.head; pSubP != NULL; pSubP = pSubP->next)

diff --git a/src/lib/orionld/pernot/pernotSubCacheLookup.h b/src/lib/orionld/pernot/pernotSubCacheLookup.h
@@ -35,8 +35,8 @@
 //
 extern PernotSubscription* pernotSubCacheLookup
 (
-  const char* subscriptionId,
-  const char* tenant
+  const char* tenant,
+  const char* subscriptionId
 );
 
 #endif  // SRC_LIB_ORIONLD_PERNOT_PERNOTSUBCACHELOOKUP_H_
diff --git a/src/lib/orionld/serviceRoutines/orionldGetSubscription.cpp b/src/lib/orionld/serviceRoutines/orionldGetSubscription.cpp
@@ -217,7 +217,7 @@ static bool orionldGetSubscriptionFromDb(void)
   }
   else
   {
-    PernotSubscription* pSubP = pernotSubCacheLookup(orionldState.wildcard[0], orionldState.tenantP->tenant);
+    PernotSubscription* pSubP = pernotSubCacheLookup(orionldState.tenantP->tenant, orionldState.wildcard[0]);
     if (pSubP != NULL)
       orionldSubCounters(apiSubP, NULL, pSubP);
   }
@@ -265,7 +265,7 @@ bool orionldGetSubscription(void)
   }
 
   // pernot subscription?
-  PernotSubscription* pSubP = pernotSubCacheLookup(subscriptionId, orionldState.tenantP->tenant);
+  PernotSubscription* pSubP = pernotSubCacheLookup(orionldState.tenantP->tenant, subscriptionId);
   if (pSubP != NULL)
   {
     orionldState.httpStatusCode = 200;

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_get_pernot_and_normal_subscriptions.test b/test/functionalTest/cases/0000_ngsild/ngsild_get_pernot_and_normal_subscriptions.test
@@ -192,7 +192,7 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld>; rel="h
 04. GET subs (from DB)
 ======================
 HTTP/1.1 200 OK
-Content-Length: 768
+Content-Length: 840
 Content-Type: application/json
 Date: REGEX(.*)
 Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"
@@ -217,7 +217,10 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld>; rel="h
                 "uri": "http://127.0.0.1:9997/notify"
             },
             "format": "normalized",
-            "status": "ok"
+            "lastNotification": "202REGEX(.*)Z",
+            "noMatch": 1,
+            "status": "ok",
+            "timesSent": 1
         },
         "origin": "database",
         "q": "P3==1|P3==2",