temporarily disabled subscription check

Return per-module lesson and practice aggregates under unit modules listing so clients can render module depth without additional queries.

Co-authored-by: Cursor <cursoragent@cursor.com>

db/query/exam_prep_catalog_courses.sql

@@ -17,6 +17,17 @@ FROM exam_prep.catalog_courses
 WHERE id = $1;
 
 -- name: ExamPrepListCatalogCourses :many
+WITH catalog_course_counts AS (
+    SELECT
+        u.catalog_course_id,
+        COUNT(DISTINCT u.id)::BIGINT AS units_count,
+        COUNT(DISTINCT m.id)::BIGINT AS modules_count,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count
+    FROM exam_prep.units u
+    LEFT JOIN exam_prep.unit_modules m ON m.unit_id = u.id
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    GROUP BY u.catalog_course_id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     c.id,
@@ -24,9 +35,13 @@ SELECT
     c.description,
     c.thumbnail,
     c.sort_order,
+    COALESCE(cc.units_count, 0)::BIGINT AS units_count,
+    COALESCE(cc.modules_count, 0)::BIGINT AS modules_count,
+    COALESCE(cc.lessons_count, 0)::BIGINT AS lessons_count,
     c.created_at,
     c.updated_at
 FROM exam_prep.catalog_courses c
+LEFT JOIN catalog_course_counts cc ON cc.catalog_course_id = c.id
 ORDER BY c.sort_order ASC, c.id ASC
 LIMIT $1 OFFSET $2;
 

db/query/exam_prep_unit_modules.sql

@@ -30,6 +30,16 @@ ORDER BY
     m.id;
 
 -- name: ExamPrepListUnitModulesByUnit :many
+WITH module_counts AS (
+    SELECT
+        m.id AS module_id,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count,
+        COUNT(DISTINCT p.id)::BIGINT AS practices_count
+    FROM exam_prep.unit_modules m
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    LEFT JOIN exam_prep.lesson_practices p ON p.unit_module_lesson_id = l.id
+    GROUP BY m.id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     m.id,
@@ -39,9 +49,12 @@ SELECT
     m.thumbnail,
     m.icon,
     m.sort_order,
+    COALESCE(mc.lessons_count, 0)::BIGINT AS lessons_count,
+    COALESCE(mc.practices_count, 0)::BIGINT AS practices_count,
     m.created_at,
     m.updated_at
 FROM exam_prep.unit_modules m
+LEFT JOIN module_counts mc ON mc.module_id = m.id
 WHERE
     m.unit_id = $1
 ORDER BY

db/query/exam_prep_units.sql

@@ -29,6 +29,18 @@ ORDER BY
     u.id;
 
 -- name: ExamPrepListUnitsByCatalogCourse :many
+WITH unit_counts AS (
+    SELECT
+        u.id AS unit_id,
+        COUNT(DISTINCT m.id)::BIGINT AS modules_count,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count,
+        COUNT(DISTINCT p.id)::BIGINT AS practices_count
+    FROM exam_prep.units u
+    LEFT JOIN exam_prep.unit_modules m ON m.unit_id = u.id
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    LEFT JOIN exam_prep.lesson_practices p ON p.unit_module_lesson_id = l.id
+    GROUP BY u.id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     u.id,
@@ -37,9 +49,13 @@ SELECT
     u.description,
     u.thumbnail,
     u.sort_order,
+    COALESCE(uc.modules_count, 0)::BIGINT AS modules_count,
+    COALESCE(uc.lessons_count, 0)::BIGINT AS lessons_count,
+    COALESCE(uc.practices_count, 0)::BIGINT AS practices_count,
     u.created_at,
     u.updated_at
 FROM exam_prep.units u
+LEFT JOIN unit_counts uc ON uc.unit_id = u.id
 WHERE
     u.catalog_course_id = $1
 ORDER BY

gen/db/exam_prep_catalog_courses.sql.go

@@ -105,6 +105,17 @@ func (q *Queries) ExamPrepListAllCatalogCourseIDs(ctx context.Context) ([]int64,
 }
 
 const ExamPrepListCatalogCourses = `-- name: ExamPrepListCatalogCourses :many
+WITH catalog_course_counts AS (
+    SELECT
+        u.catalog_course_id,
+        COUNT(DISTINCT u.id)::BIGINT AS units_count,
+        COUNT(DISTINCT m.id)::BIGINT AS modules_count,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count
+    FROM exam_prep.units u
+    LEFT JOIN exam_prep.unit_modules m ON m.unit_id = u.id
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    GROUP BY u.catalog_course_id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     c.id,
@@ -112,9 +123,13 @@ SELECT
     c.description,
     c.thumbnail,
     c.sort_order,
+    COALESCE(cc.units_count, 0)::BIGINT AS units_count,
+    COALESCE(cc.modules_count, 0)::BIGINT AS modules_count,
+    COALESCE(cc.lessons_count, 0)::BIGINT AS lessons_count,
     c.created_at,
     c.updated_at
 FROM exam_prep.catalog_courses c
+LEFT JOIN catalog_course_counts cc ON cc.catalog_course_id = c.id
 ORDER BY c.sort_order ASC, c.id ASC
 LIMIT $1 OFFSET $2
 `
@@ -125,14 +140,17 @@ type ExamPrepListCatalogCoursesParams struct {
 }
 
 type ExamPrepListCatalogCoursesRow struct {
-	TotalCount  int64              `json:"total_count"`
+	TotalCount   int64              `json:"total_count"`
-	ID          int64              `json:"id"`
+	ID           int64              `json:"id"`
-	Name        string             `json:"name"`
+	Name         string             `json:"name"`
-	Description pgtype.Text        `json:"description"`
+	Description  pgtype.Text        `json:"description"`
-	Thumbnail   pgtype.Text        `json:"thumbnail"`
+	Thumbnail    pgtype.Text        `json:"thumbnail"`
-	SortOrder   int32              `json:"sort_order"`
+	SortOrder    int32              `json:"sort_order"`
-	CreatedAt   pgtype.Timestamptz `json:"created_at"`
+	UnitsCount   int64              `json:"units_count"`
-	UpdatedAt   pgtype.Timestamptz `json:"updated_at"`
+	ModulesCount int64              `json:"modules_count"`
+	LessonsCount int64              `json:"lessons_count"`
+	CreatedAt    pgtype.Timestamptz `json:"created_at"`
+	UpdatedAt    pgtype.Timestamptz `json:"updated_at"`
 }
 
 func (q *Queries) ExamPrepListCatalogCourses(ctx context.Context, arg ExamPrepListCatalogCoursesParams) ([]ExamPrepListCatalogCoursesRow, error) {
@@ -151,6 +169,9 @@ func (q *Queries) ExamPrepListCatalogCourses(ctx context.Context, arg ExamPrepLi
 			&i.Description,
 			&i.Thumbnail,
 			&i.SortOrder,
+			&i.UnitsCount,
+			&i.ModulesCount,
+			&i.LessonsCount,
 			&i.CreatedAt,
 			&i.UpdatedAt,
 		); err != nil {

gen/db/exam_prep_unit_modules.sql.go

@@ -124,6 +124,16 @@ func (q *Queries) ExamPrepListUnitModuleIDsByUnit(ctx context.Context, unitID in
 }
 
 const ExamPrepListUnitModulesByUnit = `-- name: ExamPrepListUnitModulesByUnit :many
+WITH module_counts AS (
+    SELECT
+        m.id AS module_id,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count,
+        COUNT(DISTINCT p.id)::BIGINT AS practices_count
+    FROM exam_prep.unit_modules m
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    LEFT JOIN exam_prep.lesson_practices p ON p.unit_module_lesson_id = l.id
+    GROUP BY m.id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     m.id,
@@ -133,9 +143,12 @@ SELECT
     m.thumbnail,
     m.icon,
     m.sort_order,
+    COALESCE(mc.lessons_count, 0)::BIGINT AS lessons_count,
+    COALESCE(mc.practices_count, 0)::BIGINT AS practices_count,
     m.created_at,
     m.updated_at
 FROM exam_prep.unit_modules m
+LEFT JOIN module_counts mc ON mc.module_id = m.id
 WHERE
     m.unit_id = $1
 ORDER BY
@@ -152,16 +165,18 @@ type ExamPrepListUnitModulesByUnitParams struct {
 }
 
 type ExamPrepListUnitModulesByUnitRow struct {
-	TotalCount  int64              `json:"total_count"`
+	TotalCount     int64              `json:"total_count"`
-	ID          int64              `json:"id"`
+	ID             int64              `json:"id"`
-	UnitID      int64              `json:"unit_id"`
+	UnitID         int64              `json:"unit_id"`
-	Name        string             `json:"name"`
+	Name           string             `json:"name"`
-	Description pgtype.Text        `json:"description"`
+	Description    pgtype.Text        `json:"description"`
-	Thumbnail   pgtype.Text        `json:"thumbnail"`
+	Thumbnail      pgtype.Text        `json:"thumbnail"`
-	Icon        pgtype.Text        `json:"icon"`
+	Icon           pgtype.Text        `json:"icon"`
-	SortOrder   int32              `json:"sort_order"`
+	SortOrder      int32              `json:"sort_order"`
-	CreatedAt   pgtype.Timestamptz `json:"created_at"`
+	LessonsCount   int64              `json:"lessons_count"`
-	UpdatedAt   pgtype.Timestamptz `json:"updated_at"`
+	PracticesCount int64              `json:"practices_count"`
+	CreatedAt      pgtype.Timestamptz `json:"created_at"`
+	UpdatedAt      pgtype.Timestamptz `json:"updated_at"`
 }
 
 func (q *Queries) ExamPrepListUnitModulesByUnit(ctx context.Context, arg ExamPrepListUnitModulesByUnitParams) ([]ExamPrepListUnitModulesByUnitRow, error) {
@@ -182,6 +197,8 @@ func (q *Queries) ExamPrepListUnitModulesByUnit(ctx context.Context, arg ExamPre
 			&i.Thumbnail,
 			&i.Icon,
 			&i.SortOrder,
+			&i.LessonsCount,
+			&i.PracticesCount,
 			&i.CreatedAt,
 			&i.UpdatedAt,
 		); err != nil {

gen/db/exam_prep_units.sql.go

@@ -119,6 +119,18 @@ func (q *Queries) ExamPrepListUnitIDsByCatalogCourse(ctx context.Context, catalo
 }
 
 const ExamPrepListUnitsByCatalogCourse = `-- name: ExamPrepListUnitsByCatalogCourse :many
+WITH unit_counts AS (
+    SELECT
+        u.id AS unit_id,
+        COUNT(DISTINCT m.id)::BIGINT AS modules_count,
+        COUNT(DISTINCT l.id)::BIGINT AS lessons_count,
+        COUNT(DISTINCT p.id)::BIGINT AS practices_count
+    FROM exam_prep.units u
+    LEFT JOIN exam_prep.unit_modules m ON m.unit_id = u.id
+    LEFT JOIN exam_prep.unit_module_lessons l ON l.unit_module_id = m.id
+    LEFT JOIN exam_prep.lesson_practices p ON p.unit_module_lesson_id = l.id
+    GROUP BY u.id
+)
 SELECT
     COUNT(*) OVER () AS total_count,
     u.id,
@@ -127,9 +139,13 @@ SELECT
     u.description,
     u.thumbnail,
     u.sort_order,
+    COALESCE(uc.modules_count, 0)::BIGINT AS modules_count,
+    COALESCE(uc.lessons_count, 0)::BIGINT AS lessons_count,
+    COALESCE(uc.practices_count, 0)::BIGINT AS practices_count,
     u.created_at,
     u.updated_at
 FROM exam_prep.units u
+LEFT JOIN unit_counts uc ON uc.unit_id = u.id
 WHERE
     u.catalog_course_id = $1
 ORDER BY
@@ -153,6 +169,9 @@ type ExamPrepListUnitsByCatalogCourseRow struct {
 	Description     pgtype.Text        `json:"description"`
 	Thumbnail       pgtype.Text        `json:"thumbnail"`
 	SortOrder       int32              `json:"sort_order"`
+	ModulesCount    int64              `json:"modules_count"`
+	LessonsCount    int64              `json:"lessons_count"`
+	PracticesCount  int64              `json:"practices_count"`
 	CreatedAt       pgtype.Timestamptz `json:"created_at"`
 	UpdatedAt       pgtype.Timestamptz `json:"updated_at"`
 }
@@ -174,6 +193,9 @@ func (q *Queries) ExamPrepListUnitsByCatalogCourse(ctx context.Context, arg Exam
 			&i.Description,
 			&i.Thumbnail,
 			&i.SortOrder,
+			&i.ModulesCount,
+			&i.LessonsCount,
+			&i.PracticesCount,
 			&i.CreatedAt,
 			&i.UpdatedAt,
 		); err != nil {

internal/domain/exam_prep_catalog_course.go

@@ -4,13 +4,16 @@ import "time"
 
 // ExamPrepCatalogCourse is a top-level exam-prep track (e.g. DET, IELTS) in schema exam_prep — separate from LMS Learn English courses.
 type ExamPrepCatalogCourse struct {
-	ID          int64      `json:"id"`
+	ID           int64      `json:"id"`
-	Name        string     `json:"name"`
+	Name         string     `json:"name"`
-	Description *string    `json:"description,omitempty"`
+	Description  *string    `json:"description,omitempty"`
-	Thumbnail   *string    `json:"thumbnail,omitempty"`
+	Thumbnail    *string    `json:"thumbnail,omitempty"`
-	SortOrder   int        `json:"sort_order"`
+	SortOrder    int        `json:"sort_order"`
-	CreatedAt   time.Time  `json:"created_at"`
+	UnitsCount   *int64     `json:"units_count,omitempty"`
-	UpdatedAt   *time.Time `json:"updated_at,omitempty"`
+	ModulesCount *int64     `json:"modules_count,omitempty"`
+	LessonsCount *int64     `json:"lessons_count,omitempty"`
+	CreatedAt    time.Time  `json:"created_at"`
+	UpdatedAt    *time.Time `json:"updated_at,omitempty"`
 }
 
 type CreateExamPrepCatalogCourseInput struct {

internal/domain/exam_prep_module.go

@@ -4,15 +4,17 @@ import "time"
 
 // ExamPrepModule is a module under an exam-prep unit (stored in exam_prep.unit_modules).
 type ExamPrepModule struct {
-	ID          int64      `json:"id"`
+	ID             int64      `json:"id"`
-	UnitID      int64      `json:"unit_id"`
+	UnitID         int64      `json:"unit_id"`
-	Name        string     `json:"name"`
+	Name           string     `json:"name"`
-	Description *string    `json:"description,omitempty"`
+	Description    *string    `json:"description,omitempty"`
-	Thumbnail   *string    `json:"thumbnail,omitempty"`
+	Thumbnail      *string    `json:"thumbnail,omitempty"`
-	Icon        *string    `json:"icon,omitempty"`
+	Icon           *string    `json:"icon,omitempty"`
-	SortOrder   int        `json:"sort_order"`
+	SortOrder      int        `json:"sort_order"`
-	CreatedAt   time.Time  `json:"created_at"`
+	LessonsCount   *int64     `json:"lessons_count,omitempty"`
-	UpdatedAt   *time.Time `json:"updated_at,omitempty"`
+	PracticesCount *int64     `json:"practices_count,omitempty"`
+	CreatedAt      time.Time  `json:"created_at"`
+	UpdatedAt      *time.Time `json:"updated_at,omitempty"`
 }
 
 type CreateExamPrepModuleInput struct {

internal/domain/exam_prep_unit.go

@@ -5,11 +5,14 @@ import "time"
 // ExamPrepUnit is a chapter-like grouping under an exam-prep catalog course (schema exam_prep.units).
 type ExamPrepUnit struct {
 	ID              int64      `json:"id"`
-	CatalogCourseID int64    `json:"catalog_course_id"`
+	CatalogCourseID int64      `json:"catalog_course_id"`
 	Name            string     `json:"name"`
 	Description     *string    `json:"description,omitempty"`
 	Thumbnail       *string    `json:"thumbnail,omitempty"`
 	SortOrder       int        `json:"sort_order"`
+	ModulesCount    *int64     `json:"modules_count,omitempty"`
+	LessonsCount    *int64     `json:"lessons_count,omitempty"`
+	PracticesCount  *int64     `json:"practices_count,omitempty"`
 	CreatedAt       time.Time  `json:"created_at"`
 	UpdatedAt       *time.Time `json:"updated_at,omitempty"`
 }

internal/repository/exam_prep_catalog_courses.go

@@ -67,7 +67,7 @@ func (s *Store) ListExamPrepCatalogCourses(ctx context.Context, limit, offset in
 		if i == 0 {
 			total = r.TotalCount
 		}
-		out = append(out, examPrepCatalogCourseToDomain(dbgen.ExamPrepCatalogCourse{
+		item := examPrepCatalogCourseToDomain(dbgen.ExamPrepCatalogCourse{
 			ID:          r.ID,
 			Name:        r.Name,
 			Description: r.Description,
@@ -75,7 +75,11 @@ func (s *Store) ListExamPrepCatalogCourses(ctx context.Context, limit, offset in
 			SortOrder:   r.SortOrder,
 			CreatedAt:   r.CreatedAt,
 			UpdatedAt:   r.UpdatedAt,
-		}))
+		})
+		item.UnitsCount = &r.UnitsCount
+		item.ModulesCount = &r.ModulesCount
+		item.LessonsCount = &r.LessonsCount
+		out = append(out, item)
 	}
 	return out, total, nil
 }

internal/repository/exam_prep_unit_modules.go

@@ -72,7 +72,7 @@ func (s *Store) ListExamPrepUnitModulesByUnit(ctx context.Context, unitID int64,
 		if i == 0 {
 			total = r.TotalCount
 		}
-		out = append(out, examPrepModuleToDomain(dbgen.ExamPrepUnitModule{
+		item := examPrepModuleToDomain(dbgen.ExamPrepUnitModule{
 			ID:          r.ID,
 			UnitID:      r.UnitID,
 			Name:        r.Name,
@@ -82,7 +82,10 @@ func (s *Store) ListExamPrepUnitModulesByUnit(ctx context.Context, unitID int64,
 			SortOrder:   r.SortOrder,
 			CreatedAt:   r.CreatedAt,
 			UpdatedAt:   r.UpdatedAt,
-		}))
+		})
+		item.LessonsCount = &r.LessonsCount
+		item.PracticesCount = &r.PracticesCount
+		out = append(out, item)
 	}
 	return out, total, nil
 }

internal/repository/exam_prep_units.go

@@ -55,8 +55,8 @@ func (s *Store) GetExamPrepUnitByID(ctx context.Context, id int64) (domain.ExamP
 func (s *Store) ListExamPrepUnitsByCatalogCourse(ctx context.Context, catalogCourseID int64, limit, offset int32) ([]domain.ExamPrepUnit, int64, error) {
 	rows, err := s.queries.ExamPrepListUnitsByCatalogCourse(ctx, dbgen.ExamPrepListUnitsByCatalogCourseParams{
 		CatalogCourseID: catalogCourseID,
-		Limit:             limit,
+		Limit:           limit,
-		Offset:            offset,
+		Offset:          offset,
 	})
 	if err != nil {
 		return nil, 0, err
@@ -70,7 +70,7 @@ func (s *Store) ListExamPrepUnitsByCatalogCourse(ctx context.Context, catalogCou
 		if i == 0 {
 			total = r.TotalCount
 		}
-		out = append(out, examPrepUnitToDomain(dbgen.ExamPrepUnit{
+		item := examPrepUnitToDomain(dbgen.ExamPrepUnit{
 			ID:              r.ID,
 			CatalogCourseID: r.CatalogCourseID,
 			Name:            r.Name,
@@ -79,7 +79,11 @@ func (s *Store) ListExamPrepUnitsByCatalogCourse(ctx context.Context, catalogCou
 			SortOrder:       r.SortOrder,
 			CreatedAt:       r.CreatedAt,
 			UpdatedAt:       r.UpdatedAt,
-		}))
+		})
+		item.ModulesCount = &r.ModulesCount
+		item.LessonsCount = &r.LessonsCount
+		item.PracticesCount = &r.PracticesCount
+		out = append(out, item)
 	}
 	return out, total, nil
 }

internal/web_server/middleware.go

@@ -199,10 +199,9 @@ func (a *App) RequireActiveSubscription() fiber.Handler {
 				return fiber.NewError(fiber.StatusInternalServerError, "Failed to verify subscription")
 			}
 			if !active {
-				return c.Status(fiber.StatusForbidden).JSON(domain.ErrorResponse{
+				// Temporary bypass: allow unsubscribed learners to access content.
-					Message: "Active subscription required to access this content",
+				// Re-enable the previous 403 response when subscription gating is turned back on.
-					Error:   "subscription_required",
+				return c.Next()
-				})
 			}
 			return c.Next()
 		default: