Merge pull request #4124 from Agnul97/feature-appId_deviceManagementO…

…perations_query 🎉 Capability to search operations by their appId in API 'GET /{scopeId}/devices/{deviceId}/operations'
eclipse-kapua · Oct 31, 2024 · 6eba56b · 6eba56b
2 parents 2e475a1 + d9ee177
commit 6eba56b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...ain/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java b/...ain/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java
@@ -70,6 +70,7 @@ public DeviceManagementOperationListResult simpleQuery(
             @PathParam("scopeId") ScopeId scopeId,
             @PathParam("deviceId") EntityId deviceId,
             @QueryParam("resource") String resource,
+            @QueryParam("appId") String appId,
             @QueryParam("status") DeviceManagementOperationStatus operationStatus,
             @QueryParam("askTotalCount") boolean askTotalCount,
             @QueryParam("sortParam") String sortParam,
@@ -89,6 +90,10 @@ public DeviceManagementOperationListResult simpleQuery(
             andPredicate.and(query.attributePredicate(DeviceManagementOperationAttributes.STATUS, operationStatus));
         }
 
+        if (!Strings.isNullOrEmpty(appId)) {
+            andPredicate.and(query.attributePredicate(DeviceManagementOperationAttributes.APP_ID, appId));
+        }
+
         if (!Strings.isNullOrEmpty(sortParam)) {
             query.setSortCriteria(query.fieldSortCriteria(sortParam, sortDir));
         }

diff --git a/...esources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId.yaml b/...esources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId.yaml
@@ -26,6 +26,11 @@ paths:
           description: The resource of the DeviceManagementOperation in which to search results
           schema:
             type: string
+        - name: appId
+          in: query
+          description: The appId of the DeviceManagementOperation in which to search results
+          schema:
+            type: string
         - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/status'
         - $ref: '../openapi.yaml#/components/parameters/askTotalCount'
         - $ref: '../openapi.yaml#/components/parameters/sortParam'