Deploy files from GitHub repository

.gitignore

@@ -1 +1,2 @@
-/.env
+/.env
+go-boilerplate.exe

config/supabase.go

@@ -1,19 +0,0 @@
-package config
-
-type Supabase interface{
-    NewSupabaseConfig(url string, key string, bucket string)
-}
-
-type SupabaseConfig struct {
-    URL        string
-    ServiceKey string
-    BucketName string
-}
-
-func NewSupabaseConfig(url string, key string, bucket string) SupabaseConfig {
-    return SupabaseConfig{
-        URL:        url,
-        ServiceKey: key,
-        BucketName: bucket,
-    }
-}

config/supabase_config.go

@@ -0,0 +1,25 @@
+package config
+
+type SupabaseConfig interface {
+    GetURL() string
+    GetServiceKey() string
+    GetBucketName() string
+}
+
+type supabaseConfig struct {
+    url        string
+    serviceKey string
+    bucketName string
+}
+
+func NewSupabaseConfig(url string, key string, bucket string) SupabaseConfig {
+    return &supabaseConfig{
+        url:        url,
+        serviceKey: key,
+        bucketName: bucket,
+    }
+}
+
+func (c *supabaseConfig) GetURL() string { return c.url }
+func (c *supabaseConfig) GetServiceKey() string { return c.serviceKey }
+func (c *supabaseConfig) GetBucketName() string { return c.bucketName }

config/upload_config.go

@@ -0,0 +1,49 @@
+package config
+
+import models "abdanhafidz.com/go-boilerplate/models/entity"
+
+
+type UploadRule struct {
+    MaxBytes    int64
+    AllowedExts map[string]bool
+    PathPrefix  string
+    MaxCount    int
+}
+
+type UploadConfig interface {
+    Get(contextType string) (UploadRule, error)
+}
+
+type uploadConfig struct{}
+
+func NewUploadConfig() UploadConfig { return &uploadConfig{} }
+
+func (c *uploadConfig) Get(contextType string) (UploadRule, error) {
+    codeExts := map[string]bool{".cpp": true, ".c": true, ".py": true, ".java": true, ".go": true, ".js": true, ".txt": true}
+    imgExts := map[string]bool{".jpg": true, ".jpeg": true, ".png": true, ".webp": true, ".gif": true}
+    docExts := map[string]bool{".pdf": true, ".doc": true, ".docx": true}
+
+    allExts := make(map[string]bool)
+    for k, v := range codeExts { allExts[k] = v }
+    for k, v := range imgExts { allExts[k] = v }
+    for k, v := range docExts { allExts[k] = v }
+
+    switch contextType {
+    case "image":
+        return UploadRule{ MaxBytes: 10 * models.MB, AllowedExts: imgExts, PathPrefix: "images", MaxCount: 5 }, nil
+    case "material":
+        return UploadRule{ MaxBytes: 10 * models.MB, AllowedExts: docExts, PathPrefix: "materials", MaxCount: 1 }, nil
+    case "submission":
+        return UploadRule{ MaxBytes: 1 * models.MB, AllowedExts: codeExts, PathPrefix: "submissions", MaxCount: 1 }, nil
+    case "general":
+        return UploadRule{ MaxBytes: 5 * models.MB, AllowedExts: allExts, PathPrefix: "temp", MaxCount: 5 }, nil
+    default:
+        return UploadRule{}, ErrInvalidUploadContext
+    }
+}
+
+var ErrInvalidUploadContext = errInvalidUploadContext{}
+
+type errInvalidUploadContext struct{}
+
+func (e errInvalidUploadContext) Error() string { return "invalid upload context" }

controllers/academy_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -77,7 +76,6 @@ func (c *academyController) ListAcademies(ctx *gin.Context) {
 		return
 	}
 
-	fmt.Println("Account ID in ListAcademies:", accountId)
 	res, err := c.academyService.ListAcademies(ctx.Request.Context(), accountId)
 	ResponseJSON(ctx, gin.H{}, res, err)
 }

controllers/upload_controller.go

@@ -18,12 +18,10 @@ import (
 )
 
 type UploadController struct {
-	uploadService *services.UploadService
+    uploadService services.UploadService
 }
 
-func NewUploadController(s *services.UploadService) *UploadController {
-	return &UploadController{uploadService: s}
-}
+func NewUploadController(s services.UploadService) *UploadController { return &UploadController{ uploadService: s } }
 
 func (c *UploadController) Upload(ctx *gin.Context) {
     fmt.Println("👉 Content-Type:", ctx.GetHeader("Content-Type"))
@@ -248,4 +246,4 @@ func (c *UploadController) inferContextFromExt(ext string) string {
 		return "material"
 	}
 	return ""
-}
+}

models/entity/contant.go

@@ -4,4 +4,6 @@ const (
 	StatusNotStarted = "NOT_STARTED"
 	StatusInProgress = "IN_PROGRESS"
 	StatusCompleted  = "COMPLETED"
-)
+)
+
+const MB = 1024 * 1024

models/entity/entity.go

@@ -267,7 +267,7 @@ type Academy struct {
 	ImageUrl         string            `json:"image_url,omitempty"`
 	MaterialsCount   int64             `json:"materials_count,omitempty"`
 	Materials        []AcademyMaterial `gorm:"foreignKey:AcademyId;references:Id" json:"materials,omitempty"`
-	AcademyProgresss AcademyProgress   `gorm:"foreignKey:AcademyId;references:Id" json:"academy_progresses,omitempty"`
+	AcademyProgress AcademyProgress   `gorm:"foreignKey:AcademyId;references:Id" json:"academy_progresses,omitempty"`
 }
 
 func (Academy) TableName() string { return "academy" }
