feat(product): enhance product info endpoint

Author: lazhenyi

route/api.rs

@@ -58,13 +58,13 @@ pub fn api_router(cfg: &mut web::ServiceConfig) {
         )
         .service(
             scope("/product")
-                .service(
+                .route("/list", post().to(product_list))
+                .route("/info/{uid}",get().to(product_info))
+                .route("/down/{uid}",get().to(product_download)).service(
                     scope("/{owner}/{repo}")
                         .route("/post",post().to(product_post))
                 )
-                .route("/list", post().to(product_list))
-                .route("/info/{uid}",get().to(product_info))
-                .route("/down/{uid}",get().to(product_download))
+                
         )
 
     ;

services/product/download.rs

@@ -6,8 +6,8 @@ use crate::services::AppState;
 impl AppState {
     pub async fn product_data_download_zip(&self, product: Uuid) -> io::Result<actix_files::NamedFile> {
         let product = self.product_info(product).await?;
-        let repo = self.repo_get_by_uid(product.repository_uid).await?;
-        let hash = product.hash;
+        let repo = self.repo_get_by_uid(product.data.repository_uid).await?;
+        let hash = product.data.hash;
         let path = format!("{}/{}/{}/", GIT_ROOT, repo.node_uid, repo.uid);
         let zip_path = format!("{}/product/{}.zip", path, hash);
         if std::fs::metadata(&zip_path).is_err() {

services/product/info.rs

@@ -3,13 +3,19 @@ use sea_orm::EntityTrait;
 use uuid::Uuid;
 use crate::model::product::data_product;
 use crate::services::AppState;
+use crate::services::product::list::ProductList;
 
 impl AppState {
-    pub async fn product_info(&self, uid: Uuid) -> io::Result<data_product::Model> {
-        data_product::Entity::find_by_id(uid)
+    pub async fn product_info(&self, uid: Uuid) -> io::Result<ProductList> {
+        let data = data_product::Entity::find_by_id(uid)
             .one(&self.read)
             .await
             .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?
-            .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "Product not found"))
+            .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "Product not found"))?;
+        Ok(ProductList {
+            data: data.clone(),
+            owner: self.user_info_by_uid(data.owner).await?,
+            repo: self.repo_get_by_uid(data.repository_uid).await?,
+        })
     }
 }