FahdShalhoub/thamanyah
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REFACTOR: Seperated Catagories And Video DB Repositories
Build, Push and Deploy CMS / build-push-deploy (push) Successful in 2m45s
Details

Browse Source
This commit is contained in:
FahdShalhoub
2026-08-26 08:51:40 +03:00
parent b77afbfed6
commit 4132c6071e
8 changed files with 182 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cms/internal/db/client.go
+30
View File
@@ -0,0 +1,30 @@
package db
import (
"context"
"database/sql"
"fmt"
"log"
)
func CreateDBConnection(connectionString string) *sql.DB {
sqlDB, err := sql.Open("postgres", connectionString)
if err != nil {
panic(fmt.Errorf("db: cannot open connection: %w", err))
}
return sqlDB
}
func CloseConnection(SQLDB *sql.DB) {
err := SQLDB.Close()
if err != nil {
log.Fatalf("Error Closing DB Connection: %s", err)
}
}
func AssertSuccessfulConnection(ctx context.Context, SQLDB *sql.DB) {
if err := SQLDB.PingContext(ctx); err != nil {
panic(fmt.Errorf("db: cannot connect: %w", err))
}
}
cms/internal/db/repositories/catagories.go
+54
View File
@@ -0,0 +1,54 @@
package repositories
import (
"context"
"database/sql"
"thamanyah/cms/v2/internal/models"
)
type CatagoriesRepository interface {
ListCategories(ctx context.Context) ([]models.Category, error)
ListCategoriesIDs(ctx context.Context) ([]int16, error)
}
var CatagoriesRepo CatagoriesRepository
type ConcreteCatagoriesRepository struct {
SQLDB *sql.DB
}
func (svc ConcreteCatagoriesRepository) ListCategories(ctx context.Context) ([]models.Category, error) {
rows, err := svc.SQLDB.QueryContext(ctx, `SELECT id, name FROM categories ORDER BY name`)
if err != nil {
return nil, err
}
defer rows.Close()
var categories []models.Category
for rows.Next() {
var category models.Category
if err := rows.Scan(&category.ID, &category.Name); err != nil {
return nil, err
}
categories = append(categories, category)
}
return categories, rows.Err()
}
func (svc ConcreteCatagoriesRepository) ListCategoriesIDs(ctx context.Context) ([]int16, error) {
rows, err := svc.SQLDB.QueryContext(ctx, `SELECT id FROM categories`)
if err != nil {
return nil, err
}
defer rows.Close()
var categories []int16
for rows.Next() {
var category int16
if err := rows.Scan(&category); err != nil {
return nil, err
}
categories = append(categories, category)
}
return categories, rows.Err()
}
cms/internal/db/repositories/videos.go
+52
View File
@@ -0,0 +1,52 @@
package repositories
import (
"context"
"database/sql"
"fmt"
"strings"
"thamanyah/cms/v2/internal/models"
)
type VideoRepository interface {
CreateVideo(ctx context.Context, v models.Video) (models.Video, error)
}
var VideoRepo VideoRepository
type ConcreteVideoRepository struct {
SQLDB *sql.DB
}
func (svc ConcreteVideoRepository) CreateVideo(ctx context.Context, v models.Video) (models.Video, error) {
tx, err := svc.SQLDB.BeginTx(ctx, nil)
if err != nil {
return models.Video{}, err
}
defer tx.Rollback()
row := tx.QueryRowContext(ctx, `
INSERT INTO videos (title, description, tags, file_name, storage_key, mediaconvert_job_id, status, size_bytes)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
RETURNING id, created_at, updated_at
`, v.Title, v.Description, v.Tags, v.FileName, v.StorageKey, v.MediaConvertJobID, string(v.Status), v.SizeBytes)
if err := row.Scan(&v.ID, &v.CreatedAt, &v.UpdatedAt); err != nil {
return models.Video{}, err
}
rows := make([]string, 0, len(v.CategoryIDs))
for _, categoryID := range v.CategoryIDs {
rows = append(rows, fmt.Sprintf("($1, %d)", categoryID))
}
if _, err := tx.ExecContext(ctx, `INSERT INTO video_categories (video_id, category_id) VALUES `+strings.Join(rows, ", "), v.ID); err != nil {
return models.Video{}, fmt.Errorf("linking categories %v: %w", v.CategoryIDs, err)
}
if err := tx.Commit(); err != nil {
return models.Video{}, err
}
return v, nil
}
cms/internal/handlers/videos.go
+8 -6
View File
@@ -13,6 +13,8 @@ import (
"strconv"
"strings"
"thamanyah/cms/v2/internal/api"
"thamanyah/cms/v2/internal/db/repositories"
"thamanyah/cms/v2/internal/models"
"thamanyah/cms/v2/internal/services"
"time"
)
@@ -33,7 +35,7 @@ const (
// @Failure 500 {object} api.ProblemDetails "Categories could not be read from the database"
// @Router /api/categories [get]
func ListCategories(w http.ResponseWriter, r *http.Request) {
categories, err := services.DB.ListCategories(r.Context())
categories, err := repositories.CatagoriesRepo.ListCategories(r.Context())
if err != nil {
log.Printf("Something Went Wrong Loading Categories: %s", err)
writeProblem(w, http.StatusInternalServerError, "Something Went Wrong Loading Categories",
@@ -143,7 +145,7 @@ func CompleteVideoUpload(w http.ResponseWriter, r *http.Request) {
return
}
err := resolveCategoryIDs(r.Context(), req.CategoryIDs)
err := validateCatagoryIDS(r.Context(), req.CategoryIDs)
if err != nil {
log.Printf("Something Went Wrong Loading Categories: %s", err)
writeProblem(w, http.StatusInternalServerError, "Something Went Wrong Loading Categories",
@@ -159,7 +161,7 @@ func CompleteVideoUpload(w http.ResponseWriter, r *http.Request) {
return
}
video, err := services.DB.CreateVideo(r.Context(), services.Video{
video, err := repositories.VideoRepo.CreateVideo(r.Context(), models.Video{
Title: title,
Description: strings.TrimSpace(req.Description),
CategoryIDs: req.CategoryIDs,
@@ -167,7 +169,7 @@ func CompleteVideoUpload(w http.ResponseWriter, r *http.Request) {
FileName: strings.TrimSpace(req.FileName),
StorageKey: key,
MediaConvertJobID: jobID,
Status: services.VideoStatusProcessing,
Status: models.VideoStatusProcessing,
SizeBytes: 60,
})
if err != nil {
@@ -193,8 +195,8 @@ func CompleteVideoUpload(w http.ResponseWriter, r *http.Request) {
})
}
func resolveCategoryIDs(ctx context.Context, submitted []int16) (err error) {
categoryIDS, err := services.DB.ListCategoriesIDs(ctx)
func validateCatagoryIDS(ctx context.Context, submitted []int16) (err error) {
categoryIDS, err := repositories.CatagoriesRepo.ListCategoriesIDs(ctx)
if err != nil {
return err
}
cms/internal/models/catagory.go
+6
View File
@@ -0,0 +1,6 @@
package models
type Category struct {
ID int16
Name string
}
cms/internal/services/status.go → cms/internal/models/video.go
+18 -1
View File
@@ -1,4 +1,21 @@
package services
package models
import "time"
type Video struct {
ID string
Title string
Description string
CategoryIDs []int16
Tags string
FileName string
StorageKey string
MediaConvertJobID string
Status VideoStatus
SizeBytes int64
CreatedAt time.Time
UpdatedAt time.Time
}
// VideoStatus is the transcoding lifecycle state of a video, stored verbatim
// in videos.status. The set is closed on both sides: the database rejects
cms/internal/services/db.go
-141
View File
@@ -1,141 +0,0 @@
package services
import (
"context"
"database/sql"
"fmt"
"log"
"strings"
"thamanyah/cms/v2/internal/db"
"time"
)
var DB DBClient
type Category struct {
ID int16
Name string
}
type Video struct {
ID string
Title string
Description string
CategoryIDs []int16
Tags string
FileName string
StorageKey string
MediaConvertJobID string
Status VideoStatus
SizeBytes int64
CreatedAt time.Time
UpdatedAt time.Time
}
type DBClient interface {
CreateVideo(ctx context.Context, v Video) (Video, error)
ListCategories(ctx context.Context) ([]Category, error)
ListCategoriesIDs(ctx context.Context) ([]int16, error)
}
type DBConcrete struct {
SQLDB *sql.DB
}
func CreateConcreteDbClient(connectionString string) DBConcrete {
sqlDB, err := sql.Open("postgres", connectionString)
if err != nil {
panic(fmt.Errorf("db: cannot open connection: %w", err))
}
return DBConcrete{
SQLDB: sqlDB,
}
}
func (svc DBConcrete) CreateVideo(ctx context.Context, v Video) (Video, error) {
tx, err := svc.SQLDB.BeginTx(ctx, nil)
if err != nil {
return Video{}, err
}
defer tx.Rollback()
row := tx.QueryRowContext(ctx, `
INSERT INTO videos (title, description, tags, file_name, storage_key, mediaconvert_job_id, status, size_bytes)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
RETURNING id, created_at, updated_at
`, v.Title, v.Description, v.Tags, v.FileName, v.StorageKey, v.MediaConvertJobID, string(v.Status), v.SizeBytes)
if err := row.Scan(&v.ID, &v.CreatedAt, &v.UpdatedAt); err != nil {
return Video{}, err
}
rows := make([]string, 0, len(v.CategoryIDs))
for _, categoryID := range v.CategoryIDs {
rows = append(rows, fmt.Sprintf("($1, %d)", categoryID))
}
if _, err := tx.ExecContext(ctx, `INSERT INTO video_categories (video_id, category_id) VALUES `+strings.Join(rows, ", "), v.ID); err != nil {
return Video{}, fmt.Errorf("linking categories %v: %w", v.CategoryIDs, err)
}
if err := tx.Commit(); err != nil {
return Video{}, err
}
return v, nil
}
func (svc DBConcrete) ListCategories(ctx context.Context) ([]Category, error) {
rows, err := svc.SQLDB.QueryContext(ctx, `SELECT id, name FROM categories ORDER BY name`)
if err != nil {
return nil, err
}
defer rows.Close()
var categories []Category
for rows.Next() {
var category Category
if err := rows.Scan(&category.ID, &category.Name); err != nil {
return nil, err
}
categories = append(categories, category)
}
return categories, rows.Err()
}
func (svc DBConcrete) ListCategoriesIDs(ctx context.Context) ([]int16, error) {
rows, err := svc.SQLDB.QueryContext(ctx, `SELECT id FROM categories`)
if err != nil {
return nil, err
}
defer rows.Close()
var categories []int16
for rows.Next() {
var category int16
if err := rows.Scan(&category); err != nil {
return nil, err
}
categories = append(categories, category)
}
return categories, rows.Err()
}
func (svc DBConcrete) Migrate() {
if err := db.Migrate(svc.SQLDB); err != nil {
panic(err)
}
}
func (svc DBConcrete) CloseConnection() {
err := svc.SQLDB.Close()
if err != nil {
log.Fatalf("Error Closing DB Connection: %s", err)
}
}
func (svc DBConcrete) AssertSuccessfulConnection(ctx context.Context) {
if err := svc.SQLDB.PingContext(ctx); err != nil {
panic(fmt.Errorf("db: cannot connect: %w", err))
}
}
cms/main.go
+14 -7
View File
@@ -6,6 +6,8 @@ import (
"log"
"net/http"
"os"
"thamanyah/cms/v2/internal/db"
"thamanyah/cms/v2/internal/db/repositories"
"thamanyah/cms/v2/internal/handlers"
"thamanyah/cms/v2/internal/services"
@@ -32,9 +34,9 @@ func main() {
}
func runMigrate() {
concreteDBClient := services.CreateConcreteDbClient(requireDBConnectionString())
defer concreteDBClient.CloseConnection()
concreteDBClient.Migrate()
concreteDBClient := db.CreateDBConnection(requireDBConnectionString())
defer db.CloseConnection(concreteDBClient)
db.Migrate(concreteDBClient)
log.Println("migrations applied successfully")
}
@@ -79,10 +81,15 @@ func runServer() {
OutputBucket: mediaConvertOutputBucket,
}
concreteDBClient := services.CreateConcreteDbClient(requireDBConnectionString())
defer concreteDBClient.CloseConnection()
concreteDBClient.AssertSuccessfulConnection(context.Background())
services.DB = concreteDBClient
concreteDBClient := db.CreateDBConnection(requireDBConnectionString())
defer db.CloseConnection(concreteDBClient)
db.AssertSuccessfulConnection(context.Background(), concreteDBClient)
repositories.VideoRepo = &repositories.ConcreteVideoRepository{
SQLDB: concreteDBClient,
}
repositories.CatagoriesRepo = &repositories.ConcreteCatagoriesRepository{
SQLDB: concreteDBClient,
}
mux := http.NewServeMux()