@@ -300,9 +300,9 @@ func (AcademyContent) TableName() string { return "academy_contents" }
 // Progress
 
 type AcademyProgress struct {
-	Id                      uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
-	AccountId               uuid.UUID  `gorm:"type:uuid;index" json:"account_id,omitempty"`
-	AcademyId               uuid.UUID  `gorm:"type:uuid;index" json:"academy_id,omitempty"`
+    Id                      uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
+    AccountId               uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_academy" json:"account_id,omitempty"`
+    AcademyId               uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_academy" json:"academy_id,omitempty"`
 	Status                  string     `gorm:"type:varchar(50);default:'not attempted'" json:"status,omitempty"`
 	Progress                float64    `gorm:"default:0" json:"progress"`
 	TotalCompletedMaterials uint       `gorm:"default:0" json:"total_completed_materials"`
@@ -312,10 +312,10 @@ type AcademyProgress struct {
 func (AcademyProgress) TableName() string { return "academy_progress" }
 
 type AcademyMaterialProgress struct {
-	Id                     uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
-	AccountId              uuid.UUID  `gorm:"type:uuid;index" json:"account_id,omitempty"`
-	AcademyId              uuid.UUID  `gorm:"type:uuid;index" json:"academy_id,omitempty"`
-	MaterialId             uuid.UUID  `gorm:"type:uuid;index" json:"material_id,omitempty"`
+    Id                     uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
+    AccountId              uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_material" json:"account_id,omitempty"`
+    AcademyId              uuid.UUID  `gorm:"type:uuid;index" json:"academy_id,omitempty"`
+    MaterialId             uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_material" json:"material_id,omitempty"`
 	Progress               float64    `gorm:"default:0" json:"progress,omitempty"`
 	TotalCompletedContents uint       `gorm:"default:0" json:"total_completed_contents,omitempty"`
 	Status                 string     `gorm:"type:varchar(50);default:'not attempted'" json:"status,omitempty"`
@@ -325,11 +325,11 @@ type AcademyMaterialProgress struct {
 func (AcademyMaterialProgress) TableName() string { return "academy_material_progress" }
 
 type AcademyContentProgress struct {
-	Id          uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
-	AccountId   uuid.UUID  `gorm:"type:uuid;index" json:"account_id,omitempty"`
-	AcademyId   uuid.UUID  `gorm:"type:uuid;index" json:"academy_id,omitempty"`
-	MaterialId  uuid.UUID  `gorm:"type:uuid;index" json:"material_id,omitempty"`
-	ContentId   uuid.UUID  `gorm:"type:uuid;index" json:"content_id,omitempty"`
+    Id          uuid.UUID  `gorm:"type:uuid;primaryKey" json:"id"`
+    AccountId   uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_content" json:"account_id,omitempty"`
+    AcademyId   uuid.UUID  `gorm:"type:uuid;index" json:"academy_id,omitempty"`
+    MaterialId  uuid.UUID  `gorm:"type:uuid;index" json:"material_id,omitempty"`
+    ContentId   uuid.UUID  `gorm:"type:uuid;uniqueIndex:idx_account_content" json:"content_id,omitempty"`
 	Status      string     `gorm:"type:varchar(50);default:'not attempted'" json:"status,omitempty"`
 	CompletedAt *time.Time `json:"completed_at"`
 }

provider/provider.go

@@ -5,6 +5,7 @@ import (
     "strings"
     entity "abdanhafidz.com/go-boilerplate/models/entity"
     "github.com/gin-gonic/gin"
+    "abdanhafidz.com/go-boilerplate/services"
 )
 
 type AppProvider interface {
@@ -30,16 +31,16 @@ func NewAppProvider() AppProvider {
     configProvider := NewConfigProvider()
     repositoriesProvider := NewRepositoriesProvider(configProvider)
     supabaseCfg := configProvider.ProvideSupabaseConfig()
-    if supabaseCfg.URL == "" || supabaseCfg.ServiceKey == "" || supabaseCfg.BucketName == "" {
+    if supabaseCfg.GetURL() == "" || supabaseCfg.GetServiceKey() == "" || supabaseCfg.GetBucketName() == "" {
         log.Fatalf("Supabase configuration is invalid: URL, ServiceKey, or BucketName is empty")
     }
-    if !strings.HasPrefix(supabaseCfg.URL, "https://") || !strings.Contains(supabaseCfg.URL, ".supabase.co") {
+    if !strings.HasPrefix(supabaseCfg.GetURL(), "https://") || !strings.Contains(supabaseCfg.GetURL(), ".supabase.co") {
         log.Fatalf("Supabase URL is invalid")
     }
-    if strings.Count(supabaseCfg.ServiceKey, ".") != 2 {
+    if strings.Count(supabaseCfg.GetServiceKey(), ".") != 2 {
         log.Fatalf("Supabase service key is not a valid compact JWS")
     }
-    storageDriver := NewSupabaseStorage(supabaseCfg.URL, supabaseCfg.ServiceKey, supabaseCfg.BucketName)
+    storageDriver := services.NewSupabaseStorageService(supabaseCfg.GetURL(), supabaseCfg.GetServiceKey(), supabaseCfg.GetBucketName())
     servicesProvider := NewServicesProvider(repositoriesProvider, configProvider, storageDriver)
     controllerProvider := NewControllerProvider(servicesProvider)
     middlewareProvider := NewMiddlewareProvider(servicesProvider)
@@ -129,4 +130,4 @@ func (a *appProvider) ProvideControllers() ControllerProvider {
 
 func (a *appProvider) ProvideMiddlewares() MiddlewareProvider {
 	return a.middlewareProvider
-}
+}

provider/services_provider.go

@@ -1,7 +1,8 @@
 package provider
 
 import (
-    "abdanhafidz.com/go-boilerplate/services" 
+    "abdanhafidz.com/go-boilerplate/config"
+    "abdanhafidz.com/go-boilerplate/services"
 )
 
 type ServicesProvider interface {
@@ -16,7 +17,7 @@ type ServicesProvider interface {
     ProvideForgotPasswordService() services.ForgotPasswordService
     ProvideEmailVerificationService() services.EmailVerificationService
     ProvideExternalAuthService() services.ExternalAuthService
-    ProvideUploadService() *services.UploadService 
+    ProvideUploadService() services.UploadService 
     ProvideAcademyExamService() services.AcademyExamService
 }
 
@@ -32,14 +33,14 @@ type servicesProvider struct {
     forgotPasswordService    services.ForgotPasswordService
     emailVerificationService services.EmailVerificationService
     externalAuthService      services.ExternalAuthService
-    uploadService            *services.UploadService 
+    uploadService            services.UploadService 
     academyExamService       services.AcademyExamService
 }
 
 func NewServicesProvider(
     repoProvider RepositoriesProvider, 
     configProvider ConfigProvider, 
-    storageProvider services.StorageProvider, 
+    storageProvider StorageProvider, 
 ) ServicesProvider {
 
     eventService := services.NewEventService(repoProvider.ProvideEventsRepository(), repoProvider.ProvideEventAssignRepository())
@@ -66,6 +67,7 @@ func NewServicesProvider(
     uploadService := services.NewUploadService(
         storageProvider, 
         repoProvider.ProvideFileRepository(), 
+        config.NewUploadConfig(),
     )
 
     return &servicesProvider{
@@ -119,8 +121,8 @@ func (s *servicesProvider) ProvideExternalAuthService() services.ExternalAuthSer
     return s.externalAuthService
 }
 
-func (s *servicesProvider) ProvideUploadService() *services.UploadService {
+func (s *servicesProvider) ProvideUploadService() services.UploadService {
     return s.uploadService
 }
 
-func (s *servicesProvider) ProvideAcademyExamService() services.AcademyExamService { return s.academyExamService }
+func (s *servicesProvider) ProvideAcademyExamService() services.AcademyExamService { return s.academyExamService }

provider/storage_provider.go

@@ -0,0 +1,10 @@
+package provider
+
+import (
+    "context"
+    "io"
+)
+
+type StorageProvider interface {
+    UploadFile(ctx context.Context, file io.Reader, destinationPath string, contentType string) (string, error)
+}

provider/supabase_storage.go

@@ -1,47 +0,0 @@
-package provider
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"mime/multipart"
-	storage_go "github.com/supabase-community/storage-go"
-)
-
-type StorageProvider interface {
-	UploadFile(ctx context.Context, file multipart.File, header *multipart.FileHeader) (string, error)
-	GetFileURL(path string) (string, error)
-	DeleteFile(path string) error
-}
-
-type SupabaseStorage struct {
-	client     *storage_go.Client
-	bucketName string
-	url        string
-}
-
-func NewSupabaseStorage(url string, key string, bucketName string) *SupabaseStorage {
-	client := storage_go.NewClient(url+"/storage/v1", key, nil)
-	return &SupabaseStorage{
-		client:     client,
-		bucketName: bucketName,
-		url:        url,
-	}
-}
-
-func (s *SupabaseStorage) UploadFile(ctx context.Context, file io.Reader, destinationPath string, contentType string) (string, error) {
-	_, err := s.client.UploadFile(s.bucketName, destinationPath, file, storage_go.FileOptions{
-		ContentType: &contentType, 
-		Upsert:      new(bool), 
-	})
-
-	if err != nil {
-		return "", err
-	}
-	publicURL := s.client.GetPublicUrl(s.bucketName, destinationPath).SignedURL
-	if publicURL == "" {
-		publicURL = fmt.Sprintf("%s/storage/v1/object/public/%s/%s", s.url, s.bucketName, destinationPath)
-	}
-
-	return publicURL, nil
-}

repositories/academy_repository.go

@@ -58,9 +58,6 @@ type AcademyRepository interface {
 	DecrementContentOrdersGreaterThan(ctx context.Context, materialId uuid.UUID, order uint) error
 	GetAccumulatedMaterialProgress(ctx context.Context, accountId uuid.UUID, academyId uuid.UUID) (float64, error)
 
-	BatchRecalculateMaterialProgress(ctx context.Context, materialId uuid.UUID) error
-	BatchRecalculateAcademyProgress(ctx context.Context, academyId uuid.UUID) error
-
 	GetMaterialProgressBatch(ctx context.Context, accountId uuid.UUID, academyId uuid.UUID, materialIds []uuid.UUID) (map[uuid.UUID]entity.AcademyMaterialProgress, error)
 	GetContentProgressBatch(ctx context.Context, accountId uuid.UUID, academyId uuid.UUID, contentIds []uuid.UUID) (map[uuid.UUID]entity.AcademyContentProgress, error)
 }
@@ -107,7 +104,7 @@ func (r *academyRepository) GetAcademyWithProgress(ctx context.Context, accountI
 	if err != nil {
 		return a, err
 	}
-	a.AcademyProgresss = ap
+	a.AcademyProgress = ap
 	return a, nil
 }
 
@@ -152,9 +149,9 @@ func (r *academyRepository) ListAcademy(ctx context.Context, accountId uuid.UUID
 
 	for i := range list {
 		if p, exists := progressMap[list[i].Id]; exists {
-			list[i].AcademyProgresss = p
+			list[i].AcademyProgress = p
 		} else {
-			list[i].AcademyProgresss = entity.AcademyProgress{
+			list[i].AcademyProgress = entity.AcademyProgress{
 				AccountId: accountId,
 				AcademyId: list[i].Id,
 				Status:    entity.StatusNotStarted,
@@ -289,7 +286,7 @@ func (r *academyRepository) GetAcademyProgress(ctx context.Context, accountId uu
 
 func (r *academyRepository) UpsertAcademyProgress(ctx context.Context, p entity.AcademyProgress) (entity.AcademyProgress, error) {
 	return p, r.db.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "id"}},
+		Columns:   []clause.Column{{Name: "account_id"}, {Name: "academy_id"}},
 		UpdateAll: true,
 	}).Save(&p).Error
 }
@@ -311,7 +308,7 @@ func (r *academyRepository) GetMaterialProgress(ctx context.Context, accountId u
 
 func (r *academyRepository) UpsertMaterialProgress(ctx context.Context, p entity.AcademyMaterialProgress) (entity.AcademyMaterialProgress, error) {
 	return p, r.db.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "id"}},
+		Columns:   []clause.Column{{Name: "account_id"}, {Name: "material_id"}},
 		UpdateAll: true,
 	}).Save(&p).Error
 }
@@ -334,7 +331,7 @@ func (r *academyRepository) GetContentProgress(ctx context.Context, accountId uu
 
 func (r *academyRepository) UpsertContentProgress(ctx context.Context, p entity.AcademyContentProgress) (entity.AcademyContentProgress, error) {
 	return p, r.db.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "id"}},
+		Columns:   []clause.Column{{Name: "account_id"}, {Name: "content_id"}},
 		UpdateAll: true,
 	}).Save(&p).Error
 }
@@ -396,96 +393,6 @@ func (r *academyRepository) GetAccumulatedMaterialProgress(ctx context.Context,
 	return total, err
 }
 
-func (r *academyRepository) BatchRecalculateMaterialProgress(ctx context.Context, materialId uuid.UUID) error {
-	totalContents, err := r.CountContentsByMaterialID(ctx, materialId)
-	if err != nil {
-		return err
-	}
-
-	if totalContents == 0 {
-		return r.db.WithContext(ctx).Model(&entity.AcademyMaterialProgress{}).
-			Where("material_id = ?", materialId).
-			Updates(map[string]interface{}{
-				"progress":                 100,
-				"status":                   entity.StatusCompleted,
-				"total_completed_contents": 0,
-			}).Error
-	}
-
-	return r.db.WithContext(ctx).Exec(`
-		UPDATE academy_material_progresses amp
-		SET 
-			total_completed_contents = (
-				SELECT COUNT(id) FROM academy_content_progresses acp 
-				WHERE acp.material_id = amp.material_id AND acp.account_id = amp.account_id AND acp.status = 'COMPLETED'
-			),
-			progress = (
-				SELECT COUNT(id) FROM academy_content_progresses acp 
-				WHERE acp.material_id = amp.material_id AND acp.account_id = amp.account_id AND acp.status = 'COMPLETED'
-			)::float / ? * 100,
-			status = CASE 
-				WHEN (
-					SELECT COUNT(id) FROM academy_content_progresses acp 
-					WHERE acp.material_id = amp.material_id AND acp.account_id = amp.account_id AND acp.status = 'COMPLETED'
-				) >= ? THEN 'COMPLETED' 
-				ELSE 'IN_PROGRESS' 
-			END,
-			completed_at = CASE 
-				WHEN (
-					SELECT COUNT(id) FROM academy_content_progresses acp 
-					WHERE acp.material_id = amp.material_id AND acp.account_id = amp.account_id AND acp.status = 'COMPLETED'
-				) >= ? THEN NOW() 
-				ELSE NULL 
-			END
-		WHERE amp.material_id = ?
-	`, totalContents, totalContents, totalContents, materialId).Error
-}
-
-func (r *academyRepository) BatchRecalculateAcademyProgress(ctx context.Context, academyId uuid.UUID) error {
-	totalMaterials, err := r.CountMaterialsByAcademyID(ctx, academyId)
-	if err != nil {
-		return err
-	}
-
-	if totalMaterials == 0 {
-		return r.db.WithContext(ctx).Model(&entity.AcademyProgress{}).
-			Where("academy_id = ?", academyId).
-			Updates(map[string]interface{}{
-				"progress":                  100,
-				"status":                    entity.StatusCompleted,
-				"total_completed_materials": 0,
-			}).Error
-	}
-
-	return r.db.WithContext(ctx).Exec(`
-		UPDATE academy_progress ap
-		SET 
-			progress = (
-				SELECT COALESCE(SUM(amp.progress), 0) FROM academy_material_progresses amp
-				WHERE amp.academy_id = ap.academy_id AND amp.account_id = ap.account_id
-			)::float / ?,
-			total_completed_materials = (
-				SELECT COUNT(id) FROM academy_material_progresses amp
-				WHERE amp.academy_id = ap.academy_id AND amp.account_id = ap.account_id AND amp.status = 'COMPLETED'
-			),
-			status = CASE 
-				WHEN (
-					SELECT COUNT(id) FROM academy_material_progresses amp
-					WHERE amp.academy_id = ap.academy_id AND amp.account_id = ap.account_id AND amp.status = 'COMPLETED'
-				) >= ? THEN 'COMPLETED' 
-				ELSE 'IN_PROGRESS' 
-			END,
-			completed_at = CASE 
-				WHEN (
-					SELECT COUNT(id) FROM academy_material_progresses amp
-					WHERE amp.academy_id = ap.academy_id AND amp.account_id = ap.account_id AND amp.status = 'COMPLETED'
-				) >= ? THEN NOW() 
-				ELSE NULL 
-			END
-		WHERE ap.academy_id = ?
-	`, totalMaterials, totalMaterials, totalMaterials, academyId).Error
-}
-
 func (r *academyRepository) GetMaterialProgressBatch(ctx context.Context, accountId uuid.UUID, academyId uuid.UUID, materialIds []uuid.UUID) (map[uuid.UUID]entity.AcademyMaterialProgress, error) {
 	var progresses []entity.AcademyMaterialProgress
 	result := r.db.WithContext(ctx).Where("account_id = ? AND academy_id = ? AND material_id IN ?", accountId, academyId, materialIds).Find(&progresses)

services/academy_service.go

@@ -172,9 +172,7 @@ func (s *academyService) CreateMaterial(ctx context.Context, req dto.CreateMater
 			return err
 		}
 
-		if err := txRepo.BatchRecalculateAcademyProgress(ctx, req.AcademyId); err != nil {
-			return err
-		}
+		// progress recalculation handled on get
 
 		return nil
 	})
@@ -223,9 +221,7 @@ func (s *academyService) DeleteMaterial(ctx context.Context, id uuid.UUID) error
 			return err
 		}
 
-		if err := txRepo.BatchRecalculateAcademyProgress(ctx, m.AcademyId); err != nil {
-			return err
-		}
+		// progress recalculation handled on get
 
 		return nil
 	})
@@ -268,12 +264,7 @@ func (s *academyService) CreateContent(ctx context.Context, req dto.CreateConten
 			return err
 		}
 
-		if err := txRepo.BatchRecalculateMaterialProgress(ctx, req.MaterialId); err != nil {
-			return err
-		}
-		if err := txRepo.BatchRecalculateAcademyProgress(ctx, m.AcademyId); err != nil {
-			return err
-		}
+		// progress recalculation handled on get
 
 		return nil
 	})
@@ -315,20 +306,13 @@ func (s *academyService) DeleteContent(ctx context.Context, id uuid.UUID) error
 		if _, err := txRepo.UpdateMaterial(ctx, material); err != nil {
 			return err
 		}
-		if err := txRepo.BatchRecalculateMaterialProgress(ctx, c.MaterialId); err != nil {
-			return err
-		}
-
-		// Update Academy juga
-		if err := txRepo.BatchRecalculateAcademyProgress(ctx, material.AcademyId); err != nil {
-			return err
-		}
+		// progress recalculation handled on get
 
 		return nil
 	})
 }
 
