feat: Implement multi-tenancy with organization ID in LMS tables and middleware, refactor web API calls, and update analytics and gamification features."

2026-01-15 11:40:38 -03:00
parent 8bc034b82d
commit daeda7e905
12 changed files with 325 additions and 106 deletions
@@ -0,0 +1,59 @@
+-- Migration: Update Analytics Functions for Multi-Tenancy
+-- Scope: fn_get_cohort_analytics, fn_get_retention_data
+
+-- 1. Update Course Cohort Analytics to include p_organization_id
+CREATE OR REPLACE FUNCTION fn_get_cohort_analytics(p_course_id UUID, p_organization_id UUID)
+RETURNS TABLE (
+    period TEXT,
+    student_count BIGINT,
+    completion_rate FLOAT4
+) AS $$
+BEGIN
+    RETURN QUERY
+    WITH cohort_students AS (
+        SELECT 
+            user_id,
+            TO_CHAR(enrolled_at, 'YYYY-MM') as v_period
+        FROM enrollments
+        WHERE course_id = p_course_id AND organization_id = p_organization_id
+    ),
+    course_lesson_count AS (
+        SELECT COUNT(*)::float4 as total_lessons
+        FROM lessons
+        WHERE module_id IN (SELECT id FROM modules WHERE course_id = p_course_id AND organization_id = p_organization_id)
+          AND organization_id = p_organization_id
+    )
+    SELECT 
+        cs.v_period as period,
+        COUNT(DISTINCT cs.user_id) as student_count,
+        COALESCE(AVG(
+            (SELECT COUNT(DISTINCT lesson_id)::float4 FROM user_grades WHERE user_id = cs.user_id AND course_id = p_course_id AND organization_id = p_organization_id) / 
+            NULLIF((SELECT total_lessons FROM course_lesson_count), 0)
+        ), 0)::float4 as completion_rate
+    FROM cohort_students cs
+    GROUP BY cs.v_period
+    ORDER BY cs.v_period DESC;
+END;
+$$ LANGUAGE plpgsql;
+
+-- 2. Update Retention Data Function to include p_organization_id
+CREATE OR REPLACE FUNCTION fn_get_retention_data(p_course_id UUID, p_organization_id UUID)
+RETURNS TABLE (
+    lesson_id UUID,
+    lesson_title VARCHAR,
+    student_count BIGINT
+) AS $$
+BEGIN
+    RETURN QUERY
+    SELECT 
+        l.id as lesson_id,
+        l.title as lesson_title,
+        COUNT(DISTINCT ug.user_id) as student_count
+    FROM lessons l
+    LEFT JOIN user_grades ug ON l.id = ug.lesson_id AND ug.organization_id = p_organization_id
+    WHERE l.module_id IN (SELECT id FROM modules WHERE course_id = p_course_id AND organization_id = p_organization_id)
+      AND l.organization_id = p_organization_id
+    GROUP BY l.id, l.title, l.position
+    ORDER BY l.position;
+END;
+$$ LANGUAGE plpgsql;
@@ -0,0 +1,32 @@
+-- Migration: Add organization_id to remaining content tables (LMS)
+-- Tables: modules, lessons, grading_categories, user_grades, user_badges, points_log
+
+-- 1. Add organization_id to modules
+ALTER TABLE modules ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE modules ADD CONSTRAINT fk_module_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE modules ALTER COLUMN organization_id DROP DEFAULT;
+
+-- 2. Add organization_id to lessons
+ALTER TABLE lessons ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE lessons ADD CONSTRAINT fk_lesson_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE lessons ALTER COLUMN organization_id DROP DEFAULT;
+
+-- 3. Add organization_id to grading_categories
+ALTER TABLE grading_categories ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE grading_categories ADD CONSTRAINT fk_grading_category_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE grading_categories ALTER COLUMN organization_id DROP DEFAULT;
+
+-- 4. Add organization_id to user_grades
+ALTER TABLE user_grades ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE user_grades ADD CONSTRAINT fk_user_grade_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE user_grades ALTER COLUMN organization_id DROP DEFAULT;
+
+-- 5. Add organization_id to user_badges
+ALTER TABLE user_badges ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE user_badges ADD CONSTRAINT fk_user_badge_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE user_badges ALTER COLUMN organization_id DROP DEFAULT;
+
+-- 6. Add organization_id to points_log
+ALTER TABLE points_log ADD COLUMN organization_id UUID NOT NULL DEFAULT '00000000-0000-0000-0000-000000000001';
+ALTER TABLE points_log ADD CONSTRAINT fk_points_log_organization FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+ALTER TABLE points_log ALTER COLUMN organization_id DROP DEFAULT;
@@ -215,13 +215,29 @@ pub async fn login(
    }))
 }

