fix: adapt tests and imports for release/0.4.z

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

Author: mrrajan

modules/fundamental/src/license/service/test.rs

@@ -5,7 +5,6 @@ use test_log::test;
 use trustify_common::{db::query::Query, id::Id, model::Paginated};
 use trustify_entity::{expanded_license, sbom_license_expanded};
 use trustify_test_context::TrustifyContext;
-use uuid::Uuid;
 
 /// RED-GREEN-REFACTOR: Test licenses() UNION query
 /// Verifies: expanded_license.expanded_text UNION license.text for CycloneDX
@@ -74,7 +73,10 @@ async fn test_get_all_license_info_coalesce(ctx: &TrustifyContext) -> Result<(),
     let result = ctx
         .ingest_document("spdx/OCP-TOOLS-4.11-RHEL-8.json")
         .await?;
-    let sbom_id = Uuid::parse_str(&result.id)?;
+    let sbom_id = result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     // GREEN: Get license info
     let info = service
@@ -119,7 +121,10 @@ async fn test_junction_table_mapping_integrity(ctx: &TrustifyContext) -> Result<
     let result = ctx
         .ingest_document("spdx/OCP-TOOLS-4.11-RHEL-8.json")
         .await?;
-    let sbom_id = Uuid::parse_str(&result.id)?;
+    let sbom_id = result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     // REFACTOR: Verify every junction entry references valid expanded_license
     let entries = sbom_license_expanded::Entity::find()
@@ -227,7 +232,10 @@ async fn test_coalesce_refactoring_correctness(ctx: &TrustifyContext) -> Result<
     let spdx_result = ctx
         .ingest_document("spdx/OCP-TOOLS-4.11-RHEL-8.json")
         .await?;
-    let sbom_id = Uuid::parse_str(&spdx_result.id)?;
+    let sbom_id = spdx_result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     let info = service
         .get_all_license_info(Id::Uuid(sbom_id), &ctx.db)

modules/fundamental/src/purl/model/details/purl.rs

@@ -1,15 +1,15 @@
 use crate::{
     Error,
     advisory::model::AdvisoryHead,
-    common::{LicenseInfo, LicenseRefMapping, license_filtering},
+    common::{LicenseInfo, LicenseRefMapping},
     purl::model::{BasePurlHead, PurlHead, VersionedPurlHead},
     sbom::{model::SbomHead, service::sbom::LicenseBasicInfo},
     vulnerability::model::VulnerabilityHead,
 };
 use sea_orm::{
-    ColumnTrait, ConnectionTrait, DbErr, EntityTrait, FromQueryResult, IntoSimpleExpr, LoaderTrait,
-    ModelTrait, QueryFilter, QueryOrder, QueryResult, QuerySelect, QueryTrait, RelationTrait,
-    Select, SelectColumns,
+    ColumnTrait, ConnectionTrait, DbErr, EntityTrait, FromQueryResult, IntoSimpleExpr, Iterable,
+    LoaderTrait, ModelTrait, QueryFilter, QueryOrder, QueryResult, QuerySelect, QueryTrait,
+    RelationTrait, Select, SelectColumns,
 };
 use sea_query::{Asterisk, ColumnRef, Expr, Func, IntoIden, JoinType, SimpleExpr};
 use serde::{Deserialize, Serialize};

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

@@ -673,8 +673,14 @@ async fn test_sbom_package_licenses_coalesce(ctx: &TrustifyContext) -> Result<()
         .ingest_document("zookeeper-3.9.2-cyclonedx.json")
         .await?;
 
-    let spdx_id = Uuid::parse_str(&spdx_result.id)?;
-    let cyclonedx_id = Uuid::parse_str(&cyclonedx_result.id)?;
+    let spdx_id = spdx_result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
+    let cyclonedx_id = cyclonedx_result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     let spdx_packages = service
         .fetch_sbom_packages(
@@ -748,7 +754,10 @@ async fn test_sbom_package_license_filtering_with_coalesce(
     let result = ctx
         .ingest_document("spdx/OCP-TOOLS-4.11-RHEL-8.json")
         .await?;
-    let sbom_id = Uuid::parse_str(&result.id)?;
+    let sbom_id = result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     // Filter by license (should work via COALESCE on expanded_text OR text)
     let apache_packages = service
@@ -795,7 +804,10 @@ async fn test_sbom_package_license_not_null_filter(
     let result = ctx
         .ingest_document("spdx/OCP-TOOLS-4.11-RHEL-8.json")
         .await?;
-    let sbom_id = Uuid::parse_str(&result.id)?;
+    let sbom_id = result
+        .id
+        .try_as_uid()
+        .ok_or_else(|| anyhow::anyhow!("Expected UUID ID"))?;
 
     let packages = service
         .fetch_sbom_packages(

openapi.yaml

@@ -4347,13 +4347,7 @@ components:
                 type: array
                 items:
                   $ref: '#/components/schemas/LicenseRefMapping'
-                description: |-
-                  LicenseRef mappings
-
-                  **Deprecated**: Licenses are now pre-expanded at ingestion time via `expanded_license` /
-                  `sbom_license_expanded` tables. This field is always empty and will be removed in a future
-                  release.
-                deprecated: true
+                description: LicenseRef mappings
               name:
                 type: string
                 description: The name of the package in the SBOM
@@ -4963,13 +4957,7 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/LicenseRefMapping'
-          description: |-
-            LicenseRef mappings
-
-            **Deprecated**: Licenses are now pre-expanded at ingestion time via `expanded_license` /
-            `sbom_license_expanded` tables. This field is always empty and will be removed in a future
-            release.
-          deprecated: true
+          description: LicenseRef mappings
         name:
           type: string
           description: The name of the package in the SBOM