fix: /sbom/by-package api can now sort results by name

fixes: #1476

Author: jcrossley3

modules/fundamental/src/sbom/endpoints/test.rs

@@ -13,7 +13,9 @@ use trustify_common::{id::Id, model::PaginatedResults};
 use trustify_entity::labels::Labels;
 use trustify_module_ingestor::model::IngestResult;
 use trustify_test_context::{TrustifyContext, call::CallService, document_bytes};
+use urlencoding::encode;
 use uuid::Uuid;
+
 #[test_context(TrustifyContext)]
 #[test(actix_web::test)]
 async fn license_export(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
@@ -303,3 +305,39 @@ async fn query_sboms_by_ingested_time(ctx: &TrustifyContext) -> Result<(), anyho
 
     Ok(())
 }
+
+#[test_context(TrustifyContext)]
+#[test(actix_web::test)]
+async fn query_sboms_by_package(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
+    let query = async |purl, sort| {
+        let app = caller(ctx).await.unwrap();
+        let uri = format!(
+            "/api/v2/sbom/by-package?purl={}&sort={}",
+            encode(purl),
+            encode(sort)
+        );
+        let request = TestRequest::get().uri(&uri).to_request();
+        let response: Value = app.call_and_read_body_json(request).await;
+        tracing::debug!(test = "", "{response:#?}");
+        response
+    };
+
+    // Ingest 2 SBOM's that depend on the same purl
+    ctx.ingest_documents(["spdx/simple-ext-a.json", "spdx/simple-ext-b.json"])
+        .await?;
+
+    assert_eq!(
+        2,
+        query("pkg:rpm/redhat/[email protected]?arch=src", "").await["total"]
+    );
+    assert_eq!(
+        "simple-a",
+        query("pkg:rpm/redhat/[email protected]?arch=src", "name:asc").await["items"][0]["name"]
+    );
+    assert_eq!(
+        "simple-b",
+        query("pkg:rpm/redhat/[email protected]?arch=src", "name:desc").await["items"][0]["name"]
+    );
+
+    Ok(())
+}

modules/fundamental/src/sbom/service/sbom.rs

@@ -321,7 +321,12 @@ impl SbomService {
                 .filter(sbom_package_cpe_ref::Column::CpeId.eq(cpe.uuid())),
         };
 
-        let query = select.filtering(query)?.find_also_linked(SbomNodeLink);
+        let query = select.find_also_linked(SbomNodeLink).filtering_with(
+            query,
+            Columns::from_entity::<sbom::Entity>()
+                .add_columns(sbom_node::Entity)
+                .alias("sbom_node", "r0"),
+        )?;
 
         // limit and execute