From b8f87c4d409f9ddc31805b6dabb1a53042e6d4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Fri, 1 May 2026 10:01:31 +0800
Subject: [PATCH] feat: support query public packages without org_id (all orgs)

Make org_id optional in find_public_course_packages API.
When omitted, return all active packages across all orgs.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 htykc/src/ws_course_package.rs |  6 ++++--
 htykc_models/src/models.rs     | 35 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/htykc/src/ws_course_package.rs b/htykc/src/ws_course_package.rs
index 6054efb..ab7d82a 100644
--- a/htykc/src/ws_course_package.rs
+++ b/htykc/src/ws_course_package.rs
@@ -231,11 +231,13 @@ pub async fn find_public_course_packages(
     Query(params): Query<HashMap<String, String>>,
 ) -> Json<HtyResponse<(Vec<CoursePackage>, i64, i64)>> {
     let result = (|| -> anyhow::Result<(Vec<CoursePackage>, i64, i64)> {
-        let org_id = params.get("org_id").ok_or_else(|| anyhow!("org_id is required"))?;
         let page = get_some_from_query_params::<i64>("page", &params).unwrap_or(1);
         let page_size = get_some_from_query_params::<i64>("page_size", &params).unwrap_or(20);
         let keyword = get_some_from_query_params::<String>("keyword", &params);
-        CoursePackage::find_all_active_by_org_with_page(org_id, &keyword, page, page_size, extract_conn(fetch_db_conn(&db_pool)?).deref_mut())
+        match params.get("org_id") {
+            Some(org_id) => CoursePackage::find_all_active_by_org_with_page(org_id, &keyword, page, page_size, extract_conn(fetch_db_conn(&db_pool)?).deref_mut()),
+            None => CoursePackage::find_all_active_with_page(&keyword, page, page_size, extract_conn(fetch_db_conn(&db_pool)?).deref_mut()),
+        }
     })();
     match result {
         Ok(ok) => wrap_json_ok_resp(ok),
diff --git a/htykc_models/src/models.rs b/htykc_models/src/models.rs
index 6b8aa4d..dd12ab3 100644
--- a/htykc_models/src/models.rs
+++ b/htykc_models/src/models.rs
@@ -875,6 +875,41 @@ impl CoursePackage {
         Ok((items, pages, total))
     }
 
+    pub fn find_all_active_with_page(
+        keyword: &Option<String>,
+        page: i64,
+        page_size: i64,
+        conn: &mut PgConnection,
+    ) -> anyhow::Result<(Vec<CoursePackage>, i64, i64)> {
+        use crate::schema::course_package::dsl::{
+            course_package as packages, is_delete, package_name, package_status,
+            sort_order, created_at,
+        };
+        let total: i64 = packages
+            .filter(package_status.eq("ACTIVE"))
+            .filter(is_delete.is_null().or(is_delete.eq(false)))
+            .count()
+            .get_result(conn)?;
+        let pages = (total + page_size - 1) / page_size;
+        let offset = (page - 1) * page_size;
+        let kws = keyword.clone().unwrap_or_default();
+        let mut query = packages
+            .filter(package_status.eq("ACTIVE"))
+            .filter(is_delete.is_null().or(is_delete.eq(false)))
+            .into_boxed();
+        if !kws.is_empty() {
+            let pattern = format!("%{}%", kws);
+            query = query.filter(package_name.like(pattern));
+        }
+        let items = query
+            .order(sort_order.asc())
+            .then_order_by(created_at.desc())
+            .offset(offset)
+            .limit(page_size)
+            .load::<CoursePackage>(conn)?;
+        Ok((items, pages, total))
+    }
+
     pub fn find_all_by_teacher_id_with_page(
         teacher_id: &String,
         org: &String,