-// ================= UPDATE PROGRESS =================	
+// ================= UPDATE PROGRESS =================
 
 func (s *academyService) UpdateContentProgress(ctx context.Context, accountId uuid.UUID, academySlug string, materialSlug string, order uint) (entity.AcademyContentProgress, entity.AcademyMaterialProgress, entity.AcademyProgress, error) {
 	academy, err := s.academyRepo.GetAcademyBySlug(ctx, academySlug)
@@ -383,7 +367,7 @@ func (s *academyService) UpdateContentProgress(ctx context.Context, accountId uu
 			if totalContentsCompleted >= m.ContentsCount {
 				matStatus = entity.StatusCompleted
 				matCompletedAt = utils.Ptr(time.Now())
-				progressPct = 100 
+				progressPct = 100
 			}
 		} else {
 			matStatus = entity.StatusCompleted
@@ -411,7 +395,7 @@ func (s *academyService) UpdateContentProgress(ctx context.Context, accountId uu
 		}
 
 		accumulatedProgress, _ := txRepo.GetAccumulatedMaterialProgress(ctx, accountId, academy.Id)
-		a, _ := txRepo.GetAcademyByID(ctx, academy.Id) 
+		a, _ := txRepo.GetAcademyByID(ctx, academy.Id)
 
 		acadStatus := entity.StatusNotStarted
 		var acadCompletedAt *time.Time
@@ -467,7 +451,11 @@ func (s *academyService) GetAcademyResponse(ctx context.Context, accountId uuid.
 	if err != nil {
 		return nil, http_error.ACADEMY_NOT_FOUND
 	}
-	academyProgress, _ := s.academyRepo.GetAcademyProgress(ctx, accountId, academy.Id)
+	accumulatedProgress, _ := s.academyRepo.GetAccumulatedMaterialProgress(ctx, accountId, academy.Id)
+	academyProgress := s.calculateAcademyProgress(ctx, s.academyRepo, accountId, academy.Id, accumulatedProgress, academy.MaterialsCount)
+	if _, err := s.academyRepo.UpsertAcademyProgress(ctx, academyProgress); err != nil {
+		return nil, err
+	}
 	materials, err := s.academyRepo.GetMaterialsWithContents(ctx, academy.Id)
 	if err != nil {
 		materials = []entity.AcademyMaterial{}
@@ -489,7 +477,16 @@ func (s *academyService) GetMaterialResponse(ctx context.Context, accountId uuid
 	if err != nil {
 		return nil, http_error.MATERIAL_NOT_FOUND
 	}
-	materialProgress, _ := s.academyRepo.GetMaterialProgress(ctx, accountId, academy.Id, material.Id)
+	totalCompleted, _ := s.academyRepo.CountCompletedContentsByMaterialAndAccount(ctx, accountId, material.Id)
+	materialProgress := s.calculateMaterialProgress(ctx, s.academyRepo, accountId, academy.Id, material.Id, totalCompleted, material.ContentsCount)
+	if _, err := s.academyRepo.UpsertMaterialProgress(ctx, materialProgress); err != nil {
+		return nil, err
+	}
+	accumulatedProgress, _ := s.academyRepo.GetAccumulatedMaterialProgress(ctx, accountId, academy.Id)
+	academyProgress := s.calculateAcademyProgress(ctx, s.academyRepo, accountId, academy.Id, accumulatedProgress, academy.MaterialsCount)
+	if _, err := s.academyRepo.UpsertAcademyProgress(ctx, academyProgress); err != nil {
+		return nil, err
+	}
 	_, contents, err := s.academyRepo.GetMaterialWithContents(ctx, material.Id)
 	if err != nil {
 		contents = []entity.AcademyContent{}

services/academy_service_helpers.go

@@ -39,11 +39,15 @@ func (s *academyService) getProgressStatus(progress float64, completed, total in
 }
 
 func (s *academyService) upsertContentProgressSimplified(
-	ctx context.Context,
-	txRepo repositories.AcademyRepository,
-	accountId, academyId, materialId, contentId uuid.UUID,
-) entity.AcademyContentProgress {
-	existing, _ := txRepo.GetContentProgress(ctx, accountId, academyId, materialId, contentId)
+    ctx context.Context,
+    txRepo repositories.AcademyRepository,
+    accountId, academyId, materialId, contentId uuid.UUID,
+) (entity.AcademyContentProgress, error) {
+    existing, err := txRepo.GetContentProgress(ctx, accountId, academyId, materialId, contentId)
+    if err != nil {
+        // propagate non-not-found errors
+        return entity.AcademyContentProgress{}, err
+    }
 
 	acp := entity.AcademyContentProgress{
 		Id:          s.getOrCreateID(existing.Id),
@@ -55,8 +59,10 @@ func (s *academyService) upsertContentProgressSimplified(
 		CompletedAt: utils.Ptr(time.Now()),
 	}
 
-	txRepo.UpsertContentProgress(ctx, acp)
-	return acp
+    if _, err := txRepo.UpsertContentProgress(ctx, acp); err != nil {
+        return entity.AcademyContentProgress{}, err
+    }
+    return acp, nil
 }
 
 func (s *academyService) calculateMaterialProgress(
@@ -125,26 +131,24 @@ func (s *academyService) calculateAcademyProgress(
 }
 
 func (s *academyService) updateAcademyMaterialCount(ctx context.Context, txRepo repositories.AcademyRepository, academyId uuid.UUID) error {
-	count, err := txRepo.CountMaterialsByAcademyID(ctx, academyId)
-	if err != nil {
-		return err
-	}
-	academy, _ := txRepo.GetAcademyByID(ctx, academyId)
-	academy.MaterialsCount = count
-	_, err = txRepo.UpdateAcademy(ctx, academy)
-	return err
+    count, err := txRepo.CountMaterialsByAcademyID(ctx, academyId)
+    if err != nil { return err }
+    academy, err := txRepo.GetAcademyByID(ctx, academyId)
+    if err != nil { return err }
+    academy.MaterialsCount = count
+    _, err = txRepo.UpdateAcademy(ctx, academy)
+    return err
 }
 
 
 func (s *academyService) updateMaterialContentCount(ctx context.Context, txRepo repositories.AcademyRepository, materialId uuid.UUID) error {
-	count, err := txRepo.CountContentsByMaterialID(ctx, materialId)
-	if err != nil {
-		return err
-	}
-	material, _ := txRepo.GetMaterialByID(ctx, materialId)
-	material.ContentsCount = count
-	_, err = txRepo.UpdateMaterial(ctx, material)
-	return err
+    count, err := txRepo.CountContentsByMaterialID(ctx, materialId)
+    if err != nil { return err }
+    material, err := txRepo.GetMaterialByID(ctx, materialId)
+    if err != nil { return err }
+    material.ContentsCount = count
+    _, err = txRepo.UpdateMaterial(ctx, material)
+    return err
 }
 
 func formatTime(t *time.Time) *string {

services/account_service.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"errors"
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -37,7 +38,6 @@ func NewAccountService(jwtService JWTService, accountRepo repositories.AccountRe
 		jwtService:        jwtService,
 		accountRepo:       accountRepo,
 		accountDetailRepo: accountDetailRepo,
-		
 	}
 }
 
@@ -68,7 +68,9 @@ func (s *accountService) Create(ctx context.Context, name string, email string,
 		return entity.Account{}, err
 	}
 
-	_, _ = s.CreateEmptyDetail(ctx, created.Id)
+	if _, err := s.CreateEmptyDetail(ctx, created.Id); err != nil {
+		return entity.Account{}, fmt.Errorf("create empty detail: %w", err)
+	}
 
 	return created, nil
 

services/supabase_storage_service.go

@@ -0,0 +1,27 @@
+package services
+
+import (
+    "context"
+    "fmt"
+    "io"
+    storage_go "github.com/supabase-community/storage-go"
+)
+
+type SupabaseStorageService struct {
+    client     *storage_go.Client
+    bucketName string
+    url        string
+}
+
+func NewSupabaseStorageService(url string, key string, bucketName string) *SupabaseStorageService {
+    client := storage_go.NewClient(url+"/storage/v1", key, nil)
+    return &SupabaseStorageService{ client: client, bucketName: bucketName, url: url }
+}
+
+func (s *SupabaseStorageService) UploadFile(ctx context.Context, file io.Reader, destinationPath string, contentType string) (string, error) {
+    _, err := s.client.UploadFile(s.bucketName, destinationPath, file, storage_go.FileOptions{ ContentType: &contentType, Upsert: new(bool) })
+    if err != nil { return "", err }
+    publicURL := s.client.GetPublicUrl(s.bucketName, destinationPath).SignedURL
+    if publicURL == "" { publicURL = fmt.Sprintf("%s/storage/v1/object/public/%s/%s", s.url, s.bucketName, destinationPath) }
+    return publicURL, nil
+}

services/upload_service.go

@@ -1,54 +1,45 @@
 package services
 
 import (
-    "context"
-    "errors"
-    "fmt"
-    "io"
-    "mime/multipart"
-    "path/filepath"
-    "regexp"
-    "strings"
-    "time"
-
-    "github.com/google/uuid"
-
-    entity "abdanhafidz.com/go-boilerplate/models/entity"
-    http_error "abdanhafidz.com/go-boilerplate/models/error"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"time"
+
+	"abdanhafidz.com/go-boilerplate/config"
+	entity "abdanhafidz.com/go-boilerplate/models/entity"
+	http_error "abdanhafidz.com/go-boilerplate/models/error"
+	"abdanhafidz.com/go-boilerplate/repositories"
+	"github.com/google/uuid"
 )
 
-const MB = 1024 * 1024
-
-type uploadConfig struct {
-	MaxBytes    int64
-	AllowedExts map[string]bool
-	PathPrefix  string
-	MaxCount    int
-}
-
-type StorageProvider interface {
-	UploadFile(ctx context.Context, file io.Reader, destinationPath string, contentType string) (string, error)
+type UploadService interface {
+	UploadFiles(ctx context.Context, files []*multipart.FileHeader, uploadContext string, accountID uuid.UUID) ([]entity.File, error)
+	GetFileByID(ctx context.Context, fileID uuid.UUID, accountID uuid.UUID) (*entity.File, error)
+	UploadRawFile(ctx context.Context, reader io.Reader, originalName string, contentType string, uploadContext string, accountID uuid.UUID) (*entity.File, error)
 }
 
-type FileRepository interface {
-	Create(ctx context.Context, file *entity.File) error
-	FindByID(ctx context.Context, id uuid.UUID) (*entity.File, error)
+type uploadService struct {
+	storageProvider storageUploader
+	fileRepo        repositories.FileRepository
+	cfg             config.UploadConfig
 }
 
-type UploadService struct {
-	storageProvider StorageProvider
-	fileRepo        FileRepository
+func NewUploadService(storage storageUploader, repo repositories.FileRepository, cfg config.UploadConfig) UploadService {
+	return &uploadService{storageProvider: storage, fileRepo: repo, cfg: cfg}
 }
 
-func NewUploadService(storage StorageProvider, repo FileRepository) *UploadService {
-	return &UploadService{
-		storageProvider: storage,
-		fileRepo:        repo,
-	}
+type storageUploader interface {
+	UploadFile(ctx context.Context, file io.Reader, destinationPath string, contentType string) (string, error)
 }
 
-func (s *UploadService) UploadFiles(ctx context.Context, files []*multipart.FileHeader, uploadContext string, accountID uuid.UUID) ([]entity.File, error) {
-	config, err := s.getUploadConfig(uploadContext)
+func (s *uploadService) UploadFiles(ctx context.Context, files []*multipart.FileHeader, uploadContext string, accountID uuid.UUID) ([]entity.File, error) {
+	config, err := s.cfg.Get(uploadContext)
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +72,7 @@ func (s *UploadService) UploadFiles(ctx context.Context, files []*multipart.File
 	return uploadedFiles, nil
 }
 
-func (s *UploadService) GetFileByID(ctx context.Context, fileID uuid.UUID, accountID uuid.UUID) (*entity.File, error) {
+func (s *uploadService) GetFileByID(ctx context.Context, fileID uuid.UUID, accountID uuid.UUID) (*entity.File, error) {
 	file, err := s.fileRepo.FindByID(ctx, fileID)
 	if err != nil {
 		if errors.Is(err, http_error.NOT_FOUND_ERROR) {
@@ -97,7 +88,7 @@ func (s *UploadService) GetFileByID(ctx context.Context, fileID uuid.UUID, accou
 	return file, nil
 }
 
-func (s *UploadService) processSingleFile(ctx context.Context, fileHeader *multipart.FileHeader, config uploadConfig, uploadContext string, accountID uuid.UUID) (*entity.File, error) {
+func (s *uploadService) processSingleFile(ctx context.Context, fileHeader *multipart.FileHeader, config config.UploadRule, uploadContext string, accountID uuid.UUID) (*entity.File, error) {
 	if err := s.validateFile(fileHeader, config); err != nil {
 		return nil, err
 	}
@@ -137,7 +128,7 @@ func (s *UploadService) processSingleFile(ctx context.Context, fileHeader *multi
 	return fileEntity, nil
 }
 
-func (s *UploadService) validateFile(file *multipart.FileHeader, config uploadConfig) error {
+func (s *uploadService) validateFile(file *multipart.FileHeader, config config.UploadRule) error {
 	if file.Size == 0 || file.Size > config.MaxBytes {
 		return http_error.FILE_TOO_LARGE
 	}
@@ -155,7 +146,7 @@ func (s *UploadService) validateFile(file *multipart.FileHeader, config uploadCo
 	return nil
 }
 
-func (s *UploadService) generateStoredFilename(originalName string, ext string) string {
+func (s *uploadService) generateStoredFilename(originalName string, ext string) string {
 	originalNameWithoutExt := strings.TrimSuffix(originalName, ext)
 	reg := regexp.MustCompile("[^a-zA-Z0-9._-]+")
 	sanitizedRawName := reg.ReplaceAllString(originalNameWithoutExt, "_")
@@ -165,7 +156,7 @@ func (s *UploadService) generateStoredFilename(originalName string, ext string)
 	return fmt.Sprintf("%s-%d-%s%s", uniqueID.String(), timestamp, sanitizedRawName, ext)
 }
 
-func (s *UploadService) generateStoragePath(prefix, contextType, filename string, accountID uuid.UUID) string {
+func (s *uploadService) generateStoragePath(prefix, contextType, filename string, accountID uuid.UUID) string {
 	switch contextType {
 	case "submission":
 		now := time.Now()
@@ -177,98 +168,48 @@ func (s *UploadService) generateStoragePath(prefix, contextType, filename string
 	}
 }
 
-func (s *UploadService) getUploadConfig(contextType string) (uploadConfig, error) {
-	codeExts := map[string]bool{".cpp": true, ".c": true, ".py": true, ".java": true, ".go": true, ".js": true, ".txt": true}
-	imgExts := map[string]bool{".jpg": true, ".jpeg": true, ".png": true, ".webp": true, ".gif": true}
-	docExts := map[string]bool{".pdf": true, ".doc": true, ".docx": true}
-
-	allExts := make(map[string]bool)
-	for k, v := range codeExts {
-		allExts[k] = v
+func (s *uploadService) UploadRawFile(ctx context.Context, reader io.Reader, originalName string, contentType string, uploadContext string, accountID uuid.UUID) (*entity.File, error) {
+	rule, err := s.cfg.Get(uploadContext)
+	if err != nil {
+		return nil, http_error.BAD_REQUEST_ERROR
+	}
+
+	ext := strings.ToLower(strings.TrimSpace(filepath.Ext(originalName)))
+	if ext == "" {
+		if strings.Contains(contentType, "pdf") {
+			ext = ".pdf"
+		} else if strings.Contains(contentType, "png") {
+			ext = ".png"
+		} else if strings.Contains(contentType, "jpeg") || strings.Contains(contentType, "jpg") {
+			ext = ".jpg"
+		} else {
+			ext = ".bin"
+		}
 	}
-	for k, v := range imgExts {
-		allExts[k] = v
+
+	storedFilename := s.generateStoredFilename(originalName, ext)
+	storagePath := s.generateStoragePath(rule.PathPrefix, uploadContext, storedFilename, accountID)
+
+	publicURL, err := s.storageProvider.UploadFile(ctx, reader, storagePath, contentType)
+	if err != nil {
+		return nil, err
 	}
-	for k, v := range docExts {
-		allExts[k] = v
+
+	fileEntity := &entity.File{
+		Id:           uuid.New(),
+		OriginalName: originalName,
+		StoredName:   storedFilename,
+		MimeType:     contentType,
+		Size:         0,
+		Path:         publicURL,
+		Context:      uploadContext,
+		AccountId:    accountID,
+		CreatedAt:    time.Now(),
 	}
 
-	switch contextType {
-	case "image":
-		return uploadConfig{
-			MaxBytes:    10 * MB,
-			AllowedExts: imgExts,
-			PathPrefix:  "images",
-			MaxCount:    5,
-		}, nil
-	case "material":
-		return uploadConfig{
-			MaxBytes:    10 * MB,
-			AllowedExts: docExts,
-			PathPrefix:  "materials",
-			MaxCount:    1,
-		}, nil
-	case "submission":
-		return uploadConfig{
-			MaxBytes:    1 * MB,
-			AllowedExts: codeExts,
-			PathPrefix:  "submissions",
-			MaxCount:    1,
-		}, nil
-	case "general":
-		return uploadConfig{
-			MaxBytes:    5 * MB,
-			AllowedExts: allExts,
-			PathPrefix:  "temp",
-			MaxCount:    5,
-		}, nil
-	default:
-		return uploadConfig{}, http_error.INVALID_DATA_PAYLOAD
+	if err := s.fileRepo.Create(ctx, fileEntity); err != nil {
+		return nil, err
 	}
-}
 
-func (s *UploadService) UploadRawFile(ctx context.Context, reader io.Reader, originalName string, contentType string, uploadContext string, accountID uuid.UUID) (*entity.File, error) {
-    config, err := s.getUploadConfig(uploadContext)
-    if err != nil {
-        return nil, http_error.BAD_REQUEST_ERROR
-    }
-
-    ext := strings.ToLower(strings.TrimSpace(filepath.Ext(originalName)))
-    if ext == "" {
-        if strings.Contains(contentType, "pdf") {
-            ext = ".pdf"
-        } else if strings.Contains(contentType, "png") {
-            ext = ".png"
-        } else if strings.Contains(contentType, "jpeg") || strings.Contains(contentType, "jpg") {
-            ext = ".jpg"
-        } else {
-            ext = ".bin"
-        }
-    }
-
-    storedFilename := s.generateStoredFilename(originalName, ext)
-    storagePath := s.generateStoragePath(config.PathPrefix, uploadContext, storedFilename, accountID)
-
-    publicURL, err := s.storageProvider.UploadFile(ctx, reader, storagePath, contentType)
-    if err != nil {
-        return nil, err
-    }
-
-    fileEntity := &entity.File{
-        Id:           uuid.New(),
-        OriginalName: originalName,
-        StoredName:   storedFilename,
-        MimeType:     contentType,
-        Size:         0,
-        Path:         publicURL,
-        Context:      uploadContext,
-        AccountId:    accountID,
-        CreatedAt:    time.Now(),
-    }
-
-    if err := s.fileRepo.Create(ctx, fileEntity); err != nil {
-        return nil, err
-    }
-
-    return fileEntity, nil
-}
+	return fileEntity, nil
+}

space/.gitignore

@@ -1 +1,2 @@
-/.env
+/.env
+go-boilerplate.exe