1

server-rs/crates/api-server/src/match3d.rs

@@ -3862,12 +3862,6 @@ fn is_match3d_generated_asset_image_ready(asset: &Match3DGeneratedItemAsset) ->
         })
         .count();
     view_count >= MATCH3D_ITEM_VIEW_COUNT
-        || asset
-            .image_object_key
-            .as_deref()
-            .map(str::trim)
-            .filter(|value| !value.is_empty())
-            .is_some()
 }
 
 fn has_match3d_required_item_images(
@@ -4952,7 +4946,7 @@ mod tests {
     }
 
     #[test]
-    fn match3d_required_item_images_require_object_keys() {
+    fn match3d_required_item_images_require_five_views() {
         let assets = vec![
             Match3DGeneratedItemAsset {
                 item_id: "match3d-item-1".to_string(),
@@ -5024,6 +5018,47 @@ mod tests {
         ];
 
         assert!(!has_match3d_required_item_images(&assets, 3));
+
+        let five_view_assets = (1..=3)
+            .map(|index| Match3DGeneratedItemAsset {
+                item_id: format!("match3d-item-{index}"),
+                item_name: format!("物品{index}"),
+                image_src: Some(format!(
+                    "/generated-match3d-assets/s/p/items/i{index}/views/view-01.png"
+                )),
+                image_object_key: Some(format!(
+                    "generated-match3d-assets/s/p/items/i{index}/views/view-01.png"
+                )),
+                image_views: (1..=MATCH3D_ITEM_VIEW_COUNT)
+                    .map(|view_index| Match3DGeneratedItemImageView {
+                        view_id: format!("view-{view_index:02}"),
+                        view_index: view_index as u32,
+                        image_src: Some(format!(
+                            "/generated-match3d-assets/s/p/items/i{index}/views/view-{view_index:02}.png"
+                        )),
+                        image_object_key: Some(format!(
+                            "generated-match3d-assets/s/p/items/i{index}/views/view-{view_index:02}.png"
+                        )),
+                    })
+                    .collect(),
+                model_src: None,
+                model_object_key: None,
+                model_file_name: None,
+                task_uuid: None,
+                subscription_key: None,
+                sound_prompt: None,
+                background_music_title: None,
+                background_music_style: None,
+                background_music_prompt: None,
+                background_music: None,
+                click_sound: None,
+                background_asset: None,
+                status: "image_ready".to_string(),
+                error: None,
+            })
+            .collect::<Vec<_>>();
+
+        assert!(has_match3d_required_item_images(&five_view_assets, 3));
     }
 
     #[test]