Deploy files from GitHub repository

main.go

@@ -10,7 +10,7 @@ import (
 	email_controller "api.qobiltu.id/controller/email"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
-	"api.qobiltu.id/mail"
+	"api.qobiltu.id/pkg/mail"
 	"api.qobiltu.id/pkg/storage"
 	"api.qobiltu.id/pkg/validation"
 	"api.qobiltu.id/pkg/worker"

pkg/mail/sender.go

@@ -0,0 +1,8 @@
+package mail
+
+type Sender interface {
+	Send(recipient, subject string, htmlContent string, data any) error
+}
+
+// EmailSender is a global variable to hold the email sender
+var EmailSender Sender

pkg/mail/smtp.go

@@ -0,0 +1,71 @@
+package mail
+
+import (
+	"errors"
+	"fmt"
+	"github.com/jordan-wright/email"
+	"net/mail"
+	"net/smtp"
+)
+
+var (
+	ErrEmailEmpty   = errors.New("mail is empty")
+	ErrEmailInvalid = errors.New("invalid email")
+)
+
+// Config menyimpan pengaturan untuk koneksi SMTP.
+type Config struct {
+	Host     string
+	Port     string
+	Username string
+	Password string
+	From     string
+}
+
+// SMTP adalah implementasi Sender untuk mengirim mail melalui SMTP
+type SMTP struct {
+	name              string
+	fromEmailAddress  string
+	smtpServerAddress string
+	smtpAuthAddress   smtp.Auth
+}
+
+// New membuat instance baru SMTP dengan konfigurasi.
+func New(cfg *Config) (Sender, error) {
+	if err := validateEmail(cfg.From); err != nil {
+		return nil, fmt.Errorf("invalid from address: %w", err)
+	}
+
+	return &SMTP{
+		name:              cfg.From,
+		fromEmailAddress:  cfg.From,
+		smtpServerAddress: fmt.Sprintf("%s:%s", cfg.Host, cfg.Port),
+		smtpAuthAddress:   smtp.PlainAuth("", cfg.Username, cfg.Password, cfg.Host),
+	}, nil
+}
+
+// Send mengirim mail ke penerima dengan subjek, konten HTML, dan data lainnya.
+func (s *SMTP) Send(recipient, subject string, htmlContent string, data any) error {
+	e := email.NewEmail()
+	e.From = s.fromEmailAddress
+	e.To = []string{recipient}
+	e.Subject = subject
+	e.HTML = []byte(htmlContent)
+	return s.sendEmail(e)
+}
+
+func (s *SMTP) sendEmail(e *email.Email) error {
+	return e.Send(s.smtpServerAddress, s.smtpAuthAddress)
+}
+
+func validateEmail(email string) error {
+	if email == "" {
+		return ErrEmailEmpty
+	}
+
+	if _, err := mail.ParseAddress(email); err != nil {
+		return ErrEmailInvalid
+	}
+
+	return nil
+}

pkg/worker/processor.go

@@ -1,11 +1,12 @@
 package worker
 
 import (
-	"api.qobiltu.id/mail"
 	"context"
+	"log/slog"
+
+	"api.qobiltu.id/pkg/mail"
 	"github.com/hibiken/asynq"
 	"github.com/redis/go-redis/v9"
-	"log/slog"
 )
 
 const (

router/email_route.go

@@ -2,11 +2,10 @@ package router
 
 import (
 	"api.qobiltu.id/middleware"
-	"github.com/gin-gonic/gin"
 )
 
-func (s *Server) EmailRoute(router *gin.Engine) {
-	routerGroup := router.Group("/api/v1/email").Use(middleware.AuthUser)
+func (s *Server) EmailRoute() {
+	routerGroup := s.router.Group("/api/v1/email").Use(middleware.AuthUser)
 	{
 		routerGroup.POST("/create-verification", s.emailController.CreateEmailVerification)
 		routerGroup.POST("/verify", s.emailController.Verify)

router/router.go

@@ -14,7 +14,7 @@ func (s *Server) setupRoutes() {
 	AcademyRoute(s.router)
 	QuizRoute(s.router)
 
-	s.EmailRoute(s.router)
+	s.EmailRoute()
 	s.CVRoute()
 	s.MarriageReadinessProfileRoute()
 	s.PartnerCriteriaRoute()

space/main.go

@@ -10,7 +10,7 @@ import (
 	email_controller "api.qobiltu.id/controller/email"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
-	"api.qobiltu.id/mail"
+	"api.qobiltu.id/pkg/mail"
 	"api.qobiltu.id/pkg/storage"
 	"api.qobiltu.id/pkg/validation"
 	"api.qobiltu.id/pkg/worker"

space/pkg/worker/processor.go

@@ -1,11 +1,12 @@
 package worker
 
 import (
-	"api.qobiltu.id/mail"
 	"context"
+	"log/slog"
+
+	"api.qobiltu.id/pkg/mail"
 	"github.com/hibiken/asynq"
 	"github.com/redis/go-redis/v9"
-	"log/slog"
 )
 
 const (

space/router/email_route.go

@@ -2,11 +2,10 @@ package router
 
 import (
 	"api.qobiltu.id/middleware"
-	"github.com/gin-gonic/gin"
 )
 
-func (s *Server) EmailRoute(router *gin.Engine) {
-	routerGroup := router.Group("/api/v1/email").Use(middleware.AuthUser)
+func (s *Server) EmailRoute() {
+	routerGroup := s.router.Group("/api/v1/email").Use(middleware.AuthUser)
 	{
 		routerGroup.POST("/create-verification", s.emailController.CreateEmailVerification)
 		routerGroup.POST("/verify", s.emailController.Verify)

space/router/router.go

@@ -14,7 +14,7 @@ func (s *Server) setupRoutes() {
 	AcademyRoute(s.router)
 	QuizRoute(s.router)
 
-	s.EmailRoute(s.router)
+	s.EmailRoute()
 	s.CVRoute()
 	s.MarriageReadinessProfileRoute()
 	s.PartnerCriteriaRoute()

space/space/controller/auth/auth_login_controller.go

@@ -1,4 +1,4 @@
-package user
+package auth
 
 import (
 	"api.qobiltu.id/controller"

space/space/controller/auth/auth_register_controller.go

@@ -1,4 +1,4 @@
-package user
+package auth
 
 import (
 	"api.qobiltu.id/controller"

space/space/controller/email/email_controller.go

@@ -0,0 +1,64 @@
+package email_controller
+
+import (
+	"net/http"
+
+	"api.qobiltu.id/middleware"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/response"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+type EmailController interface {
+	CreateEmailVerification(ctx *gin.Context)
+	Verify(ctx *gin.Context)
+}
+
+type emailController struct {
+	emailService services.EmailService
+}
+
+func NewEmailController(emailService services.EmailService) EmailController {
+	return &emailController{
+		emailService: emailService,
+	}
+}
+
+func (c *emailController) CreateEmailVerification(ctx *gin.Context) {
+	accountData := middleware.GetAccountData(ctx)
+	req := models.CreateEmailVerificationRequest{
+		AccountID: int64(accountData.UserID),
+	}
+
+	res, err := c.emailService.CreateEmailVerification(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Email verification created", res, nil)
+}
+
+func (c *emailController) Verify(ctx *gin.Context) {
+	var req models.ValidateEmailVerificationRequest
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
+		return
+	}
+
+	accountData := middleware.GetAccountData(ctx)
+	req.AccountID = int64(accountData.UserID)
+
+	res, err := c.emailService.ValidateEmailVerification(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Email verified", res, nil)
+}

space/space/main.go

@@ -7,9 +7,10 @@ import (
 
 	"api.qobiltu.id/config"
 	cv_controller "api.qobiltu.id/controller/cv"
+	email_controller "api.qobiltu.id/controller/email"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
-	"api.qobiltu.id/mail"
+	"api.qobiltu.id/pkg/mail"
 	"api.qobiltu.id/pkg/storage"
 	"api.qobiltu.id/pkg/validation"
 	"api.qobiltu.id/pkg/worker"
@@ -54,6 +55,10 @@ func main() {
 	worker.AsyncTaskDistributor = taskDistributor
 
 	// setup repo, service, and controller
+	emailRepository := repositories.NewEmailRepository(config.DB)
+	emailService := services.NewEmailService(emailRepository, taskDistributor)
+	emailController := email_controller.NewEmailController(emailService)
+
 	cvRepository := repositories.NewCVRepository(config.DB)
 	cvService := services.NewCVService(cvRepository, localStorage, validator)
 	cvController := cv_controller.NewCVController(cvService)
@@ -73,6 +78,7 @@ func main() {
 
 	// create server
 	s, err := router.NewServer(
+		emailController,
 		cvController,
 		marriageReadinessProfileController,
 		partnerCriteriaController,

space/space/models/database_orm_model.go

@@ -38,13 +38,15 @@ type AccountDetails struct {
 }
 
 type EmailVerification struct {
-	ID        uint      `gorm:"primaryKey" json:"id"`
+	ID        int64     `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	AccountID int64     `gorm:"column:account_id;not null" json:"account_id"`
+	Account   *Account  `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"`
 	UUID      uuid.UUID `gorm:"type:uuid" json:"uuid" `
-	Token     uint      `json:"token"`
-	AccountID uint      `json:"account_id"`
-	IsExpired bool      `json:"is_expired"`
-	CreatedAt time.Time `json:"created_at"`
+	Token     int64     `json:"token"`
 	ExpiredAt time.Time `json:"expired_at"`
+	IsExpired bool      `json:"is_expired"`
+	CreatedAt time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"`
+	UpdatedAt time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
 }
 
 type ExternalAuth struct {

space/space/models/request_model.go

@@ -57,6 +57,17 @@ type AnswerQuizRequest struct {
 	Answer     int `json:"answer" binding:"required"`
 }
 
+type (
+	CreateEmailVerificationRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	ValidateEmailVerificationRequest struct {
+		AccountID int64 `json:"-"`
+		Token     int64 `json:"token" validate:"required"`
+	}
+)
+
 type (
 	SavePersonalityAndPreferenceRequest struct {
 		AccountID int64 `json:"-"`

space/space/repositories/email_repository.go

@@ -0,0 +1,65 @@
+package repositories
+
+import (
+	"context"
+
+	"api.qobiltu.id/models"
+	"gorm.io/gorm"
+)
+
+type EmailRepository interface {
+	SaveEmailVerification(ctx context.Context, req *models.EmailVerification) (*models.EmailVerification, error)
+	GetEmailVerification(ctx context.Context, accountID int64, token int64) (*models.EmailVerification, error)
+	DeleteEmailVerification(ctx context.Context, id int64) error
+
+	// later, will relocate to account repository
+	GetAccountById(ctx context.Context, id int64) (*models.Account, error)
+	SaveAccount(ctx context.Context, req *models.Account) (*models.Account, error)
+}
+
+type emailRepository struct {
+	db *gorm.DB
+}
+
+func NewEmailRepository(db *gorm.DB) EmailRepository {
+	return &emailRepository{db: db}
+}
+
+func (r *emailRepository) SaveEmailVerification(ctx context.Context, req *models.EmailVerification) (*models.EmailVerification, error) {
+	err := r.db.WithContext(ctx).Save(req).Error
+	if err != nil {
+		return nil, err
+	}
+	return req, nil
+}
+
+func (r *emailRepository) GetEmailVerification(ctx context.Context, accountID int64, token int64) (*models.EmailVerification, error) {
+	var emailVerification models.EmailVerification
+	err := r.db.WithContext(ctx).Where("account_id = ? AND token = ?", accountID, token).First(&emailVerification).Error
+	if err != nil {
+		return nil, err
+	}
+
+	return &emailVerification, nil
+}
+
+func (r *emailRepository) DeleteEmailVerification(ctx context.Context, id int64) error {
+	return r.db.WithContext(ctx).Delete(&models.EmailVerification{}, id).Error
+}
+
+func (r *emailRepository) GetAccountById(ctx context.Context, id int64) (*models.Account, error) {
+	var account models.Account
+	err := r.db.WithContext(ctx).Where("id = ?", id).First(&account).Error
+	if err != nil {
+		return nil, err
+	}
+	return &account, nil
+}
+
+func (r *emailRepository) SaveAccount(ctx context.Context, req *models.Account) (*models.Account, error) {
+	err := r.db.WithContext(ctx).Save(req).Error
+	if err != nil {
+		return nil, err
+	}
+	return req, nil
+}

space/space/router/email_route.go

@@ -1,15 +1,13 @@
 package router
 
 import (
-	EmailController "api.qobiltu.id/controller/email"
 	"api.qobiltu.id/middleware"
-	"github.com/gin-gonic/gin"
 )
 
-func EmailRoute(router *gin.Engine) {
-	routerGroup := router.Group("/api/v1/email")
+func (s *Server) EmailRoute() {
+	routerGroup := s.router.Group("/api/v1/email").Use(middleware.AuthUser)
 	{
-		routerGroup.POST("/verify", middleware.AuthUser, EmailController.Verify)
-		routerGroup.POST("/create-verification", middleware.AuthUser, EmailController.CreateVerification)
+		routerGroup.POST("/create-verification", s.emailController.CreateEmailVerification)
+		routerGroup.POST("/verify", s.emailController.Verify)
 	}
 }

space/space/router/router.go

@@ -10,12 +10,11 @@ func (s *Server) setupRoutes() {
 
 	AuthRoute(s.router)
 	UserRoute(s.router)
-	EmailRoute(s.router)
 	OptionsRoute(s.router)
 	AcademyRoute(s.router)
 	QuizRoute(s.router)
 
-	// another way to register routes
+	s.EmailRoute()
 	s.CVRoute()
 	s.MarriageReadinessProfileRoute()
 	s.PartnerCriteriaRoute()

space/space/router/server.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	cv_controller "api.qobiltu.id/controller/cv"
+	email_controller "api.qobiltu.id/controller/email"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
 	"github.com/gin-gonic/gin"
@@ -9,12 +10,14 @@ import (
 
 type Server struct {
 	router                             *gin.Engine
+	emailController                    email_controller.EmailController
 	cvController                       cv_controller.CVController
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController
 	partnerCriteriaController          partner_criteria_controller.PartnerCriteriaController
 }
 
 func NewServer(
+	emailController email_controller.EmailController,
 	cvController cv_controller.CVController,
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController,
 	partnerCriteriaController partner_criteria_controller.PartnerCriteriaController,
@@ -24,6 +27,7 @@ func NewServer(
 	router.Use(gin.Recovery())
 
 	server := &Server{
+		emailController:                    emailController,
 		cvController:                       cvController,
 		marriageReadinessProfileController: marriageReadinessProfileController,
 		partnerCriteriaController:          partnerCriteriaController,

space/space/services/email_service.go

@@ -0,0 +1,123 @@
+package services
+
+import (
+	"context"
+	"strconv"
+	"time"
+
+	"api.qobiltu.id/config"
+	"api.qobiltu.id/pkg/worker"
+	"api.qobiltu.id/response"
+	"api.qobiltu.id/utils"
+	"github.com/hibiken/asynq"
+	uuid "github.com/satori/go.uuid"
+
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/repositories"
+)
+
+type EmailService interface {
+	CreateEmailVerification(ctx context.Context, req *models.CreateEmailVerificationRequest) (*models.EmailVerification, error)
+	ValidateEmailVerification(ctx context.Context, req *models.ValidateEmailVerificationRequest) (*models.EmailVerification, error)
+}
+
+type emailService struct {
+	emailRepository repositories.EmailRepository
+	taskDistributor worker.TaskDistributor
+}
+
+func NewEmailService(emailRepository repositories.EmailRepository, taskDistributor worker.TaskDistributor) EmailService {
+	return &emailService{emailRepository: emailRepository, taskDistributor: taskDistributor}
+}
+
+func (s *emailService) CreateEmailVerification(ctx context.Context, req *models.CreateEmailVerificationRequest) (*models.EmailVerification, error) {
+	account, err := s.emailRepository.GetAccountById(ctx, req.AccountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	token, err := utils.GenerateToken()
+	if err != nil {
+		return nil, models.Exception{
+			InternalServerError: true,
+			Message:             "failed to generate token for email verification",
+		}
+	}
+
+	remainingTime := time.Duration(config.EMAIL_VERIFICATION_DURATION) * time.Minute
+	dueTime := time.Now().Add(remainingTime)
+
+	payload := models.EmailVerification{
+		AccountID: int64(account.Id),
+		Token:     token,
+		UUID:      uuid.NewV4(),
+		ExpiredAt: dueTime,
+		IsExpired: false,
+	}
+
+	emailVerification, err := s.emailRepository.SaveEmailVerification(ctx, &payload)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	opts := []asynq.Option{
+		asynq.MaxRetry(worker.TaskSendVerifyEmailMaxRetry),
+		asynq.Queue(worker.Critical),
+	}
+
+	err = s.taskDistributor.DistributeTaskSendVerifyEmail(
+		context.Background(),
+		&worker.PayloadSendVerifyEmail{
+			EmailAddress:        account.Email,
+			VerificationCode:    strconv.Itoa(int(token)),
+			ExpirationInMinutes: int(remainingTime.Minutes()),
+			Subject:             worker.TaskSendVerifyEmailSubject,
+		}, opts...)
+
+	if err != nil {
+		return nil, models.Exception{
+			InternalServerError: true,
+			Message:             "failed to distribute task send verify email",
+		}
+	}
+
+	return emailVerification, nil
+}
+
+func (s *emailService) ValidateEmailVerification(ctx context.Context, req *models.ValidateEmailVerificationRequest) (*models.EmailVerification, error) {
+	emailVerification, err := s.emailRepository.GetEmailVerification(ctx, req.AccountID, int64(req.Token))
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	if emailVerification.ExpiredAt.Before(time.Now()) {
+		err = s.emailRepository.DeleteEmailVerification(ctx, emailVerification.ID)
+		if err != nil {
+			return nil, response.HandleGormError(err, "Internal Server Error")
+		}
+
+		return nil, models.Exception{
+			Unauthorized: true,
+			Message:      "Token has expired!",
+		}
+	}
+
+	account, err := s.emailRepository.GetAccountById(ctx, emailVerification.AccountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	account.IsEmailVerified = true
+
+	_, err = s.emailRepository.SaveAccount(ctx, account)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	err = s.emailRepository.DeleteEmailVerification(ctx, emailVerification.ID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	return emailVerification, nil
+}

space/space/space/controller/quiz/review_quiz_controller.go

@@ -0,0 +1,26 @@
+package controller
+
+import (
+	"strconv"
+
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func Review(c *gin.Context) {
+	reviewQuiz := services.ReviewQuizService{}
+	reviewQuizController := controller.Controller[any, models.Quiz, models.QuestionResponse]{
+		Service: &reviewQuiz.Service,
+	}
+	reviewQuizController.HeaderParse(c, func() {
+		quizId, _ := strconv.Atoi(c.Param("quiz_id"))
+		academyId, _ := strconv.Atoi(c.Param("academy_id"))
+		questionNo, _ := strconv.Atoi(c.Query("question_no"))
+		reviewQuizController.Service.Constructor.ID = uint(quizId)
+		reviewQuizController.Service.Constructor.AcademyID = uint(academyId)
+		reviewQuiz.Retrieve(reviewQuizController.AccountData.UserID, questionNo)
+		reviewQuizController.Response(c)
+	})
+}

space/space/space/router/quiz_route.go

@@ -12,6 +12,7 @@ func QuizRoute(router *gin.Engine) {
 		routerGroup.GET("/:academy_id/list", middleware.AuthUser, QuizController.List)
 		routerGroup.POST("/:academy_id/:quiz_id/attempt", middleware.AuthUser, QuizController.Attempt)
 		routerGroup.GET("/:academy_id/:quiz_id/question", middleware.AuthUser, QuizController.Question)
+		routerGroup.GET("/:academy_id/:quiz_id/review", middleware.AuthUser, QuizController.Review)
 		routerGroup.PUT("/:academy_id/:quiz_id/choose-answer", middleware.AuthUser, QuizController.Answer)
 		routerGroup.GET("result/:attempt_id", middleware.AuthUser, QuizController.Result)
 		routerGroup.GET("result/", middleware.AuthUser, QuizController.Result)

space/space/space/services/academy_quiz_question_service.go

@@ -34,6 +34,8 @@ func (s *QuestionQuizService) Retrieve(userID uint, questionNo int) {
 			s.Exception.Message = "There is no Answer Option with given QuestionId!"
 			return
 		}
+		questionRepo.Result.Review = "SECRET"
+		questionRepo.Result.CorrectAnswer = 0
 		s.Result = models.QuestionResponse{
 			Question:   questionRepo.Result,
 			Answer:     answerOptionRepo.Result,

space/space/space/services/academy_quiz_review_service.go

@@ -0,0 +1,56 @@
+package services
+
+import (
+	"errors"
+
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/repositories"
+)
+
+type ReviewQuizService struct {
+	Service[models.Quiz, models.QuestionResponse]
+}
+
+func (s *ReviewQuizService) Retrieve(userID uint, questionNo int) {
+	latestAttemptRepo := repositories.GetUserLastAttempt(userID, s.Constructor.ID)
+	s.Error = latestAttemptRepo.RowsError
+	if latestAttemptRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no attempt data with given user ID!"
+		return
+	}
+	quizRepo := repositories.GetQuizbyId(s.Constructor.ID)
+	s.Error = errors.Join(s.Error, quizRepo.RowsError)
+	if latestAttemptRepo.Result.Score >= float64(quizRepo.Result.MinScore) {
+		questionRepo := repositories.GetQuestionByOrder(s.Constructor.ID, questionNo)
+		s.Error = questionRepo.RowsError
+		if questionRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no quiz with given academy!"
+			return
+		}
+		answerRepo := repositories.GetUserAnswerByAttemptQuestionId(latestAttemptRepo.Result.ID, questionRepo.Result.ID)
+		if answerRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no Answer with given AttemptId!"
+			return
+		}
+		answerOptionRepo := repositories.GetAnswerByQuestionId(questionRepo.Result.ID)
+		if answerOptionRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no Answer Option with given QuestionId!"
+			return
+		}
+		s.Result = models.QuestionResponse{
+			Question:   questionRepo.Result,
+			Answer:     answerOptionRepo.Result,
+			UserAnswer: int(answerRepo.Result.SelectedAnswer),
+		}
+	} else {
+		s.Exception.Forbidden = true
+		s.Exception.Message = "You have to passed the exam to review the quiz! "
+		return
+	}
+
+	return
+}

space/space/space/services/academy_quiz_service.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"time"
 
 	"api.qobiltu.id/models"
@@ -131,7 +130,8 @@ func (s *AttemptQuizService) Create(userID uint) {
 			if latestAttemptRepo.Result.Score < float64(quizRepo.Result.MinScore) {
 				Attempt(s, quizRepo, userID)
 			} else {
-				s.Result = latestAttemptRepo.Result
+				s.Exception.Forbidden = true
+				s.Exception.Message = "You're alread passed the quiz, you don't have to re-attempt!"
 				return
 			}
 		} else {
@@ -142,10 +142,7 @@ func (s *AttemptQuizService) Create(userID uint) {
 }
 
 func (s *SubmitQuizService) Create() {
-	fmt.Println(s.Constructor.ID)
-	fmt.Println(s.Constructor.AccountID)
 	quizAttemptRepo := repositories.GetAttemptByIdandUserId(s.Constructor.ID, s.Constructor.AccountID)
-	fmt.Println(quizAttemptRepo.Result)
 	if quizAttemptRepo.NoRecord {
 		s.Exception.DataNotFound = true
 		s.Exception.Message = "There is no quiz attempt with given user!"

space/space/space/space/main.go

@@ -7,7 +7,6 @@ import (
 
 	"api.qobiltu.id/config"
 	cv_controller "api.qobiltu.id/controller/cv"
-	health_check_controller "api.qobiltu.id/controller/health_check"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
 	"api.qobiltu.id/mail"
@@ -55,10 +54,6 @@ func main() {
 	worker.AsyncTaskDistributor = taskDistributor
 
 	// setup repo, service, and controller
-	healthCheckRepository := repositories.NewHealthCheckRepository(config.DB)
-	healthCheckService := services.NewHealthCheckService(healthCheckRepository)
-	healthCheckController := health_check_controller.NewHealthCheckController(healthCheckService)
-
 	cvRepository := repositories.NewCVRepository(config.DB)
 	cvService := services.NewCVService(cvRepository, localStorage, validator)
 	cvController := cv_controller.NewCVController(cvService)
@@ -78,7 +73,6 @@ func main() {
 
 	// create server
 	s, err := router.NewServer(
-		healthCheckController,
 		cvController,
 		marriageReadinessProfileController,
 		partnerCriteriaController,

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

@@ -78,8 +78,10 @@ type Academy struct {
 	Slug              string    `json:"slug" gorm:"uniqueIndex" `
 	TotalMaterial     int       `json:"total_material"`
 	CompletedMaterial int       `json:"completed_material"`
+	TotalQuiz         int       `json:"total_quiz"`
+	PassedQuiz        int       `json:"passed_quiz"`
 	IsCompletedRead   bool      `json:"is_read"`
-	IsPassedExam      bool      `json:"is_exam"`
+	IsPassedExam      bool      `json:"is_passed_exam"`
 	Description       string    `json:"description"`
 }
 
@@ -189,6 +191,7 @@ type QuizResult struct {
 	TotalQuestions int     `gorm:"column:total_questions" json:"total_questions"`
 	CorrectAnswers int     `gorm:"column:correct_answers" json:"correct_answers"`
 	AverageScore   float64 `gorm:"column:average_score" json:"average_score"`
+	IsPassed       bool    `gorm:"column:is_passed" json:"is_passed"`
 }
 
 type (
@@ -396,7 +399,8 @@ type (
 		Account   *Account `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"`
 
 		// Kriteria Umum
-		ExpectedAgeLimit                     *int            `gorm:"column:expected_age_limit" json:"expected_age_limit"`                                             // batas usia pasangan yang diharapkan
+		ExpecteMinAgeLimit                   *int            `gorm:"column:expected_min_age_limit" json:"expected_min_age_limit"`                                     // batas usia pasangan yang diharapkan
+		ExpecteMaxAgeLimit                   *int            `gorm:"column:expected_max_age_limit" json:"expected_max_age_limit"`                                     // batas usia pasangan yang diharapkan
 		ExpectedDomicile                     *string         `gorm:"column:expected_domicile" json:"expected_domicile"`                                               // domisili pasangan yang diharapkan
 		AcceptedMaritalStatus                *pq.StringArray `gorm:"column:accepted_marital_status;type:varchar(255)[]" json:"accepted_marital_status"`               // status pernikahan yang diterima
 		PartnerFamilyReligion                *string         `gorm:"column:partner_family_religion" json:"partner_family_religion"`                                   // agama yang dianut keluarga pasangan
@@ -405,11 +409,12 @@ type (
 		PartnerCanCook                       *string         `gorm:"column:partner_can_cook" json:"partner_can_cook"`                                                 // apakah pasangan diharapkan bisa memasak
 
 		// Kriteria Fisik
-		ExpectedBodyShapes    *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
-		ExpectedSkinColors    *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
-		ExpectedHairTypes     *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
-		ExpectedHairThickness *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
-		ExpectedHeight        *int            `gorm:"column:expected_height" json:"expected_height"`                                     // tinggi badan yang diharapkan
+		ExpectedBodyShapes     *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
+		ExpectedSkinColors     *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
+		ExpectedHairTypes      *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
+		ExpectedHairThickness  *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
+		ExpectedMinHeightLimit *int            `gorm:"column:expected_min_height_limit" json:"expected_min_height_limit"`                 // tinggi badan yang diharapkan
+		ExpectedMaxHeightLimit *int            `gorm:"column:expected_max_height_limit" json:"expected_max_height_limit"`                 // tinggi badan yang diharapkan
 
 		// Pendidikan & Pekerjaan
 		ExpectedPartnerIncome *string         `gorm:"column:expected_partner_income" json:"expected_partner_income"`                     // penghasilan pasangan per bulan yang diharapkan

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

@@ -336,7 +336,8 @@ type (
 	SavePartnerCriteriaRequest struct {
 		AccountID int64 `json:"account_id"`
 
-		ExpectedAgeLimit                     *int            `gorm:"column:expected_age_limit" json:"expected_age_limit"`                                             // batas usia pasangan yang diharapkan
+		ExpecteMinAgeLimit                   *int            `gorm:"column:expected_min_age_limit" json:"expected_min_age_limit"`                                     // batas usia pasangan yang diharapkan
+		ExpecteMaxAgeLimit                   *int            `gorm:"column:expected_max_age_limit" json:"expected_max_age_limit"`                                     // batas usia pasangan yang diharapkan
 		ExpectedDomicile                     *string         `gorm:"column:expected_domicile" json:"expected_domicile"`                                               // domisili pasangan yang diharapkan
 		AcceptedMaritalStatus                *pq.StringArray `gorm:"column:accepted_marital_status;type:varchar(255)[]" json:"accepted_marital_status"`               // status pernikahan yang diterima
 		PartnerFamilyReligion                *string         `gorm:"column:partner_family_religion" json:"partner_family_religion"`                                   // agama yang dianut keluarga pasangan
@@ -345,11 +346,12 @@ type (
 		PartnerCanCook                       *string         `gorm:"column:partner_can_cook" json:"partner_can_cook"`                                                 // apakah pasangan diharapkan bisa memasak
 
 		// Kriteria Fisik
-		ExpectedBodyShapes    *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
-		ExpectedSkinColors    *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
-		ExpectedHairTypes     *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
-		ExpectedHairThickness *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
-		ExpectedHeight        *int            `gorm:"column:expected_height" json:"expected_height"`                                     // tinggi badan yang diharapkan
+		ExpectedBodyShapes     *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
+		ExpectedSkinColors     *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
+		ExpectedHairTypes      *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
+		ExpectedHairThickness  *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
+		ExpectedMinHeightLimit *int            `gorm:"column:expected_min_height_limit" json:"expected_min_height_limit"`                 // tinggi badan yang diharapkan
+		ExpectedMaxHeightLimit *int            `gorm:"column:expected_max_height_limit" json:"expected_max_height_limit"`                 // tinggi badan yang diharapkan
 
 		// Pendidikan & Pekerjaan
 		ExpectedPartnerIncome *string         `gorm:"column:expected_partner_income" json:"expected_partner_income"`                     // penghasilan pasangan per bulan yang diharapkan

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

@@ -16,7 +16,6 @@ func (s *Server) setupRoutes() {
 	QuizRoute(s.router)
 
 	// another way to register routes
-	s.HealthCheckRoute()
 	s.CVRoute()
 	s.MarriageReadinessProfileRoute()
 	s.PartnerCriteriaRoute()

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

@@ -2,7 +2,6 @@ package router
 
 import (
 	cv_controller "api.qobiltu.id/controller/cv"
-	health_check_controller "api.qobiltu.id/controller/health_check"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
 	"github.com/gin-gonic/gin"
@@ -10,14 +9,12 @@ import (
 
 type Server struct {
 	router                             *gin.Engine
-	healthCheckController              health_check_controller.HealthCheckController
 	cvController                       cv_controller.CVController
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController
 	partnerCriteriaController          partner_criteria_controller.PartnerCriteriaController
 }
 
 func NewServer(
-	healthCheckController health_check_controller.HealthCheckController,
 	cvController cv_controller.CVController,
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController,
 	partnerCriteriaController partner_criteria_controller.PartnerCriteriaController,
@@ -27,7 +24,6 @@ func NewServer(
 	router.Use(gin.Recovery())
 
 	server := &Server{
-		healthCheckController:              healthCheckController,
 		cvController:                       cvController,
 		marriageReadinessProfileController: marriageReadinessProfileController,
 		partnerCriteriaController:          partnerCriteriaController,

space/space/space/space/services/partner_criteria_service.go

@@ -42,7 +42,8 @@ func (s *partnerCriteriaService) SavePartnerCriteria(ctx context.Context, req *m
 
 	partnerCriteria.AccountID = req.AccountID
 
-	utils.AssignIfNotNil(&partnerCriteria.ExpectedAgeLimit, req.ExpectedAgeLimit)
+	utils.AssignIfNotNil(&partnerCriteria.ExpecteMinAgeLimit, req.ExpecteMinAgeLimit)
+	utils.AssignIfNotNil(&partnerCriteria.ExpecteMaxAgeLimit, req.ExpecteMaxAgeLimit)
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedDomicile, req.ExpectedDomicile)
 	utils.AssignIfNotNil(&partnerCriteria.AcceptedMaritalStatus, req.AcceptedMaritalStatus)
 	utils.AssignIfNotNil(&partnerCriteria.PartnerFamilyReligion, req.PartnerFamilyReligion)
@@ -54,7 +55,8 @@ func (s *partnerCriteriaService) SavePartnerCriteria(ctx context.Context, req *m
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedSkinColors, req.ExpectedSkinColors)
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedHairTypes, req.ExpectedHairTypes)
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedHairThickness, req.ExpectedHairThickness)
-	utils.AssignIfNotNil(&partnerCriteria.ExpectedHeight, req.ExpectedHeight)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedMinHeightLimit, req.ExpectedMinHeightLimit)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedMaxHeightLimit, req.ExpectedMaxHeightLimit)
 
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedPartnerIncome, req.ExpectedPartnerIncome)
 	utils.AssignIfNotNil(&partnerCriteria.ExpectedIncomeSources, req.ExpectedIncomeSources)

space/space/space/space/space/pkg/validation/validation.go

@@ -1,174 +1,35 @@
 package validation
 
 import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
+	"context"
+	"time"
 
-	"github.com/go-playground/locales/en"
-	"github.com/go-playground/locales/id"
-	ut "github.com/go-playground/universal-translator"
-	v10 "github.com/go-playground/validator/v10"
-	entranslations "github.com/go-playground/validator/v10/translations/en"
-	idtranslations "github.com/go-playground/validator/v10/translations/id"
+	"gorm.io/gorm"
 )
 
-// Constants for supported locales
-const (
-	LocaleID = "id"
-	LocaleEN = "en"
-)
-
-// ErrorMessage represents a validation error message
 type ErrorMessage struct {
 	Field   string `json:"field"`
 	Message string `json:"-"`
 }
 
-type validator struct {
-	validate   *v10.Validate
-	translator ut.Translator
-}
-
-// validatorInstance adalah instance global dari validator.
-var validatorInstance *validator
-
-// New creates a new validation instance with the specified locale
-// dan menginisialisasi instance global validatorInstance.
-func New(locale string) error {
-	v := &validator{}
-	parsedLocale := parseLocale(locale)
-
-	uni := ut.New(en.New(), id.New(), en.New())
-	translator, found := uni.GetTranslator(parsedLocale)
-	if !found {
-		return fmt.Errorf("translator not found for locale: %s", parsedLocale)
-	}
-
-	validate := v10.New()
-
-	if err := setupValidations(validate); err != nil {
-		return fmt.Errorf("failed to setup validations: %w", err)
-	}
-
-	if err := setupTranslations(validate, translator, parsedLocale); err != nil {
-		return fmt.Errorf("failed to setup translations for locale %s: %w", parsedLocale, err)
-	}
-
-	v.validate = validate
-	v.translator = translator
-
-	validatorInstance = v // Inisialisasi instance global
-	return nil
-}
-
-func parseLocale(locale string) string {
-	switch strings.ToLower(locale) {
-	case "id":
-		return LocaleID
-	case "en":
-		return LocaleEN
-	default:
-		return LocaleID // Default to Indonesian
-	}
-}
-
-// setupValidations configures custom validation rules.
-func setupValidations(validate *v10.Validate) error {
-	rules := NewValidatorRules(&InMemoryOptionSource{})
-	if err := rules.RegisterAllCustomRules(validate); err != nil {
-		return err
-	}
-
-	return nil
-}
+func New(db *gorm.DB) (*Validator, error) {
 
-// setupTranslations configures translations for validation messages.
-func setupTranslations(validate *v10.Validate, translator ut.Translator, locale string) error {
-	// Register default translations based on locale
-	if err := registerDefaultTranslations(validate, translator, locale); err != nil {
-		return fmt.Errorf("failed to register default translations for locale %s: %w", locale, err)
-	}
-
-	// Register custom password validation translation
-	err := validate.RegisterTranslation("password", translator,
-		func(ut ut.Translator) error {
-			return ut.Add("password", "harus mengandung minimal 8 karakter, huruf besar, huruf kecil, dan angka.", true)
-		},
-		func(ut ut.Translator, fe v10.FieldError) string {
-			translated, err := ut.T(fe.Tag(), fe.Field())
-			if err != nil {
-				return fe.Field() + " is invalid"
-			}
-			return translated
-		},
-	)
+	// Create source with 5 minute cache expiry
+	expiry := 5 * time.Minute
+	dbSource, err := NewDBOptionSource(db, expiry)
 	if err != nil {
-		return fmt.Errorf("failed to register password translation: %w", err)
-	}
-
-	return nil
-}
-
-// registerDefaultTranslations sets up default translations for the specified locale.
-func registerDefaultTranslations(validate *v10.Validate, translator ut.Translator, locale string) error {
-	switch locale {
-	case LocaleID:
-		return idtranslations.RegisterDefaultTranslations(validate, translator)
-	case LocaleEN:
-		return entranslations.RegisterDefaultTranslations(validate, translator)
-	default:
-		// Fallback to English if the locale is not supported
-		return entranslations.RegisterDefaultTranslations(validate, translator)
+		return nil, err
 	}
-}
-
-// Validate validates a struct using the global validator instance
-// and returns a slice of ErrorMessage.
-func Validate(s any) []ErrorMessage {
-	if validatorInstance == nil {
-		return []ErrorMessage{{Field: "", Message: "Validator belum diinisialisasi. Panggil validation.New() terlebih dahulu."}}
-	}
-
-	err := validatorInstance.validate.Struct(s)
-	if err != nil {
-		return TranslateError(err)
-	}
-
-	return nil
-}
-
-// TranslateError takes a validation error and translates it using the global translator.
-func TranslateError(err error) []ErrorMessage {
-	if validatorInstance == nil {
-		return nil
-	}
-
-	var validationErrors v10.ValidationErrors
-	if !errors.As(err, &validationErrors) {
-		return nil
-	}
-
-	var errorMessages []ErrorMessage
-
-	for _, e := range validationErrors {
-		fieldLabel := e.Field()
-
-		if e.Kind() == reflect.Ptr {
-			continue
-		}
 
-		msg, err := validatorInstance.translator.T(e.Tag(), fieldLabel)
-		if err != nil {
-			msg = fieldLabel + " is Invalid"
-		}
+	// Start background refresh every 10 minutes
+	ctx := context.Background()
+	dbSource.StartAutoRefresh(ctx, 10*time.Minute)
 
-		errorMessages = append(errorMessages, ErrorMessage{
-			Field:   e.Tag(),
-			Message: msg,
-		})
+	// create validator
+	validator := NewValidator(dbSource)
+	if err := validator.RegisterAllCustomRules(); err != nil {
+		return nil, err
 	}
 
-	return errorMessages
+	return validator, nil
 }

space/space/space/space/space/response/validation.go

@@ -3,12 +3,29 @@ package response
 import (
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/pkg/validation"
+	"github.com/go-playground/validator/v10"
 )
 
-func HandleValidationError(validationErrors []validation.ErrorMessage) error {
+func HandleValidationError(err error) error {
+	validationErrors, ok := err.(validator.ValidationErrors)
+	if !ok {
+		return models.Exception{
+			ValidationError: true,
+			Message:         "Validation failed",
+		}
+	}
+
+	validationErrorMessages := make([]validation.ErrorMessage, len(validationErrors))
+	for i, err := range validationErrors {
+		validationErrorMessages[i] = validation.ErrorMessage{
+			Field:   err.Field(),
+			Message: err.Error(),
+		}
+	}
+
 	return models.Exception{
 		ValidationError:       true,
 		Message:               "Validation failed",
-		ValidationErrorFields: validationErrors,
+		ValidationErrorFields: validationErrorMessages,
 	}
 }

space/space/space/space/space/services/marriage_readiness_profile_service.go

@@ -19,14 +19,15 @@ type MarriageReadinessProfileService interface {
 
 type marriageReadinessProfileService struct {
 	marriageReadinessProfileRepository repositories.MarriageReadinessProfileRepository
+	validator                          *validation.Validator
 }
 
-func NewMarriageReadinessProfileService(marriageReadinessProfileRepository repositories.MarriageReadinessProfileRepository) MarriageReadinessProfileService {
-	return &marriageReadinessProfileService{marriageReadinessProfileRepository: marriageReadinessProfileRepository}
+func NewMarriageReadinessProfileService(marriageReadinessProfileRepository repositories.MarriageReadinessProfileRepository, validator *validation.Validator) MarriageReadinessProfileService {
+	return &marriageReadinessProfileService{marriageReadinessProfileRepository: marriageReadinessProfileRepository, validator: validator}
 }
 
 func (s *marriageReadinessProfileService) SaveMarriageReadinessProfile(ctx context.Context, req *models.SaveMarriageReadinessProfileRequest) (*models.MarriageReadinessProfile, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 

space/space/space/space/space/space/controller/partner_criteria/partner_criteria_controller.go

@@ -0,0 +1,66 @@
+package partner_criteria_controller
+
+import (
+	"net/http"
+
+	"api.qobiltu.id/middleware"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/response"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+type PartnerCriteriaController interface {
+	SavePartnerCriteria(ctx *gin.Context)
+	GetPartnerCriteria(ctx *gin.Context)
+}
+
+type partnerCriteriaController struct {
+	partnerCriteriaService services.PartnerCriteriaService
+}
+
+func NewPartnerCriteriaController(partnerCriteriaService services.PartnerCriteriaService) PartnerCriteriaController {
+	return &partnerCriteriaController{
+		partnerCriteriaService: partnerCriteriaService,
+	}
+}
+
+func (c *partnerCriteriaController) SavePartnerCriteria(ctx *gin.Context) {
+	var req models.SavePartnerCriteriaRequest
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
+		return
+	}
+
+	accountData := middleware.GetAccountData(ctx)
+	req.AccountID = int64(accountData.UserID)
+
+	res, err := c.partnerCriteriaService.SavePartnerCriteria(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Partner criteria saved", res, nil)
+}
+
+func (c *partnerCriteriaController) GetPartnerCriteria(ctx *gin.Context) {
+	accountData := middleware.GetAccountData(ctx)
+	accountID := int64(accountData.UserID)
+
+	req := models.GetPartnerCriteriaRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.partnerCriteriaService.GetPartnerCriteria(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Get partner criteria success", res, nil)
+}

space/space/space/space/space/space/main.go

@@ -9,6 +9,7 @@ import (
 	cv_controller "api.qobiltu.id/controller/cv"
 	health_check_controller "api.qobiltu.id/controller/health_check"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
+	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
 	"api.qobiltu.id/mail"
 	"api.qobiltu.id/pkg/storage"
 	"api.qobiltu.id/pkg/validation"
@@ -23,7 +24,7 @@ import (
 func main() {
 
 	// setup validation
-	err := validation.New(validation.LocaleID)
+	validator, err := validation.New(config.DB)
 	utils.FatalIfErr("failed to setup validator", err)
 
 	// setup storage
@@ -59,13 +60,17 @@ func main() {
 	healthCheckController := health_check_controller.NewHealthCheckController(healthCheckService)
 
 	cvRepository := repositories.NewCVRepository(config.DB)
-	cvService := services.NewCVService(cvRepository, localStorage)
+	cvService := services.NewCVService(cvRepository, localStorage, validator)
 	cvController := cv_controller.NewCVController(cvService)
 
 	marriageReadinessProfileRepository := repositories.NewMarriageReadinessProfileRepository(config.DB)
-	marriageReadinessProfileService := services.NewMarriageReadinessProfileService(marriageReadinessProfileRepository)
+	marriageReadinessProfileService := services.NewMarriageReadinessProfileService(marriageReadinessProfileRepository, validator)
 	marriageReadinessProfileController := marriage_readiness_profile_controller.NewMarriageReadinessProfileController(marriageReadinessProfileService)
 
+	partnerCriteriaRepository := repositories.NewPartnerCriteriaRepository(config.DB)
+	partnerCriteriaService := services.NewPartnerCriteriaService(partnerCriteriaRepository, validator)
+	partnerCriteriaController := partner_criteria_controller.NewPartnerCriteriaController(partnerCriteriaService)
+
 	// start task processor
 	err = taskProcessor.Start()
 	utils.FatalIfErr("failed to start task processor", err)
@@ -76,6 +81,7 @@ func main() {
 		healthCheckController,
 		cvController,
 		marriageReadinessProfileController,
+		partnerCriteriaController,
 	)
 	utils.FatalIfErr("failed to create server", err)
 

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

@@ -248,26 +248,27 @@ type (
 	}
 
 	WorshipAndReligiousUnderstandingCV struct {
-		ID                         int64           `gorm:"column:id;primaryKey;autoIncrement" json:"id" counter:"skip"`
-		AccountID                  int64           `gorm:"column:account_id;not null;unique" json:"account_id" counter:"skip"`
-		Account                    *Account        `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty" counter:"skip"`
-		ObligatoryPrayer           *string         `gorm:"column:obligatory_prayer" json:"obligatory_prayer"`                           // sholat_wajib_5_waktu
-		CongregationalPrayer       *string         `gorm:"column:congregational_prayer" json:"congregational_prayer"`                   // sholat_berjamaah_di_masjid
-		TahajjudPrayer             *string         `gorm:"column:tahajjud_prayer" json:"tahajjud_prayer"`                               // sholat_tahajud
-		DhuhaPrayer                *string         `gorm:"column:dhuha_prayer" json:"dhuha_prayer"`                                     // sholat_dhuha
-		QuranMemorization          *string         `gorm:"column:quran_memorization" json:"quran_memorization"`                         // hafalan_alquran
-		QuranReadingAbility        *string         `gorm:"column:quran_reading_ability" json:"quran_reading_ability"`                   // kemampuan_baca_alquran
-		DaudFasting                *string         `gorm:"column:daud_fasting" json:"daud_fasting"`                                     // puasa_daud
-		AyyamulBidhFasting         *string         `gorm:"column:ayyamul_bidh_fasting" json:"ayyamul_bidh_fasting"`                     // puasa_ayyamul_bidh
-		HajjOrUmrah                *pq.StringArray `gorm:"column:hajj_or_umrah;type:varchar(255)[]" json:"hajj_or_umrah"`               // ibadah_haji_umroh
-		ListeningToMusic           *string         `gorm:"column:listening_to_music" json:"listening_to_music"`                         // mendengarkan_musik
-		OpinionOnIkhtilat          *string         `gorm:"column:opinion_on_ikhtilat" json:"opinion_on_ikhtilat"`                       // pendapat_ikhtilat
-		OpinionOnTouchingNonMahram *string         `gorm:"column:opinion_on_touching_non_mahram" json:"opinion_on_touching_non_mahram"` // pendapat_menyentuh_non_mahram
-		OpinionOnVeil              *string         `gorm:"column:opinion_on_veil" json:"opinion_on_veil"`                               // pendapat_tentang_cadar
-		WeeklyReligiousStudies     *string         `gorm:"column:weekly_religious_studies" json:"weekly_religious_studies"`             // kajian_yang_diikuti_dalam_sepekan
-		FollowedUstadz             *string         `gorm:"column:followed_ustadz" json:"followed_ustadz"`                               // ustadz_yang_diikuti
-		CreatedAt                  time.Time       `gorm:"column:created_at;autoCreateTime" json:"created_at" counter:"skip"`
-		UpdatedAt                  time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at" counter:"skip"`
+		ID                            int64           `gorm:"column:id;primaryKey;autoIncrement" json:"id" counter:"skip"`
+		AccountID                     int64           `gorm:"column:account_id;not null;unique" json:"account_id" counter:"skip"`
+		Account                       *Account        `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty" counter:"skip"`
+		ObligatoryPrayer              *string         `gorm:"column:obligatory_prayer" json:"obligatory_prayer"`                               // sholat_wajib_5_waktu
+		CongregationalPrayer          *string         `gorm:"column:congregational_prayer" json:"congregational_prayer"`                       // sholat_berjamaah_di_masjid
+		TahajjudPrayer                *string         `gorm:"column:tahajjud_prayer" json:"tahajjud_prayer"`                                   // sholat_tahajud
+		DhuhaPrayer                   *string         `gorm:"column:dhuha_prayer" json:"dhuha_prayer"`                                         // sholat_dhuha
+		QuranMemorization             *string         `gorm:"column:quran_memorization" json:"quran_memorization"`                             // hafalan_alquran
+		QuranReadingAbility           *string         `gorm:"column:quran_reading_ability" json:"quran_reading_ability"`                       // kemampuan_baca_alquran
+		WeeklyReligiousStudyFrequency *string         `gorm:"column:weekly_religious_study_frequency" json:"weekly_religious_study_frequency"` // kajian_yang_diikuti_dalam_sepekan
+		DaudFasting                   *string         `gorm:"column:daud_fasting" json:"daud_fasting"`                                         // puasa_daud
+		AyyamulBidhFasting            *string         `gorm:"column:ayyamul_bidh_fasting" json:"ayyamul_bidh_fasting"`                         // puasa_ayyamul_bidh
+		HajjOrUmrah                   *pq.StringArray `gorm:"column:hajj_or_umrah;type:varchar(255)[]" json:"hajj_or_umrah"`                   // ibadah_haji_umroh
+		ListeningToMusic              *string         `gorm:"column:listening_to_music" json:"listening_to_music"`                             // mendengarkan_musik
+		OpinionOnIkhtilat             *string         `gorm:"column:opinion_on_ikhtilat" json:"opinion_on_ikhtilat"`                           // pendapat_ikhtilat
+		OpinionOnTouchingNonMahram    *string         `gorm:"column:opinion_on_touching_non_mahram" json:"opinion_on_touching_non_mahram"`     // pendapat_menyentuh_non_mahram
+		OpinionOnVeil                 *string         `gorm:"column:opinion_on_veil" json:"opinion_on_veil"`                                   // pendapat_tentang_cadar
+		WeeklyReligiousStudies        *string         `gorm:"column:weekly_religious_studies" json:"weekly_religious_studies"`                 // kajian_yang_diikuti_dalam_sepekan
+		FollowedUstadz                *string         `gorm:"column:followed_ustadz" json:"followed_ustadz"`                                   // ustadz_yang_diikuti
+		CreatedAt                     time.Time       `gorm:"column:created_at;autoCreateTime" json:"created_at" counter:"skip"`
+		UpdatedAt                     time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at" counter:"skip"`
 		FieldCounter
 	}
 
@@ -388,6 +389,39 @@ type (
 	}
 )
 
+type (
+	PartnerCriteria struct {
+		ID        int64    `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+		AccountID int64    `gorm:"column:account_id;not null;unique" json:"account_id"`
+		Account   *Account `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"`
+
+		// Kriteria Umum
+		ExpectedAgeLimit                     *int            `gorm:"column:expected_age_limit" json:"expected_age_limit"`                                             // batas usia pasangan yang diharapkan
+		ExpectedDomicile                     *string         `gorm:"column:expected_domicile" json:"expected_domicile"`                                               // domisili pasangan yang diharapkan
+		AcceptedMaritalStatus                *pq.StringArray `gorm:"column:accepted_marital_status;type:varchar(255)[]" json:"accepted_marital_status"`               // status pernikahan yang diterima
+		PartnerFamilyReligion                *string         `gorm:"column:partner_family_religion" json:"partner_family_religion"`                                   // agama yang dianut keluarga pasangan
+		PartnerWeeklyReligiousStudyFrequency *string         `gorm:"column:partner_weekly_religious_study_frequency" json:"partner_weekly_religious_study_frequency"` // rata-rata jumlah kajian yang diikuti pasangan per pekan
+		PartnerMonthlySpendingEstimate       *string         `gorm:"column:partner_monthly_spending_estimate" json:"partner_monthly_spending_estimate"`               // estimasi pengeluaran pasangan per bulan
+		PartnerCanCook                       *string         `gorm:"column:partner_can_cook" json:"partner_can_cook"`                                                 // apakah pasangan diharapkan bisa memasak
+
+		// Kriteria Fisik
+		ExpectedBodyShapes    *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
+		ExpectedSkinColors    *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
+		ExpectedHairTypes     *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
+		ExpectedHairThickness *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
+		ExpectedHeight        *int            `gorm:"column:expected_height" json:"expected_height"`                                     // tinggi badan yang diharapkan
+
+		// Pendidikan & Pekerjaan
+		ExpectedPartnerIncome *string         `gorm:"column:expected_partner_income" json:"expected_partner_income"`                     // penghasilan pasangan per bulan yang diharapkan
+		ExpectedIncomeSources *pq.StringArray `gorm:"column:expected_income_sources;type:varchar(255)[]" json:"expected_income_sources"` // sumber penghasilan pasangan
+		ExpectedLastEducation *pq.StringArray `gorm:"column:expected_last_education;type:varchar(255)[]" json:"expected_last_education"` // pendidikan terakhir yang diharapkan
+		ExpectedJobType       *string         `gorm:"column:expected_job_type" json:"expected_job_type"`                                 // jenis pekerjaan pasangan yang diharapkan
+
+		CreatedAt time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"`
+		UpdatedAt time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+	}
+)
+
 // Gorm table name settings
 func (Account) TableName() string                    { return "account" }
 func (AccountDetails) TableName() string             { return "account_details" }

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

@@ -74,7 +74,7 @@ type (
 		FavoriteFoodAndDrinks *string `json:"favorite_food_and_drinks"`                     // makanan dan minuman favorit
 		CanCook               *bool   `json:"can_cook"`                                     // bisa memasak
 		TypesOfDishesCooked   *string `json:"types_of_dishes_cooked"`                       // jenis masakan yang bisa dimasak
-		MonthlyExpenses       *string `json:"monthly_expenses" validate:"monthly_expenses"` // pengeluaran per bulan
+		MonthlyExpenses       *string `json:"monthly_expenses" validate:"monthly-expenses"` // pengeluaran per bulan
 	}
 
 	GetPersonalityAndPreferenceRequest struct {
@@ -84,11 +84,11 @@ type (
 	CreateFamilyMemberRequest struct {
 		AccountID int64 `json:"-"`
 
-		Role          *string `json:"role" validate:"family_role"`              // Peran dalam keluarga
-		Status        *string `json:"status" validate:"life_status"`            // Status (Hidup, Wafat)
+		Role          *string `json:"role" validate:"family-role"`              // Peran dalam keluarga
+		Status        *string `json:"status" validate:"life-status"`            // Status (Hidup, Wafat)
 		Religion      *string `json:"religion" validate:"religion"`             // Agama
 		Job           *string `json:"job"`                                      // Pekerjaan
-		LastEducation *string `json:"last_education" validate:"last_education"` // Pendidikan terakhir
+		LastEducation *string `json:"last_education" validate:"last-education"` // Pendidikan terakhir
 		Age           *int    `json:"age"`                                      // Usia
 	}
 
@@ -96,11 +96,11 @@ type (
 		ID        int64 `json:"-"`
 		AccountID int64 `json:"-"`
 
-		Role          *string `json:"role" validate:"family_role"`              // Peran dalam keluarga
-		Status        *string `json:"status" validate:"life_status"`            // Status (Hidup, Wafat)
+		Role          *string `json:"role" validate:"family-role"`              // Peran dalam keluarga
+		Status        *string `json:"status" validate:"life-status"`            // Status (Hidup, Wafat)
 		Religion      *string `json:"religion" validate:"religion"`             // Agama
 		Job           *string `json:"job"`                                      // Pekerjaan
-		LastEducation *string `json:"last_education" validate:"last_education"` // Pendidikan terakhir
+		LastEducation *string `json:"last_education" validate:"last-education"` // Pendidikan terakhir
 		Age           *int    `json:"age"`                                      // Usia
 	}
 
@@ -120,9 +120,9 @@ type (
 		AccountID        int64           `json:"-"`
 		HeightInCm       *int            `json:"height_cm"`                        // Tinggi badan dalam satuan sentimeter
 		WeightInKg       *int            `json:"weight_kg"`                        // Berat badan dalam satuan kilogram
-		BodyShape        *string         `json:"body_shape" validate:"body_shape"` // Bentuk tubuh
-		SkinColor        *string         `json:"skin_color" validate:"skin_color"` // Warna kulit
-		HairType         *string         `json:"hair_type" validate:"hair_type"`   // Tipe rambut
+		BodyShape        *string         `json:"body_shape" validate:"body-shape"` // Bentuk tubuh
+		SkinColor        *string         `json:"skin_color" validate:"skin-color"` // Warna kulit
+		HairType         *string         `json:"hair_type" validate:"hair-type"`   // Tipe rambut
 		MedicalHistory   *pq.StringArray `json:"medical_history"`                  // Riwayat penyakit
 		PhysicalDisorder *string         `json:"physical_disorder"`                // Cacat fisik
 		PhysicalTraits   *string         `json:"physical_traits"`                  // Ciri khas fisik
@@ -139,10 +139,10 @@ type (
 		DateOfBirth   *time.Time `json:"date_of_birth"`
 		PlaceOfBirth  *string    `json:"place_of_birth"`
 		Domicile      *string    `json:"domicile"`
-		MaritalStatus *string    `json:"marital_status" validate:"marital_status"`
-		LastEducation *string    `json:"last_education" validate:"last_education"`
+		MaritalStatus *string    `json:"marital_status" validate:"marital-status"`
+		LastEducation *string    `json:"last_education" validate:"last-education"`
 		LastJob       *string    `json:"last_job"`
-		PhoneNumber   *string    `json:"phone_number" validate:"phone_number"`
+		PhoneNumber   *string    `json:"phone_number" validate:"phone-number"`
 	}
 
 	GetAccountDetailsRequest struct {
@@ -150,22 +150,23 @@ type (
 	}
 
 	SaveWorshipAndReligiousUnderstandingRequest struct {
-		AccountID                  int64           `json:"-"`
-		ObligatoryPrayer           *string         `json:"obligatory_prayer"`                                      // sholat_wajib_5_waktu
-		CongregationalPrayer       *string         `json:"congregational_prayer"`                                  // sholat_berjamaah_di_masjid
-		TahajjudPrayer             *string         `json:"tahajjud_prayer"`                                        // sholat_tahajud
-		DhuhaPrayer                *string         `json:"dhuha_prayer"`                                           // sholat_dhuha
-		QuranMemorization          *string         `json:"quran_memorization"`                                     // hafalan_alquran
-		QuranReadingAbility        *string         `json:"quran_reading_ability" validate:"quran_reading_ability"` // kemampuan_baca_alquran
-		DaudFasting                *string         `json:"daud_fasting"`                                           // puasa_daud
-		AyyamulBidhFasting         *string         `json:"ayyamul_bidh_fasting"`                                   // puasa_ayyamul_bidh
-		HajjOrUmrah                *pq.StringArray `json:"hajj_or_umrah"`                                          // ibadah_haji_umroh
-		ListeningToMusic           *string         `json:"listening_to_music"`                                     // mendengarkan_musik
-		OpinionOnIkhtilat          *string         `json:"opinion_on_ikhtilat"`                                    // pendapat_ikhtilat
-		OpinionOnTouchingNonMahram *string         `json:"opinion_on_touching_non_mahram"`                         // pendapat_menyentuh_non_mahram
-		OpinionOnVeil              *string         `json:"opinion_on_veil"`                                        // pendapat_tentang_cadar
-		WeeklyReligiousStudies     *string         `json:"weekly_religious_studies"`                               // kajian_yang_diikuti_dalam_sepekan
-		FollowedUstadz             *string         `json:"followed_ustadz"`                                        // ustadz_yang_diikuti
+		AccountID                     int64           `json:"-"`
+		ObligatoryPrayer              *string         `json:"obligatory_prayer"`                                                            // sholat_wajib_5_waktu
+		CongregationalPrayer          *string         `json:"congregational_prayer"`                                                        // sholat_berjamaah_di_masjid
+		TahajjudPrayer                *string         `json:"tahajjud_prayer"`                                                              // sholat_tahajud
+		DhuhaPrayer                   *string         `json:"dhuha_prayer"`                                                                 // sholat_dhuha
+		QuranMemorization             *string         `json:"quran_memorization"`                                                           // hafalan_alquran
+		QuranReadingAbility           *string         `json:"quran_reading_ability" validate:"quran-reading-ability"`                       // kemampuan_baca_alquran
+		WeeklyReligiousStudyFrequency *string         `json:"weekly_religious_study_frequency" validate:"weekly-religious-study-frequency"` // kajian_yang_diikuti_dalam_sepekan
+		DaudFasting                   *string         `json:"daud_fasting"`                                                                 // puasa_daud
+		AyyamulBidhFasting            *string         `json:"ayyamul_bidh_fasting"`                                                         // puasa_ayyamul_bidh
+		HajjOrUmrah                   *pq.StringArray `json:"hajj_or_umrah"`                                                                // ibadah_haji_umroh
+		ListeningToMusic              *string         `json:"listening_to_music"`                                                           // mendengarkan_musik
+		OpinionOnIkhtilat             *string         `json:"opinion_on_ikhtilat"`                                                          // pendapat_ikhtilat
+		OpinionOnTouchingNonMahram    *string         `json:"opinion_on_touching_non_mahram"`                                               // pendapat_menyentuh_non_mahram
+		OpinionOnVeil                 *string         `json:"opinion_on_veil"`                                                              // pendapat_tentang_cadar
+		WeeklyReligiousStudies        *string         `json:"weekly_religious_studies"`                                                     // kajian_yang_diikuti_dalam_sepekan
+		FollowedUstadz                *string         `json:"followed_ustadz"`                                                              // ustadz_yang_diikuti
 	}
 
 	GetWorshipAndReligiousUnderstandingRequest struct {
@@ -174,7 +175,7 @@ type (
 
 	CreateEducationRequest struct {
 		AccountID          int64   `json:"-"`
-		LastEducation      *string `json:"last_education" validate:"last_education"` // pendidikan terakhir
+		LastEducation      *string `json:"last_education" validate:"last-education"` // pendidikan terakhir
 		EducationInstitute *string `json:"education_institute"`                      // institusi pendidikan
 		EducationMajor     *string `json:"education_major"`                          // jurusan pendidikan
 		YearStart          *int    `json:"year_start"`                               // tahun masuk
@@ -184,7 +185,7 @@ type (
 	UpdateEducationRequest struct {
 		ID                 int64   `json:"-"`
 		AccountID          int64   `json:"-"`
-		LastEducation      *string `json:"last_education" validate:"last_education"` // pendidikan terakhir
+		LastEducation      *string `json:"last_education" validate:"last-education"` // pendidikan terakhir
 		EducationInstitute *string `json:"education_institute"`                      // institusi pendidikan
 		EducationMajor     *string `json:"education_major"`                          // jurusan pendidikan
 		YearStart          *int    `json:"year_start"`                               // tahun masuk
@@ -208,7 +209,7 @@ type (
 		InstitutionName    *string         `json:"institution_name"`                         // nama instansi
 		CurrentJob         *string         `json:"current_job"`                              // pekerjaan saat ini
 		YearStartedWorking *int            `json:"year_started_working"`                     // tahun mulai bekerja
-		MonthlyIncome      *string         `json:"monthly_income" validate:"monthly_income"` // penghasilan per bulan
+		MonthlyIncome      *string         `json:"monthly_income" validate:"monthly-income"` // penghasilan per bulan
 		IncomeSources      *pq.StringArray `json:"income_sources"`                           // sumber penghasilan
 	}
 
@@ -218,7 +219,7 @@ type (
 		InstitutionName    *string         `json:"institution_name"`                         // nama instansi
 		CurrentJob         *string         `json:"current_job"`                              // pekerjaan saat ini
 		YearStartedWorking *int            `json:"year_started_working"`                     // tahun mulai bekerja
-		MonthlyIncome      *string         `json:"monthly_income" validate:"monthly_income"` // penghasilan per bulan
+		MonthlyIncome      *string         `json:"monthly_income" validate:"monthly-income"` // penghasilan per bulan
 		IncomeSources      *pq.StringArray `json:"income_sources"`                           // sumber penghasilan
 	}
 
@@ -283,48 +284,82 @@ type (
 	}
 )
 
-type SaveMarriageReadinessProfileRequest struct {
-	AccountID int64 `json:"account_id"`
-
-	// Visi Misi Rumah Tangga
-	MarriageVision     *string `gorm:"column:marriage_vision" json:"marriage_vision"`         // Apa visi dan tujuan utama kamu dalam membangun rumah tangga?
-	LivingPlan         *string `gorm:"column:living_plan" json:"living_plan"`                 // Setelah menikah, kamu berencana tinggal di mana?
-	SpouseRoles        *string `gorm:"column:spouse_roles" json:"spouse_roles"`               // Menurutmu, apa peran utama suami dan istri dalam rumah tangga?
-	SpouseRights       *string `gorm:"column:spouse_rights" json:"spouse_rights"`             // Apa saja hak suami dan istri menurutmu?
-	ConflictResolution *string `gorm:"column:conflict_resolution" json:"conflict_resolution"` // Jika terjadi konflik, bagaimana kamu menyikapinya?
-	ParentingStyle     *string `gorm:"column:parenting_style" json:"parenting_style"`         // Setelah punya anak, pola pengasuhan seperti apa yang kamu inginkan?
-
-	// Konsep Acara Pernikahan
-	ReadyToMarryDuration *string `gorm:"column:ready_to_marry_duration" json:"ready_to_marry_duration"` // Setelah taaruf dimulai, berapa lama kamu butuh untuk siap menikah?
-	WeddingConcept       *string `gorm:"column:wedding_concept" json:"wedding_concept"`                 // Seperti apa konsep pernikahan yang kamu harapkan?
-	WeddingFunding       *string `gorm:"column:wedding_funding" json:"wedding_funding"`                 // Apakah kamu sudah mempersiapkan dana pernikahan? Dari mana sumbernya?
-
-	// Karir Kedepannya
-	CareerAfterMarriage *string `gorm:"column:career_after_marriage" json:"career_after_marriage"` // Apakah kamu ingin tetap bekerja setelah menikah?
-	TimeManagement      *string `gorm:"column:time_management" json:"time_management"`             // Bagaimana kamu membagi waktu antara keluarga, ibadah, dan pekerjaan?
-	CareerGoals         *string `gorm:"column:career_goals" json:"career_goals"`                   // Apa impian karier atau cita-cita kamu dalam 5 sampai 10 tahun ke depan?
-	SelfDevelopment     *string `gorm:"column:self_development" json:"self_development"`           // Apa usaha kamu untuk terus mengembangkan diri dan skill?
-
-	// Pendidikan Keluarga
-	DelayChildren          *string `gorm:"column:delay_children" json:"delay_children"`                     // Apakah kamu berencana menunda memiliki anak?
-	ChildEducationPlan     *string `gorm:"column:child_education_plan" json:"child_education_plan"`         // Apakah kamu sudah punya rencana pendidikan anak?
-	ReligiousEmotionalBond *string `gorm:"column:religious_emotional_bond" json:"religious_emotional_bond"` // Bagaimana cara menjaga nilai agama & kedekatan emosional dengan anak?
-	ParentingChallenges    *string `gorm:"column:parenting_challenges" json:"parenting_challenges"`         // Saat menghadapi tantangan pengasuhan, bagaimana kamu menyikapinya?
-
-	// Finansial Keluarga
-	MonthlyFinance       *string `gorm:"column:monthly_finance" json:"monthly_finance"`             // Bagaimana kamu mengelola keuangan bulanan?
-	FamilyResponsibility *string `gorm:"column:family_responsibility" json:"family_responsibility"` // Apakah kamu masih punya tanggungan keluarga setelah menikah?
-	DebtStatus           *string `gorm:"column:debt_status" json:"debt_status"`                     // Apakah kamu punya cicilan/utang setelah menikah?
-	FinanceSharing       *string `gorm:"column:finance_sharing" json:"finance_sharing"`             // Setelah menikah, bagaimana pembagian tanggung jawab keuangan?
-	IncomeGapView        *string `gorm:"column:income_gap_view" json:"income_gap_view"`             // Pandangan kamu jika istri berpenghasilan lebih besar dari suami?
-
-	// Keputusan dan Komunikasi
-	DecisionMaking     *string `gorm:"column:decision_making" json:"decision_making"`         // Dalam mengambil keputusan, kamu lebih mempertimbangkan pasangan atau sendiri?
-	GrowthTogether     *string `gorm:"column:growth_together" json:"growth_together"`         // Apakah kamu siap berjuang bersama pasangan? Apa saja yang ingin diperjuangkan?
-	ParentIntervention *string `gorm:"column:parent_intervention" json:"parent_intervention"` // Sejauh mana orang tua/mertua boleh ikut campur dalam rumah tangga?
-	HabitResponse      *string `gorm:"column:habit_response" json:"habit_response"`           // Bagaimana kamu menyikapi kebiasaan pasangan yang kurang kamu sukai?
-}
+type (
+	SaveMarriageReadinessProfileRequest struct {
+		AccountID int64 `json:"account_id"`
 
-type GetMarriageReadinessProfileRequest struct {
-	AccountID int64 `json:"-"`
-}
+		// Visi Misi Rumah Tangga
+		MarriageVision     *string `gorm:"column:marriage_vision" json:"marriage_vision"`         // Apa visi dan tujuan utama kamu dalam membangun rumah tangga?
+		LivingPlan         *string `gorm:"column:living_plan" json:"living_plan"`                 // Setelah menikah, kamu berencana tinggal di mana?
+		SpouseRoles        *string `gorm:"column:spouse_roles" json:"spouse_roles"`               // Menurutmu, apa peran utama suami dan istri dalam rumah tangga?
+		SpouseRights       *string `gorm:"column:spouse_rights" json:"spouse_rights"`             // Apa saja hak suami dan istri menurutmu?
+		ConflictResolution *string `gorm:"column:conflict_resolution" json:"conflict_resolution"` // Jika terjadi konflik, bagaimana kamu menyikapinya?
+		ParentingStyle     *string `gorm:"column:parenting_style" json:"parenting_style"`         // Setelah punya anak, pola pengasuhan seperti apa yang kamu inginkan?
+
+		// Konsep Acara Pernikahan
+		ReadyToMarryDuration *string `gorm:"column:ready_to_marry_duration" json:"ready_to_marry_duration"` // Setelah taaruf dimulai, berapa lama kamu butuh untuk siap menikah?
+		WeddingConcept       *string `gorm:"column:wedding_concept" json:"wedding_concept"`                 // Seperti apa konsep pernikahan yang kamu harapkan?
+		WeddingFunding       *string `gorm:"column:wedding_funding" json:"wedding_funding"`                 // Apakah kamu sudah mempersiapkan dana pernikahan? Dari mana sumbernya?
+
+		// Karir Kedepannya
+		CareerAfterMarriage *string `gorm:"column:career_after_marriage" json:"career_after_marriage"` // Apakah kamu ingin tetap bekerja setelah menikah?
+		TimeManagement      *string `gorm:"column:time_management" json:"time_management"`             // Bagaimana kamu membagi waktu antara keluarga, ibadah, dan pekerjaan?
+		CareerGoals         *string `gorm:"column:career_goals" json:"career_goals"`                   // Apa impian karier atau cita-cita kamu dalam 5 sampai 10 tahun ke depan?
+		SelfDevelopment     *string `gorm:"column:self_development" json:"self_development"`           // Apa usaha kamu untuk terus mengembangkan diri dan skill?
+
+		// Pendidikan Keluarga
+		DelayChildren          *string `gorm:"column:delay_children" json:"delay_children"`                     // Apakah kamu berencana menunda memiliki anak?
+		ChildEducationPlan     *string `gorm:"column:child_education_plan" json:"child_education_plan"`         // Apakah kamu sudah punya rencana pendidikan anak?
+		ReligiousEmotionalBond *string `gorm:"column:religious_emotional_bond" json:"religious_emotional_bond"` // Bagaimana cara menjaga nilai agama & kedekatan emosional dengan anak?
+		ParentingChallenges    *string `gorm:"column:parenting_challenges" json:"parenting_challenges"`         // Saat menghadapi tantangan pengasuhan, bagaimana kamu menyikapinya?
+
+		// Finansial Keluarga
+		MonthlyFinance       *string `gorm:"column:monthly_finance" json:"monthly_finance"`             // Bagaimana kamu mengelola keuangan bulanan?
+		FamilyResponsibility *string `gorm:"column:family_responsibility" json:"family_responsibility"` // Apakah kamu masih punya tanggungan keluarga setelah menikah?
+		DebtStatus           *string `gorm:"column:debt_status" json:"debt_status"`                     // Apakah kamu punya cicilan/utang setelah menikah?
+		FinanceSharing       *string `gorm:"column:finance_sharing" json:"finance_sharing"`             // Setelah menikah, bagaimana pembagian tanggung jawab keuangan?
+		IncomeGapView        *string `gorm:"column:income_gap_view" json:"income_gap_view"`             // Pandangan kamu jika istri berpenghasilan lebih besar dari suami?
+
+		// Keputusan dan Komunikasi
+		DecisionMaking     *string `gorm:"column:decision_making" json:"decision_making"`         // Dalam mengambil keputusan, kamu lebih mempertimbangkan pasangan atau sendiri?
+		GrowthTogether     *string `gorm:"column:growth_together" json:"growth_together"`         // Apakah kamu siap berjuang bersama pasangan? Apa saja yang ingin diperjuangkan?
+		ParentIntervention *string `gorm:"column:parent_intervention" json:"parent_intervention"` // Sejauh mana orang tua/mertua boleh ikut campur dalam rumah tangga?
+		HabitResponse      *string `gorm:"column:habit_response" json:"habit_response"`           // Bagaimana kamu menyikapi kebiasaan pasangan yang kurang kamu sukai?
+	}
+
+	GetMarriageReadinessProfileRequest struct {
+		AccountID int64 `json:"-"`
+	}
+)
+
+type (
+	SavePartnerCriteriaRequest struct {
+		AccountID int64 `json:"account_id"`
+
+		ExpectedAgeLimit                     *int            `gorm:"column:expected_age_limit" json:"expected_age_limit"`                                             // batas usia pasangan yang diharapkan
+		ExpectedDomicile                     *string         `gorm:"column:expected_domicile" json:"expected_domicile"`                                               // domisili pasangan yang diharapkan
+		AcceptedMaritalStatus                *pq.StringArray `gorm:"column:accepted_marital_status;type:varchar(255)[]" json:"accepted_marital_status"`               // status pernikahan yang diterima
+		PartnerFamilyReligion                *string         `gorm:"column:partner_family_religion" json:"partner_family_religion"`                                   // agama yang dianut keluarga pasangan
+		PartnerWeeklyReligiousStudyFrequency *string         `gorm:"column:partner_weekly_religious_study_frequency" json:"partner_weekly_religious_study_frequency"` // rata-rata jumlah kajian yang diikuti pasangan per pekan
+		PartnerMonthlySpendingEstimate       *string         `gorm:"column:partner_monthly_spending_estimate" json:"partner_monthly_spending_estimate"`               // estimasi pengeluaran pasangan per bulan
+		PartnerCanCook                       *string         `gorm:"column:partner_can_cook" json:"partner_can_cook"`                                                 // apakah pasangan diharapkan bisa memasak
+
+		// Kriteria Fisik
+		ExpectedBodyShapes    *pq.StringArray `gorm:"column:expected_body_shapes;type:varchar(255)[]" json:"expected_body_shapes"`       // bentuk tubuh yang diharapkan
+		ExpectedSkinColors    *pq.StringArray `gorm:"column:expected_skin_colors;type:varchar(255)[]" json:"expected_skin_colors"`       // warna kulit yang diharapkan
+		ExpectedHairTypes     *pq.StringArray `gorm:"column:expected_hair_types;type:varchar(255)[]" json:"expected_hair_types"`         // tipe rambut yang diharapkan
+		ExpectedHairThickness *pq.StringArray `gorm:"column:expected_hair_thickness;type:varchar(255)[]" json:"expected_hair_thickness"` // jenis rambut yang diharapkan
+		ExpectedHeight        *int            `gorm:"column:expected_height" json:"expected_height"`                                     // tinggi badan yang diharapkan
+
+		// Pendidikan & Pekerjaan
+		ExpectedPartnerIncome *string         `gorm:"column:expected_partner_income" json:"expected_partner_income"`                     // penghasilan pasangan per bulan yang diharapkan
+		ExpectedIncomeSources *pq.StringArray `gorm:"column:expected_income_sources;type:varchar(255)[]" json:"expected_income_sources"` // sumber penghasilan pasangan
+		ExpectedLastEducation *pq.StringArray `gorm:"column:expected_last_education;type:varchar(255)[]" json:"expected_last_education"` // pendidikan terakhir yang diharapkan
+		ExpectedJobType       *string         `gorm:"column:expected_job_type" json:"expected_job_type"`                                 // jenis pekerjaan pasangan yang diharapkan
+
+	}
+
+	GetPartnerCriteriaRequest struct {
+		AccountID int64 `json:"-"`
+	}
+)

space/space/space/space/space/space/pkg/validation/custom_rules.go

@@ -1,105 +1,154 @@
 package validation
 
 import (
+	"context"
+	"fmt"
+	"reflect"
 	"regexp"
 	"strings"
 	"sync"
+	"time"
 
 	v10 "github.com/go-playground/validator/v10"
 	"gorm.io/gorm"
 )
 
-type ValidOptionSource interface {
+type ValidatorOptionSource interface {
 	GetValidOptions(key string) ([]string, error)
 	GetValidKeys() []string
+	Refresh() error
+	StartAutoRefresh(ctx context.Context, interval time.Duration)
+	HasKey(key string) bool
 }
 
 // --------------------
-// InMemoryOptionSource
+// DBOptionSource with Safe Handling
 // --------------------
 
-type InMemoryOptionSource struct{}
-
-var inMemoryOptions = map[string][]string{
-	"last_education":        {"SD", "SMP", "SMA", "D1", "D2", "D3", "D4", "D5", "S1", "S2", "S3"},
-	"marital_status":        {"Belum Menikah", "Duda", "Janda"},
-	"gender":                {"Laki-laki", "Perempuan"},
-	"monthly_expenses":      {"< 2 Juta", "2-5 Juta", "5-20 Juta", "> 10 Juta"},
-	"monthly_income":        {"< 3 Juta", "3-5 Juta", "5-10 Juta", "> 10 Juta"},
-	"religion":              {"Islam", "Non-Islam"},
-	"family_role":           {"Ayah", "Ibu", "Kakak", "Adik", "Anak"},
-	"life_status":           {"Hidup", "Wafat"},
-	"body_shape":            {"Ideal", "Kurus", "Berisi", "Gemuk"},
-	"skin_color":            {"Putih", "Kuning Langsat", "Sawo Matang"},
-	"hair_type":             {"Lurus", "Bergelombang", "Keriting"},
-	"frequently":            {"Selalu", "Sering", "Kadang", "Jarang", "Tidak Pernah"},
-	"quran_reading_ability": {"Lancar", "Menengah", "Perlu Bimbingan"},
-}
-
-func (s *InMemoryOptionSource) GetValidOptions(key string) ([]string, error) {
-	return inMemoryOptions[key], nil
+type DBOptionSource struct {
+	db         *gorm.DB
+	options    map[string][]string
+	mu         sync.RWMutex
+	lastUpdate time.Time
+	expiry     time.Duration
+	stopChan   chan struct{}
 }
 
-func (s *InMemoryOptionSource) GetValidKeys() []string {
-	keys := make([]string, 0, len(inMemoryOptions))
-	for k := range inMemoryOptions {
-		keys = append(keys, k)
+func NewDBOptionSource(db *gorm.DB, expiry time.Duration) (*DBOptionSource, error) {
+	source := &DBOptionSource{
+		db:       db,
+		expiry:   expiry,
+		stopChan: make(chan struct{}),
 	}
-	return keys
+	if err := source.Refresh(); err != nil {
+		return nil, fmt.Errorf("failed to initialize DB option source: %w", err)
+	}
+	return source, nil
 }
 
-// --------------------
-// DBOptionSource
-// --------------------
+func (s *DBOptionSource) Refresh() error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
 
-type DBOptionSource struct {
-	options map[string][]string
-	mu      sync.RWMutex
-}
+	// Buat session baru tanpa transaction
+	tx := s.db.Session(&gorm.Session{SkipDefaultTransaction: true})
 
-type (
-	OptionCategory struct {
-		ID         int64  `gorm:"primaryKey" json:"id"`
-		OptionName string `json:"option_name"`
-		OptionSlug string `json:"option_slug" gorm:"uniqueIndex"`
+	var results []struct {
+		Slug  string `gorm:"column:slug"`
+		Value string `gorm:"column:value"`
 	}
 
-	OptionValues struct {
-		ID               int64  `gorm:"primaryKey" json:"id"`
-		OptionCategoryID int64  `json:"option_category_id"`
-		OptionValue      string `json:"option_value"`
+	err := tx.Raw(`
+        SELECT
+            c.option_slug AS slug,
+            v.option_value AS value
+        FROM option_categories c
+        JOIN option_values v ON c.id = v.option_category_id
+        ORDER BY c.id, v.id
+    `).Scan(&results).Error
+
+	if err != nil {
+		return fmt.Errorf("failed to refresh options: %w", err)
 	}
-)
 
-func NewDBOptionSource(db *gorm.DB) (*DBOptionSource, error) {
-	var categories []OptionCategory
-	if err := db.Find(&categories).Error; err != nil {
-		return nil, err
+	newOptions := make(map[string][]string)
+	for _, r := range results {
+		newOptions[r.Slug] = append(newOptions[r.Slug], r.Value)
 	}
 
-	options := make(map[string][]string)
-	for _, cat := range categories {
-		var values []OptionValues
-		if err := db.Where("option_category_id = ?", cat.ID).Find(&values).Error; err != nil {
-			return nil, err
-		}
-		for _, val := range values {
-			options[cat.OptionSlug] = append(options[cat.OptionSlug], val.OptionValue)
+	s.options = newOptions
+	s.lastUpdate = time.Now()
+
+	fmt.Println("options refreshed")
+
+	return nil
+}
+
+func (s *DBOptionSource) StartAutoRefresh(ctx context.Context, interval time.Duration) {
+	ticker := time.NewTicker(interval)
+	go func() {
+		for {
+			select {
+			case <-ticker.C:
+				s.mu.Lock()
+				needsRefresh := time.Since(s.lastUpdate) > s.expiry
+				s.mu.Unlock()
+
+				if needsRefresh {
+					if err := s.Refresh(); err != nil {
+						fmt.Printf("failed to auto-refresh options: %v\n", err)
+					}
+				}
+			case <-ctx.Done():
+				ticker.Stop()
+				return
+			case <-s.stopChan:
+				ticker.Stop()
+				return
+			}
 		}
-	}
+	}()
+}
+
+func (s *DBOptionSource) StopAutoRefresh() {
+	close(s.stopChan)
+}
 
-	return &DBOptionSource{options: options}, nil
+func (s *DBOptionSource) HasKey(key string) bool {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	_, exists := s.options[key]
+	return exists
 }
 
 func (s *DBOptionSource) GetValidOptions(key string) ([]string, error) {
+	s.mu.RLock()
+	needsRefresh := time.Since(s.lastUpdate) > s.expiry
+	s.mu.RUnlock()
+
+	if needsRefresh {
+		if err := s.Refresh(); err != nil {
+			return nil, fmt.Errorf("failed to refresh options: %w", err)
+		}
+	}
+
 	s.mu.RLock()
 	defer s.mu.RUnlock()
-	return s.options[key], nil
+
+	options, exists := s.options[key]
+	if !exists {
+		return nil, nil // Return nil instead of error for missing keys
+	}
+
+	copied := make([]string, len(options))
+	copy(copied, options)
+	return copied, nil
 }
 
 func (s *DBOptionSource) GetValidKeys() []string {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
+
 	keys := make([]string, 0, len(s.options))
 	for k := range s.options {
 		keys = append(keys, k)
@@ -108,58 +157,144 @@ func (s *DBOptionSource) GetValidKeys() []string {
 }
 
 // --------------------
-// Validator
+// Validator with Safe Rule Handling
 // --------------------
 
 type Validator struct {
-	source ValidOptionSource
+	source   ValidatorOptionSource
+	validate *v10.Validate
 }
 
-func NewValidatorRules(source ValidOptionSource) *Validator {
-	return &Validator{source: source}
+func NewValidator(source ValidatorOptionSource) *Validator {
+	validate := v10.New()
+	return &Validator{
+		source:   source,
+		validate: validate,
+	}
 }
 
-func (v *Validator) GenericOptionRule(key string) func(fl v10.FieldLevel) bool {
-	return func(fl v10.FieldLevel) bool {
-		value := fl.Field().String()
-		if value == "" {
-			return true
+func (v *Validator) RegisterAllCustomRules() error {
+	// First register static validation rules
+	staticRules := map[string]func(v10.FieldLevel) bool{
+		"password":     v.validatePassword,
+		"phone-number": v.validatePhoneNumber,
+	}
+
+	for name, fn := range staticRules {
+		if err := v.validate.RegisterValidation(name, fn); err != nil {
+			return fmt.Errorf("failed to register %s validation: %w", name, err)
 		}
-		validOptions, err := v.source.GetValidOptions(key)
-		if err != nil {
-			return false
+	}
+
+	// Then register dynamic option rules
+	for _, key := range v.source.GetValidKeys() {
+		if !v.source.HasKey(key) {
+			continue // Skip if key doesn't exist
 		}
-		for _, opt := range validOptions {
-			if opt == value {
-				return true
-			}
+
+		if err := v.validate.RegisterValidation(key, v.createOptionRule(key)); err != nil {
+			return fmt.Errorf("failed to register validation for %s: %w", key, err)
 		}
-		return false
 	}
+
+	return nil
 }
+func (v *Validator) Validate(input interface{}) error {
+	if input == nil {
+		return nil
+	}
 
-func (v *Validator) RegisterAllCustomRules(validate *v10.Validate) error {
-	for _, key := range v.source.GetValidKeys() {
-		err := validate.RegisterValidation(key, v.GenericOptionRule(key))
-		if err != nil {
-			return err
+	val := reflect.ValueOf(input)
+	if val.Kind() == reflect.Ptr {
+		if val.IsNil() {
+			return nil
 		}
+		val = val.Elem() // Dereference the pointer
 	}
 
-	err := validate.RegisterValidation("password", v.PasswordRule)
-	if err != nil {
-		return err
+	err := v.validate.Struct(input)
+	if err == nil {
+		return nil
 	}
 
-	err = validate.RegisterValidation("phone_number", v.PhoneNumberRule)
-	if err != nil {
-		return err
+	// Filter out errors for nil/empty fields
+	if ve, ok := err.(v10.ValidationErrors); ok {
+		var filteredErrors v10.ValidationErrors
+		for _, fe := range ve {
+			fieldValue := val.FieldByName(fe.StructField())
+			if !fieldValue.IsValid() {
+				continue
+			}
+
+			if !isEmpty(fieldValue) {
+				filteredErrors = append(filteredErrors, fe)
+			} else {
+				fmt.Printf("Ignoring validation error for empty field: %s\n", fe.Field())
+			}
+		}
+
+		if len(filteredErrors) > 0 {
+			return filteredErrors
+		}
+		return nil
 	}
 
-	return nil
+	return err
+}
+
+// isEmpty checks if a value is nil or empty
+func isEmpty(v reflect.Value) bool {
+	switch v.Kind() {
+	case reflect.String:
+		return v.Len() == 0
+	case reflect.Ptr, reflect.Interface:
+		return v.IsNil()
+	case reflect.Slice, reflect.Map, reflect.Array:
+		return v.Len() == 0
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return v.Int() == 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return v.Uint() == 0
+	case reflect.Float32, reflect.Float64:
+		return v.Float() == 0
+	case reflect.Bool:
+		return !v.Bool()
+	case reflect.Struct:
+		if t, ok := v.Interface().(time.Time); ok {
+			return t.IsZero()
+		}
+		// Consider non-time structs as non-empty
+		return false
+	default:
+		return false
+	}
 }
 
-func (v *Validator) PasswordRule(fl v10.FieldLevel) bool {
+// createOptionRule remains the same as previous version
+func (v *Validator) createOptionRule(key string) func(v10.FieldLevel) bool {
+	return func(fl v10.FieldLevel) bool {
+		field := fl.Field()
+		if isEmpty(field) {
+			return true
+		}
+
+		value := field.String()
+		validOptions, err := v.source.GetValidOptions(key)
+		if err != nil || validOptions == nil {
+			return true
+		}
+
+		for _, opt := range validOptions {
+			if opt == value {
+				return true
+			}
+		}
+
+		return false
+	}
+}
+
+func (v *Validator) validatePassword(fl v10.FieldLevel) bool {
 	password := fl.Field().String()
 	return len(password) >= 8 &&
 		strings.ContainsAny(password, "abcdefghijklmnopqrstuvwxyz") &&
@@ -167,38 +302,23 @@ func (v *Validator) PasswordRule(fl v10.FieldLevel) bool {
 		strings.ContainsAny(password, "0123456789")
 }
 
-func (v *Validator) PhoneNumberRule(fl v10.FieldLevel) bool {
-	phone := SanitizePhoneNumber(fl.Field().String())
+func (v *Validator) validatePhoneNumber(fl v10.FieldLevel) bool {
+	phone := NormalizePhoneNumber(fl.Field().String())
 	return strings.HasPrefix(phone, "+62")
 }
 
-func SanitizePhoneNumber(input string) string {
-	// Hilangkan semua spasi dan strip
-	input = strings.ReplaceAll(input, " ", "")
-	input = strings.ReplaceAll(input, "-", "")
-	input = strings.ReplaceAll(input, "(", "")
-	input = strings.ReplaceAll(input, ")", "")
-
-	// Hilangkan semua karakter non-digit kecuali +
+func NormalizePhoneNumber(input string) string {
 	re := regexp.MustCompile(`[^0-9\+]`)
 	input = re.ReplaceAllString(input, "")
 
-	// Handle nomor diawali 0 (contoh: 0812...) menjadi +62812...
-	if strings.HasPrefix(input, "0") {
-		input = "+62" + input[1:]
+	switch {
+	case strings.HasPrefix(input, "0"):
+		return "+62" + input[1:]
+	case strings.HasPrefix(input, "62") && !strings.HasPrefix(input, "+62"):
+		return "+" + input
+	case strings.HasPrefix(input, "8"):
+		return "+62" + input
+	default:
+		return input
 	}
-
-	// Handle jika diawali dengan 62 tanpa + (contoh: 62812...)
-	if strings.HasPrefix(input, "62") && !strings.HasPrefix(input, "+62") {
-		input = "+" + input
-	}
-
-	// Handle jika tidak ada awalan +62 sama sekali (contoh: 8123456789)
-	if !strings.HasPrefix(input, "+62") {
-		if strings.HasPrefix(input, "8") {
-			input = "+62" + input
-		}
-	}
-
-	return input
 }

space/space/space/space/space/space/repositories/partner_criteria_repository.go

@@ -0,0 +1,38 @@
+package repositories
+
+import (
+	"context"
+
+	"api.qobiltu.id/models"
+	"gorm.io/gorm"
+)
+
+type PartnerCriteriaRepository interface {
+	SavePartnerCriteria(ctx context.Context, req *models.PartnerCriteria) (*models.PartnerCriteria, error)
+	GetPartnerCriteria(ctx context.Context, accountID int64) (*models.PartnerCriteria, error)
+}
+
+type partnerCriteriaRepository struct {
+	db *gorm.DB
+}
+
+func NewPartnerCriteriaRepository(db *gorm.DB) PartnerCriteriaRepository {
+	return &partnerCriteriaRepository{
+		db: db,
+	}
+}
+
+func (r *partnerCriteriaRepository) SavePartnerCriteria(ctx context.Context, req *models.PartnerCriteria) (*models.PartnerCriteria, error) {
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
+}
+
+func (r *partnerCriteriaRepository) GetPartnerCriteria(ctx context.Context, accountID int64) (*models.PartnerCriteria, error) {
+	var partnerCriteria models.PartnerCriteria
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&partnerCriteria).Error; err != nil {
+		return nil, err
+	}
+	return &partnerCriteria, nil
+}

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

@@ -0,0 +1,11 @@
+package router
+
+import "api.qobiltu.id/middleware"
+
+func (s *Server) PartnerCriteriaRoute() {
+	routerGroup := s.router.Group("/api/v1/partner-criteria").Use(middleware.AuthUser)
+	{
+		routerGroup.POST("", s.partnerCriteriaController.SavePartnerCriteria)
+		routerGroup.GET("", s.partnerCriteriaController.GetPartnerCriteria)
+	}
+}

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

@@ -19,5 +19,6 @@ func (s *Server) setupRoutes() {
 	s.HealthCheckRoute()
 	s.CVRoute()
 	s.MarriageReadinessProfileRoute()
+	s.PartnerCriteriaRoute()
 	s.StorageRoute()
 }

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

@@ -4,6 +4,7 @@ import (
 	cv_controller "api.qobiltu.id/controller/cv"
 	health_check_controller "api.qobiltu.id/controller/health_check"
 	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
+	partner_criteria_controller "api.qobiltu.id/controller/partner_criteria"
 	"github.com/gin-gonic/gin"
 )
 
@@ -12,12 +13,14 @@ type Server struct {
 	healthCheckController              health_check_controller.HealthCheckController
 	cvController                       cv_controller.CVController
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController
+	partnerCriteriaController          partner_criteria_controller.PartnerCriteriaController
 }
 
 func NewServer(
 	healthCheckController health_check_controller.HealthCheckController,
 	cvController cv_controller.CVController,
 	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController,
+	partnerCriteriaController partner_criteria_controller.PartnerCriteriaController,
 ) (*Server, error) {
 
 	router := gin.Default()
@@ -27,6 +30,7 @@ func NewServer(
 		healthCheckController:              healthCheckController,
 		cvController:                       cvController,
 		marriageReadinessProfileController: marriageReadinessProfileController,
+		partnerCriteriaController:          partnerCriteriaController,
 		router:                             router,
 	}
 

space/space/space/space/space/space/services/partner_criteria_service.go

@@ -0,0 +1,78 @@
+package services
+
+import (
+	"context"
+	"errors"
+
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/pkg/validation"
+	"api.qobiltu.id/repositories"
+	"api.qobiltu.id/response"
+	"api.qobiltu.id/utils"
+	"gorm.io/gorm"
+)
+
+type PartnerCriteriaService interface {
+	SavePartnerCriteria(ctx context.Context, req *models.SavePartnerCriteriaRequest) (*models.PartnerCriteria, error)
+	GetPartnerCriteria(ctx context.Context, req *models.GetPartnerCriteriaRequest) (*models.PartnerCriteria, error)
+}
+
+type partnerCriteriaService struct {
+	partnerCriteriaRepository repositories.PartnerCriteriaRepository
+	validator                 *validation.Validator
+}
+
+func NewPartnerCriteriaService(partnerCriteriaRepository repositories.PartnerCriteriaRepository, validator *validation.Validator) PartnerCriteriaService {
+	return &partnerCriteriaService{partnerCriteriaRepository: partnerCriteriaRepository, validator: validator}
+}
+
+func (s *partnerCriteriaService) SavePartnerCriteria(ctx context.Context, req *models.SavePartnerCriteriaRequest) (*models.PartnerCriteria, error) {
+	if err := s.validator.Validate(req); err != nil {
+		return nil, response.HandleValidationError(err)
+	}
+
+	partnerCriteria, err := s.partnerCriteriaRepository.GetPartnerCriteria(ctx, req.AccountID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	if partnerCriteria == nil {
+		partnerCriteria = &models.PartnerCriteria{}
+	}
+
+	partnerCriteria.AccountID = req.AccountID
+
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedAgeLimit, req.ExpectedAgeLimit)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedDomicile, req.ExpectedDomicile)
+	utils.AssignIfNotNil(&partnerCriteria.AcceptedMaritalStatus, req.AcceptedMaritalStatus)
+	utils.AssignIfNotNil(&partnerCriteria.PartnerFamilyReligion, req.PartnerFamilyReligion)
+	utils.AssignIfNotNil(&partnerCriteria.PartnerWeeklyReligiousStudyFrequency, req.PartnerWeeklyReligiousStudyFrequency)
+	utils.AssignIfNotNil(&partnerCriteria.PartnerMonthlySpendingEstimate, req.PartnerMonthlySpendingEstimate)
+	utils.AssignIfNotNil(&partnerCriteria.PartnerCanCook, req.PartnerCanCook)
+
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedBodyShapes, req.ExpectedBodyShapes)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedSkinColors, req.ExpectedSkinColors)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedHairTypes, req.ExpectedHairTypes)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedHairThickness, req.ExpectedHairThickness)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedHeight, req.ExpectedHeight)
+
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedPartnerIncome, req.ExpectedPartnerIncome)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedIncomeSources, req.ExpectedIncomeSources)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedLastEducation, req.ExpectedLastEducation)
+	utils.AssignIfNotNil(&partnerCriteria.ExpectedJobType, req.ExpectedJobType)
+
+	res, err := s.partnerCriteriaRepository.SavePartnerCriteria(ctx, partnerCriteria)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	return res, nil
+}
+
+func (s *partnerCriteriaService) GetPartnerCriteria(ctx context.Context, req *models.GetPartnerCriteriaRequest) (*models.PartnerCriteria, error) {
+	res, err := s.partnerCriteriaRepository.GetPartnerCriteria(ctx, req.AccountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+	return res, nil
+}

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

@@ -3,7 +3,6 @@ package config
 import (
 	"fmt"
 	"log"
-	"log/slog"
 	"os"
 
 	"gorm.io/driver/postgres"
@@ -78,11 +77,23 @@ func AutoMigrateAll(db *gorm.DB) {
 		&models.JobCV{},
 		&models.AchievementCV{},
 		&models.MarriageReadinessProfile{},
+		&models.PartnerCriteria{},
 	)
 
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	slog.Info("Auto-migration completed successfully")
+	sequences := []string{
+		`CREATE SEQUENCE IF NOT EXISTS seq_ikh_counter START 1 INCREMENT 1 MINVALUE 1;`,
+		`CREATE SEQUENCE IF NOT EXISTS seq_akh_counter START 1 INCREMENT 1 MINVALUE 1;`,
+	}
+
+	for _, seq := range sequences {
+		if err := db.Exec(seq).Error; err != nil {
+			fmt.Printf("Gagal membuat sequence: %v", err)
+		}
+	}
+
+	fmt.Println("Auto-migration sequence check completed successfully")
 }

space/space/space/space/space/space/space/models/sequence.go

@@ -0,0 +1,25 @@
+package models
+
+import (
+	"fmt"
+	"strings"
+)
+
+const (
+	SeqIkhCounter = "seq_ikh_counter"
+	SeqAkhCounter = "seq_akh_counter"
+)
+
+func GetSequenceName(gender string) string {
+	if strings.ToLower(gender) == "laki-laki" {
+		return SeqIkhCounter
+	}
+	return SeqAkhCounter
+}
+
+func BuildInitialName(gender string, number int64) string {
+	if strings.ToLower(gender) == "laki-laki" {
+		return fmt.Sprintf("IKH_%d", number)
+	}
+	return fmt.Sprintf("AKH_%d", number)
+}

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

@@ -85,3 +85,21 @@ func UpdateAccountDetails(accountDetails models.AccountDetails) Repository[model
 	repo.Result = accountDetails
 	return *repo
 }
+
+func GetNextInitialNameNumber(gender string) Repository[string, int] {
+	repo := Construct[string, int](gender)
+	sequenceName := models.GetSequenceName(gender)
+	repo.Transaction.Raw("SELECT nextval('" + sequenceName + "')").Scan(&repo.Result)
+	return *repo
+}
+
+func GetAccountDetailsByAccountID(accountID uint) Repository[models.AccountDetails, models.AccountDetails] {
+	repo := Construct[models.AccountDetails, models.AccountDetails](
+		models.AccountDetails{AccountID: accountID},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.AccountDetails, models.AccountDetails],
+		Find[models.AccountDetails, models.AccountDetails],
+	)
+	return *repo
+}

space/space/space/space/space/space/space/repositories/cv_repository.go

@@ -1,243 +1,259 @@
 package repositories
 
 import (
-    "api.qobiltu.id/models"
-    "context"
-    "gorm.io/gorm"
+	"context"
+	"fmt"
+
+	"api.qobiltu.id/models"
+	"gorm.io/gorm"
 )
 
 type CVRepository interface {
-    SaveAccountDetails(ctx context.Context, req *models.AccountDetails) (*models.AccountDetails, error)
-    GetAccountDetailsByAccountID(ctx context.Context, accountID int64) (*models.AccountDetails, error)
-
-    SavePersonalityAndPreference(ctx context.Context, req *models.PersonalityAndPreferenceCV) (*models.PersonalityAndPreferenceCV, error)
-    GetPersonalityAndPreferenceByAccountID(ctx context.Context, accountID int64) (*models.PersonalityAndPreferenceCV, error)
-
-    SaveFamilyMember(ctx context.Context, req *models.FamilyMemberCV) (*models.FamilyMemberCV, error)
-    ListFamilyMember(ctx context.Context, accountID int64) ([]models.FamilyMemberCV, error)
-    GetFamilyMember(ctx context.Context, id int64) (*models.FamilyMemberCV, error)
-    DeleteFamilyMember(ctx context.Context, id int64) error
-
-    SavePhysicalAndHealth(ctx context.Context, req *models.PhysicalAndHealthCV) (*models.PhysicalAndHealthCV, error)
-    GetPhysicalAndHealthByAccountID(ctx context.Context, accountID int64) (*models.PhysicalAndHealthCV, error)
-
-    SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.WorshipAndReligiousUnderstandingCV) (*models.WorshipAndReligiousUnderstandingCV, error)
-    GetWorshipAndReligiousUnderstandingByAccountID(ctx context.Context, accountID int64) (*models.WorshipAndReligiousUnderstandingCV, error)
-
-    SaveEducation(ctx context.Context, req *models.EducationCV) (*models.EducationCV, error)
-    ListEducation(ctx context.Context, accountID int64) ([]models.EducationCV, error)
-    GetEducation(ctx context.Context, id int64) (*models.EducationCV, error)
-    DeleteEducation(ctx context.Context, id int64) error
-
-    SaveJob(ctx context.Context, req *models.JobCV) (*models.JobCV, error)
-    ListJob(ctx context.Context, accountID int64) ([]models.JobCV, error)
-    GetJob(ctx context.Context, id int64) (*models.JobCV, error)
-    DeleteJob(ctx context.Context, id int64) error
-
-    SaveAchievement(ctx context.Context, req *models.AchievementCV) (*models.AchievementCV, error)
-    ListAchievement(ctx context.Context, accountID int64) ([]models.AchievementCV, error)
-    GetAchievement(ctx context.Context, id int64) (*models.AchievementCV, error)
-    DeleteAchievement(ctx context.Context, id int64) error
+	SaveAccountDetails(ctx context.Context, req *models.AccountDetails) (*models.AccountDetails, error)
+	GetAccountDetailsByAccountID(ctx context.Context, accountID int64) (*models.AccountDetails, error)
+	GetNextInitialNameNumber(ctx context.Context, gender string) (int64, error)
+
+	SavePersonalityAndPreference(ctx context.Context, req *models.PersonalityAndPreferenceCV) (*models.PersonalityAndPreferenceCV, error)
+	GetPersonalityAndPreferenceByAccountID(ctx context.Context, accountID int64) (*models.PersonalityAndPreferenceCV, error)
+
+	SaveFamilyMember(ctx context.Context, req *models.FamilyMemberCV) (*models.FamilyMemberCV, error)
+	ListFamilyMember(ctx context.Context, accountID int64) ([]models.FamilyMemberCV, error)
+	GetFamilyMember(ctx context.Context, id int64) (*models.FamilyMemberCV, error)
+	DeleteFamilyMember(ctx context.Context, id int64) error
+
+	SavePhysicalAndHealth(ctx context.Context, req *models.PhysicalAndHealthCV) (*models.PhysicalAndHealthCV, error)
+	GetPhysicalAndHealthByAccountID(ctx context.Context, accountID int64) (*models.PhysicalAndHealthCV, error)
+
+	SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.WorshipAndReligiousUnderstandingCV) (*models.WorshipAndReligiousUnderstandingCV, error)
+	GetWorshipAndReligiousUnderstandingByAccountID(ctx context.Context, accountID int64) (*models.WorshipAndReligiousUnderstandingCV, error)
+
+	SaveEducation(ctx context.Context, req *models.EducationCV) (*models.EducationCV, error)
+	ListEducation(ctx context.Context, accountID int64) ([]models.EducationCV, error)
+	GetEducation(ctx context.Context, id int64) (*models.EducationCV, error)
+	DeleteEducation(ctx context.Context, id int64) error
+
+	SaveJob(ctx context.Context, req *models.JobCV) (*models.JobCV, error)
+	ListJob(ctx context.Context, accountID int64) ([]models.JobCV, error)
+	GetJob(ctx context.Context, id int64) (*models.JobCV, error)
+	DeleteJob(ctx context.Context, id int64) error
+
+	SaveAchievement(ctx context.Context, req *models.AchievementCV) (*models.AchievementCV, error)
+	ListAchievement(ctx context.Context, accountID int64) ([]models.AchievementCV, error)
+	GetAchievement(ctx context.Context, id int64) (*models.AchievementCV, error)
+	DeleteAchievement(ctx context.Context, id int64) error
 }
 
 type cvRepository struct {
-    db *gorm.DB
+	db *gorm.DB
 }
 
 func NewCVRepository(db *gorm.DB) CVRepository {
-    return &cvRepository{
-        db: db,
-    }
+	return &cvRepository{
+		db: db,
+	}
 }
 
 func (r *cvRepository) SaveAccountDetails(ctx context.Context, req *models.AccountDetails) (*models.AccountDetails, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 func (r *cvRepository) GetAccountDetailsByAccountID(ctx context.Context, accountID int64) (*models.AccountDetails, error) {
-    var accountDetails models.AccountDetails
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&accountDetails).Error; err != nil {
-        return nil, err
-    }
-    return &accountDetails, nil
+	var accountDetails models.AccountDetails
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&accountDetails).Error; err != nil {
+		return nil, err
+	}
+	return &accountDetails, nil
+}
+
+func (r *cvRepository) GetNextInitialNameNumber(ctx context.Context, gender string) (int64, error) {
+	sequenceName := models.GetSequenceName(gender)
+
+	var number int64
+	query := fmt.Sprintf("SELECT nextval('%s')", sequenceName)
+	err := r.db.WithContext(ctx).Raw(query).Scan(&number).Error
+	if err != nil {
+		return 0, err
+	}
+
+	return number, nil
 }
 
 func (r *cvRepository) SavePersonalityAndPreference(ctx context.Context, req *models.PersonalityAndPreferenceCV) (*models.PersonalityAndPreferenceCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 func (r *cvRepository) GetPersonalityAndPreferenceByAccountID(ctx context.Context, accountID int64) (*models.PersonalityAndPreferenceCV, error) {
-    var personalityAndPreference models.PersonalityAndPreferenceCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&personalityAndPreference).Error; err != nil {
-        return nil, err
-    }
-    return &personalityAndPreference, nil
+	var personalityAndPreference models.PersonalityAndPreferenceCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&personalityAndPreference).Error; err != nil {
+		return nil, err
+	}
+	return &personalityAndPreference, nil
 }
 
 func (r *cvRepository) SaveFamilyMember(ctx context.Context, req *models.FamilyMemberCV) (*models.FamilyMemberCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 func (r *cvRepository) GetFamilyMember(ctx context.Context, id int64) (*models.FamilyMemberCV, error) {
-    var familyMember models.FamilyMemberCV
-    if err := r.db.WithContext(ctx).Where("id = ?", id).First(&familyMember).Error; err != nil {
-        return nil, err
-    }
-    return &familyMember, nil
+	var familyMember models.FamilyMemberCV
+	if err := r.db.WithContext(ctx).Where("id = ?", id).First(&familyMember).Error; err != nil {
+		return nil, err
+	}
+	return &familyMember, nil
 }
 
 func (r *cvRepository) DeleteFamilyMember(ctx context.Context, id int64) error {
-    if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.FamilyMemberCV{}).Error; err != nil {
-        return err
-    }
-    return nil
+	if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.FamilyMemberCV{}).Error; err != nil {
+		return err
+	}
+	return nil
 }
 
 func (r *cvRepository) ListFamilyMember(ctx context.Context, accountID int64) ([]models.FamilyMemberCV, error) {
-    familyMembers := make([]models.FamilyMemberCV, 0)
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&familyMembers).Error; err != nil {
-        return nil, err
-    }
-    return familyMembers, nil
+	familyMembers := make([]models.FamilyMemberCV, 0)
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&familyMembers).Error; err != nil {
+		return nil, err
+	}
+	return familyMembers, nil
 }
 
 func (r *cvRepository) SavePhysicalAndHealth(ctx context.Context, req *models.PhysicalAndHealthCV) (*models.PhysicalAndHealthCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 func (r *cvRepository) GetPhysicalAndHealthByAccountID(ctx context.Context, accountID int64) (*models.PhysicalAndHealthCV, error) {
-    var physicalAndHealth models.PhysicalAndHealthCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&physicalAndHealth).Error; err != nil {
-        return nil, err
-    }
-    return &physicalAndHealth, nil
+	var physicalAndHealth models.PhysicalAndHealthCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&physicalAndHealth).Error; err != nil {
+		return nil, err
+	}
+	return &physicalAndHealth, nil
 }
 
 func (r *cvRepository) SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.WorshipAndReligiousUnderstandingCV) (*models.WorshipAndReligiousUnderstandingCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 func (r *cvRepository) GetWorshipAndReligiousUnderstandingByAccountID(ctx context.Context, accountID int64) (*models.WorshipAndReligiousUnderstandingCV, error) {
-    var worshipAndReligiousUnderstanding models.WorshipAndReligiousUnderstandingCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&worshipAndReligiousUnderstanding).Error; err != nil {
-        return nil, err
-    }
-    return &worshipAndReligiousUnderstanding, nil
+	var worshipAndReligiousUnderstanding models.WorshipAndReligiousUnderstandingCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&worshipAndReligiousUnderstanding).Error; err != nil {
+		return nil, err
+	}
+	return &worshipAndReligiousUnderstanding, nil
 }
 
 // SaveEducation menyimpan atau memperbarui data pendidikan ke database
 func (r *cvRepository) SaveEducation(ctx context.Context, req *models.EducationCV) (*models.EducationCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 // ListEducation mengambil daftar data pendidikan berdasarkan account_id
 func (r *cvRepository) ListEducation(ctx context.Context, accountID int64) ([]models.EducationCV, error) {
-    var educations []models.EducationCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&educations).Error; err != nil {
-        return nil, err
-    }
-    return educations, nil
+	var educations []models.EducationCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&educations).Error; err != nil {
+		return nil, err
+	}
+	return educations, nil
 }
 
 // GetEducation mengambil satu data pendidikan berdasarkan id
 func (r *cvRepository) GetEducation(ctx context.Context, id int64) (*models.EducationCV, error) {
-    var education models.EducationCV
-    if err := r.db.WithContext(ctx).Where("id = ?", id).First(&education).Error; err != nil {
-        return nil, err
-    }
-    return &education, nil
+	var education models.EducationCV
+	if err := r.db.WithContext(ctx).Where("id = ?", id).First(&education).Error; err != nil {
+		return nil, err
+	}
+	return &education, nil
 }
 
 // DeleteEducation menghapus data pendidikan berdasarkan id
 func (r *cvRepository) DeleteEducation(ctx context.Context, id int64) error {
-    if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.EducationCV{}).Error; err != nil {
-        return err
-    }
-    return nil
+	if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.EducationCV{}).Error; err != nil {
+		return err
+	}
+	return nil
 }
 
 // SaveJob menyimpan atau memperbarui data pekerjaan ke database
 func (r *cvRepository) SaveJob(ctx context.Context, req *models.JobCV) (*models.JobCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 // ListJob mengambil daftar data pekerjaan berdasarkan account_id
 func (r *cvRepository) ListJob(ctx context.Context, accountID int64) ([]models.JobCV, error) {
-    var jobs []models.JobCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&jobs).Error; err != nil {
-        return nil, err
-    }
-    return jobs, nil
+	var jobs []models.JobCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&jobs).Error; err != nil {
+		return nil, err
+	}
+	return jobs, nil
 }
 
 // GetJob mengambil satu data pekerjaan berdasarkan id
 func (r *cvRepository) GetJob(ctx context.Context, id int64) (*models.JobCV, error) {
-    var job models.JobCV
-    if err := r.db.WithContext(ctx).Where("id = ?", id).First(&job).Error; err != nil {
-        return nil, err
-    }
-    return &job, nil
+	var job models.JobCV
+	if err := r.db.WithContext(ctx).Where("id = ?", id).First(&job).Error; err != nil {
+		return nil, err
+	}
+	return &job, nil
 }
 
 // DeleteJob menghapus data pekerjaan berdasarkan id
 func (r *cvRepository) DeleteJob(ctx context.Context, id int64) error {
-    if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.JobCV{}).Error; err != nil {
-        return err
-    }
-    return nil
+	if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.JobCV{}).Error; err != nil {
+		return err
+	}
+	return nil
 }
 
 // SaveAchievement menyimpan atau memperbarui data prestasi ke database
 func (r *cvRepository) SaveAchievement(ctx context.Context, req *models.AchievementCV) (*models.AchievementCV, error) {
-    if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
-        return req, err
-    }
-    return req, nil
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
 }
 
 // ListAchievement mengambil daftar data prestasi berdasarkan account_id
 func (r *cvRepository) ListAchievement(ctx context.Context, accountID int64) ([]models.AchievementCV, error) {
-    var achievements []models.AchievementCV
-    if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&achievements).Error; err != nil {
-        return nil, err
-    }
-    return achievements, nil
+	var achievements []models.AchievementCV
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).Find(&achievements).Error; err != nil {
+		return nil, err
+	}
+	return achievements, nil
 }
 
 // GetAchievement mengambil satu data prestasi berdasarkan id
 func (r *cvRepository) GetAchievement(ctx context.Context, id int64) (*models.AchievementCV, error) {
-    var achievement models.AchievementCV
-    if err := r.db.WithContext(ctx).Where("id = ?", id).First(&achievement).Error; err != nil {
-        return nil, err
-    }
-    return &achievement, nil
+	var achievement models.AchievementCV
+	if err := r.db.WithContext(ctx).Where("id = ?", id).First(&achievement).Error; err != nil {
+		return nil, err
+	}
+	return &achievement, nil
 }
 
 // DeleteAchievement menghapus data prestasi berdasarkan id
 func (r *cvRepository) DeleteAchievement(ctx context.Context, id int64) error {
-    if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.AchievementCV{}).Error; err != nil {
-        return err
-    }
-    return nil
+	if err := r.db.WithContext(ctx).Where("id = ?", id).Delete(&models.AchievementCV{}).Error; err != nil {
+		return err
+	}
+	return nil
 }

space/space/space/space/space/space/space/services/cv_service.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"math"
 	"strconv"
+	"strings"
 
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/pkg/storage"
@@ -59,19 +60,19 @@ type CVService interface {
 type cvService struct {
 	cvRepository repositories.CVRepository
 	storage      storage.Storage
+	validator    *validation.Validator
 }
 
-func NewCVService(cvRepository repositories.CVRepository, storage storage.Storage) CVService {
+func NewCVService(cvRepository repositories.CVRepository, storage storage.Storage, validator *validation.Validator) CVService {
 	return &cvService{
 		cvRepository: cvRepository,
 		storage:      storage,
+		validator:    validator,
 	}
 }
 
 func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.SaveAccountDetailsRequest) (*models.AccountDetails, error) {
-	// notes
-	// jika ingin mengubah value wajib kirimkan field beserta value nya
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -81,15 +82,42 @@ func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.SaveAcco
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	// Apply perubahan
-	if accountDetails == nil {
+	// Cek apakah accountDetails baru atau existing
+	isNew := accountDetails == nil
+	if isNew {
 		accountDetails = &models.AccountDetails{}
+		accountDetails.AccountID = uint(req.AccountID)
+	}
+
+	// Simpan gender lama jika ada
+	oldGender := ""
+	if accountDetails.Gender != nil {
+		oldGender = strings.ToLower(*accountDetails.Gender)
 	}
 
-	accountDetails.AccountID = uint(req.AccountID)
+	// Update gender jika dikirim dari request
+	var genderChanged bool
+	if req.Gender != nil {
+		newGender := strings.ToLower(*req.Gender)
+		if oldGender != newGender {
+			genderChanged = true
+			accountDetails.Gender = req.Gender
+		}
+	}
 
+	// Jika gender baru atau gender berubah, generate InitialName baru via sequence
+	if isNew || genderChanged {
+		if accountDetails.Gender != nil {
+			number, err := s.cvRepository.GetNextInitialNameNumber(ctx, *accountDetails.Gender)
+			if err != nil {
+				return nil, response.HandleGormError(err, "Gagal generate initial name")
+			}
+			accountDetails.InitialName = models.BuildInitialName(*accountDetails.Gender, number)
+		}
+	}
+
+	// Apply perubahan field lainnya
 	utils.AssignIfNotNil(&accountDetails.FullName, req.FullName)
-	utils.AssignIfNotNil(&accountDetails.Gender, req.Gender)
 	utils.AssignIfNotNil(&accountDetails.DateOfBirth, req.DateOfBirth)
 	utils.AssignIfNotNil(&accountDetails.PlaceOfBirth, req.PlaceOfBirth)
 	utils.AssignIfNotNil(&accountDetails.Domicile, req.Domicile)
@@ -98,11 +126,11 @@ func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.SaveAcco
 	utils.AssignIfNotNil(&accountDetails.LastJob, req.LastJob)
 
 	if req.PhoneNumber != nil {
-		sanitizedPhone := validation.SanitizePhoneNumber(*req.PhoneNumber)
-		accountDetails.PhoneNumber = &sanitizedPhone
+		normalizedPhoneNumber := validation.NormalizePhoneNumber(*req.PhoneNumber)
+		accountDetails.PhoneNumber = &normalizedPhoneNumber
 	}
 
-	// Simpan data
+	// Simpan ke database
 	res, err := s.cvRepository.SaveAccountDetails(ctx, accountDetails)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
@@ -120,7 +148,7 @@ func (s *cvService) GetAccountDetails(ctx context.Context, req *models.GetAccoun
 }
 
 func (s *cvService) SavePersonalityAndPreference(ctx context.Context, req *models.SavePersonalityAndPreferenceRequest) (*models.PersonalityAndPreferenceCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -170,7 +198,7 @@ func (s *cvService) GetPersonalityAndPreference(ctx context.Context, req *models
 }
 
 func (s *cvService) CreateFamilyMember(ctx context.Context, req *models.CreateFamilyMemberRequest) (*models.FamilyMemberCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -219,7 +247,7 @@ func (s *cvService) DeleteFamilyMember(ctx context.Context, req *models.DeleteFa
 }
 
 func (s *cvService) UpdateFamilyMember(ctx context.Context, req *models.UpdateFamilyMemberRequest) (*models.FamilyMemberCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -244,7 +272,7 @@ func (s *cvService) UpdateFamilyMember(ctx context.Context, req *models.UpdateFa
 }
 
 func (s *cvService) SavePhysicalAndHealth(ctx context.Context, req *models.SavePhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -289,7 +317,7 @@ func (s *cvService) GetPhysicalAndHealth(ctx context.Context, req *models.GetPhy
 }
 
 func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.SaveWorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -313,6 +341,7 @@ func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, re
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.DhuhaPrayer, req.DhuhaPrayer)
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.QuranMemorization, req.QuranMemorization)
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.QuranReadingAbility, req.QuranReadingAbility)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.WeeklyReligiousStudyFrequency, req.WeeklyReligiousStudyFrequency)
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.DaudFasting, req.DaudFasting)
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.AyyamulBidhFasting, req.AyyamulBidhFasting)
 	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.HajjOrUmrah, req.HajjOrUmrah)
@@ -341,7 +370,7 @@ func (s *cvService) GetWorshipAndReligiousUnderstanding(ctx context.Context, req
 }
 
 func (s *cvService) CreateEducation(ctx context.Context, req *models.CreateEducationRequest) (*models.EducationCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -363,7 +392,7 @@ func (s *cvService) CreateEducation(ctx context.Context, req *models.CreateEduca
 }
 
 func (s *cvService) UpdateEducation(ctx context.Context, req *models.UpdateEducationRequest) (*models.EducationCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -402,7 +431,7 @@ func (s *cvService) DeleteEducation(ctx context.Context, req *models.DeleteEduca
 }
 
 func (s *cvService) CreateJob(ctx context.Context, req *models.CreateJobRequest) (*models.JobCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
@@ -422,7 +451,7 @@ func (s *cvService) CreateJob(ctx context.Context, req *models.CreateJobRequest)
 }
 
 func (s *cvService) UpdateJob(ctx context.Context, req *models.UpdateJobRequest) (*models.JobCV, error) {
-	if err := validation.Validate(req); err != nil {
+	if err := s.validator.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}