feat: allow searching of release manifests by advisory id or name

project-ncl · Dec 19, 2024 · dce92b5 · dce92b5
1 parent 2b2657c
commit dce92b5
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/...e/src/main/java/org/jboss/sbomer/service/feature/sbom/service/RequestEventRepository.java b/...e/src/main/java/org/jboss/sbomer/service/feature/sbom/service/RequestEventRepository.java
@@ -249,6 +249,24 @@ protected StringBuilder addConfigCondition(
         return query;
     }
 
+    protected StringBuilder addReleaseMetadataCondition(
+            StringBuilder query,
+            String condition,
+            String sbomAlias,
+            String property,
+            String operator) {
+        query.append(" ")
+                .append(condition)
+                .append(sbomAlias != null && sbomAlias.length() > 0 ? " " + sbomAlias + "." : " ")
+                .append("release_metadata ->> '")
+                .append(property)
+                .append("' ")
+                .append(operator)
+                .append(" :")
+                .append(property);
+        return query;
+    }
+
     protected long executeCountQuery(String query, Map<String, Object> params) {
         Query q = getEntityManager().createNativeQuery(query);
         for (Map.Entry<String, Object> entry : params.entrySet()) {
@@ -291,13 +309,18 @@ public List<V1BaseBeta1RequestRecord> searchRequestRecords(QueryParameters param
         });
     }
 
+    private static final String RELEASE_METADATA_ERRATA_ID = "release.errata_id";
+    private static final String RELEASE_METADATA_ERRATA_FULLNAME = "release.errata_fullname";
+
     private static final Set<String> ALLOWED_TYPE_KEYS = Set.of(
             "id",
             ErrataAdvisoryRequestConfig.TYPE_NAME,
             ImageRequestConfig.TYPE_NAME,
             PncAnalysisRequestConfig.TYPE_NAME,
             PncBuildRequestConfig.TYPE_NAME,
-            PncOperationRequestConfig.TYPE_NAME);
+            PncOperationRequestConfig.TYPE_NAME,
+            RELEASE_METADATA_ERRATA_ID,
+            RELEASE_METADATA_ERRATA_FULLNAME);
 
     private static final Map<String, Class<? extends RequestConfig>> TYPE_TO_CONFIG_CLASS = Map.of(
             ImageRequestConfig.TYPE_NAME,
@@ -368,6 +391,16 @@ private Map<String, Object> filterAndBuildQueryParams(StringBuilder sb, String t
             sb.append("WHERE re.id = :id");
             return Map.of("id", typeValue);
         }
+        if (RELEASE_METADATA_ERRATA_ID.equals(typeKey)) {
+            sb.append("WHERE s.release_metadata is not null");
+            addReleaseMetadataCondition(sb, "AND", "s", "errata_id", "=");
+            return Map.of("errata_id", typeValue);
+        }
+        if (RELEASE_METADATA_ERRATA_FULLNAME.equals(typeKey)) {
+            sb.append("WHERE s.release_metadata is not null");
+            addReleaseMetadataCondition(sb, "AND", "s", "errata_fullname", "=");
+            return Map.of("errata_fullname", typeValue);
+        }
 
         String identifierKey = getValueOfField(TYPE_TO_CONFIG_CLASS.get(typeKey), "IDENTIFIER_KEY");
         addConfigCondition(sb, "WHERE", REQUEST_CONFIG_TYPE, "=");

diff --git a/service/src/main/java/org/jboss/sbomer/service/rest/api/v1beta1/RequestsV1Beta1.java b/service/src/main/java/org/jboss/sbomer/service/rest/api/v1beta1/RequestsV1Beta1.java
@@ -83,7 +83,13 @@ public class RequestsV1Beta1 {
                             name = "Filter requests of events generated for the PNC analysis on the for the specified milestone"),
                     @ExampleObject(
                             value = "pnc-operation=BDQXCNRZJYYAA",
-                            name = "Filter requests of events generated for the specified PNC operation") })
+                            name = "Filter requests of events generated for the specified PNC operation"),
+                    @ExampleObject(
+                            value = "release.errata_id=1234",
+                            name = "Filter requests of events generated for the specified Errata release by advisory id "),
+                    @ExampleObject(
+                            value = "release.errata_fullname=ERRATA",
+                            name = "Filter requests of events generated for the specified Errata release by advisory name") })
     @APIResponse(
             responseCode = "200",
             description = "The request event with all the manifest generated",

diff --git a/.../src/test/java/org/jboss/sbomer/service/test/utils/AlternativeRequestEventRepository.java b/.../src/test/java/org/jboss/sbomer/service/test/utils/AlternativeRequestEventRepository.java
@@ -78,6 +78,27 @@ protected StringBuilder addConfigCondition(
         return query;
     }
 
+    @Override
+    protected StringBuilder addReleaseMetadataCondition(
+            StringBuilder query,
+            String condition,
+            String sbomAlias,
+            String property,
+            String operator) {
+        query.append(" ")
+                .append(condition)
+                .append(
+                        sbomAlias != null && sbomAlias.length() > 0 ? " JSON_EXTRACT(" + sbomAlias + "."
+                                : " JSON_EXTRACT(")
+                .append("release_metadata, '$.")
+                .append(property)
+                .append("') ")
+                .append(operator)
+                .append(" :")
+                .append(property);
+        return query;
+    }
+
     @Override
     protected Instant convertFromTimestamp(Object rawTimeObject) {
         OffsetDateTime offsetDateTime = (OffsetDateTime) rawTimeObject;