Yimaru/Yimaru-BackEnd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Yimaru:73370633ced922ec14881770c46de77b32437bca
Branches Tags
Yimaru:main
Yimaru:production
Yimaru:poduction
..
compare: Yimaru:10954d88b087a5e6a98299dd291669c2701c3766
Branches Tags
Yimaru:production
Yimaru:main
Yimaru:poduction

No commits in common. "73370633ced922ec14881770c46de77b32437bca" and "10954d88b087a5e6a98299dd291669c2701c3766" have entirely different histories.
73370633ce ... 10954d88b0

13 changed files with 47 additions and 169 deletions
Show Stats Expand all files Collapse all files

15
db/query/exam_prep_catalog_courses.sql
View File

@ -17,17 +17,6 @@ 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,
@ -35,13 +24,9 @@ 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;

13
db/query/exam_prep_unit_modules.sql
View File

@ -30,16 +30,6 @@ 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,
@ -49,12 +39,9 @@ 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

16
db/query/exam_prep_units.sql
View File

@ -29,18 +29,6 @@ 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,
@ -49,13 +37,9 @@ 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

21
gen/db/exam_prep_catalog_courses.sql.go
View File

@ -105,17 +105,6 @@ 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,
@ -123,13 +112,9 @@ 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
`
@ -146,9 +131,6 @@ type ExamPrepListCatalogCoursesRow struct {
Description pgtype.Text `json:"description"`
Thumbnail pgtype.Text `json:"thumbnail"`
SortOrder int32 `json:"sort_order"`
UnitsCount int64 `json:"units_count"`
ModulesCount int64 `json:"modules_count"`
LessonsCount int64 `json:"lessons_count"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
@ -169,9 +151,6 @@ 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 {

17
gen/db/exam_prep_unit_modules.sql.go
View File

@ -124,16 +124,6 @@ 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,
@ -143,12 +133,9 @@ 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
@ -173,8 +160,6 @@ type ExamPrepListUnitModulesByUnitRow struct {
Thumbnail pgtype.Text `json:"thumbnail"`
Icon pgtype.Text `json:"icon"`
SortOrder int32 `json:"sort_order"`
LessonsCount int64 `json:"lessons_count"`
PracticesCount int64 `json:"practices_count"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
@ -197,8 +182,6 @@ 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 {

22
gen/db/exam_prep_units.sql.go
View File

@ -119,18 +119,6 @@ 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,
@ -139,13 +127,9 @@ 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
@ -169,9 +153,6 @@ 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"`
}
@ -193,9 +174,6 @@ 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 {

3
internal/domain/exam_prep_catalog_course.go
View File

@ -9,9 +9,6 @@ type ExamPrepCatalogCourse struct {
Description *string `json:"description,omitempty"`
Thumbnail *string `json:"thumbnail,omitempty"`
SortOrder int `json:"sort_order"`
UnitsCount *int64 `json:"units_count,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"`
}

2
internal/domain/exam_prep_module.go
View File

@ -11,8 +11,6 @@ type ExamPrepModule struct {
Thumbnail *string `json:"thumbnail,omitempty"`
Icon *string `json:"icon,omitempty"`
SortOrder int `json:"sort_order"`
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"`
}

3
internal/domain/exam_prep_unit.go
View File

@ -10,9 +10,6 @@ type ExamPrepUnit struct {
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"`
}

8
internal/repository/exam_prep_catalog_courses.go
View File

@ -67,7 +67,7 @@ func (s *Store) ListExamPrepCatalogCourses(ctx context.Context, limit, offset in
if i == 0 {
total = r.TotalCount
}
item := examPrepCatalogCourseToDomain(dbgen.ExamPrepCatalogCourse{
out = append(out, examPrepCatalogCourseToDomain(dbgen.ExamPrepCatalogCourse{
ID: r.ID,
Name: r.Name,
Description: r.Description,
@ -75,11 +75,7 @@ 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
}

7
internal/repository/exam_prep_unit_modules.go
View File

@ -72,7 +72,7 @@ func (s *Store) ListExamPrepUnitModulesByUnit(ctx context.Context, unitID int64,
if i == 0 {
total = r.TotalCount
}
item := examPrepModuleToDomain(dbgen.ExamPrepUnitModule{
out = append(out, examPrepModuleToDomain(dbgen.ExamPrepUnitModule{
ID: r.ID,
UnitID: r.UnitID,
Name: r.Name,
@ -82,10 +82,7 @@ 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
}

8
internal/repository/exam_prep_units.go
View File

@ -70,7 +70,7 @@ func (s *Store) ListExamPrepUnitsByCatalogCourse(ctx context.Context, catalogCou
if i == 0 {
total = r.TotalCount
}
item := examPrepUnitToDomain(dbgen.ExamPrepUnit{
out = append(out, examPrepUnitToDomain(dbgen.ExamPrepUnit{
ID: r.ID,
CatalogCourseID: r.CatalogCourseID,
Name: r.Name,
@ -79,11 +79,7 @@ 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
}

7
internal/web_server/middleware.go
View File

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