+#[derive(Deserialize)]
+pub struct CatalogQuery {
+    pub organization_id: Option<Uuid>,
+}
+
 pub async fn get_course_catalog(
    State(pool): State<PgPool>,
+    Query(query): Query<CatalogQuery>,
 ) -> Result<Json<Vec<Course>>, StatusCode> {
-    let courses = sqlx::query_as::<_, Course>("SELECT * FROM courses")
-        .fetch_all(&pool)
-        .await
-        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+    let courses = match query.organization_id {
+        Some(org_id) => {
+            sqlx::query_as::<_, Course>("SELECT * FROM courses WHERE organization_id = $1")
+                .bind(org_id)
+                .fetch_all(&pool)
+                .await
+        }
+        None => {
+            sqlx::query_as::<_, Course>("SELECT * FROM courses")
+                .fetch_all(&pool)
+                .await
+        }
+    }
+    .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;

    Ok(Json(courses))
 }
@@ -543,14 +559,16 @@ pub async fn submit_lesson_score(
        )
        .await;

-    // TODO: Detect course completion logic
-    let total_lessons: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM lessons WHERE module_id IN (SELECT id FROM modules WHERE course_id = $1)")
+    // Detect course completion logic
+    let total_lessons: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM lessons WHERE organization_id = $1 AND module_id IN (SELECT id FROM modules WHERE course_id = $2)")
+        .bind(org_ctx.id)
        .bind(payload.course_id)
        .fetch_one(&pool).await.unwrap_or(0);

    let completed_lessons: i64 = sqlx::query_scalar(
-        "SELECT COUNT(*) FROM user_grades WHERE user_id = $1 AND course_id = $2",
+        "SELECT COUNT(*) FROM user_grades WHERE organization_id = $1 AND user_id = $2 AND course_id = $3",
    )
+    .bind(org_ctx.id)
    .bind(payload.user_id)
    .bind(payload.course_id)
    .fetch_one(&pool)
@@ -590,12 +608,13 @@ pub struct BadgeResponse {
 }

 pub async fn get_user_gamification(
-    Org(_org_ctx): Org,
+    Org(org_ctx): Org,
    State(pool): State<PgPool>,
    Path(user_id): Path<Uuid>,
 ) -> Result<Json<GamificationStatus>, StatusCode> {
-    let user_stats: (i32, i32) = sqlx::query_as("SELECT xp, level FROM users WHERE id = $1")
+    let user_stats: (i32, i32) = sqlx::query_as("SELECT xp, level FROM users WHERE id = $1 AND organization_id = $2")
        .bind(user_id)
+        .bind(org_ctx.id)
        .fetch_one(&pool)
        .await
        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
@@ -604,9 +623,10 @@ pub async fn get_user_gamification(
        "SELECT b.id, b.name, b.description, b.icon_url, ub.earned_at 
         FROM user_badges ub 
         JOIN badges b ON ub.badge_id = b.id 
-         WHERE ub.user_id = $1",
+         WHERE ub.user_id = $1 AND ub.organization_id = $2",
    )
    .bind(user_id)
+    .bind(org_ctx.id)
    .fetch_all(&pool)
    .await
    .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
@@ -732,15 +752,16 @@ pub async fn get_course_analytics(
 }

 pub async fn get_advanced_analytics(
-    Org(_org_ctx): Org,
+    Org(org_ctx): Org,
    State(pool): State<PgPool>,
    Path(course_id): Path<Uuid>,
 ) -> Result<Json<common::models::AdvancedAnalytics>, StatusCode> {
    // 1. Cohort Analysis using DB function
    let cohort_data = sqlx::query_as::<_, common::models::CohortData>(
-        "SELECT period, student_count as count, completion_rate FROM fn_get_cohort_analytics($1)",
+        "SELECT period, student_count as count, completion_rate FROM fn_get_cohort_analytics($1, $2)",
    )
    .bind(course_id)
+    .bind(org_ctx.id)
    .fetch_all(&pool)
    .await
    .map_err(|e| {
@@ -750,9 +771,10 @@ pub async fn get_advanced_analytics(

    // 2. Retention Analysis using DB function
    let retention_data = sqlx::query_as::<_, common::models::RetentionData>(
-        "SELECT lesson_id, lesson_title, student_count FROM fn_get_retention_data($1)",
+        "SELECT lesson_id, lesson_title, student_count FROM fn_get_retention_data($1, $2)",
    )
    .bind(course_id)
+    .bind(org_ctx.id)
    .fetch_all(&pool)
    .await
    .map_err(|e| {