Deploy files from GitHub repository

controllers/academy_controller.go

@@ -17,7 +17,7 @@ type AcademyController interface {
 	CreateAcademy(ctx *gin.Context)
 	GetAcademy(ctx *gin.Context)
 	GetAcademyDetail(ctx *gin.Context)
-	ListAcademies(ctx *gin.Context)
+	ListAcademy(ctx *gin.Context)
 	UpdateAcademy(ctx *gin.Context)
 	DeleteAcademy(ctx *gin.Context)
 	JoinAcademyByCode(ctx *gin.Context)
@@ -73,26 +73,66 @@ func (c *academyController) GetAcademyDetail(ctx *gin.Context) {
 	ResponseJSON(ctx, gin.H{"id": id}, res, err)
 }
 
-func (c *academyController) ListAcademies(ctx *gin.Context) {
+func (c *academyController) ListAcademy(ctx *gin.Context) {
 	accountIdStr := ctx.GetString("account_id")
 	accountId, err := uuid.Parse(accountIdStr)
 	if err != nil {
 		ResponseJSON[any, any](ctx, nil, nil, http_error.UNAUTHORIZED)
 		return
 	}
+
 	limit, _ := strconv.Atoi(ctx.DefaultQuery("limit", "10"))
 	page, _ := strconv.Atoi(ctx.DefaultQuery("page", "1"))
+	isModified := false
+
+	if limit < 1 {
+		limit = 10
+		isModified = true
+	} else if limit > 50 {
+		limit = 50
+		isModified = true
+	}
+
 	if page < 1 {
 		page = 1
+		isModified = true
 	}
+
 	offset := (page - 1) * limit
 	p := repositories.Pagination{Limit: limit, Offset: offset}
-	list, total, err := c.academyService.ListAcademies(ctx.Request.Context(), accountId, p)
+	list, total, err := c.academyService.ListAcademy(ctx.Request.Context(), accountId, p)
+
+	if err != nil {
+		ResponseJSON[any, any](ctx, nil, nil, err)
+		return
+	}
+
+	var totalPages int
+	if total == 0 {
+		totalPages = 1
+	} else {
+		totalPages = int((total + int64(limit) - 1) / int64(limit))
+	}
+
+	if page > totalPages {
+		page = totalPages
+		offset = (page - 1) * limit
+		p.Offset = offset
+		list, total, err = c.academyService.ListAcademy(ctx.Request.Context(), accountId, p)
+		isModified = true
+	}
+
 	meta := gin.H{
 		"total_records": total,
 		"page_size":     limit,
 		"current_page":  page,
+		"is_modified":   isModified,
 	}
+
+		if isModified {
+			ctx.Status(http.StatusAccepted)
+		}
+
 	ResponseJSON(ctx, meta, list, err)
 }
 

models/dto/academy_dto.go

@@ -44,6 +44,17 @@ type AcademyProgressResponse struct {
 	CompletedAt             *string   `json:"completed_at"`
 }
 
+type MaterialProgressResponse struct {
+	Id                     uuid.UUID `json:"id"`
+	AccountId              uuid.UUID `json:"account_id"`
+	AcademyId              uuid.UUID `json:"academy_id"`
+	MaterialId             uuid.UUID `json:"material_id"`
+	Progress               float64   `json:"progress"`
+	TotalCompletedContents uint      `json:"total_completed_contents"`
+	Status                 string    `json:"status"`
+	CompletedAt            *string   `json:"completed_at"`
+}
+
 type AcademyContentResponse struct {
 	Id     uuid.UUID `json:"id"`
 	Order  uint      `json:"order"`
@@ -64,6 +75,26 @@ type AcademyMaterialResponse struct {
 	Contents               []AcademyContentResponse `json:"contents"`
 }
 
+// PREVIEW DTOs
+
+type AcademyPublicPreviewResponse struct {
+	Id             uuid.UUID         `json:"id"`
+	Title          string            `json:"title"`
+	Description    string            `json:"description"`
+	ImageUrl       string            `json:"image_url"`
+	Code           string            `json:"code"`
+	RegisterStatus int               `json:"register_status" binding:"required"`
+	Materials      []MaterialPreview `json:"materials"`
+}
+
+type MaterialPreview struct {
+	Id    uuid.UUID `json:"id"`
+	Title string    `json:"title"`
+	Order uint      `json:"order"`
+}
+
+// Detail Response
+
 type AcademyDetailResponse struct {
 	Id              uuid.UUID                 `json:"id"`
 	Title           string                    `json:"title"`
@@ -77,37 +108,6 @@ type AcademyDetailResponse struct {
 	RegisterStatus  int                       `json:"register_status" binding:"required"`
 }
 
-type MaterialPreview struct {
-	Id    uuid.UUID `json:"id"`
-	Title string    `json:"title"`
-	Order uint      `json:"order"`
-}
-
-type AcademyPublicPreviewResponse struct {
-	Id             uuid.UUID         `json:"id"`
-	Title          string            `json:"title"`
-	RegisterStatus int               `json:"register_status" binding:"required"`
-	Materials      []MaterialPreview `json:"materials"`
-}
-
-type MaterialProgressResponse struct {
-	Id                     uuid.UUID `json:"id"`
-	AccountId              uuid.UUID `json:"account_id"`
-	AcademyId              uuid.UUID `json:"academy_id"`
-	MaterialId             uuid.UUID `json:"material_id"`
-	Progress               float64   `json:"progress"`
-	TotalCompletedContents uint      `json:"total_completed_contents"`
-	Status                 string    `json:"status"`
-	CompletedAt            *string   `json:"completed_at"`
-}
-
-type ContentDetailResponse struct {
-	Id     uuid.UUID `json:"id"`
-	Order  uint      `json:"order"`
-	Title  string    `json:"title"`
-	Status string    `json:"status"`
-}
-
 type MaterialDetailResponse struct {
 	Id            uuid.UUID                 `json:"id"`
 	AcademyId     uuid.UUID                 `json:"academy_id"`
@@ -121,6 +121,13 @@ type MaterialDetailResponse struct {
 	Meta          map[string]string         `json:"meta"`
 }
 
+type ContentDetailResponse struct {
+	Id     uuid.UUID `json:"id"`
+	Order  uint      `json:"order"`
+	Title  string    `json:"title"`
+	Status string    `json:"status"`
+}
+
 type AssignRequest struct {
 	AcademyId string `json:"academy_id"`
 	AccountId string `json:"account_id"`

models/entity/entity.go

@@ -300,7 +300,7 @@ func (AcademyContent) TableName() string { return "academy_contents" }
 // Progress
 
 type AcademyProgress struct {
-	Id                      uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	Id                      uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id,omitempty"`
 	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"`
@@ -312,7 +312,7 @@ type AcademyProgress struct {
 func (AcademyProgress) TableName() string { return "academy_progress" }
 
 type AcademyMaterialProgress struct {
-	Id                     uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	Id                     uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id,omitempty"`
 	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"`
@@ -325,7 +325,7 @@ type AcademyMaterialProgress struct {
 func (AcademyMaterialProgress) TableName() string { return "academy_material_progress" }
 
 type AcademyContentProgress struct {
-	Id          uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id"`
+	Id          uuid.UUID  `gorm:"type:uuid;primaryKey;default:gen_random_uuid()" json:"id,omitempty"`
 	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"`

repositories/academy_repository.go

@@ -384,7 +384,7 @@ func (r *academyRepository) GetContentProgress(ctx context.Context, accountId uu
 			AcademyId:  academyId,
 			MaterialId: materialId,
 			ContentId:  contentId,
-			Status:     entity.StatusNotStarted,
+			Status:     entity.StatusInProgress,
 		}, nil
 	}
 	return existing, err

router/academy_router.go

@@ -12,25 +12,26 @@ func AcademyRouter(router *gin.Engine, middleware provider.MiddlewareProvider, c
 	routerGroup := router.Group("/api/v1/academy")
 
 	routerGroup.Use(gzip.Gzip(gzip.DefaultCompression))
-
-	adminGroup := routerGroup.Group("/admin", authenticationMiddleware.VerifyAccount)
-
-	adminGroup.POST("/", academyController.CreateAcademy)
-	adminGroup.GET("/id/:id/detail", academyController.GetAcademyDetail)
-	adminGroup.PUT("/id/:id", academyController.UpdateAcademy)
-	adminGroup.DELETE("/id/:id", academyController.DeleteAcademy)
-
-	adminGroup.POST("/materials", academyController.CreateMaterial)
-	adminGroup.DELETE("/materials/:id", academyController.DeleteMaterial)
-
-	adminGroup.POST("/contents", academyController.CreateContent)
-	adminGroup.DELETE("/contents/:id", academyController.DeleteContent)
-
-	adminGroup.POST("/assign", academyController.AssignAccountToAcademy)
-	adminGroup.DELETE("/assign/:id", academyController.UnassignAccountFromAcademy)
-	adminGroup.GET("/assign/:academy_id", academyController.ListAssignmentsByAcademy)
-
-	routerGroup.GET("/", authenticationMiddleware.VerifyAccount, academyController.ListAcademies)
+	{
+		adminGroup := routerGroup.Group("/admin", authenticationMiddleware.VerifyAccount)
+
+		adminGroup.POST("/", academyController.CreateAcademy)
+		adminGroup.GET("/id/:id/detail", academyController.GetAcademyDetail)
+		adminGroup.PUT("/id/:id", academyController.UpdateAcademy)
+		adminGroup.DELETE("/id/:id", academyController.DeleteAcademy)
+
+		adminGroup.POST("/materials", academyController.CreateMaterial)
+		adminGroup.DELETE("/materials/:id", academyController.DeleteMaterial)
+
+		adminGroup.POST("/contents", academyController.CreateContent)
+		adminGroup.DELETE("/contents/:id", academyController.DeleteContent)
+
+		adminGroup.POST("/assign", academyController.AssignAccountToAcademy)
+		adminGroup.DELETE("/assign/:id", academyController.UnassignAccountFromAcademy)
+		adminGroup.GET("/assign/:academy_id", academyController.ListAssignmentsByAcademy)
+	}
+	
+	routerGroup.GET("/", authenticationMiddleware.VerifyAccount, academyController.ListAcademy)
 	routerGroup.POST("/join", authenticationMiddleware.VerifyAccount, academyController.JoinAcademyByCode)
 	routerGroup.GET("/:academy_slug", authenticationMiddleware.VerifyAccount, academyController.GetAcademy)
 	routerGroup.GET("/:academy_slug/:material_slug", authenticationMiddleware.VerifyAccount, academyController.GetMaterial)

services/academy_service.go

@@ -22,7 +22,7 @@ type AcademyService interface {
 	CreateAcademy(ctx context.Context, req dto.CreateAcademyRequest) (entity.Academy, error)
 	UpdateAcademy(ctx context.Context, id uuid.UUID, req dto.UpdateAcademyRequest) (entity.Academy, error)
 	DeleteAcademy(ctx context.Context, id uuid.UUID) error
-	ListAcademies(ctx context.Context, accountId uuid.UUID, p repositories.Pagination) ([]entity.Academy, int64, error)
+	ListAcademy(ctx context.Context, accountId uuid.UUID, p repositories.Pagination) ([]entity.Academy, int64, error)
 
 	CreateMaterial(ctx context.Context, req dto.CreateMaterialRequest) (entity.AcademyMaterial, error)
 	GetMaterial(ctx context.Context, accountId uuid.UUID, academySlug string, materialSlug string) (entity.AcademyMaterial, error)
@@ -145,7 +145,7 @@ func (s *academyService) DeleteAcademy(ctx context.Context, id uuid.UUID) error
 	return s.academyRepo.DeleteAcademy(ctx, id)
 }
 
-func (s *academyService) ListAcademies(ctx context.Context, accountId uuid.UUID, p repositories.Pagination) ([]entity.Academy, int64, error) {
+func (s *academyService) ListAcademy(ctx context.Context, accountId uuid.UUID, p repositories.Pagination) ([]entity.Academy, int64, error) {
 	list, total, err := s.academyRepo.ListVisibleAcademy(ctx, accountId, &p)
 	return list, total, err
 }
@@ -321,6 +321,55 @@ func (s *academyService) GetContent(ctx context.Context, accountId uuid.UUID, ac
 	if err != nil {
 		return entity.AcademyContent{}, err
 	}
+
+	if err := s.academyRepo.Atomic(ctx, func(txRepo repositories.AcademyRepository) error {
+		existingAMP, _ := txRepo.GetMaterialProgress(ctx, accountId, material.AcademyId, material.Id)
+		ampID := existingAMP.Id
+		if ampID == uuid.Nil {
+			ampID = uuid.New()
+		}
+		matStatus := existingAMP.Status
+		if matStatus != entity.StatusFinished {
+			matStatus = entity.StatusInProgress
+		}
+		if _, err := txRepo.UpsertMaterialProgress(ctx, entity.AcademyMaterialProgress{
+			Id:                     ampID,
+			AccountId:              accountId,
+			AcademyId:              material.AcademyId,
+			MaterialId:             material.Id,
+			Progress:               existingAMP.Progress,
+			TotalCompletedContents: existingAMP.TotalCompletedContents,
+			Status:                 matStatus,
+			CompletedAt:            existingAMP.CompletedAt,
+		}); err != nil {
+			return err
+		}
+
+		existingAP, _ := txRepo.GetAcademyProgress(ctx, accountId, material.AcademyId)
+		apID := existingAP.Id
+		if apID == uuid.Nil {
+			apID = uuid.New()
+		}
+		acadStatus := existingAP.Status
+		if acadStatus != entity.StatusFinished {
+			acadStatus = entity.StatusInProgress
+		}
+		if _, err := txRepo.UpsertAcademyProgress(ctx, entity.AcademyProgress{
+			Id:                      apID,
+			AccountId:               accountId,
+			AcademyId:               material.AcademyId,
+			Progress:                existingAP.Progress,
+			TotalCompletedMaterials: existingAP.TotalCompletedMaterials,
+			Status:                  acadStatus,
+			CompletedAt:             existingAP.CompletedAt,
+		}); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return entity.AcademyContent{}, err
+	}
+
 	return s.academyRepo.GetContentWithProgress(ctx, accountId, material.AcademyId, material.Id, order)
 }
 
@@ -515,9 +564,21 @@ func (s *academyService) GetAcademyResponse(ctx context.Context, accountId uuid.
 			}
 			previews := make([]dto.MaterialPreview, len(mats))
 			for i, m := range mats {
-				previews[i] = dto.MaterialPreview{Id: m.Id, Title: m.Title, Order: m.Order}
+				previews[i] = dto.MaterialPreview{
+					Id:    m.Id,
+					Title: m.Title,
+					Order: m.Order,
+				}
+			}
+			res := dto.AcademyPublicPreviewResponse{
+				Id:             academy.Id,
+				Title:          academy.Title,
+				Description:    academy.Description,
+				ImageUrl:       academy.ImageUrl,
+				Code:           academy.Code,
+				RegisterStatus: 0,
+				Materials:      previews,
 			}
-			res := dto.AcademyPublicPreviewResponse{Id: academy.Id, Title: academy.Title, RegisterStatus: 0, Materials: previews}
 			return res, nil
 		}
 		return nil, http_error.UNAUTHORIZED