Fetching id, name, and properties, but lacking purls

Author: jcrossley3

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

@@ -1773,7 +1773,7 @@ async fn get_aibom_models(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
     let uri = format!("/api/v2/sbom/{id}/models");
     let req = TestRequest::get().uri(&uri).to_request();
     let response: Value = app.call_and_read_body_json(req).await;
-    log::info!("response:\n{:#}", json!(response));
+    log::debug!("response:\n{:#}", json!(response));
     let expected_result = json!(
         {
            "items": [

modules/fundamental/src/sbom/model/mod.rs

@@ -8,7 +8,7 @@ use crate::{
     purl::model::summary::purl::PurlSummary,
     source_document::model::SourceDocument,
 };
-use sea_orm::{ConnectionTrait, ModelTrait, PaginatorTrait, prelude::Uuid};
+use sea_orm::{ConnectionTrait, FromQueryResult, ModelTrait, PaginatorTrait, prelude::Uuid};
 use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 use tracing::instrument;
@@ -110,12 +110,18 @@ impl SbomSummary {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, ToSchema, Default)]
+#[derive(
+    FromQueryResult, Serialize, Deserialize, Debug, Clone, PartialEq, Eq, ToSchema, Default,
+)]
 pub struct SbomModel {
     /// The SBOM internal ID of a model
     pub id: String,
     /// The name of the model in the SBOM
     pub name: String,
+    /// The properties associated with the model
+    pub properties: serde_json::Value,
+    /// The model's PURL
+    pub purls: Vec<serde_json::Value>,
 }
 
 impl SbomModel {

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

@@ -446,10 +446,10 @@ impl SbomService {
         let query = join_purls(
             sbom_ai::Entity::find()
                 .select_only()
-                .column(sbom_ai::Column::SbomId)
-                .group_by(sbom_ai::Column::SbomId)
-                .column(sbom_ai::Column::NodeId)
+                .column_as(sbom_ai::Column::NodeId, "id")
                 .group_by(sbom_ai::Column::NodeId)
+                .column_as(sbom_node::Column::Name, "name")
+                .group_by(sbom_node::Column::Name)
                 .column(sbom_ai::Column::Properties)
                 .group_by(sbom_ai::Column::Properties)
                 .filter(sbom_ai::Column::SbomId.eq(sbom_id))
@@ -458,16 +458,19 @@ impl SbomService {
         )
         .filtering(search)?;
 
-        let limiter = query.limiting(connection, paginated.offset, paginated.limit);
+        let limiter = limit_selector::<'_, _, _, _, SbomModel>(
+            connection,
+            query,
+            paginated.offset,
+            paginated.limit,
+        );
+
         let total = limiter.total().await?;
         let items = limiter.fetch().await?;
 
         log::debug!("total={total}");
 
-        Ok(PaginatedResults {
-            items: SbomModel::from_entities(&items).await?,
-            total,
-        })
+        Ok(PaginatedResults { items, total })
     }
 
     /// Get all the tuples License ID, License Name from the licensing_infos table for a single SBOM

openapi.yaml

@@ -5004,13 +5004,21 @@ components:
             required:
             - id
             - name
+            - properties
+            - purls
             properties:
               id:
                 type: string
                 description: The SBOM internal ID of a model
               name:
                 type: string
                 description: The name of the model in the SBOM
+              properties:
+                description: The properties associated with the model
+              purls:
+                type: array
+                items: {}
+                description: The model's PURL
         total:
           type: integer
           format: int64
@@ -5682,13 +5690,21 @@ components:
       required:
       - id
       - name
+      - properties
+      - purls
       properties:
         id:
           type: string
           description: The SBOM internal ID of a model
         name:
           type: string
           description: The name of the model in the SBOM
+        properties:
+          description: The properties associated with the model
+        purls:
+          type: array
+          items: {}
+          description: The model's PURL
     SbomPackage:
       type: object
       required: