Deploy files from GitHub repository

controller/academy/academy_contents_controller.go

@@ -9,7 +9,7 @@ import (
 
 func ContentList(c *gin.Context) {
 	academyContent := services.AcademyContentService{}
-	academyController := controller.Controller[any, models.AcademyMaterial, []models.AcademyContent]{
+	academyController := controller.Controller[any, models.AcademyMaterial, models.AcademyContent]{
 		Service: &academyContent.Service,
 	}
 	academyController.Service.Constructor.Slug = c.Param("slug_material")

models/database_orm_model.go

@@ -71,9 +71,11 @@ type Academy struct {
 	ID                uint      `gorm:"primaryKey" json:"id"`
 	UUID              uuid.UUID `gorm:"type:uuid" json:"uuid"`
 	Title             string    `json:"title"`
-	Slug              string    `json:"slug"`
+	Slug              string    `json:"slug" gorm:"uniqueIndex" `
 	TotalMaterial     int       `json:"total_material"`
 	CompletedMaterial int       `json:"completed_material"`
+	IsCompletedRead   bool      `json:"is_read"`
+	IsPassedExam      bool      `json:"is_exam"`
 	Description       string    `json:"description"`
 }
 
@@ -82,7 +84,7 @@ type AcademyMaterial struct {
 	UUID        uuid.UUID `gorm:"type:uuid" json:"uuid"`
 	AcademyID   uint      `json:"academy_id"`
 	Title       string    `json:"title"`
-	Slug        string    `json:"slug"`
+	Slug        string    `json:"slug" gorm:"uniqueIndex"`
 	IsCompleted bool      `json:"is_completed"`
 	Description string    `json:"description"`
 }
@@ -98,7 +100,7 @@ type AcademyContent struct {
 type OptionCategory struct {
 	ID         uint   `gorm:"primaryKey" json:"id"`
 	OptionName string `json:"option_name"`
-	OptionSlug string `json:"option_slug"`
+	OptionSlug string `json:"option_slug" gorm:"uniqueIndex"`
 }
 
 type OptionValues struct {

models/response_model.go

@@ -33,7 +33,7 @@ type UserProfileResponse struct {
 
 type AcademyMaterialResponse struct {
 	Materials AcademyMaterial
-	Contents  []AcademyContent
+	Contents  AcademyContent
 }
 type AcademyResponse struct {
 	Academy   Academy                   `json:"academy"`

repositories/academy_repository.go

@@ -35,13 +35,13 @@ func GetAllAcademyMaterialsByAcademyID(acaddemyId uint) Repository[models.Academ
 	return *repo
 }
 
-func GetAllAcademyContentsByMaterialID(materialId uint) Repository[models.AcademyContent, []models.AcademyContent] {
-	repo := Construct[models.AcademyContent, []models.AcademyContent](
+func GetAllAcademyContentsByMaterialID(materialId uint) Repository[models.AcademyContent, models.AcademyContent] {
+	repo := Construct[models.AcademyContent, models.AcademyContent](
 		models.AcademyContent{AcademyMaterialID: materialId},
 	)
 	repo.Transactions(
-		WhereGivenConstructor[models.AcademyContent, []models.AcademyContent],
-		Find[models.AcademyContent, []models.AcademyContent],
+		WhereGivenConstructor[models.AcademyContent, models.AcademyContent],
+		Find[models.AcademyContent, models.AcademyContent],
 	)
 	return *repo
 }

services/academy_service.go

@@ -1,6 +1,8 @@
 package services
 
 import (
+	"errors"
+
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/repositories"
 	"github.com/gosimple/slug"
@@ -20,12 +22,13 @@ type AcademyMaterialService struct {
 }
 
 type AcademyContentService struct {
-	Service[models.AcademyMaterial, []models.AcademyContent]
+	Service[models.AcademyMaterial, models.AcademyContent]
 }
 
 func castAcademyMaterials(academyId uint) []models.AcademyMaterialResponse {
 	var ArrMaterials []models.AcademyMaterialResponse
-	for _, academyMaterial := range repositories.GetAllAcademyMaterialsByAcademyID(academyId).Result {
+	academyMaterialsRepo := repositories.GetAllAcademyMaterialsByAcademyID(academyId)
+	for _, academyMaterial := range academyMaterialsRepo.Result {
 		ArrMaterials = append(ArrMaterials, models.AcademyMaterialResponse{
 			Materials: academyMaterial,
 			Contents:  repositories.GetAllAcademyContentsByMaterialID(academyMaterial.ID).Result,
@@ -78,7 +81,7 @@ func (s *CreateAcademyService) Create() {
 				s.Error = createdMaterial.RowsError
 				return
 			}
-			for _, content := range material.Contents {
+			for _, content := range []models.AcademyContent{material.Contents} {
 				content.UUID = uuid.NewV4()
 				content.AcademyMaterialID = createdMaterial.Result.ID
 				createdContent := repositories.CreateAcademyContent(content)
@@ -98,9 +101,15 @@ func (s *CreateAcademyService) Create() {
 }
 
 func (s *AcademyMaterialService) Retrieve() {
-	academyId := repositories.GetAcademyDataBySlug(s.Constructor.Slug).Result.ID
-	academyMaterialRepo := repositories.GetAllAcademyMaterialsByAcademyID(academyId)
-	s.Error = academyMaterialRepo.RowsError
+	academyRepo := repositories.GetAcademyDataBySlug(s.Constructor.Slug)
+	if academyRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no Academy found with given Slug!"
+		return
+	}
+	s.Error = academyRepo.RowsError
+	academyMaterialRepo := repositories.GetAllAcademyMaterialsByAcademyID(academyRepo.Result.ID)
+	s.Error = errors.Join(s.Error, academyMaterialRepo.RowsError)
 	if academyMaterialRepo.NoRecord {
 		s.Exception.DataNotFound = true
 		s.Exception.Message = "There is no Academy Material with given ID"
@@ -110,9 +119,15 @@ func (s *AcademyMaterialService) Retrieve() {
 }
 
 func (s *AcademyContentService) Retrieve() {
-	academyMaterialId := repositories.GetAcademyMaterialBySlug(s.Constructor.Slug).Result.ID
-	academyContentRepo := repositories.GetAllAcademyContentsByMaterialID(academyMaterialId)
-	s.Error = academyContentRepo.RowsError
+	academyMaterialRepo := repositories.GetAcademyMaterialBySlug(s.Constructor.Slug)
+	s.Error = academyMaterialRepo.RowsError
+	if academyMaterialRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no Academy Material with given Slug"
+		return
+	}
+	academyContentRepo := repositories.GetAllAcademyContentsByMaterialID(academyMaterialRepo.Result.ID)
+	s.Error = errors.Join(s.Error, academyContentRepo.RowsError)
 	if academyContentRepo.NoRecord {
 		s.Exception.DataNotFound = true
 		s.Exception.Message = "There is no Academy Contents with given Material ID"

services/register_service.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"unicode"
 
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/repositories"
@@ -13,10 +14,49 @@ type RegisterService struct {
 	Service[models.Account, models.Account]
 }
 
+func ValidatePassword(password string) models.Exception {
+	var (
+		hasMinLen  = false
+		hasUpper   = false
+		hasLower   = false
+		hasNumber  = false
+		hasSpecial = false
+	)
+
+	if len(password) >= 8 {
+		hasMinLen = true
+	}
+
+	for _, char := range password {
+		switch {
+		case unicode.IsUpper(char):
+			hasUpper = true
+			break
+		case unicode.IsLower(char):
+			hasLower = true
+			break
+		case unicode.IsDigit(char):
+			hasNumber = true
+			break
+		case unicode.IsPunct(char) || unicode.IsSymbol(char):
+			hasSpecial = true
+			break
+		}
+	}
+	approve := hasMinLen && hasUpper && hasLower && hasNumber && hasSpecial
+	if !approve {
+		return models.Exception{
+			BadRequest: true,
+			Message:    "Password must contain at least 8 characters, including uppercase, lowercase, number, and special character!",
+		}
+	}
+	return models.Exception{}
+}
+
 func (s *RegisterService) Create() {
-	if len(s.Constructor.Password) < 8 {
-		s.Exception.InvalidPasswordLength = true
-		s.Exception.Message = "Password must have at least 8 characters!"
+	validatePassword := ValidatePassword(s.Constructor.Password)
+	if validatePassword.BadRequest {
+		s.Exception = validatePassword
 		return
 	}
 	hashed_password, err_hash := HashPassword(s.Constructor.Password)

space/controller/academy/academy_contents_controller.go

@@ -0,0 +1,19 @@
+package academy
+
+import (
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func ContentList(c *gin.Context) {
+	academyContent := services.AcademyContentService{}
+	academyController := controller.Controller[any, models.AcademyMaterial, []models.AcademyContent]{
+		Service: &academyContent.Service,
+	}
+	academyController.Service.Constructor.Slug = c.Param("slug_material")
+	academyContent.Retrieve()
+	academyController.Response(c)
+
+}

space/controller/academy/academy_controller.go

@@ -9,7 +9,7 @@ import (
 
 func List(c *gin.Context) {
 	academy := services.AcademyService{}
-	academyController := controller.Controller[any, models.Academy, models.AllAcademyResponse]{
+	academyController := controller.Controller[any, models.Academy, []models.Academy]{
 		Service: &academy.Service,
 	}
 	academyController.Service.Constructor.Slug = c.Param("slug")

space/controller/academy/academy_materials_controller.go

@@ -0,0 +1,19 @@
+package academy
+
+import (
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func MaterialsList(c *gin.Context) {
+	academyMaterial := services.AcademyMaterialService{}
+	academyController := controller.Controller[any, models.Academy, []models.AcademyMaterial]{
+		Service: &academyMaterial.Service,
+	}
+	academyController.Service.Constructor.Slug = c.Param("slug")
+	academyMaterial.Retrieve()
+	academyController.Response(c)
+
+}

space/models/database_orm_model.go

@@ -68,11 +68,13 @@ type ForgotPassword struct {
 }
 
 type Academy struct {
-	ID          uint      `gorm:"primaryKey" json:"id"`
-	UUID        uuid.UUID `gorm:"type:uuid" json:"uuid"`
-	Title       string    `json:"title"`
-	Slug        string    `json:"slug"`
-	Description string    `json:"description"`
+	ID                uint      `gorm:"primaryKey" json:"id"`
+	UUID              uuid.UUID `gorm:"type:uuid" json:"uuid"`
+	Title             string    `json:"title"`
+	Slug              string    `json:"slug"`
+	TotalMaterial     int       `json:"total_material"`
+	CompletedMaterial int       `json:"completed_material"`
+	Description       string    `json:"description"`
 }
 
 type AcademyMaterial struct {
@@ -81,6 +83,7 @@ type AcademyMaterial struct {
 	AcademyID   uint      `json:"academy_id"`
 	Title       string    `json:"title"`
 	Slug        string    `json:"slug"`
+	IsCompleted bool      `json:"is_completed"`
 	Description string    `json:"description"`
 }
 

space/repositories/academy_repository.go

@@ -71,3 +71,14 @@ func CreateAcademyContent(academyContent models.AcademyContent) Repository[model
 	Create(repo)
 	return *repo
 }
+
+func GetAcademyMaterialBySlug(slug string) Repository[models.AcademyMaterial, models.AcademyMaterial] {
+	repo := Construct[models.AcademyMaterial, models.AcademyMaterial](
+		models.AcademyMaterial{Slug: slug},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.AcademyMaterial, models.AcademyMaterial],
+		Find[models.AcademyMaterial, models.AcademyMaterial],
+	)
+	return *repo
+}

space/router/academy_route.go

@@ -9,7 +9,8 @@ import (
 func AcademyRoute(router *gin.Engine) {
 	routerGroup := router.Group("/api/v1/academy")
 	{
-		routerGroup.GET("/list/:slug", middleware.AuthUser, AcademyController.List)
+		routerGroup.GET("/:slug", middleware.AuthUser, AcademyController.MaterialsList)
+		routerGroup.GET("/:slug/:slug_material", middleware.AuthUser, AcademyController.ContentList)
 		routerGroup.GET("/list", middleware.AuthUser, AcademyController.List)
 		routerGroup.POST("/create", middleware.AuthUser, AcademyController.Create)
 	}

space/services/academy_service.go

@@ -8,13 +8,21 @@ import (
 )
 
 type AcademyService struct {
-	Service[models.Academy, models.AllAcademyResponse]
+	Service[models.Academy, []models.Academy]
 }
 
 type CreateAcademyService struct {
 	Service[models.AllAcademyResponse, models.AllAcademyResponse]
 }
 
+type AcademyMaterialService struct {
+	Service[models.Academy, []models.AcademyMaterial]
+}
+
+type AcademyContentService struct {
+	Service[models.AcademyMaterial, []models.AcademyContent]
+}
+
 func castAcademyMaterials(academyId uint) []models.AcademyMaterialResponse {
 	var ArrMaterials []models.AcademyMaterialResponse
 	for _, academyMaterial := range repositories.GetAllAcademyMaterialsByAcademyID(academyId).Result {
@@ -35,27 +43,13 @@ func (s *AcademyService) Retrieve() {
 			return
 		}
 
-		s.Result = models.AllAcademyResponse{
-			Academies: []models.AcademyResponse{
-				models.AcademyResponse{
-					Academy:   AcademyRepo.Result,
-					Materials: castAcademyMaterials(s.Constructor.ID),
-				},
-			},
+		s.Result = []models.Academy{
+			AcademyRepo.Result,
 		}
 	} else {
 		AcademyRepo := repositories.GetAllAcademy()
 		s.Error = AcademyRepo.RowsError
-		var ArrAcademy []models.AcademyResponse
-		for _, academy := range AcademyRepo.Result {
-			ArrAcademy = append(ArrAcademy, models.AcademyResponse{
-				Academy:   academy,
-				Materials: castAcademyMaterials(academy.ID),
-			})
-		}
-		s.Result = models.AllAcademyResponse{
-			Academies: ArrAcademy,
-		}
+		s.Result = AcademyRepo.Result
 	}
 
 }
@@ -102,3 +96,27 @@ func (s *CreateAcademyService) Create() {
 	s.Result = models.AllAcademyResponse{Academies: ArrAcademy}
 
 }
+
+func (s *AcademyMaterialService) Retrieve() {
+	academyId := repositories.GetAcademyDataBySlug(s.Constructor.Slug).Result.ID
+	academyMaterialRepo := repositories.GetAllAcademyMaterialsByAcademyID(academyId)
+	s.Error = academyMaterialRepo.RowsError
+	if academyMaterialRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no Academy Material with given ID"
+		return
+	}
+	s.Result = academyMaterialRepo.Result
+}
+
+func (s *AcademyContentService) Retrieve() {
+	academyMaterialId := repositories.GetAcademyMaterialBySlug(s.Constructor.Slug).Result.ID
+	academyContentRepo := repositories.GetAllAcademyContentsByMaterialID(academyMaterialId)
+	s.Error = academyContentRepo.RowsError
+	if academyContentRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no Academy Contents with given Material ID"
+		return
+	}
+	s.Result = academyContentRepo.Result
+}

space/services/jwt_service.go

@@ -20,7 +20,7 @@ func GenerateToken(user *models.Account) (string, error) {
 		RegisteredClaims: jwt.RegisteredClaims{
 			ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour * 24)), // Token berlaku 24 jam
 			IssuedAt:  jwt.NewNumericDate(time.Now()),
-			Issuer:    "qobiltu.id",
+			Issuer:    "apqobiltu.id",
 		},
 	}
 

space/services/service.go

@@ -16,6 +16,9 @@ type (
 		Authenticate()
 		Authorize()
 	}
+	IService interface {
+		Implements()
+	}
 	Service[TConstructor any, TResult any] struct {
 		Constructor TConstructor
 		Result      TResult

space/space/services/email_verification_service.go

@@ -75,18 +75,7 @@ func (s *EmailVerificationService) Create() {
 			return
 		}
 
-		// 2. Start TLS
-		tlsconfig := &tls.Config{
-			ServerName: smtpHost,
-		}
-
-		if err = c.StartTLS(tlsconfig); err != nil {
-			s.Error = err
-			log.Printf("Error start TLS: %v", err)
-			return
-		}
-
-		// 3. Auth
+		// 2. Auth
 		auth := smtp.PlainAuth("", from, password, smtpHost)
 		if err = c.Auth(auth); err != nil {
 			s.Error = err
@@ -94,7 +83,7 @@ func (s *EmailVerificationService) Create() {
 			return
 		}
 
-		// 4. Set From and To
+		// 3. Set From and To
 		if err = c.Mail(from); err != nil {
 			s.Error = err
 			log.Printf("Error set mail from to: %v", err)
@@ -109,7 +98,7 @@ func (s *EmailVerificationService) Create() {
 			}
 		}
 
-		// 5. Send message
+		// 4. Send message
 		wc, err := c.Data()
 		if err != nil {
 			s.Error = err

space/space/space/space/config/config.go

@@ -7,6 +7,7 @@ import (
 	"github.com/joho/godotenv"
 )
 
+var ENV string
 var TCP_ADDRESS string
 var LOG_PATH string
 
@@ -21,6 +22,7 @@ var SMTP_PORT string
 
 func init() {
 	godotenv.Load()
+	ENV = os.Getenv("ENV")
 	HOST_ADDRESS = os.Getenv("HOST_ADDRESS")
 	HOST_PORT = os.Getenv("HOST_PORT")
 	TCP_ADDRESS = HOST_ADDRESS + ":" + HOST_PORT

space/space/space/space/services/email_verification_service.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"crypto/tls"
 	"fmt"
 	"log"
 	"math/rand/v2"
@@ -39,27 +40,118 @@ func (s *EmailVerificationService) Create() {
 
 	// ⬇ Kirim token ke email user menggunakan SMTP
 	go func(toEmail string, token uint) {
+		env := config.ENV
 		from := config.SMTP_SENDER_EMAIL
 		password := config.SMTP_SENDER_PASSWORD
 		smtpHost := config.SMTP_HOST
 		smtpPort := config.SMTP_PORT
+		to := []string{toEmail}
 
-		auth := smtp.PlainAuth("", from, password, smtpHost)
-
-		subject := "Email Verification Token"
+		subject := "Verification token"
 		body := fmt.Sprintf("Your verification token is: %06d\nPlease use it before it expires.", token)
 
-		msg := []byte("To: " + toEmail + "\r\n" +
-			"Subject: " + subject + "\r\n" +
-			"\r\n" +
-			body + "\r\n")
+		msg := []byte(fmt.Sprintf("From: %s\r\n", from) +
+			fmt.Sprintf("To: %s\r\n", toEmail) +
+			fmt.Sprintf("Subject: %s\r\n", subject) +
+			"\r\n" + body)
+
+		// 1. Connect to the server
+		conn, err := tls.Dial("tcp", fmt.Sprintf("[%s]:%s", smtpHost, smtpPort), &tls.Config{
+			InsecureSkipVerify: env != "production", // ⚠️ set false di production
+			ServerName:         smtpHost,
+		})
 
-		err := smtp.SendMail(smtpHost+":"+smtpPort, auth, from, []string{toEmail}, msg)
+		// conn, err := net.Dial("tcp", fmt.Sprintf("[%s]:%s", smtpHost, smtpPort))
 		if err != nil {
 			s.Error = err
 			log.Printf("Error sending verification email: %v", err)
 			return
 		}
+
+		c, err := smtp.NewClient(conn, smtpHost)
+		if err != nil {
+			s.Error = err
+			log.Printf("Error create new client mail: %v", err)
+			return
+		}
+
+		// 2. Start TLS
+		tlsconfig := &tls.Config{
+			ServerName: smtpHost,
+		}
+
+		if err = c.StartTLS(tlsconfig); err != nil {
+			s.Error = err
+			log.Printf("Error start TLS: %v", err)
+			return
+		}
+
+		// 3. Auth
+		auth := smtp.PlainAuth("", from, password, smtpHost)
+		if err = c.Auth(auth); err != nil {
+			s.Error = err
+			log.Printf("Error auth mail: %v", err)
+			return
+		}
+
+		// 4. Set From and To
+		if err = c.Mail(from); err != nil {
+			s.Error = err
+			log.Printf("Error set mail from to: %v", err)
+			return
+		}
+
+		for _, addr := range to {
+			if err = c.Rcpt(addr); err != nil {
+				s.Error = err
+				log.Printf("Error receipt addr: %v", err)
+				return
+			}
+		}
+
+		// 5. Send message
+		wc, err := c.Data()
+		if err != nil {
+			s.Error = err
+			log.Printf("Error data Send Message: %v", err)
+			return
+		}
+
+		_, err = wc.Write(msg)
+		if err != nil {
+			s.Error = err
+			log.Printf("Error write Send Message: %v", err)
+			return
+		}
+
+		err = wc.Close()
+		if err != nil {
+			s.Error = err
+			log.Printf("Error close Send Message: %v", err)
+			return
+		}
+
+		c.Quit()
+		fmt.Println("Email sent successfully!")
+
+		// auth := smtp.PlainAuth("", from, password, smtpHost)
+
+		// subject := "Email Verification Token"
+		// body := fmt.Sprintf("Your verification token is: %06d\nPlease use it before it expires.", token)
+
+		// msg := []byte("To: " + toEmail + "\r\n" +
+		// 	"Subject: " + subject + "\r\n" +
+		// 	"\r\n" +
+		// 	body + "\r\n")
+
+		// err := smtp.SendMail(smtpHost+":"+smtpPort, auth, from, []string{toEmail}, msg)
+		// if err != nil {
+		// 	s.Error = err
+		// 	log.Printf("Error sending verification email: %v", err)
+		// 	return
+		// } else {
+		// 	log.Printf("Successfully sending verification email: %v", err)
+		// }
 	}(accountRepo.Result.Email, token)
 	// s.Result.Token = 0
 }

space/space/space/space/space/services/external_authentication_service.go

@@ -24,6 +24,16 @@ func (s *GoogleAuthService) Authenticate(isAgree bool) {
 		return
 	}
 	email := payload.Claims["email"]
+	checkRegisteredEmail := repositories.GetAccountbyEmail(email.(string))
+	if !checkRegisteredEmail.NoRecord {
+		token, _ := GenerateToken(&checkRegisteredEmail.Result)
+		checkRegisteredEmail.Result.Password = "SECRET"
+		s.Result = models.AuthenticatedUser{
+			Account: checkRegisteredEmail.Result,
+			Token:   token,
+		}
+		return
+	}
 	if GoogleAuth.NoRecord {
 		if !isAgree {
 			s.Exception.BadRequest = true
@@ -32,12 +42,6 @@ func (s *GoogleAuthService) Authenticate(isAgree bool) {
 		}
 		s.Constructor.UUID = uuid.NewV4()
 		s.Constructor.OauthProvider = "Google"
-		checkRegisteredEmail := repositories.GetAccountbyEmail(email.(string))
-		if !checkRegisteredEmail.NoRecord {
-			s.Exception.DataDuplicate = true
-			s.Exception.Message = "Account with email" + email.(string) + "already registered!"
-			return
-		}
 
 		createAccount := repositories.CreateAccount(models.Account{
 			UUID:            uuid.NewV4(),

space/space/space/space/space/space/services/email_verification_service.go

@@ -29,10 +29,7 @@ func (s *EmailVerificationService) Create() {
 	remainingTime := time.Duration(config.EMAIL_VERIFICATION_DURATION) * time.Hour
 	dueTime := CalculateDueTime(remainingTime)
 
-	token := uint(rand.IntN(1000000))
-	for token < 1000000 {
-		token = uint(rand.IntN(1000000))
-	}
+	token := uint(rand.IntN(999999-100000) + 100000)
 	s.Constructor.UUID = uuid.NewV4()
 
 	repo := repositories.CreateEmailVerification(s.Constructor.UUID, s.Constructor.AccountID, dueTime, token)

space/space/space/space/space/space/services/forgot_password_service.go

@@ -34,10 +34,7 @@ func (s *ForgotPasswordService) Create(email string) {
 	remainingTime := time.Duration(config.EMAIL_VERIFICATION_DURATION) * time.Hour
 	dueTime := CalculateDueTime(remainingTime)
 
-	token := uint(rand.IntN(1000000))
-	for token < 1000000 {
-		token = uint(rand.IntN(1000000))
-	}
+	token := uint(rand.IntN(999999-100000) + 100000)
 	s.Constructor.UUID = uuid.NewV4()
 	s.Constructor.ExpiredAt = dueTime
 	s.Constructor.AccountID = accountRepo.Result.Id

space/space/space/space/space/space/space/services/external_authentication_service.go

@@ -32,17 +32,34 @@ func (s *GoogleAuthService) Authenticate(isAgree bool) {
 		}
 		s.Constructor.UUID = uuid.NewV4()
 		s.Constructor.OauthProvider = "Google"
+		checkRegisteredEmail := repositories.GetAccountbyEmail(email.(string))
+		if !checkRegisteredEmail.NoRecord {
+			s.Exception.DataDuplicate = true
+			s.Exception.Message = "Account with email" + email.(string) + "already registered!"
+			return
+		}
+
 		createAccount := repositories.CreateAccount(models.Account{
 			UUID:            uuid.NewV4(),
 			Email:           email.(string),
 			IsEmailVerified: true,
 		})
+
 		s.Constructor.AccountID = createAccount.Result.Id
 		createGoogleAuth := repositories.CreateExternalAuth(s.Constructor)
-		GoogleAuth.Result.AccountID = createGoogleAuth.Result.ID
+
+		GoogleAuth.Result.AccountID = createGoogleAuth.Result.AccountID
+		userProfile := UserProfileService{}
+		userProfile.Constructor.AccountID = GoogleAuth.Result.AccountID
+		userProfile.Create()
+		if userProfile.Error != nil {
+			s.Error = userProfile.Error
+			return
+		}
 		s.Error = createGoogleAuth.RowsError
 		s.Error = errors.Join(s.Error, createAccount.RowsError)
 	}
+
 	accountData := repositories.GetAccountById(GoogleAuth.Result.AccountID)
 	token, err_tok := GenerateToken(&accountData.Result)
 

space/space/space/space/space/space/space/space/controller/academy/academy_controller.go

@@ -0,0 +1,31 @@
+package academy
+
+import (
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func List(c *gin.Context) {
+	academy := services.AcademyService{}
+	academyController := controller.Controller[any, models.Academy, models.AllAcademyResponse]{
+		Service: &academy.Service,
+	}
+	academyController.Service.Constructor.Slug = c.Param("slug")
+	academy.Retrieve()
+	academyController.Response(c)
+
+}
+
+func Create(c *gin.Context) {
+	createAcademy := services.CreateAcademyService{}
+	academyController := controller.Controller[models.AllAcademyResponse, models.AllAcademyResponse, models.AllAcademyResponse]{
+		Service: &createAcademy.Service,
+	}
+	academyController.RequestJSON(c, func() {
+		academyController.Service.Constructor.Academies = academyController.Request.Academies
+		createAcademy.Create()
+	})
+
+}

space/space/space/space/space/space/space/space/logs/error_log.txt

@@ -0,0 +1,2 @@
+2025/04/20 10:05:28 Error Log : duplicated key not allowed
+2025/04/20 10:11:41 Error Log : duplicated key not allowed

space/space/space/space/space/space/space/space/models/database_orm_model.go

@@ -30,7 +30,7 @@ type AccountDetails struct {
 	LastEducation *string    `json:"last_education"`
 	MaritalStatus *string    `json:"marital_status"`
 	Avatar        *string    `json:"avatar"`
-	PhoneNumber   *uint      `json:"phone_number"`
+	PhoneNumber   *string    `json:"phone_number"`
 }
 
 type EmailVerification struct {
@@ -85,12 +85,12 @@ type AcademyMaterial struct {
 }
 
 type AcademyContent struct {
-	ID                uint   `gorm:"primaryKey" json:"id"`
-	UUID              uint   `json:"uuid"`
-	Title             string `json:"title"`
-	Order             uint   `json:"order"`
-	AcademyMaterialID uint   `json:"academy_material_id"`
-	Description       string `json:"description"`
+	ID                uint      `gorm:"primaryKey" json:"id"`
+	UUID              uuid.UUID `json:"uuid"`
+	Title             string    `json:"title"`
+	Order             uint      `json:"order"`
+	AcademyMaterialID uint      `json:"academy_material_id"`
+	Description       string    `json:"description"`
 }
 type OptionCategory struct {
 	ID         uint   `gorm:"primaryKey" json:"id"`

space/space/space/space/space/space/space/space/repositories/academy_repository.go

@@ -13,9 +13,9 @@ func GetAllAcademy() Repository[models.Academy, []models.Academy] {
 	return *repo
 }
 
-func GetAcademyDataById(academyId uint) Repository[models.Academy, models.Academy] {
+func GetAcademyDataBySlug(slug string) Repository[models.Academy, models.Academy] {
 	repo := Construct[models.Academy, models.Academy](
-		models.Academy{ID: academyId},
+		models.Academy{Slug: slug},
 	)
 	repo.Transactions(
 		WhereGivenConstructor[models.Academy, models.Academy],
@@ -45,3 +45,29 @@ func GetAllAcademyContentsByMaterialID(materialId uint) Repository[models.Academ
 	)
 	return *repo
 }
+
+func CreateAcademy(academies models.Academy) Repository[models.Academy, models.Academy] {
+	repo := Construct[models.Academy, models.Academy](
+		academies,
+	)
+
+	Create(repo)
+	return *repo
+}
+
+func CreateAcademyMaterial(academyMaterial models.AcademyMaterial) Repository[models.AcademyMaterial, models.AcademyMaterial] {
+	repo := Construct[models.AcademyMaterial, models.AcademyMaterial](
+		academyMaterial,
+	)
+
+	Create(repo)
+	return *repo
+}
+
+func CreateAcademyContent(academyContent models.AcademyContent) Repository[models.AcademyContent, models.AcademyContent] {
+	repo := Construct[models.AcademyContent, models.AcademyContent](
+		academyContent,
+	)
+	Create(repo)
+	return *repo
+}

space/space/space/space/space/space/space/space/router/academy_route.go

@@ -0,0 +1,16 @@
+package router
+
+import (
+	AcademyController "api.qobiltu.id/controller/academy"
+	"api.qobiltu.id/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+func AcademyRoute(router *gin.Engine) {
+	routerGroup := router.Group("/api/v1/academy")
+	{
+		routerGroup.GET("/list/:slug", middleware.AuthUser, AcademyController.List)
+		routerGroup.GET("/list", middleware.AuthUser, AcademyController.List)
+		routerGroup.POST("/create", middleware.AuthUser, AcademyController.Create)
+	}
+}

space/space/space/space/space/space/space/space/router/router.go

@@ -16,7 +16,7 @@ func StartService() {
 	UserRoute(router)
 	EmailRoute(router)
 	OptionsRoute(router)
-
+	AcademyRoute(router)
 	err := router.Run(config.TCP_ADDRESS)
 	if err != nil {
 		log.Fatalf("Failed to run server: %v", err)

space/space/space/space/space/space/space/space/services/academy_service.go

@@ -3,38 +3,102 @@ package services
 import (
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/repositories"
+	"github.com/gosimple/slug"
+	uuid "github.com/satori/go.uuid"
 )
 
 type AcademyService struct {
 	Service[models.Academy, models.AllAcademyResponse]
 }
 
+type CreateAcademyService struct {
+	Service[models.AllAcademyResponse, models.AllAcademyResponse]
+}
+
+func castAcademyMaterials(academyId uint) []models.AcademyMaterialResponse {
+	var ArrMaterials []models.AcademyMaterialResponse
+	for _, academyMaterial := range repositories.GetAllAcademyMaterialsByAcademyID(academyId).Result {
+		ArrMaterials = append(ArrMaterials, models.AcademyMaterialResponse{
+			Materials: academyMaterial,
+			Contents:  repositories.GetAllAcademyContentsByMaterialID(academyMaterial.ID).Result,
+		})
+	}
+	return ArrMaterials
+}
 func (s *AcademyService) Retrieve() {
-	if s.Constructor.ID != 0 {
-		AcademyRepo := repositories.GetAcademyDataById(s.Constructor.ID)
+	if s.Constructor.Slug != "" {
+		AcademyRepo := repositories.GetAcademyDataBySlug(s.Constructor.Slug)
 		s.Error = AcademyRepo.RowsError
 		if AcademyRepo.NoRecord {
 			s.Exception.Message = "Academy not found"
 			s.Exception.DataNotFound = true
 			return
 		}
-		var ArrMaterials []models.AcademyMaterialResponse
-		for _, academyMaterial := range repositories.GetAllAcademyMaterialsByAcademyID(s.Constructor.ID).Result {
-			ArrMaterials = append(ArrMaterials, models.AcademyMaterialResponse{
-				Materials: academyMaterial,
-				Contents:  repositories.GetAllAcademyContentsByMaterialID(academyMaterial.ID).Result,
-			})
-		}
+
 		s.Result = models.AllAcademyResponse{
 			Academies: []models.AcademyResponse{
 				models.AcademyResponse{
 					Academy:   AcademyRepo.Result,
-					Materials: ArrMaterials,
+					Materials: castAcademyMaterials(s.Constructor.ID),
 				},
 			},
 		}
 	} else {
-		// AcademyRepo := repositories.GetAllAcademy()
+		AcademyRepo := repositories.GetAllAcademy()
+		s.Error = AcademyRepo.RowsError
+		var ArrAcademy []models.AcademyResponse
+		for _, academy := range AcademyRepo.Result {
+			ArrAcademy = append(ArrAcademy, models.AcademyResponse{
+				Academy:   academy,
+				Materials: castAcademyMaterials(academy.ID),
+			})
+		}
+		s.Result = models.AllAcademyResponse{
+			Academies: ArrAcademy,
+		}
+	}
+
+}
+
+func (s *CreateAcademyService) Create() {
+	var ArrAcademy []models.AcademyResponse
+	for _, academy := range s.Constructor.Academies {
+		academy.Academy.UUID = uuid.NewV4()
+		if academy.Academy.Slug == "" {
+			academy.Academy.Slug = slug.Make(academy.Academy.Title)
+		}
+
+		createdAcademy := repositories.CreateAcademy(academy.Academy)
+		if createdAcademy.RowsError != nil {
+			s.Error = createdAcademy.RowsError
+			return
+		}
+		for _, material := range academy.Materials {
+			material.Materials.AcademyID = createdAcademy.Result.ID
+			material.Materials.UUID = uuid.NewV4()
+			if material.Materials.Slug == "" {
+				material.Materials.Slug = slug.Make(material.Materials.Title)
+			}
+			createdMaterial := repositories.CreateAcademyMaterial(material.Materials)
+			if createdMaterial.RowsError != nil {
+				s.Error = createdMaterial.RowsError
+				return
+			}
+			for _, content := range material.Contents {
+				content.UUID = uuid.NewV4()
+				content.AcademyMaterialID = createdMaterial.Result.ID
+				createdContent := repositories.CreateAcademyContent(content)
+				if createdContent.RowsError != nil {
+					s.Error = createdContent.RowsError
+					return
+				}
+				ArrAcademy = append(ArrAcademy, models.AcademyResponse{
+					Academy:   createdAcademy.Result,
+					Materials: castAcademyMaterials(createdAcademy.Result.ID),
+				})
+			}
+		}
 	}
+	s.Result = models.AllAcademyResponse{Academies: ArrAcademy}
 
 }

space/space/space/space/space/space/space/space/services/email_verification_service.go

@@ -29,7 +29,10 @@ func (s *EmailVerificationService) Create() {
 	remainingTime := time.Duration(config.EMAIL_VERIFICATION_DURATION) * time.Hour
 	dueTime := CalculateDueTime(remainingTime)
 
-	token := uint(rand.IntN(100000))
+	token := uint(rand.IntN(1000000))
+	for token < 1000000 {
+		token = uint(rand.IntN(1000000))
+	}
 	s.Constructor.UUID = uuid.NewV4()
 
 	repo := repositories.CreateEmailVerification(s.Constructor.UUID, s.Constructor.AccountID, dueTime, token)
@@ -83,7 +86,7 @@ func (s *EmailVerificationService) Validate() {
 	}
 	account := repositories.GetAccountById(repo.Result.AccountID)
 	account.Result.IsEmailVerified = true
-	
+
 	repositories.UpdateAccount(account.Result)
 	s.Result = repo.Result
 }

space/space/space/space/space/space/space/space/services/forgot_password_service.go

@@ -34,7 +34,10 @@ func (s *ForgotPasswordService) Create(email string) {
 	remainingTime := time.Duration(config.EMAIL_VERIFICATION_DURATION) * time.Hour
 	dueTime := CalculateDueTime(remainingTime)
 
-	token := uint(rand.IntN(100000))
+	token := uint(rand.IntN(1000000))
+	for token < 1000000 {
+		token = uint(rand.IntN(1000000))
+	}
 	s.Constructor.UUID = uuid.NewV4()
 	s.Constructor.ExpiredAt = dueTime
 	s.Constructor.AccountID = accountRepo.Result.Id

space/space/space/space/space/space/space/space/space/logs/error_log.txt

@@ -1 +1,2 @@
-
+2025/04/20 10:05:28 Error Log : duplicated key not allowed
+2025/04/20 10:11:41 Error Log : duplicated key not allowed

space/space/space/space/space/space/space/space/space/models/response_model.go

@@ -31,12 +31,15 @@ type UserProfileResponse struct {
 	Details AccountDetails `json:"details"`
 }
 
-type AkademiDasar struct {
-	Academies Academy           `json:"academy"`
-	Materials []AcademyMaterial `json:"academy_material"`
-	Contents  []AcademyContent  `json:"academy_content"`
+type AcademyMaterialResponse struct {
+	Materials AcademyMaterial
+	Contents  []AcademyContent
+}
+type AcademyResponse struct {
+	Academy   Academy                   `json:"academy"`
+	Materials []AcademyMaterialResponse `json:"academy_materials"`
 }
 
-type AkademiDasarResponse struct {
-	AkademiDasar []AkademiDasar `json:"academy_dasar"`
+type AllAcademyResponse struct {
+	Academies []AcademyResponse `json:"academy_dasar"`
 }

space/space/space/space/space/space/space/space/space/repositories/academy_repository.go

@@ -0,0 +1,47 @@
+package repositories
+
+import "api.qobiltu.id/models"
+
+func GetAllAcademy() Repository[models.Academy, []models.Academy] {
+	repo := Construct[models.Academy, []models.Academy](
+		models.Academy{},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.Academy, []models.Academy],
+		Find[models.Academy, []models.Academy],
+	)
+	return *repo
+}
+
+func GetAcademyDataById(academyId uint) Repository[models.Academy, models.Academy] {
+	repo := Construct[models.Academy, models.Academy](
+		models.Academy{ID: academyId},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.Academy, models.Academy],
+		Find[models.Academy, models.Academy],
+	)
+	return *repo
+}
+
+func GetAllAcademyMaterialsByAcademyID(acaddemyId uint) Repository[models.AcademyMaterial, []models.AcademyMaterial] {
+	repo := Construct[models.AcademyMaterial, []models.AcademyMaterial](
+		models.AcademyMaterial{AcademyID: acaddemyId},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.AcademyMaterial, []models.AcademyMaterial],
+		Find[models.AcademyMaterial, []models.AcademyMaterial],
+	)
+	return *repo
+}
+
+func GetAllAcademyContentsByMaterialID(materialId uint) Repository[models.AcademyContent, []models.AcademyContent] {
+	repo := Construct[models.AcademyContent, []models.AcademyContent](
+		models.AcademyContent{AcademyMaterialID: materialId},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.AcademyContent, []models.AcademyContent],
+		Find[models.AcademyContent, []models.AcademyContent],
+	)
+	return *repo
+}

space/space/space/space/space/space/space/space/space/services/academy_service.go

@@ -0,0 +1,40 @@
+package services
+
+import (
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/repositories"
+)
+
+type AcademyService struct {
+	Service[models.Academy, models.AllAcademyResponse]
+}
+
+func (s *AcademyService) Retrieve() {
+	if s.Constructor.ID != 0 {
+		AcademyRepo := repositories.GetAcademyDataById(s.Constructor.ID)
+		s.Error = AcademyRepo.RowsError
+		if AcademyRepo.NoRecord {
+			s.Exception.Message = "Academy not found"
+			s.Exception.DataNotFound = true
+			return
+		}
+		var ArrMaterials []models.AcademyMaterialResponse
+		for _, academyMaterial := range repositories.GetAllAcademyMaterialsByAcademyID(s.Constructor.ID).Result {
+			ArrMaterials = append(ArrMaterials, models.AcademyMaterialResponse{
+				Materials: academyMaterial,
+				Contents:  repositories.GetAllAcademyContentsByMaterialID(academyMaterial.ID).Result,
+			})
+		}
+		s.Result = models.AllAcademyResponse{
+			Academies: []models.AcademyResponse{
+				models.AcademyResponse{
+					Academy:   AcademyRepo.Result,
+					Materials: ArrMaterials,
+				},
+			},
+		}
+	} else {
+		// AcademyRepo := repositories.GetAllAcademy()
+	}
+
+}

space/space/space/space/space/space/space/space/space/services/external_authentication_service.go

@@ -33,6 +33,7 @@ func (s *GoogleAuthService) Authenticate(isAgree bool) {
 		s.Constructor.UUID = uuid.NewV4()
 		s.Constructor.OauthProvider = "Google"
 		createAccount := repositories.CreateAccount(models.Account{
+			UUID:            uuid.NewV4(),
 			Email:           email.(string),
 			IsEmailVerified: true,
 		})

space/space/space/space/space/space/space/space/space/services/forgot_password_service.go

@@ -71,13 +71,6 @@ func (s *ForgotPasswordService) Create(email string) {
 }
 
 func (s *ForgotPasswordService) Validate(newPassword *string) {
-	accountRepo := repositories.GetAccountById(s.Constructor.AccountID)
-	if accountRepo.NoRecord {
-		s.Error = accountRepo.RowsError
-		s.Exception.DataNotFound = true
-		s.Exception.Message = "There is no account data with given credentials!"
-		return
-	}
 
 	fgPasswordRepo := repositories.GetForgotPasswordByToken(s.Constructor.Token)
 	s.Error = fgPasswordRepo.RowsError
@@ -91,13 +84,24 @@ func (s *ForgotPasswordService) Validate(newPassword *string) {
 		s.Exception.Message = "Token has expired!"
 		return
 	}
+
+	accountRepo := repositories.GetAccountById(fgPasswordRepo.Result.AccountID)
+	if accountRepo.NoRecord {
+		s.Error = accountRepo.RowsError
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no account data with given credentials!"
+		return
+	}
 	s.Result = fgPasswordRepo.Result
 	if newPassword == nil {
 		return
 	}
+	// fmt.Println("Previous Account", accountRepo.Result)
+	// fmt.Println("New password", *newPassword)
 	hashed_password, _ := HashPassword(*newPassword)
 	accountRepo.Result.Password = hashed_password
 	changePassword := repositories.UpdateAccount(accountRepo.Result)
+	// fmt.Println("New Account", changePassword.Result)
 	if changePassword.RowsError != nil {
 		s.Error = changePassword.RowsError
 		s.Exception.QueryError = true

space/space/space/space/space/space/space/space/space/space/space/go.mod

@@ -5,9 +5,11 @@ go 1.24.0
 require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/gosimple/slug v1.15.0
 	github.com/joho/godotenv v1.5.1
 	github.com/satori/go.uuid v1.2.0
 	golang.org/x/crypto v0.36.0
+	google.golang.org/api v0.228.0
 	gorm.io/driver/postgres v1.5.11
 	gorm.io/gorm v1.25.12
 )
@@ -31,7 +33,6 @@ require (
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
-	github.com/gosimple/slug v1.15.0 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -41,13 +42,11 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -56,13 +55,11 @@ require (
 	go.opentelemetry.io/otel/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
 	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/oauth2 v0.28.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/api v0.228.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
 	google.golang.org/grpc v1.71.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect

space/space/space/space/space/space/space/space/space/space/space/go.sum

@@ -12,7 +12,6 @@ github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFos
 github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
 github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -41,11 +40,15 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
 github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
@@ -74,8 +77,8 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
 github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -91,8 +94,7 @@ github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNH
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -114,20 +116,24 @@ github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65E
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
 go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
 go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
 go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
 golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
 golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
 golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
 golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
 golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
@@ -139,16 +145,14 @@ golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 google.golang.org/api v0.228.0 h1:X2DJ/uoWGnY5obVjewbp8icSL5U4FzuCfy9OjbLSnLs=
 google.golang.org/api v0.228.0/go.mod h1:wNvRS1Pbe8r4+IfBIniV8fwCpGwTrYa+kMUDiC5z5a4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
 google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
 google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

space/space/space/space/space/space/space/space/space/space/space/space/models/response_model.go

@@ -30,3 +30,13 @@ type UserProfileResponse struct {
 	Account Account        `json:"account"`
 	Details AccountDetails `json:"details"`
 }
+
+type AkademiDasar struct {
+	Academies Academy           `json:"academy"`
+	Materials []AcademyMaterial `json:"academy_material"`
+	Contents  []AcademyContent  `json:"academy_content"`
+}
+
+type AkademiDasarResponse struct {
+	AkademiDasar []AkademiDasar `json:"academy_dasar"`
+}

space/space/space/space/space/space/space/space/space/space/space/space/services/forgot_password_service.go

@@ -70,7 +70,7 @@ func (s *ForgotPasswordService) Create(email string) {
 	// s.Result.Token = 0
 }
 
-func (s *ForgotPasswordService) Validate(newPassword string) {
+func (s *ForgotPasswordService) Validate(newPassword *string) {
 	accountRepo := repositories.GetAccountById(s.Constructor.AccountID)
 	if accountRepo.NoRecord {
 		s.Error = accountRepo.RowsError
@@ -91,7 +91,11 @@ func (s *ForgotPasswordService) Validate(newPassword string) {
 		s.Exception.Message = "Token has expired!"
 		return
 	}
-	hashed_password, _ := HashPassword(newPassword)
+	s.Result = fgPasswordRepo.Result
+	if newPassword == nil {
+		return
+	}
+	hashed_password, _ := HashPassword(*newPassword)
 	accountRepo.Result.Password = hashed_password
 	changePassword := repositories.UpdateAccount(accountRepo.Result)
 	if changePassword.RowsError != nil {
@@ -101,5 +105,5 @@ func (s *ForgotPasswordService) Validate(newPassword string) {
 		return
 	}
 	// fgPasswordRepo.Result.Token = 0
-	s.Result = fgPasswordRepo.Result
+
 }

space/space/space/space/space/space/space/space/space/space/space/space/space/controller/auth/auth_external_controller.go

@@ -14,7 +14,7 @@ func ExternalAuth(c *gin.Context) {
 			GoogleLogin := services.GoogleAuthService{}
 			ExternalAuthController.Service = &GoogleLogin.Service
 			ExternalAuthController.Service.Constructor.OauthID = ExternalAuthController.Request.OauthID
-			GoogleLogin.Authenticate()
+			GoogleLogin.Authenticate(ExternalAuthController.Request.IsAgreeTerms && !ExternalAuthController.Request.IsSexualDisease)
 		}
 	})
 }

space/space/space/space/space/space/space/space/space/space/space/space/space/controller/auth/auth_forgot_password_controller.go

@@ -1 +1,29 @@
 package auth
+
+import (
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func CreateForgotPassword(c *gin.Context) {
+	ForgotPassword := services.ForgotPasswordService{}
+	ForgotPasswordController := controller.Controller[models.ForgotPasswordRequest, models.ForgotPassword, models.ForgotPassword]{
+		Service: &ForgotPassword.Service,
+	}
+	ForgotPasswordController.RequestJSON(c, func() {
+		ForgotPassword.Create(ForgotPasswordController.Request.Email)
+	})
+
+}
+func ValidateForgotPassword(c *gin.Context) {
+	ForgotPassword := services.ForgotPasswordService{}
+	ForgotPasswordController := controller.Controller[models.ValidateForgotPasswordRequest, models.ForgotPassword, models.ForgotPassword]{
+		Service: &ForgotPassword.Service,
+	}
+	ForgotPasswordController.RequestJSON(c, func() {
+		ForgotPasswordController.Service.Constructor.Token = ForgotPasswordController.Request.Token
+		ForgotPassword.Validate(&ForgotPasswordController.Request.NewPassword)
+	})
+}

space/space/space/space/space/space/space/space/space/space/space/space/space/controller/email/email_validate_controller.go

@@ -16,7 +16,6 @@ func Verify(c *gin.Context) {
 		emailVerificationController.Service.Constructor.AccountID = uint(emailVerificationController.AccountData.UserID)
 		emailVerificationController.RequestJSON(c, func() {
 			emailVerificationController.Service.Constructor.Token = emailVerificationController.Request.Token
-			emailVerificationController.Service.Constructor.UUID = emailVerificationController.Request.UUID
 			emailVerification.Validate()
 		})
 	})

space/space/space/space/space/space/space/space/space/space/space/space/space/models/request_model.go

@@ -1,7 +1,5 @@
 package models
 
-import uuid "github.com/satori/go.uuid"
-
 type LoginRequest struct {
 	Email    string `json:"email" binding:"required"`
 	Password string `json:"password" binding:"required"`
@@ -20,8 +18,7 @@ type ChangePasswordRequest struct {
 }
 
 type CreateVerifyEmailRequest struct {
-	Token uint      `json:"token" binding:"required"`
-	UUID  uuid.UUID `json:"uuid" binding:"required"`
+	Token uint `json:"token" binding:"required"`
 }
 
 type OptionsRequest struct {
@@ -35,3 +32,11 @@ type ExternalAuthRequest struct {
 	IsAgreeTerms    bool   `json:"is_agree_terms"`
 	IsSexualDisease bool   `json:"is_sexual_disease"`
 }
+
+type ForgotPasswordRequest struct {
+	Email string `json:"email" binding:"required,email"`
+}
+type ValidateForgotPasswordRequest struct {
+	Token       uint   `json:"token" binding:"required"`
+	NewPassword string `json:"new_password"`
+}

space/space/space/space/space/space/space/space/space/space/space/space/space/repositories/account_repository.go

@@ -39,10 +39,8 @@ func UpdateAccount(account models.Account) Repository[models.Account, models.Acc
 	repo := Construct[models.Account, models.Account](
 		account,
 	)
-	repo.Transactions(
-		WhereGivenConstructor[models.Account, models.Account],
-		Update[models.Account],
-	)
+	repo.Transaction.Save(&repo.Constructor)
+	repo.Result = repo.Constructor
 	return *repo
 }
 

space/space/space/space/space/space/space/space/space/space/space/space/space/router/auth_route.go

@@ -13,5 +13,7 @@ func AuthRoute(router *gin.Engine) {
 		routerGroup.POST("/login", AuthController.Login)
 		routerGroup.POST("/register", AuthController.Register)
 		routerGroup.PUT("/change-password", middleware.AuthUser, AuthController.ChangePassword)
+		routerGroup.POST("/forgot-password", AuthController.CreateForgotPassword)
+		routerGroup.PUT("/forgot-password", AuthController.ValidateForgotPassword)
 	}
 }

space/space/space/space/space/space/space/space/space/space/space/space/space/services/authentication_service.go

@@ -58,7 +58,8 @@ func (s *AuthenticationService) Update(oldPassword string, newPassword string) {
 		s.Exception.Message = "incorrect old password!"
 		return
 	}
-	accountData.Result.Password = newPassword
+	hashed_password, _ := HashPassword(newPassword)
+	accountData.Result.Password = hashed_password
 	changePassword := repositories.UpdateAccount(accountData.Result)
 	changePassword.Result.Password = "SECRET"
 	s.Result = models.AuthenticatedUser{

space/space/space/space/space/space/space/space/space/space/space/space/space/services/email_verification_service.go

@@ -61,6 +61,7 @@ func (s *EmailVerificationService) Create() {
 			return
 		}
 	}(accountRepo.Result.Email, token)
+	// s.Result.Token = 0
 }
 
 func (s *EmailVerificationService) Validate() {
@@ -80,8 +81,11 @@ func (s *EmailVerificationService) Validate() {
 		s.Delete()
 		return
 	}
+	account := repositories.GetAccountById(repo.Result.AccountID)
+	account.Result.IsEmailVerified = true
+	
+	repositories.UpdateAccount(account.Result)
 	s.Result = repo.Result
-	s.Delete()
 }
 
 func (s *EmailVerificationService) Delete() {

space/space/space/space/space/space/space/space/space/space/space/space/space/services/external_authentication_service.go

@@ -14,7 +14,7 @@ type GoogleAuthService struct {
 	Service[models.ExternalAuth, models.AuthenticatedUser]
 }
 
-func (s *GoogleAuthService) Authenticate() {
+func (s *GoogleAuthService) Authenticate(isAgree bool) {
 	GoogleAuth := repositories.GetExternalAccountByOauthId(s.Constructor.OauthID)
 	payload, errGoogleAuth := idtoken.Validate(context.Background(), s.Constructor.OauthID, "")
 	s.Error = errGoogleAuth
@@ -25,6 +25,11 @@ func (s *GoogleAuthService) Authenticate() {
 	}
 	email := payload.Claims["email"]
 	if GoogleAuth.NoRecord {
+		if !isAgree {
+			s.Exception.BadRequest = true
+			s.Exception.Message = "Please agree to the terms and conditions to create an account"
+			return
+		}
 		s.Constructor.UUID = uuid.NewV4()
 		s.Constructor.OauthProvider = "Google"
 		createAccount := repositories.CreateAccount(models.Account{