Deploy files from GitHub repository

config/database_connection_config.go

@@ -77,6 +77,7 @@ func AutoMigrateAll(db *gorm.DB) {
 		&models.EducationCV{},
 		&models.JobCV{},
 		&models.AchievementCV{},
+		&models.MarriageReadinessProfile{},
 	)
 
 	if err != nil {

controller/marriage_readiness_profile/marriage_readiness_profile_controller.go

@@ -0,0 +1,66 @@
+package cv_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 MarriageReadinessProfileController interface {
+	SaveMarriageReadinessProfile(ctx *gin.Context)
+	GetMarriageReadinessProfile(ctx *gin.Context)
+}
+
+type marriageReadinessProfileController struct {
+	marriageReadinessProfileService services.MarriageReadinessProfileService
+}
+
+func NewMarriageReadinessProfileController(marriageReadinessProfileService services.MarriageReadinessProfileService) MarriageReadinessProfileController {
+	return &marriageReadinessProfileController{
+		marriageReadinessProfileService: marriageReadinessProfileService,
+	}
+}
+
+func (c *marriageReadinessProfileController) SaveMarriageReadinessProfile(ctx *gin.Context) {
+	var req models.SaveMarriageReadinessProfileRequest
+	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.marriageReadinessProfileService.SaveMarriageReadinessProfile(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Marriage readiness profile saved", res, nil)
+}
+
+func (c *marriageReadinessProfileController) GetMarriageReadinessProfile(ctx *gin.Context) {
+	accountData := middleware.GetAccountData(ctx)
+	accountID := int64(accountData.UserID)
+
+	req := models.GetMarriageReadinessProfileRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.marriageReadinessProfileService.GetMarriageReadinessProfile(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Get marriage readiness profile success", res, nil)
+}

main.go

@@ -1,9 +1,14 @@
 package main
 
 import (
+	"log/slog"
+	"net"
+	"strconv"
+
 	"api.qobiltu.id/config"
-	"api.qobiltu.id/controller/cv"
-	"api.qobiltu.id/controller/health_check"
+	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"
 	"api.qobiltu.id/mail"
 	"api.qobiltu.id/pkg/storage"
 	"api.qobiltu.id/pkg/validation"
@@ -13,9 +18,6 @@ import (
 	"api.qobiltu.id/services"
 	"api.qobiltu.id/utils"
 	"github.com/hibiken/asynq"
-	"log/slog"
-	"net"
-	"strconv"
 )
 
 func main() {
@@ -60,6 +62,10 @@ func main() {
 	cvService := services.NewCVService(cvRepository, localStorage)
 	cvController := cv_controller.NewCVController(cvService)
 
+	marriageReadinessProfileRepository := repositories.NewMarriageReadinessProfileRepository(config.DB)
+	marriageReadinessProfileService := services.NewMarriageReadinessProfileService(marriageReadinessProfileRepository)
+	marriageReadinessProfileController := marriage_readiness_profile_controller.NewMarriageReadinessProfileController(marriageReadinessProfileService)
+
 	// start task processor
 	err = taskProcessor.Start()
 	utils.FatalIfErr("failed to start task processor", err)
@@ -69,6 +75,7 @@ func main() {
 	s, err := router.NewServer(
 		healthCheckController,
 		cvController,
+		marriageReadinessProfileController,
 	)
 	utils.FatalIfErr("failed to create server", err)
 

models/database_orm_model.go

@@ -231,19 +231,19 @@ type (
 	}
 
 	PhysicalAndHealthCV 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"`
-		HeightInCm       *int      `gorm:"column:height_cm" json:"height_cm"`                  // Tinggi badan dalam satuan sentimeter
-		WeightInKg       *int      `gorm:"column:weight_kg" json:"weight_kg"`                  // Berat badan dalam satuan kilogram
-		BodyShape        *string   `gorm:"column:body_shape" json:"body_shape"`                // Bentuk tubuh
-		SkinColor        *string   `gorm:"column:skin_color" json:"skin_color"`                // Warna kulit
-		HairType         *string   `gorm:"column:hair_type" json:"hair_type"`                  // Tipe rambut
-		MedicalHistory   *string   `gorm:"column:medical_history" json:"medical_history"`      // Riwayat penyakit
-		PhysicalDisorder *string   `gorm:"column:physical_disorder" json:"physical_disorder"`  // Cacat fisik
-		PhysicalTraits   *string   `gorm:"column:physical_traits" json:"physical_traits"`      // Ciri khas fisik
-		CreatedAt        time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"` // Waktu data dibuat
-		UpdatedAt        time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"` // Waktu data terakhir diperbarui
+		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"`
+		HeightInCm       *int            `gorm:"column:height_cm" json:"height_cm"`                                 // Tinggi badan dalam satuan sentimeter
+		WeightInKg       *int            `gorm:"column:weight_kg" json:"weight_kg"`                                 // Berat badan dalam satuan kilogram
+		BodyShape        *string         `gorm:"column:body_shape" json:"body_shape"`                               // Bentuk tubuh
+		SkinColor        *string         `gorm:"column:skin_color" json:"skin_color"`                               // Warna kulit
+		HairType         *string         `gorm:"column:hair_type" json:"hair_type"`                                 // Tipe rambut
+		MedicalHistory   *pq.StringArray `gorm:"column:medical_history;type:varchar(255)[]" json:"medical_history"` // Riwayat penyakit
+		PhysicalDisorder *string         `gorm:"column:physical_disorder" json:"physical_disorder"`                 // Cacat fisik
+		PhysicalTraits   *string         `gorm:"column:physical_traits" json:"physical_traits"`                     // Ciri khas fisik
+		CreatedAt        time.Time       `gorm:"column:created_at;autoCreateTime" json:"created_at"`                // Waktu data dibuat
+		UpdatedAt        time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`                // Waktu data terakhir diperbarui
 		FieldCounter
 	}
 
@@ -339,6 +339,55 @@ func (w WorshipAndReligiousUnderstandingCV) GetFilledFields() []string {
 	return w.FieldCounter.GetFilledFields(w)
 }
 
+type (
+	MarriageReadinessProfile 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"`
+
+		// 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?
+
+		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" }
@@ -369,3 +418,6 @@ func (WorshipAndReligiousUnderstandingCV) TableName() string {
 func (EducationCV) TableName() string   { return "education_cv" }
 func (JobCV) TableName() string         { return "job_cv" }
 func (AchievementCV) TableName() string { return "achievement_cv" }
+func (MarriageReadinessProfile) TableName() string {
+	return "marriage_readiness_profile"
+}

models/request_model.go

@@ -117,15 +117,15 @@ type (
 	}
 
 	SavePhysicalAndHealthRequest struct {
-		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
-		MedicalHistory   *string `json:"medical_history"`                  // Riwayat penyakit
-		PhysicalDisorder *string `json:"physical_disorder"`                // Cacat fisik
-		PhysicalTraits   *string `json:"physical_traits"`                  // Ciri khas fisik
+		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
+		MedicalHistory   *pq.StringArray `json:"medical_history"`                  // Riwayat penyakit
+		PhysicalDisorder *string         `json:"physical_disorder"`                // Cacat fisik
+		PhysicalTraits   *string         `json:"physical_traits"`                  // Ciri khas fisik
 	}
 
 	GetPhysicalAndHealthRequest struct {
@@ -282,3 +282,49 @@ type (
 		TotalProgress                              float64 `json:"total_progress"`
 	}
 )
+
+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 GetMarriageReadinessProfileRequest struct {
+	AccountID int64 `json:"-"`
+}

pkg/worker/task_send_forgot_password_email.go

@@ -1,14 +1,15 @@
 package worker
 
 import (
-	"api.qobiltu.id/assets"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/hibiken/asynq"
 	"html/template"
-	"log/slog"
+	"time"
+
+	"api.qobiltu.id/assets"
+	"github.com/hibiken/asynq"
 )
 
 const (
@@ -62,14 +63,15 @@ func (p *RedisTaskProcessor) ProcessTaskSendForgotPasswordEmail(ctx context.Cont
 	}
 	htmlContent := body.String()
 
-	slog.Info("Sending forgot password email", slog.String("email", payload.EmailAddress))
+	fmt.Println("Sending forgot password email", payload.EmailAddress)
+	start := time.Now()
 
 	err = p.emailSender.Send(payload.EmailAddress, payload.Subject, htmlContent, payload)
 	if err != nil {
 		return fmt.Errorf("failed to send forgot password email: %w", err)
 	}
 
-	slog.Info("Forgot password email sent successfully", slog.String("email", payload.EmailAddress))
-
+	fmt.Println("Forgot password email sent successfully", payload.EmailAddress)
+	fmt.Println("Time taken", time.Since(start))
 	return nil
 }

pkg/worker/task_send_verify_email.go

@@ -1,14 +1,15 @@
 package worker
 
 import (
-	"api.qobiltu.id/assets"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/hibiken/asynq"
 	"html/template"
-	"log/slog"
+	"time"
+
+	"api.qobiltu.id/assets"
+	"github.com/hibiken/asynq"
 )
 
 const (
@@ -62,14 +63,16 @@ func (p *RedisTaskProcessor) ProcessTaskSendVerifyEmail(ctx context.Context, tas
 	}
 	htmlContent := body.String()
 
-	slog.Info("Sending verification email", slog.String("email", payload.EmailAddress))
+	fmt.Println("Sending verification email", payload.EmailAddress)
+	start := time.Now()
 
 	err = p.emailSender.Send(payload.EmailAddress, payload.Subject, htmlContent, payload)
 	if err != nil {
 		return fmt.Errorf("failed to send verify email: %w", err)
 	}
 
-	slog.Info("Verification email sent successfully", slog.String("email", payload.EmailAddress))
+	fmt.Println("Verification email sent successfully", payload.EmailAddress)
+	fmt.Println("Time taken", time.Since(start))
 
 	return nil
 }

repositories/marriage_readiness_profile_repository.go

@@ -0,0 +1,38 @@
+package repositories
+
+import (
+	"context"
+
+	"api.qobiltu.id/models"
+	"gorm.io/gorm"
+)
+
+type MarriageReadinessProfileRepository interface {
+	SaveMarriageReadinessProfile(ctx context.Context, req *models.MarriageReadinessProfile) (*models.MarriageReadinessProfile, error)
+	GetMarriageReadinessProfile(ctx context.Context, accountID int64) (*models.MarriageReadinessProfile, error)
+}
+
+type marriageReadinessProfileRepository struct {
+	db *gorm.DB
+}
+
+func NewMarriageReadinessProfileRepository(db *gorm.DB) MarriageReadinessProfileRepository {
+	return &marriageReadinessProfileRepository{
+		db: db,
+	}
+}
+
+func (r *marriageReadinessProfileRepository) SaveMarriageReadinessProfile(ctx context.Context, req *models.MarriageReadinessProfile) (*models.MarriageReadinessProfile, error) {
+	if err := r.db.WithContext(ctx).Save(req).Error; err != nil {
+		return req, err
+	}
+	return req, nil
+}
+
+func (r *marriageReadinessProfileRepository) GetMarriageReadinessProfile(ctx context.Context, accountID int64) (*models.MarriageReadinessProfile, error) {
+	var marriageReadinessProfile models.MarriageReadinessProfile
+	if err := r.db.WithContext(ctx).Where("account_id = ?", accountID).First(&marriageReadinessProfile).Error; err != nil {
+		return nil, err
+	}
+	return &marriageReadinessProfile, nil
+}

router/marriage_readiness_profile_route.go

@@ -0,0 +1,11 @@
+package router
+
+import "api.qobiltu.id/middleware"
+
+func (s *Server) MarriageReadinessProfileRoute() {
+	routerGroup := s.router.Group("/api/v1/marriage-readiness-profile").Use(middleware.AuthUser)
+	{
+		routerGroup.POST("", s.marriageReadinessProfileController.SaveMarriageReadinessProfile)
+		routerGroup.GET("", s.marriageReadinessProfileController.GetMarriageReadinessProfile)
+	}
+}

router/router.go

@@ -18,5 +18,6 @@ func (s *Server) setupRoutes() {
 	// another way to register routes
 	s.HealthCheckRoute()
 	s.CVRoute()
+	s.MarriageReadinessProfileRoute()
 	s.StorageRoute()
 }

router/server.go

@@ -2,28 +2,32 @@ package router
 
 import (
 	cv_controller "api.qobiltu.id/controller/cv"
-	"api.qobiltu.id/controller/health_check"
+	health_check_controller "api.qobiltu.id/controller/health_check"
+	marriage_readiness_profile_controller "api.qobiltu.id/controller/marriage_readiness_profile"
 	"github.com/gin-gonic/gin"
 )
 
 type Server struct {
-	router                *gin.Engine
-	healthCheckController health_check_controller.HealthCheckController
-	cvController          cv_controller.CVController
+	router                             *gin.Engine
+	healthCheckController              health_check_controller.HealthCheckController
+	cvController                       cv_controller.CVController
+	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController
 }
 
 func NewServer(
 	healthCheckController health_check_controller.HealthCheckController,
 	cvController cv_controller.CVController,
+	marriageReadinessProfileController marriage_readiness_profile_controller.MarriageReadinessProfileController,
 ) (*Server, error) {
 
 	router := gin.Default()
 	router.Use(gin.Recovery())
 
 	server := &Server{
-		healthCheckController: healthCheckController,
-		cvController:          cvController,
-		router:                router,
+		healthCheckController:              healthCheckController,
+		cvController:                       cvController,
+		marriageReadinessProfileController: marriageReadinessProfileController,
+		router:                             router,
 	}
 
 	server.setupRoutes()

services/marriage_readiness_profile_service.go

@@ -0,0 +1,90 @@
+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 MarriageReadinessProfileService interface {
+	SaveMarriageReadinessProfile(ctx context.Context, req *models.SaveMarriageReadinessProfileRequest) (*models.MarriageReadinessProfile, error)
+	GetMarriageReadinessProfile(ctx context.Context, req *models.GetMarriageReadinessProfileRequest) (*models.MarriageReadinessProfile, error)
+}
+
+type marriageReadinessProfileService struct {
+	marriageReadinessProfileRepository repositories.MarriageReadinessProfileRepository
+}
+
+func NewMarriageReadinessProfileService(marriageReadinessProfileRepository repositories.MarriageReadinessProfileRepository) MarriageReadinessProfileService {
+	return &marriageReadinessProfileService{marriageReadinessProfileRepository: marriageReadinessProfileRepository}
+}
+
+func (s *marriageReadinessProfileService) SaveMarriageReadinessProfile(ctx context.Context, req *models.SaveMarriageReadinessProfileRequest) (*models.MarriageReadinessProfile, error) {
+	if err := validation.Validate(req); err != nil {
+		return nil, response.HandleValidationError(err)
+	}
+
+	marriageReadinessProfile, err := s.marriageReadinessProfileRepository.GetMarriageReadinessProfile(ctx, req.AccountID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	if marriageReadinessProfile == nil {
+		marriageReadinessProfile = &models.MarriageReadinessProfile{}
+	}
+
+	marriageReadinessProfile.AccountID = req.AccountID
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.MarriageVision, req.MarriageVision)
+	utils.AssignIfNotNil(&marriageReadinessProfile.LivingPlan, req.LivingPlan)
+	utils.AssignIfNotNil(&marriageReadinessProfile.SpouseRoles, req.SpouseRoles)
+	utils.AssignIfNotNil(&marriageReadinessProfile.SpouseRights, req.SpouseRights)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ConflictResolution, req.ConflictResolution)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ParentingStyle, req.ParentingStyle)
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.ReadyToMarryDuration, req.ReadyToMarryDuration)
+	utils.AssignIfNotNil(&marriageReadinessProfile.WeddingConcept, req.WeddingConcept)
+	utils.AssignIfNotNil(&marriageReadinessProfile.WeddingFunding, req.WeddingFunding)
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.CareerAfterMarriage, req.CareerAfterMarriage)
+	utils.AssignIfNotNil(&marriageReadinessProfile.TimeManagement, req.TimeManagement)
+	utils.AssignIfNotNil(&marriageReadinessProfile.CareerGoals, req.CareerGoals)
+	utils.AssignIfNotNil(&marriageReadinessProfile.SelfDevelopment, req.SelfDevelopment)
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.DelayChildren, req.DelayChildren)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ChildEducationPlan, req.ChildEducationPlan)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ReligiousEmotionalBond, req.ReligiousEmotionalBond)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ParentingChallenges, req.ParentingChallenges)
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.MonthlyFinance, req.MonthlyFinance)
+	utils.AssignIfNotNil(&marriageReadinessProfile.FamilyResponsibility, req.FamilyResponsibility)
+	utils.AssignIfNotNil(&marriageReadinessProfile.DebtStatus, req.DebtStatus)
+	utils.AssignIfNotNil(&marriageReadinessProfile.FinanceSharing, req.FinanceSharing)
+	utils.AssignIfNotNil(&marriageReadinessProfile.IncomeGapView, req.IncomeGapView)
+
+	utils.AssignIfNotNil(&marriageReadinessProfile.DecisionMaking, req.DecisionMaking)
+	utils.AssignIfNotNil(&marriageReadinessProfile.GrowthTogether, req.GrowthTogether)
+	utils.AssignIfNotNil(&marriageReadinessProfile.ParentIntervention, req.ParentIntervention)
+	utils.AssignIfNotNil(&marriageReadinessProfile.HabitResponse, req.HabitResponse)
+
+	res, err := s.marriageReadinessProfileRepository.SaveMarriageReadinessProfile(ctx, marriageReadinessProfile)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	return res, nil
+}
+
+func (s *marriageReadinessProfileService) GetMarriageReadinessProfile(ctx context.Context, req *models.GetMarriageReadinessProfileRequest) (*models.MarriageReadinessProfile, error) {
+	res, err := s.marriageReadinessProfileRepository.GetMarriageReadinessProfile(ctx, req.AccountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+	return res, nil
+}

space/controller/cv/cv_controller.go

@@ -49,7 +49,7 @@ type CVController interface {
 	DeleteAchievement(ctx *gin.Context)
 
 	UploadProfileImage(ctx *gin.Context)
-	GetProgress(ctx *gin.Context)
+	GetProgressCV(ctx *gin.Context)
 }
 
 type cvController struct {
@@ -64,9 +64,13 @@ func NewCVController(cvService services.CVService) CVController {
 
 // --- Account Details ---
 func (c *cvController) SaveAccountDetails(ctx *gin.Context) {
-	var req models.AccountDetailsRequest
+	var req models.SaveAccountDetailsRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -86,7 +90,11 @@ func (c *cvController) GetAccountDetails(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.GetAccountDetails(ctx, accountID)
+	req := models.GetAccountDetailsRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.GetAccountDetails(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -98,9 +106,13 @@ func (c *cvController) GetAccountDetails(ctx *gin.Context) {
 // --- Personality & Preference ---
 
 func (c *cvController) SavePersonalityAndPreference(ctx *gin.Context) {
-	var req models.PersonalityAndPreferenceCVRequest
+	var req models.SavePersonalityAndPreferenceRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -120,7 +132,11 @@ func (c *cvController) GetPersonalityAndPreference(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.GetPersonalityAndPreference(ctx, accountID)
+	req := models.GetPersonalityAndPreferenceRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.GetPersonalityAndPreference(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -132,9 +148,13 @@ func (c *cvController) GetPersonalityAndPreference(ctx *gin.Context) {
 // --- Family Member ---
 
 func (c *cvController) CreateFamilyMember(ctx *gin.Context) {
-	var req models.FamilyMemberRequest
+	var req models.CreateFamilyMemberRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -158,13 +178,19 @@ func (c *cvController) UpdateFamilyMember(ctx *gin.Context) {
 		return
 	}
 
-	var req models.FamilyMemberRequest
+	var req models.UpdateFamilyMemberRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
-	res, err := c.cvService.UpdateFamilyMember(ctx, id, &req)
+	req.ID = id
+
+	res, err := c.cvService.UpdateFamilyMember(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -177,7 +203,11 @@ func (c *cvController) ListFamilyMember(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	list, err := c.cvService.ListFamilyMember(ctx, accountID)
+	req := models.ListFamilyMemberRequest{
+		AccountID: accountID,
+	}
+
+	list, err := c.cvService.ListFamilyMember(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -194,7 +224,11 @@ func (c *cvController) GetFamilyMember(ctx *gin.Context) {
 		return
 	}
 
-	res, err := c.cvService.GetFamilyMember(ctx, id)
+	req := models.GetFamilyMemberRequest{
+		ID: id,
+	}
+
+	res, err := c.cvService.GetFamilyMember(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -211,7 +245,11 @@ func (c *cvController) DeleteFamilyMember(ctx *gin.Context) {
 		return
 	}
 
-	err = c.cvService.DeleteFamilyMember(ctx, id)
+	req := models.DeleteFamilyMemberRequest{
+		ID: id,
+	}
+
+	err = c.cvService.DeleteFamilyMember(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -223,9 +261,13 @@ func (c *cvController) DeleteFamilyMember(ctx *gin.Context) {
 // --- Physical and Health ---
 
 func (c *cvController) SavePhysicalAndHealth(ctx *gin.Context) {
-	var req models.PhysicalAndHealthRequest
+	var req models.SavePhysicalAndHealthRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -245,7 +287,11 @@ func (c *cvController) GetPhysicalAndHealth(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.GetPhysicalAndHealth(ctx, accountID)
+	req := models.GetPhysicalAndHealthRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.GetPhysicalAndHealth(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -257,9 +303,13 @@ func (c *cvController) GetPhysicalAndHealth(ctx *gin.Context) {
 // --- Worship and Religious Understanding ---
 
 func (c *cvController) SaveWorshipAndReligiousUnderstanding(ctx *gin.Context) {
-	var req models.WorshipAndReligiousUnderstandingRequest
+	var req models.SaveWorshipAndReligiousUnderstandingRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -279,7 +329,11 @@ func (c *cvController) GetWorshipAndReligiousUnderstanding(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.GetWorshipAndReligiousUnderstanding(ctx, accountID)
+	req := models.GetWorshipAndReligiousUnderstandingRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.GetWorshipAndReligiousUnderstanding(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -290,9 +344,13 @@ func (c *cvController) GetWorshipAndReligiousUnderstanding(ctx *gin.Context) {
 
 // --- Education ---
 func (c *cvController) CreateEducation(ctx *gin.Context) {
-	var req models.EducationRequest
+	var req models.CreateEducationRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -316,13 +374,19 @@ func (c *cvController) UpdateEducation(ctx *gin.Context) {
 		return
 	}
 
-	var req models.EducationRequest
+	var req models.UpdateEducationRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
-	res, err := c.cvService.UpdateEducation(ctx, id, &req)
+	req.ID = id
+
+	res, err := c.cvService.UpdateEducation(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -335,7 +399,11 @@ func (c *cvController) ListEducation(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.ListEducation(ctx, accountID)
+	req := models.ListEducationRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.ListEducation(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -352,7 +420,11 @@ func (c *cvController) GetEducation(ctx *gin.Context) {
 		return
 	}
 
-	res, err := c.cvService.GetEducation(ctx, id)
+	req := models.GetEducationRequest{
+		ID: id,
+	}
+
+	res, err := c.cvService.GetEducation(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -369,7 +441,11 @@ func (c *cvController) DeleteEducation(ctx *gin.Context) {
 		return
 	}
 
-	err = c.cvService.DeleteEducation(ctx, id)
+	req := models.DeleteEducationRequest{
+		ID: id,
+	}
+
+	err = c.cvService.DeleteEducation(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -380,9 +456,13 @@ func (c *cvController) DeleteEducation(ctx *gin.Context) {
 
 // --- Job ---
 func (c *cvController) CreateJob(ctx *gin.Context) {
-	var req models.JobRequest
+	var req models.CreateJobRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -406,13 +486,19 @@ func (c *cvController) UpdateJob(ctx *gin.Context) {
 		return
 	}
 
-	var req models.JobRequest
+	var req models.UpdateJobRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
-	res, err := c.cvService.UpdateJob(ctx, id, &req)
+	req.ID = id
+
+	res, err := c.cvService.UpdateJob(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -425,7 +511,11 @@ func (c *cvController) ListJob(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.ListJob(ctx, accountID)
+	req := models.ListJobRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.ListJob(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -442,7 +532,11 @@ func (c *cvController) GetJob(ctx *gin.Context) {
 		return
 	}
 
-	res, err := c.cvService.GetJob(ctx, id)
+	req := models.GetJobRequest{
+		ID: id,
+	}
+
+	res, err := c.cvService.GetJob(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -459,7 +553,11 @@ func (c *cvController) DeleteJob(ctx *gin.Context) {
 		return
 	}
 
-	err = c.cvService.DeleteJob(ctx, id)
+	req := models.DeleteJobRequest{
+		ID: id,
+	}
+
+	err = c.cvService.DeleteJob(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -470,9 +568,13 @@ func (c *cvController) DeleteJob(ctx *gin.Context) {
 
 // --- Achievement ---
 func (c *cvController) CreateAchievement(ctx *gin.Context) {
-	var req models.AchievementRequest
+	var req models.CreateAchievementRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
@@ -496,13 +598,19 @@ func (c *cvController) UpdateAchievement(ctx *gin.Context) {
 		return
 	}
 
-	var req models.AchievementRequest
+	var req models.UpdateAchievementRequest
 	if err := ctx.ShouldBindJSON(&req); err != nil {
-		response.HandleError(ctx, err)
+		response.HandleError(ctx, models.Exception{
+			Message:    "Invalid body request",
+			BadRequest: true,
+			Err:        err,
+		})
 		return
 	}
 
-	res, err := c.cvService.UpdateAchievement(ctx, id, &req)
+	req.ID = id
+
+	res, err := c.cvService.UpdateAchievement(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -515,7 +623,11 @@ func (c *cvController) ListAchievement(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.ListAchievement(ctx, accountID)
+	req := models.ListAchievementRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.ListAchievement(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -532,7 +644,11 @@ func (c *cvController) GetAchievement(ctx *gin.Context) {
 		return
 	}
 
-	res, err := c.cvService.GetAchievement(ctx, id)
+	req := models.GetAchievementRequest{
+		ID: id,
+	}
+
+	res, err := c.cvService.GetAchievement(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -549,7 +665,11 @@ func (c *cvController) DeleteAchievement(ctx *gin.Context) {
 		return
 	}
 
-	err = c.cvService.DeleteAchievement(ctx, id)
+	req := models.DeleteAchievementRequest{
+		ID: id,
+	}
+
+	err = c.cvService.DeleteAchievement(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return
@@ -576,11 +696,15 @@ func (c *cvController) UploadProfileImage(ctx *gin.Context) {
 	response.HandleSuccess(ctx, http.StatusOK, "Profile image uploaded successfully", res, nil)
 }
 
-func (c *cvController) GetProgress(ctx *gin.Context) {
+func (c *cvController) GetProgressCV(ctx *gin.Context) {
 	accountData := middleware.GetAccountData(ctx)
 	accountID := int64(accountData.UserID)
 
-	res, err := c.cvService.GetProgress(ctx, accountID)
+	req := models.GetProgressCVRequest{
+		AccountID: accountID,
+	}
+
+	res, err := c.cvService.GetProgressCV(ctx, &req)
 	if err != nil {
 		response.HandleError(ctx, err)
 		return

space/models/database_orm_model.go

@@ -231,43 +231,43 @@ type (
 	}
 
 	PhysicalAndHealthCV 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"`
-		HeightInCm       *int      `gorm:"column:height_cm" json:"height_cm"`                  // Tinggi badan dalam satuan sentimeter
-		WeightInKg       *int      `gorm:"column:weight_kg" json:"weight_kg"`                  // Berat badan dalam satuan kilogram
-		BodyShape        *string   `gorm:"column:body_shape" json:"body_shape"`                // Bentuk tubuh
-		SkinColor        *string   `gorm:"column:skin_color" json:"skin_color"`                // Warna kulit
-		HairType         *string   `gorm:"column:hair_type" json:"hair_type"`                  // Tipe rambut
-		MedicalHistory   *string   `gorm:"column:medical_history" json:"medical_history"`      // Riwayat penyakit
-		PhysicalDisorder *string   `gorm:"column:physical_disorder" json:"physical_disorder"`  // Cacat fisik
-		PhysicalTraits   *string   `gorm:"column:physical_traits" json:"physical_traits"`      // Ciri khas fisik
-		CreatedAt        time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"` // Waktu data dibuat
-		UpdatedAt        time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"` // Waktu data terakhir diperbarui
+		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"`
+		HeightInCm       *int            `gorm:"column:height_cm" json:"height_cm"`                                 // Tinggi badan dalam satuan sentimeter
+		WeightInKg       *int            `gorm:"column:weight_kg" json:"weight_kg"`                                 // Berat badan dalam satuan kilogram
+		BodyShape        *string         `gorm:"column:body_shape" json:"body_shape"`                               // Bentuk tubuh
+		SkinColor        *string         `gorm:"column:skin_color" json:"skin_color"`                               // Warna kulit
+		HairType         *string         `gorm:"column:hair_type" json:"hair_type"`                                 // Tipe rambut
+		MedicalHistory   *pq.StringArray `gorm:"column:medical_history;type:varchar(255)[]" json:"medical_history"` // Riwayat penyakit
+		PhysicalDisorder *string         `gorm:"column:physical_disorder" json:"physical_disorder"`                 // Cacat fisik
+		PhysicalTraits   *string         `gorm:"column:physical_traits" json:"physical_traits"`                     // Ciri khas fisik
+		CreatedAt        time.Time       `gorm:"column:created_at;autoCreateTime" json:"created_at"`                // Waktu data dibuat
+		UpdatedAt        time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`                // Waktu data terakhir diperbarui
 		FieldCounter
 	}
 
 	WorshipAndReligiousUnderstandingCV 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"`
-		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"`
-		UpdatedAt                  time.Time      `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+		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"`
+		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"`
+		UpdatedAt                  time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
 		FieldCounter
 	}
 
@@ -285,16 +285,16 @@ type (
 	}
 
 	JobCV struct {
-		ID                 int64          `gorm:"column:id;primaryKey;autoIncrement" json:"id"`                              // id
-		AccountID          int64          `gorm:"column:account_id;not null" json:"account_id"`                              // id akun
-		Account            *Account       `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"` // relasi ke akun
-		InstitutionName    *string        `gorm:"column:institution_name" json:"institution_name"`                           // nama instansi
-		CurrentJob         *string        `gorm:"column:current_job" json:"current_job"`                                     // pekerjaan saat ini
-		YearStartedWorking *int           `gorm:"column:year_started_working" json:"year_started_working"`                   // tahun mulai bekerja
-		MonthlyIncome      *string        `gorm:"column:monthly_income" json:"monthly_income"`                               // penghasilan per bulan
-		IncomeSources      pq.StringArray `gorm:"column:income_sources;type:varchar(255)[]" json:"income_sources"`           // sumber penghasilan
-		CreatedAt          time.Time      `gorm:"column:created_at;autoCreateTime" json:"created_at"`                        // tanggal dibuat
-		UpdatedAt          time.Time      `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`                        // tanggal diperbarui
+		ID                 int64           `gorm:"column:id;primaryKey;autoIncrement" json:"id"`                              // id
+		AccountID          int64           `gorm:"column:account_id;not null" json:"account_id"`                              // id akun
+		Account            *Account        `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"` // relasi ke akun
+		InstitutionName    *string         `gorm:"column:institution_name" json:"institution_name"`                           // nama instansi
+		CurrentJob         *string         `gorm:"column:current_job" json:"current_job"`                                     // pekerjaan saat ini
+		YearStartedWorking *int            `gorm:"column:year_started_working" json:"year_started_working"`                   // tahun mulai bekerja
+		MonthlyIncome      *string         `gorm:"column:monthly_income" json:"monthly_income"`                               // penghasilan per bulan
+		IncomeSources      *pq.StringArray `gorm:"column:income_sources;type:varchar(255)[]" json:"income_sources"`           // sumber penghasilan
+		CreatedAt          time.Time       `gorm:"column:created_at;autoCreateTime" json:"created_at"`                        // tanggal dibuat
+		UpdatedAt          time.Time       `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`                        // tanggal diperbarui
 	}
 
 	AchievementCV struct {
@@ -339,6 +339,55 @@ func (w WorshipAndReligiousUnderstandingCV) GetFilledFields() []string {
 	return w.FieldCounter.GetFilledFields(w)
 }
 
+type (
+	MarriageReadinessProfile 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"`
+
+		// 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?
+
+		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" }
@@ -369,3 +418,6 @@ func (WorshipAndReligiousUnderstandingCV) TableName() string {
 func (EducationCV) TableName() string   { return "education_cv" }
 func (JobCV) TableName() string         { return "job_cv" }
 func (AchievementCV) TableName() string { return "achievement_cv" }
+func (MarriageReadinessProfile) TableName() string {
+	return "marriage_readiness_profile"
+}

space/models/request_model.go

@@ -58,8 +58,9 @@ type AnswerQuizRequest struct {
 }
 
 type (
-	PersonalityAndPreferenceCVRequest struct {
-		AccountID             int64   `json:"-"`
+	SavePersonalityAndPreferenceRequest struct {
+		AccountID int64 `json:"-"`
+
 		PositiveTraits        *string `json:"positive_traits"`                              // sifat positif
 		NegativeTraits        *string `json:"negative_traits"`                              // sifat negatif
 		Hobbies               *string `json:"hobbies"`                                      // hobi
@@ -76,8 +77,25 @@ type (
 		MonthlyExpenses       *string `json:"monthly_expenses" validate:"monthly_expenses"` // pengeluaran per bulan
 	}
 
-	FamilyMemberRequest struct {
-		AccountID     int64   `json:"-"`
+	GetPersonalityAndPreferenceRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	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)
+		Religion      *string `json:"religion" validate:"religion"`             // Agama
+		Job           *string `json:"job"`                                      // Pekerjaan
+		LastEducation *string `json:"last_education" validate:"last_education"` // Pendidikan terakhir
+		Age           *int    `json:"age"`                                      // Usia
+	}
+
+	UpdateFamilyMemberRequest struct {
+		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)
 		Religion      *string `json:"religion" validate:"religion"`             // Agama
@@ -86,19 +104,35 @@ type (
 		Age           *int    `json:"age"`                                      // Usia
 	}
 
-	PhysicalAndHealthRequest struct {
-		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
-		MedicalHistory   *string `json:"medical_history"`                  // Riwayat penyakit
-		PhysicalDisorder *string `json:"physical_disorder"`                // Cacat fisik
-		PhysicalTraits   *string `json:"physical_traits"`                  // Ciri khas fisik
+	ListFamilyMemberRequest struct {
+		AccountID int64 `json:"-"`
 	}
 
-	AccountDetailsRequest struct {
+	GetFamilyMemberRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	DeleteFamilyMemberRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	SavePhysicalAndHealthRequest struct {
+		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
+		MedicalHistory   *pq.StringArray `json:"medical_history"`                  // Riwayat penyakit
+		PhysicalDisorder *string         `json:"physical_disorder"`                // Cacat fisik
+		PhysicalTraits   *string         `json:"physical_traits"`                  // Ciri khas fisik
+	}
+
+	GetPhysicalAndHealthRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	SaveAccountDetailsRequest struct {
 		AccountID     int64      `json:"-"`
 		FullName      *string    `json:"full_name"`
 		Gender        *string    `json:"gender" validate:"gender"`
@@ -111,27 +145,45 @@ type (
 		PhoneNumber   *string    `json:"phone_number" validate:"phone_number"`
 	}
 
-	WorshipAndReligiousUnderstandingRequest 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
-	}
-
-	EducationRequest struct {
-		AccountID          int64   `json:"account_id"`
+	GetAccountDetailsRequest struct {
+		AccountID int64 `json:"account_id"`
+	}
+
+	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
+	}
+
+	GetWorshipAndReligiousUnderstandingRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	CreateEducationRequest struct {
+		AccountID          int64   `json:"-"`
+		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
+		YearGraduate       *int    `json:"year_graduate"`                            // tahun lulus
+	}
+
+	UpdateEducationRequest struct {
+		ID                 int64   `json:"-"`
+		AccountID          int64   `json:"-"`
 		LastEducation      *string `json:"last_education" validate:"last_education"` // pendidikan terakhir
 		EducationInstitute *string `json:"education_institute"`                      // institusi pendidikan
 		EducationMajor     *string `json:"education_major"`                          // jurusan pendidikan
@@ -139,20 +191,72 @@ type (
 		YearGraduate       *int    `json:"year_graduate"`                            // tahun lulus
 	}
 
-	JobRequest struct {
-		AccountID          int64          `json:"account_id"`
-		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
-		IncomeSources      pq.StringArray `json:"income_sources"`                           // sumber penghasilan
+	ListEducationRequest struct {
+		AccountID int64 `json:"-"`
 	}
 
-	AchievementRequest struct {
+	GetEducationRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	DeleteEducationRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	CreateJobRequest struct {
+		AccountID          int64           `json:"account_id"`
+		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
+		IncomeSources      *pq.StringArray `json:"income_sources"`                           // sumber penghasilan
+	}
+
+	UpdateJobRequest struct {
+		ID                 int64           `json:"-"`
+		AccountID          int64           `json:"-"`
+		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
+		IncomeSources      *pq.StringArray `json:"income_sources"`                           // sumber penghasilan
+	}
+
+	ListJobRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	GetJobRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	DeleteJobRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	CreateAchievementRequest struct {
 		AccountID          int64   `json:"account_id"`
 		AchievementOrAward *string `json:"achievement_or_award"` // prestasi atau penghargaan
 	}
 
+	UpdateAchievementRequest struct {
+		ID                 int64   `json:"-"`
+		AccountID          int64   `json:"-"`
+		AchievementOrAward *string `json:"achievement_or_award"` // prestasi atau penghargaan
+	}
+
+	ListAchievementRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	GetAchievementRequest struct {
+		ID int64 `json:"-"`
+	}
+
+	DeleteAchievementRequest struct {
+		ID int64 `json:"-"`
+	}
+
 	UploadProfileImageRequest struct {
 		AccountID int64
 		File      *multipart.FileHeader
@@ -162,7 +266,11 @@ type (
 		URL string `json:"url"`
 	}
 
-	ProgressResponse struct {
+	GetProgressCVRequest struct {
+		AccountID int64 `json:"-"`
+	}
+
+	GetProgressCVResponse struct {
 		AccountDetailsProgress                     float64 `json:"account_details_progress"`
 		PersonalityAndPreferenceCVProgress         float64 `json:"personality_and_preference_cv_progress"`
 		FamilyMemberCVProgress                     float64 `json:"family_member_cv_progress"`
@@ -174,3 +282,49 @@ type (
 		TotalProgress                              float64 `json:"total_progress"`
 	}
 )
+
+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 GetMarriageReadinessProfileRequest struct {
+	AccountID int64 `json:"-"`
+}

space/pkg/validation/validation.go

@@ -3,6 +3,7 @@ package validation
 import (
 	"errors"
 	"fmt"
+	"reflect"
 	"strings"
 
 	"github.com/go-playground/locales/en"
@@ -129,10 +130,12 @@ 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
 }
 
@@ -147,9 +150,15 @@ func TranslateError(err error) []ErrorMessage {
 		return nil
 	}
 
-	errorMessages := make([]ErrorMessage, 0, len(validationErrors))
+	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"

space/router/cv_route.go

@@ -42,6 +42,6 @@ func (s *Server) CVRoute() {
 		routerGroup.PUT("/achievements/:id", s.cvController.UpdateAchievement)
 		routerGroup.DELETE("/achievements/:id", s.cvController.DeleteAchievement)
 
-		routerGroup.GET("/progress", s.cvController.GetProgress)
+		routerGroup.GET("/progress", s.cvController.GetProgressCV)
 	}
 }

space/services/cv_service.go

@@ -11,48 +11,49 @@ import (
 	"api.qobiltu.id/pkg/validation"
 	"api.qobiltu.id/repositories"
 	"api.qobiltu.id/response"
+	"api.qobiltu.id/utils"
 	"gorm.io/gorm"
 )
 
 type CVService interface {
-	SaveAccountDetails(ctx context.Context, req *models.AccountDetailsRequest) (*models.AccountDetails, error)
-	GetAccountDetails(ctx context.Context, id int64) (*models.AccountDetails, error)
-
-	SavePersonalityAndPreference(ctx context.Context, req *models.PersonalityAndPreferenceCVRequest) (*models.PersonalityAndPreferenceCV, error)
-	GetPersonalityAndPreference(ctx context.Context, id int64) (*models.PersonalityAndPreferenceCV, error)
-
-	CreateFamilyMember(ctx context.Context, req *models.FamilyMemberRequest) (*models.FamilyMemberCV, error)
-	UpdateFamilyMember(ctx context.Context, id int64, req *models.FamilyMemberRequest) (*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.PhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error)
-	GetPhysicalAndHealth(ctx context.Context, id int64) (*models.PhysicalAndHealthCV, error)
-
-	SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.WorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error)
-	GetWorshipAndReligiousUnderstanding(ctx context.Context, id int64) (*models.WorshipAndReligiousUnderstandingCV, error)
-
-	CreateEducation(ctx context.Context, req *models.EducationRequest) (*models.EducationCV, error)
-	UpdateEducation(ctx context.Context, id int64, req *models.EducationRequest) (*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
-
-	CreateJob(ctx context.Context, req *models.JobRequest) (*models.JobCV, error)
-	UpdateJob(ctx context.Context, id int64, req *models.JobRequest) (*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
-
-	CreateAchievement(ctx context.Context, req *models.AchievementRequest) (*models.AchievementCV, error)
-	UpdateAchievement(ctx context.Context, id int64, req *models.AchievementRequest) (*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.SaveAccountDetailsRequest) (*models.AccountDetails, error)
+	GetAccountDetails(ctx context.Context, req *models.GetAccountDetailsRequest) (*models.AccountDetails, error)
+
+	SavePersonalityAndPreference(ctx context.Context, req *models.SavePersonalityAndPreferenceRequest) (*models.PersonalityAndPreferenceCV, error)
+	GetPersonalityAndPreference(ctx context.Context, req *models.GetPersonalityAndPreferenceRequest) (*models.PersonalityAndPreferenceCV, error)
+
+	CreateFamilyMember(ctx context.Context, req *models.CreateFamilyMemberRequest) (*models.FamilyMemberCV, error)
+	UpdateFamilyMember(ctx context.Context, req *models.UpdateFamilyMemberRequest) (*models.FamilyMemberCV, error)
+	ListFamilyMember(ctx context.Context, req *models.ListFamilyMemberRequest) ([]models.FamilyMemberCV, error)
+	GetFamilyMember(ctx context.Context, req *models.GetFamilyMemberRequest) (*models.FamilyMemberCV, error)
+	DeleteFamilyMember(ctx context.Context, req *models.DeleteFamilyMemberRequest) error
+
+	SavePhysicalAndHealth(ctx context.Context, req *models.SavePhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error)
+	GetPhysicalAndHealth(ctx context.Context, req *models.GetPhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error)
+
+	SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.SaveWorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error)
+	GetWorshipAndReligiousUnderstanding(ctx context.Context, req *models.GetWorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error)
+
+	CreateEducation(ctx context.Context, req *models.CreateEducationRequest) (*models.EducationCV, error)
+	UpdateEducation(ctx context.Context, req *models.UpdateEducationRequest) (*models.EducationCV, error)
+	ListEducation(ctx context.Context, req *models.ListEducationRequest) ([]models.EducationCV, error)
+	GetEducation(ctx context.Context, req *models.GetEducationRequest) (*models.EducationCV, error)
+	DeleteEducation(ctx context.Context, req *models.DeleteEducationRequest) error
+
+	CreateJob(ctx context.Context, req *models.CreateJobRequest) (*models.JobCV, error)
+	UpdateJob(ctx context.Context, req *models.UpdateJobRequest) (*models.JobCV, error)
+	ListJob(ctx context.Context, req *models.ListJobRequest) ([]models.JobCV, error)
+	GetJob(ctx context.Context, req *models.GetJobRequest) (*models.JobCV, error)
+	DeleteJob(ctx context.Context, req *models.DeleteJobRequest) error
+
+	CreateAchievement(ctx context.Context, req *models.CreateAchievementRequest) (*models.AchievementCV, error)
+	UpdateAchievement(ctx context.Context, req *models.UpdateAchievementRequest) (*models.AchievementCV, error)
+	ListAchievement(ctx context.Context, req *models.ListAchievementRequest) ([]models.AchievementCV, error)
+	GetAchievement(ctx context.Context, req *models.GetAchievementRequest) (*models.AchievementCV, error)
+	DeleteAchievement(ctx context.Context, req *models.DeleteAchievementRequest) error
 
 	UploadProfileImage(ctx context.Context, req *models.UploadProfileImageRequest) (*models.UploadProfileImageResponse, error)
-	GetProgress(ctx context.Context, accountID int64) (*models.ProgressResponse, error)
+	GetProgressCV(ctx context.Context, req *models.GetProgressCVRequest) (*models.GetProgressCVResponse, error)
 }
 
 type cvService struct {
@@ -67,7 +68,9 @@ func NewCVService(cvRepository repositories.CVRepository, storage storage.Storag
 	}
 }
 
-func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.AccountDetailsRequest) (*models.AccountDetails, error) {
+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 {
 		return nil, response.HandleValidationError(err)
 	}
@@ -84,14 +87,15 @@ func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.AccountD
 	}
 
 	accountDetails.AccountID = uint(req.AccountID)
-	accountDetails.FullName = req.FullName
-	accountDetails.Gender = req.Gender
-	accountDetails.DateOfBirth = req.DateOfBirth
-	accountDetails.PlaceOfBirth = req.PlaceOfBirth
-	accountDetails.Domicile = req.Domicile
-	accountDetails.MaritalStatus = req.MaritalStatus
-	accountDetails.LastEducation = req.LastEducation
-	accountDetails.LastJob = req.LastJob
+
+	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)
+	utils.AssignIfNotNil(&accountDetails.MaritalStatus, req.MaritalStatus)
+	utils.AssignIfNotNil(&accountDetails.LastEducation, req.LastEducation)
+	utils.AssignIfNotNil(&accountDetails.LastJob, req.LastJob)
 
 	if req.PhoneNumber != nil {
 		sanitizedPhone := validation.SanitizePhoneNumber(*req.PhoneNumber)
@@ -107,15 +111,15 @@ func (s *cvService) SaveAccountDetails(ctx context.Context, req *models.AccountD
 	return res, nil
 }
 
-func (s *cvService) GetAccountDetails(ctx context.Context, id int64) (*models.AccountDetails, error) {
-	res, err := s.cvRepository.GetAccountDetailsByAccountID(ctx, id)
+func (s *cvService) GetAccountDetails(ctx context.Context, req *models.GetAccountDetailsRequest) (*models.AccountDetails, error) {
+	res, err := s.cvRepository.GetAccountDetailsByAccountID(ctx, req.AccountID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data diri tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) SavePersonalityAndPreference(ctx context.Context, req *models.PersonalityAndPreferenceCVRequest) (*models.PersonalityAndPreferenceCV, error) {
+func (s *cvService) SavePersonalityAndPreference(ctx context.Context, req *models.SavePersonalityAndPreferenceRequest) (*models.PersonalityAndPreferenceCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -132,20 +136,21 @@ func (s *cvService) SavePersonalityAndPreference(ctx context.Context, req *model
 	}
 
 	personalityAndPreference.AccountID = req.AccountID
-	personalityAndPreference.PositiveTraits = req.PositiveTraits
-	personalityAndPreference.NegativeTraits = req.NegativeTraits
-	personalityAndPreference.Hobbies = req.Hobbies
-	personalityAndPreference.LifeGoals = req.LifeGoals
-	personalityAndPreference.DailyActivities = req.DailyActivities
-	personalityAndPreference.LeisureActivities = req.LeisureActivities
-	personalityAndPreference.Likes = req.Likes
-	personalityAndPreference.Dislikes = req.Dislikes
-	personalityAndPreference.StressHandling = req.StressHandling
-	personalityAndPreference.AngerTriggers = req.AngerTriggers
-	personalityAndPreference.FavoriteFoodAndDrinks = req.FavoriteFoodAndDrinks
-	personalityAndPreference.CanCook = req.CanCook
-	personalityAndPreference.TypesOfDishesCooked = req.TypesOfDishesCooked
-	personalityAndPreference.MonthlyExpenses = req.MonthlyExpenses
+
+	utils.AssignIfNotNil(&personalityAndPreference.PositiveTraits, req.PositiveTraits)
+	utils.AssignIfNotNil(&personalityAndPreference.NegativeTraits, req.NegativeTraits)
+	utils.AssignIfNotNil(&personalityAndPreference.Hobbies, req.Hobbies)
+	utils.AssignIfNotNil(&personalityAndPreference.LifeGoals, req.LifeGoals)
+	utils.AssignIfNotNil(&personalityAndPreference.DailyActivities, req.DailyActivities)
+	utils.AssignIfNotNil(&personalityAndPreference.LeisureActivities, req.LeisureActivities)
+	utils.AssignIfNotNil(&personalityAndPreference.Likes, req.Likes)
+	utils.AssignIfNotNil(&personalityAndPreference.Dislikes, req.Dislikes)
+	utils.AssignIfNotNil(&personalityAndPreference.StressHandling, req.StressHandling)
+	utils.AssignIfNotNil(&personalityAndPreference.AngerTriggers, req.AngerTriggers)
+	utils.AssignIfNotNil(&personalityAndPreference.FavoriteFoodAndDrinks, req.FavoriteFoodAndDrinks)
+	utils.AssignIfNotNil(&personalityAndPreference.CanCook, req.CanCook)
+	utils.AssignIfNotNil(&personalityAndPreference.TypesOfDishesCooked, req.TypesOfDishesCooked)
+	utils.AssignIfNotNil(&personalityAndPreference.MonthlyExpenses, req.MonthlyExpenses)
 
 	res, err := s.cvRepository.SavePersonalityAndPreference(ctx, personalityAndPreference)
 	if err != nil {
@@ -155,8 +160,8 @@ func (s *cvService) SavePersonalityAndPreference(ctx context.Context, req *model
 	return res, nil
 }
 
-func (s *cvService) GetPersonalityAndPreference(ctx context.Context, id int64) (*models.PersonalityAndPreferenceCV, error) {
-	res, err := s.cvRepository.GetPersonalityAndPreferenceByAccountID(ctx, id)
+func (s *cvService) GetPersonalityAndPreference(ctx context.Context, req *models.GetPersonalityAndPreferenceRequest) (*models.PersonalityAndPreferenceCV, error) {
+	res, err := s.cvRepository.GetPersonalityAndPreferenceByAccountID(ctx, req.AccountID)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
@@ -164,7 +169,7 @@ func (s *cvService) GetPersonalityAndPreference(ctx context.Context, id int64) (
 	return res, nil
 }
 
-func (s *cvService) CreateFamilyMember(ctx context.Context, req *models.FamilyMemberRequest) (*models.FamilyMemberCV, error) {
+func (s *cvService) CreateFamilyMember(ctx context.Context, req *models.CreateFamilyMemberRequest) (*models.FamilyMemberCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -183,62 +188,62 @@ func (s *cvService) CreateFamilyMember(ctx context.Context, req *models.FamilyMe
 	// Simpan ke repository
 	res, err := s.cvRepository.SaveFamilyMember(ctx, familyMember)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal menyimpan anggota keluarga")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return res, nil
 }
 
-func (s *cvService) ListFamilyMember(ctx context.Context, accountID int64) ([]models.FamilyMemberCV, error) {
-	list, err := s.cvRepository.ListFamilyMember(ctx, accountID)
+func (s *cvService) ListFamilyMember(ctx context.Context, req *models.ListFamilyMemberRequest) ([]models.FamilyMemberCV, error) {
+	list, err := s.cvRepository.ListFamilyMember(ctx, req.AccountID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal mengambil daftar anggota keluarga")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return list, nil
 }
 
-func (s *cvService) GetFamilyMember(ctx context.Context, id int64) (*models.FamilyMemberCV, error) {
-	res, err := s.cvRepository.GetFamilyMember(ctx, id)
+func (s *cvService) GetFamilyMember(ctx context.Context, req *models.GetFamilyMemberRequest) (*models.FamilyMemberCV, error) {
+	res, err := s.cvRepository.GetFamilyMember(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data anggota keluarga tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) DeleteFamilyMember(ctx context.Context, id int64) error {
-	err := s.cvRepository.DeleteFamilyMember(ctx, id)
+func (s *cvService) DeleteFamilyMember(ctx context.Context, req *models.DeleteFamilyMemberRequest) error {
+	err := s.cvRepository.DeleteFamilyMember(ctx, req.ID)
 	if err != nil {
-		return response.HandleGormError(err, "Gagal menghapus anggota keluarga")
+		return response.HandleGormError(err, "Internal Server Error")
 	}
 	return nil
 }
 
-func (s *cvService) UpdateFamilyMember(ctx context.Context, id int64, req *models.FamilyMemberRequest) (*models.FamilyMemberCV, error) {
+func (s *cvService) UpdateFamilyMember(ctx context.Context, req *models.UpdateFamilyMemberRequest) (*models.FamilyMemberCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
-	existing, err := s.cvRepository.GetFamilyMember(ctx, id)
+	existing, err := s.cvRepository.GetFamilyMember(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data anggota keluarga tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	existing.Role = req.Role
-	existing.Status = req.Status
-	existing.Religion = req.Religion
-	existing.Job = req.Job
-	existing.LastEducation = req.LastEducation
-	existing.Age = req.Age
+	utils.AssignIfNotNil(&existing.Role, req.Role)
+	utils.AssignIfNotNil(&existing.Status, req.Status)
+	utils.AssignIfNotNil(&existing.Religion, req.Religion)
+	utils.AssignIfNotNil(&existing.Job, req.Job)
+	utils.AssignIfNotNil(&existing.LastEducation, req.LastEducation)
+	utils.AssignIfNotNil(&existing.Age, req.Age)
 
 	updated, err := s.cvRepository.SaveFamilyMember(ctx, existing)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal memperbarui anggota keluarga")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return updated, nil
 }
 
-func (s *cvService) SavePhysicalAndHealth(ctx context.Context, req *models.PhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error) {
+func (s *cvService) SavePhysicalAndHealth(ctx context.Context, req *models.SavePhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -246,7 +251,7 @@ func (s *cvService) SavePhysicalAndHealth(ctx context.Context, req *models.Physi
 	// Cek apakah data sudah ada berdasarkan account_id
 	existing, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, req.AccountID)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, response.HandleGormError(err, "Terjadi kesalahan saat mengambil data fisik dan kesehatan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	// Jika belum ada, buat objek baru
@@ -256,33 +261,34 @@ func (s *cvService) SavePhysicalAndHealth(ctx context.Context, req *models.Physi
 
 	// Mapping field dari request
 	existing.AccountID = req.AccountID
-	existing.HeightInCm = req.HeightInCm
-	existing.WeightInKg = req.WeightInKg
-	existing.BodyShape = req.BodyShape
-	existing.SkinColor = req.SkinColor
-	existing.HairType = req.HairType
-	existing.MedicalHistory = req.MedicalHistory
-	existing.PhysicalDisorder = req.PhysicalDisorder
-	existing.PhysicalTraits = req.PhysicalTraits
+
+	utils.AssignIfNotNil(&existing.HeightInCm, req.HeightInCm)
+	utils.AssignIfNotNil(&existing.WeightInKg, req.WeightInKg)
+	utils.AssignIfNotNil(&existing.BodyShape, req.BodyShape)
+	utils.AssignIfNotNil(&existing.SkinColor, req.SkinColor)
+	utils.AssignIfNotNil(&existing.HairType, req.HairType)
+	utils.AssignIfNotNil(&existing.MedicalHistory, req.MedicalHistory)
+	utils.AssignIfNotNil(&existing.PhysicalDisorder, req.PhysicalDisorder)
+	utils.AssignIfNotNil(&existing.PhysicalTraits, req.PhysicalTraits)
 
 	// Simpan data
 	res, err := s.cvRepository.SavePhysicalAndHealth(ctx, existing)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal menyimpan data fisik dan kesehatan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return res, nil
 }
 
-func (s *cvService) GetPhysicalAndHealth(ctx context.Context, id int64) (*models.PhysicalAndHealthCV, error) {
-	res, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, id)
+func (s *cvService) GetPhysicalAndHealth(ctx context.Context, req *models.GetPhysicalAndHealthRequest) (*models.PhysicalAndHealthCV, error) {
+	res, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, req.AccountID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data fisik dan kesehatan tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.WorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error) {
+func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, req *models.SaveWorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -290,7 +296,7 @@ func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, re
 	// Cek apakah data sudah ada berdasarkan account_id
 	worshipAndReligiousUnderstanding, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, req.AccountID)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, response.HandleGormError(err, "Terjadi kesalahan saat mengambil data agama dan pemahaman agama")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	// Jika belum ada, buat objek baru
@@ -300,21 +306,22 @@ func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, re
 
 	// Mapping field dari request
 	worshipAndReligiousUnderstanding.AccountID = req.AccountID
-	worshipAndReligiousUnderstanding.ObligatoryPrayer = req.ObligatoryPrayer
-	worshipAndReligiousUnderstanding.CongregationalPrayer = req.CongregationalPrayer
-	worshipAndReligiousUnderstanding.TahajjudPrayer = req.TahajjudPrayer
-	worshipAndReligiousUnderstanding.DhuhaPrayer = req.DhuhaPrayer
-	worshipAndReligiousUnderstanding.QuranMemorization = req.QuranMemorization
-	worshipAndReligiousUnderstanding.QuranReadingAbility = req.QuranReadingAbility
-	worshipAndReligiousUnderstanding.DaudFasting = req.DaudFasting
-	worshipAndReligiousUnderstanding.AyyamulBidhFasting = req.AyyamulBidhFasting
-	worshipAndReligiousUnderstanding.HajjOrUmrah = req.HajjOrUmrah
-	worshipAndReligiousUnderstanding.ListeningToMusic = req.ListeningToMusic
-	worshipAndReligiousUnderstanding.OpinionOnIkhtilat = req.OpinionOnIkhtilat
-	worshipAndReligiousUnderstanding.OpinionOnTouchingNonMahram = req.OpinionOnTouchingNonMahram
-	worshipAndReligiousUnderstanding.OpinionOnVeil = req.OpinionOnVeil
-	worshipAndReligiousUnderstanding.WeeklyReligiousStudies = req.WeeklyReligiousStudies
-	worshipAndReligiousUnderstanding.FollowedUstadz = req.FollowedUstadz
+
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.ObligatoryPrayer, req.ObligatoryPrayer)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.CongregationalPrayer, req.CongregationalPrayer)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.TahajjudPrayer, req.TahajjudPrayer)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.DhuhaPrayer, req.DhuhaPrayer)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.QuranMemorization, req.QuranMemorization)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.QuranReadingAbility, req.QuranReadingAbility)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.DaudFasting, req.DaudFasting)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.AyyamulBidhFasting, req.AyyamulBidhFasting)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.HajjOrUmrah, req.HajjOrUmrah)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.ListeningToMusic, req.ListeningToMusic)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.OpinionOnIkhtilat, req.OpinionOnIkhtilat)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.OpinionOnTouchingNonMahram, req.OpinionOnTouchingNonMahram)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.OpinionOnVeil, req.OpinionOnVeil)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.WeeklyReligiousStudies, req.WeeklyReligiousStudies)
+	utils.AssignIfNotNil(&worshipAndReligiousUnderstanding.FollowedUstadz, req.FollowedUstadz)
 
 	// Simpan data
 	res, err := s.cvRepository.SaveWorshipAndReligiousUnderstanding(ctx, worshipAndReligiousUnderstanding)
@@ -325,15 +332,15 @@ func (s *cvService) SaveWorshipAndReligiousUnderstanding(ctx context.Context, re
 	return res, nil
 }
 
-func (s *cvService) GetWorshipAndReligiousUnderstanding(ctx context.Context, id int64) (*models.WorshipAndReligiousUnderstandingCV, error) {
-	res, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, id)
+func (s *cvService) GetWorshipAndReligiousUnderstanding(ctx context.Context, req *models.GetWorshipAndReligiousUnderstandingRequest) (*models.WorshipAndReligiousUnderstandingCV, error) {
+	res, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, req.AccountID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data agama dan pemahaman agama tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) CreateEducation(ctx context.Context, req *models.EducationRequest) (*models.EducationCV, error) {
+func (s *cvService) CreateEducation(ctx context.Context, req *models.CreateEducationRequest) (*models.EducationCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -349,52 +356,52 @@ func (s *cvService) CreateEducation(ctx context.Context, req *models.EducationRe
 
 	res, err := s.cvRepository.SaveEducation(ctx, edu)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal menambahkan data pendidikan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return res, nil
 }
 
-func (s *cvService) UpdateEducation(ctx context.Context, id int64, req *models.EducationRequest) (*models.EducationCV, error) {
+func (s *cvService) UpdateEducation(ctx context.Context, req *models.UpdateEducationRequest) (*models.EducationCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
-	edu, err := s.cvRepository.GetEducation(ctx, id)
+	edu, err := s.cvRepository.GetEducation(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data pendidikan tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	edu.LastEducation = req.LastEducation
-	edu.EducationInstitute = req.EducationInstitute
-	edu.EducationMajor = req.EducationMajor
-	edu.YearStart = req.YearStart
-	edu.YearGraduate = req.YearGraduate
+	utils.AssignIfNotNil(&edu.LastEducation, req.LastEducation)
+	utils.AssignIfNotNil(&edu.EducationInstitute, req.EducationInstitute)
+	utils.AssignIfNotNil(&edu.EducationMajor, req.EducationMajor)
+	utils.AssignIfNotNil(&edu.YearStart, req.YearStart)
+	utils.AssignIfNotNil(&edu.YearGraduate, req.YearGraduate)
 
 	res, err := s.cvRepository.SaveEducation(ctx, edu)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal memperbarui data pendidikan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) ListEducation(ctx context.Context, accountID int64) ([]models.EducationCV, error) {
-	return s.cvRepository.ListEducation(ctx, accountID)
+func (s *cvService) ListEducation(ctx context.Context, req *models.ListEducationRequest) ([]models.EducationCV, error) {
+	return s.cvRepository.ListEducation(ctx, req.AccountID)
 }
 
-func (s *cvService) GetEducation(ctx context.Context, id int64) (*models.EducationCV, error) {
-	edu, err := s.cvRepository.GetEducation(ctx, id)
+func (s *cvService) GetEducation(ctx context.Context, req *models.GetEducationRequest) (*models.EducationCV, error) {
+	edu, err := s.cvRepository.GetEducation(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data pendidikan tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return edu, nil
 }
 
-func (s *cvService) DeleteEducation(ctx context.Context, id int64) error {
-	return s.cvRepository.DeleteEducation(ctx, id)
+func (s *cvService) DeleteEducation(ctx context.Context, req *models.DeleteEducationRequest) error {
+	return s.cvRepository.DeleteEducation(ctx, req.ID)
 }
 
-func (s *cvService) CreateJob(ctx context.Context, req *models.JobRequest) (*models.JobCV, error) {
+func (s *cvService) CreateJob(ctx context.Context, req *models.CreateJobRequest) (*models.JobCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
@@ -409,93 +416,93 @@ func (s *cvService) CreateJob(ctx context.Context, req *models.JobRequest) (*mod
 	}
 	res, err := s.cvRepository.SaveJob(ctx, job)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal menambahkan data pekerjaan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) UpdateJob(ctx context.Context, id int64, req *models.JobRequest) (*models.JobCV, error) {
+func (s *cvService) UpdateJob(ctx context.Context, req *models.UpdateJobRequest) (*models.JobCV, error) {
 	if err := validation.Validate(req); err != nil {
 		return nil, response.HandleValidationError(err)
 	}
 
-	job, err := s.cvRepository.GetJob(ctx, id)
+	job, err := s.cvRepository.GetJob(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data pekerjaan tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	job.InstitutionName = req.InstitutionName
-	job.CurrentJob = req.CurrentJob
-	job.YearStartedWorking = req.YearStartedWorking
-	job.MonthlyIncome = req.MonthlyIncome
-	job.IncomeSources = req.IncomeSources
+	utils.AssignIfNotNil(&job.InstitutionName, req.InstitutionName)
+	utils.AssignIfNotNil(&job.CurrentJob, req.CurrentJob)
+	utils.AssignIfNotNil(&job.YearStartedWorking, req.YearStartedWorking)
+	utils.AssignIfNotNil(&job.MonthlyIncome, req.MonthlyIncome)
+	utils.AssignIfNotNil(&job.IncomeSources, req.IncomeSources)
 
 	res, err := s.cvRepository.SaveJob(ctx, job)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal memperbarui data pekerjaan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return res, nil
 }
 
-func (s *cvService) ListJob(ctx context.Context, accountID int64) ([]models.JobCV, error) {
-	return s.cvRepository.ListJob(ctx, accountID)
+func (s *cvService) ListJob(ctx context.Context, req *models.ListJobRequest) ([]models.JobCV, error) {
+	return s.cvRepository.ListJob(ctx, req.AccountID)
 }
 
-func (s *cvService) GetJob(ctx context.Context, id int64) (*models.JobCV, error) {
-	job, err := s.cvRepository.GetJob(ctx, id)
+func (s *cvService) GetJob(ctx context.Context, req *models.GetJobRequest) (*models.JobCV, error) {
+	job, err := s.cvRepository.GetJob(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data pekerjaan tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return job, nil
 }
 
-func (s *cvService) DeleteJob(ctx context.Context, id int64) error {
-	return s.cvRepository.DeleteJob(ctx, id)
+func (s *cvService) DeleteJob(ctx context.Context, req *models.DeleteJobRequest) error {
+	return s.cvRepository.DeleteJob(ctx, req.ID)
 }
 
-func (s *cvService) CreateAchievement(ctx context.Context, req *models.AchievementRequest) (*models.AchievementCV, error) {
+func (s *cvService) CreateAchievement(ctx context.Context, req *models.CreateAchievementRequest) (*models.AchievementCV, error) {
 	ach := &models.AchievementCV{
 		AccountID:          req.AccountID,
 		AchievementOrAward: req.AchievementOrAward,
 	}
 	res, err := s.cvRepository.SaveAchievement(ctx, ach)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal menambahkan data prestasi")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return res, nil
 }
 
-func (s *cvService) UpdateAchievement(ctx context.Context, id int64, req *models.AchievementRequest) (*models.AchievementCV, error) {
-	ach, err := s.cvRepository.GetAchievement(ctx, id)
+func (s *cvService) UpdateAchievement(ctx context.Context, req *models.UpdateAchievementRequest) (*models.AchievementCV, error) {
+	ach, err := s.cvRepository.GetAchievement(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data prestasi tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	ach.AchievementOrAward = req.AchievementOrAward
 
 	res, err := s.cvRepository.SaveAchievement(ctx, ach)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Gagal memperbarui data prestasi")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
 	return res, nil
 }
 
-func (s *cvService) ListAchievement(ctx context.Context, accountID int64) ([]models.AchievementCV, error) {
-	return s.cvRepository.ListAchievement(ctx, accountID)
+func (s *cvService) ListAchievement(ctx context.Context, req *models.ListAchievementRequest) ([]models.AchievementCV, error) {
+	return s.cvRepository.ListAchievement(ctx, req.AccountID)
 }
 
-func (s *cvService) GetAchievement(ctx context.Context, id int64) (*models.AchievementCV, error) {
-	ach, err := s.cvRepository.GetAchievement(ctx, id)
+func (s *cvService) GetAchievement(ctx context.Context, req *models.GetAchievementRequest) (*models.AchievementCV, error) {
+	ach, err := s.cvRepository.GetAchievement(ctx, req.ID)
 	if err != nil {
-		return nil, response.HandleGormError(err, "Data prestasi tidak ditemukan")
+		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 	return ach, nil
 }
 
-func (s *cvService) DeleteAchievement(ctx context.Context, id int64) error {
-	return s.cvRepository.DeleteAchievement(ctx, id)
+func (s *cvService) DeleteAchievement(ctx context.Context, req *models.DeleteAchievementRequest) error {
+	return s.cvRepository.DeleteAchievement(ctx, req.ID)
 }
 
 func (s *cvService) UploadProfileImage(ctx context.Context, req *models.UploadProfileImageRequest) (*models.UploadProfileImageResponse, error) {
@@ -569,8 +576,8 @@ func (s *cvService) UploadProfileImage(ctx context.Context, req *models.UploadPr
 	}, nil
 }
 
-func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.ProgressResponse, error) {
-	accountDetails, err := s.cvRepository.GetAccountDetailsByAccountID(ctx, accountID)
+func (s *cvService) GetProgressCV(ctx context.Context, req *models.GetProgressCVRequest) (*models.GetProgressCVResponse, error) {
+	accountDetails, err := s.cvRepository.GetAccountDetailsByAccountID(ctx, req.AccountID)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, response.HandleGormError(err, "Internal Server Error")
@@ -578,7 +585,7 @@ func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.P
 		accountDetails = &models.AccountDetails{}
 	}
 
-	personalityAndPreferenceCV, err := s.cvRepository.GetPersonalityAndPreferenceByAccountID(ctx, accountID)
+	personalityAndPreferenceCV, err := s.cvRepository.GetPersonalityAndPreferenceByAccountID(ctx, req.AccountID)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, response.HandleGormError(err, "Internal Server Error")
@@ -586,7 +593,7 @@ func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.P
 		personalityAndPreferenceCV = &models.PersonalityAndPreferenceCV{}
 	}
 
-	physicalAndHealthCV, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, accountID)
+	physicalAndHealthCV, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, req.AccountID)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, response.HandleGormError(err, "Internal Server Error")
@@ -594,7 +601,7 @@ func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.P
 		physicalAndHealthCV = &models.PhysicalAndHealthCV{}
 	}
 
-	worshipAndReligiousUnderstandingCV, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, accountID)
+	worshipAndReligiousUnderstandingCV, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, req.AccountID)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, response.HandleGormError(err, "Internal Server Error")
@@ -602,22 +609,22 @@ func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.P
 		worshipAndReligiousUnderstandingCV = &models.WorshipAndReligiousUnderstandingCV{}
 	}
 
-	educationCV, err := s.cvRepository.ListEducation(ctx, accountID)
+	educationCV, err := s.cvRepository.ListEducation(ctx, req.AccountID)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	familyMemberCV, err := s.cvRepository.ListFamilyMember(ctx, accountID)
+	familyMemberCV, err := s.cvRepository.ListFamilyMember(ctx, req.AccountID)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	jobCV, err := s.cvRepository.ListJob(ctx, accountID)
+	jobCV, err := s.cvRepository.ListJob(ctx, req.AccountID)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
 
-	achievementCV, err := s.cvRepository.ListAchievement(ctx, accountID)
+	achievementCV, err := s.cvRepository.ListAchievement(ctx, req.AccountID)
 	if err != nil {
 		return nil, response.HandleGormError(err, "Internal Server Error")
 	}
@@ -645,9 +652,9 @@ func calculateProgress(
 	familyMemberCV int,
 	jobCV int,
 	achievementCV int,
-) *models.ProgressResponse {
+) *models.GetProgressCVResponse {
 
-	// fullIfPresent returns 100 if the data is greater than 0, otherwise returns 0
+	// fullIfPresent mengembalikan 100 jika data lebih dari 0, jika tidak maka mengembalikan 0
 	fullIfPresent := func(data int) float64 {
 		if data > 0 {
 			return 100
@@ -667,7 +674,7 @@ func calculateProgress(
 
 	overallProgress := (accountDetailsPercentage + personalityAndPreferenceCVPercentage + physicalAndHealthCVPercentage + worshipAndReligiousUnderstandingCVPercentage + educationCVPercentage + familyMemberCVPercentage + jobCVPercentage + achievementCVPercentage) / 8
 
-	return &models.ProgressResponse{
+	return &models.GetProgressCVResponse{
 		AccountDetailsProgress:                     math.Round(accountDetailsPercentage*100) / 100,
 		PersonalityAndPreferenceCVProgress:         math.Round(personalityAndPreferenceCVPercentage*100) / 100,
 		FamilyMemberCVProgress:                     math.Round(familyMemberCVPercentage*100) / 100,

space/space/repositories/quiz_repository.go

@@ -129,6 +129,6 @@ func CountUserAttemptScore(attemptId uint) Repository[models.QuizAttempt, models
 	)
 	repo.Transaction.Model(&repo.Constructor).Raw("SELECT quiz_attempt_id,COUNT(*) AS total_questions,SUM(CASE WHEN is_correct = true THEN 1 ELSE 0 END) AS correct_answers,CAST(SUM(CASE WHEN is_correct = true THEN 1 ELSE 0 END) AS FLOAT) / COUNT(*) AS average_score FROM user_answers WHERE quiz_attempt_id = ? GROUP BY quiz_attempt_id", attemptId).Scan(&repo.Result)
 	repo.RowsError = repo.Transaction.Error
-	repo.NoRecord = true
+	repo.NoRecord = false
 	return *repo
 }

space/space/services/academy_quiz_answer_service.go

@@ -53,4 +53,7 @@ func (s *AnswerQuizService) Update(userID uint, questionNo int, answer int) {
 		}
 		return
 	})
+	s.Exception = QuizAttemptService.Exception
+	s.Error = errors.Join(s.Error, QuizAttemptService.Error)
+	return
 }

space/space/services/academy_quiz_question_service.go

@@ -1,6 +1,8 @@
 package services
 
 import (
+	"errors"
+
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/repositories"
 )
@@ -39,4 +41,8 @@ func (s *QuestionQuizService) Retrieve(userID uint, questionNo int) {
 		}
 		return
 	})
+
+	s.Exception = QuizAttemptService.Exception
+	s.Error = errors.Join(s.Error, QuizAttemptService.Error)
+	return
 }

space/space/services/academy_quiz_service.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"time"
 
 	"api.qobiltu.id/models"
@@ -52,7 +53,7 @@ func CheckUserAttemptLimit(s *AttemptQuizService, allAttemptsRepo repositories.R
 
 func CheckUserLatestAttempt(s *AttemptQuizService, latestAttemptRepo repositories.Repository[models.QuizAttempt, models.QuizAttempt], quizRepo repositories.Repository[models.Quiz, models.Quiz], userID uint, next func()) {
 	currentTime := time.Now()
-	if currentTime.After(latestAttemptRepo.Result.DueAt) {
+	if currentTime.After(latestAttemptRepo.Result.DueAt) && latestAttemptRepo.Result.FinishedAt == nil {
 		s.Exception.IsTimeOut = true
 		s.Exception.Message = "Your latest attempt is timeout!"
 		// Submit
@@ -127,15 +128,24 @@ func Attempt(s *AttemptQuizService, quizRepo repositories.Repository[models.Quiz
 func (s *AttemptQuizService) Create(userID uint) {
 	s.Validate(userID, func(latestAttemptRepo repositories.Repository[models.QuizAttempt, models.QuizAttempt], quizRepo repositories.Repository[models.Quiz, models.Quiz]) {
 		if latestAttemptRepo.Result.FinishedAt != nil {
-			Attempt(s, quizRepo, userID)
+			if latestAttemptRepo.Result.Score < float64(quizRepo.Result.MinScore) {
+				Attempt(s, quizRepo, userID)
+			} else {
+				s.Result = latestAttemptRepo.Result
+				return
+			}
 		} else {
 			s.Result = latestAttemptRepo.Result
+			return
 		}
 	})
 }
 
 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!"
@@ -145,7 +155,7 @@ func (s *SubmitQuizService) Create() {
 	countScoreRepo := repositories.CountUserAttemptScore(s.Constructor.ID)
 	if countScoreRepo.NoRecord {
 		s.Exception.DataNotFound = true
-		s.Exception.Message = "There is no quiz attempt with given user!"
+		s.Exception.Message = "There is no quiz attempt result with given user!"
 	}
 	s.Error = errors.Join(s.Error, countScoreRepo.RowsError)
 

space/space/space/controller/quiz/result_quiz_controller.go

@@ -0,0 +1,24 @@
+package controller
+
+import (
+	"strconv"
+
+	"api.qobiltu.id/controller"
+	"api.qobiltu.id/models"
+	"api.qobiltu.id/services"
+	"github.com/gin-gonic/gin"
+)
+
+func Result(c *gin.Context) {
+	quizResult := services.QuizResultService{}
+	quizResultController := controller.Controller[any, models.QuizAttempt, []models.QuizResultResponse]{
+		Service: &quizResult.Service,
+	}
+	quizResultController.HeaderParse(c, func() {
+		academyId, _ := strconv.Atoi(c.Param("attempt_id"))
+		quizResult.Constructor.AccountID = uint(quizResultController.AccountData.UserID)
+		quizResult.Constructor.ID = uint(academyId) | 0
+		quizResult.Retrieve()
+		quizResultController.Response(c)
+	})
+}

space/space/space/controller/quiz/submit_quiz_controller.go

@@ -15,9 +15,10 @@ func Submit(c *gin.Context) {
 		Service: &submitQuiz.Service,
 	}
 	submitQuizController.HeaderParse(c, func() {
-		quizId, _ := strconv.Atoi(c.Param("attempt_id"))
-		submitQuizController.Service.Constructor.ID = uint(quizId)
-		submitQuiz.Create(submitQuizController.AccountData.UserID)
+		attemptId, _ := strconv.Atoi(c.Param("attempt_id"))
+		submitQuizController.Service.Constructor.ID = uint(attemptId)
+		submitQuizController.Service.Constructor.AccountID = uint(submitQuizController.AccountData.UserID)
+		submitQuiz.Create()
 		submitQuizController.Response(c)
 	})
 }

space/space/space/models/database_orm_model.go

@@ -152,7 +152,8 @@ type Question struct {
 	QuizID        uint   `json:"quiz_id"`
 	Content       string `json:"content"`
 	Order         int    `json:"order"`
-	CorrectAnswer uint   `json:"-"`
+	CorrectAnswer uint   `json:"corrent_answer"`
+	Review        string `json:"reviews"`
 }
 type Quiz struct {
 	ID             uint      `gorm:"primaryKey" json:"id"`
@@ -160,7 +161,7 @@ type Quiz struct {
 	Slug           string    `json:"slug" gorm:"uniqueIndex" `
 	Title          string    `json:"title"`
 	Description    string    `json:"description"`
-	TotalQuestions string    `json:"total_questions"`
+	TotalQuestions int       `json:"total_questions"`
 	AttemptLimit   int       `json:"attempt_limit"`
 	TimeLimit      int       `json:"time_limit"`
 	MinScore       int       `json:"min_score"`
@@ -274,7 +275,7 @@ type (
 		ID                 int64     `gorm:"column:id;primaryKey;autoIncrement" json:"id"`                              // id
 		AccountID          int64     `gorm:"column:account_id;not null" json:"account_id"`                              // id akun
 		Account            *Account  `gorm:"foreignKey:AccountID;constraint:OnDelete:CASCADE" json:"account,omitempty"` // relasi ke akun
-		LastEducation      *string   `gorm:"column:last_education" json:"last_education" validate:""`                   // pendidikan terakhir
+		LastEducation      *string   `gorm:"column:last_education" json:"last_education"`                               // pendidikan terakhir
 		EducationInstitute *string   `gorm:"column:education_institute" json:"education_institute"`                     // institusi pendidikan
 		EducationMajor     *string   `gorm:"column:education_major" json:"education_major"`                             // jurusan pendidikan
 		YearStart          *int      `gorm:"column:year_start" json:"year_start"`                                       // tahun masuk

space/space/space/repositories/academy_repository.go

@@ -93,3 +93,13 @@ func GetAcademyByID(id uint) Repository[models.Academy, models.Academy] {
 	)
 	return *repo
 }
+
+func UpdateAcademyMaterialCompletedById(id_material uint) Repository[models.AcademyMaterial, models.AcademyMaterial] {
+	repo := Construct[models.AcademyMaterial, models.AcademyMaterial](
+		models.AcademyMaterial{ID: id_material, IsCompleted: true},
+	)
+	Update(repo)
+	return *repo
+}
+
+// func UpdateAcademyProgressById(id_academy uint)

space/space/space/repositories/quiz_repository.go

@@ -63,6 +63,18 @@ func GetAttemptByIdandUserId(attemptId uint, userId uint) Repository[models.Quiz
 	return *repo
 }
 
+func GetAttemptByUserId(userId uint) Repository[models.QuizAttempt, []models.QuizAttempt] {
+	repo := Construct[models.QuizAttempt, []models.QuizAttempt](
+		models.QuizAttempt{
+			AccountID: userId,
+		},
+	)
+	repo.Transactions(
+		WhereGivenConstructor[models.QuizAttempt, []models.QuizAttempt],
+		Find[models.QuizAttempt, []models.QuizAttempt],
+	)
+	return *repo
+}
 func CreateAttempt(quizAttempt models.QuizAttempt) Repository[models.QuizAttempt, models.QuizAttempt] {
 	repo := Construct[models.QuizAttempt, models.QuizAttempt](
 		quizAttempt,

space/space/space/router/quiz_route.go

@@ -13,6 +13,8 @@ func QuizRoute(router *gin.Engine) {
 		routerGroup.POST("/:academy_id/:quiz_id/attempt", middleware.AuthUser, QuizController.Attempt)
 		routerGroup.GET("/:academy_id/:quiz_id/question", middleware.AuthUser, QuizController.Question)
 		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)
 		routerGroup.POST("/submit-attempt/:attempt_id", middleware.AuthUser, QuizController.Submit)
 	}
 }

space/space/space/services/academy_quiz_service.go

@@ -20,6 +20,10 @@ type QuizListService struct {
 	Service[models.Academy, []models.Quiz]
 }
 
+type QuizResultService struct {
+	Service[models.QuizAttempt, []models.QuizResultResponse]
+}
+
 func AuthorizeQuizwithAcademy(s *AttemptQuizService, next func()) {
 	academyRepo := repositories.GetAcademyByID(s.Constructor.AcademyID)
 	s.Error = academyRepo.RowsError
@@ -130,8 +134,8 @@ func (s *AttemptQuizService) Create(userID uint) {
 	})
 }
 
-func (s *SubmitQuizService) Create(userID uint) {
-	quizAttemptRepo := repositories.GetAttemptByIdandUserId(s.Constructor.ID, userID)
+func (s *SubmitQuizService) Create() {
+	quizAttemptRepo := repositories.GetAttemptByIdandUserId(s.Constructor.ID, s.Constructor.AccountID)
 	if quizAttemptRepo.NoRecord {
 		s.Exception.DataNotFound = true
 		s.Exception.Message = "There is no quiz attempt with given user!"
@@ -139,6 +143,10 @@ func (s *SubmitQuizService) Create(userID uint) {
 	}
 	s.Error = errors.Join(s.Error, quizAttemptRepo.RowsError)
 	countScoreRepo := repositories.CountUserAttemptScore(s.Constructor.ID)
+	if countScoreRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Exception.Message = "There is no quiz attempt with given user!"
+	}
 	s.Error = errors.Join(s.Error, countScoreRepo.RowsError)
 
 	if quizAttemptRepo.Result.FinishedAt == nil {
@@ -168,3 +176,57 @@ func (s *QuizListService) Retrieve() {
 	s.Result = quizRepo.Result
 	return
 }
+
+func (s *QuizResultService) Retrieve() {
+	if s.Constructor.ID != 0 {
+		attemptRepo := repositories.GetAttemptByIdandUserId(s.Constructor.ID, s.Constructor.AccountID)
+		s.Error = attemptRepo.RowsError
+		if attemptRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no attempt with given user id"
+			return
+		}
+		if attemptRepo.Result.FinishedAt == nil {
+			s.Exception.Forbidden = true
+			s.Exception.Message = "You have to submit the exam first to see the result!"
+			return
+		}
+		countScoreRepo := repositories.CountUserAttemptScore(s.Constructor.ID)
+		s.Error = errors.Join(s.Error, countScoreRepo.RowsError)
+		if countScoreRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no quiz attempt with given user!"
+		}
+		s.Result = []models.QuizResultResponse{
+			models.QuizResultResponse{
+				QuizAttempt: attemptRepo.Result,
+				Result:      countScoreRepo.Result,
+			},
+		}
+		return
+	} else {
+		allAttemptsRepo := repositories.GetAttemptByUserId(s.Constructor.AccountID)
+		if allAttemptsRepo.NoRecord {
+			s.Exception.DataNotFound = true
+			s.Exception.Message = "There is no attempt with given user id!"
+			return
+		}
+		s.Error = allAttemptsRepo.RowsError
+		var arrResult []models.QuizResultResponse
+		for _, attempt := range allAttemptsRepo.Result {
+			if attempt.FinishedAt != nil {
+				countScoreRepo := repositories.CountUserAttemptScore(attempt.ID)
+				s.Error = errors.Join(s.Error, countScoreRepo.RowsError)
+				if countScoreRepo.NoRecord {
+					continue
+				}
+				arrResult = append(arrResult, models.QuizResultResponse{
+					QuizAttempt: attempt,
+					Result:      countScoreRepo.Result,
+				})
+			}
+		}
+		s.Result = arrResult
+		return
+	}
+}

space/space/space/services/academy_service.go

@@ -25,6 +25,10 @@ type AcademyContentService struct {
 	Service[models.AcademyMaterial, models.AcademyContent]
 }
 
+type AcademyMarkReadService struct {
+	Service[models.AcademyMaterial, models.Academy]
+}
+
 func castAcademyMaterials(academyId uint) []models.AcademyMaterialResponse {
 	var ArrMaterials []models.AcademyMaterialResponse
 	academyMaterialsRepo := repositories.GetAllAcademyMaterialsByAcademyID(academyId)
@@ -135,3 +139,12 @@ func (s *AcademyContentService) Retrieve() {
 	}
 	s.Result = academyContentRepo.Result
 }
+
+func (s *AcademyMarkReadService) Update() {
+	markReadRepo := repositories.UpdateAcademyMaterialCompletedById(s.Constructor.ID)
+	if markReadRepo.NoRecord {
+		s.Exception.DataNotFound = true
+		s.Error = markReadRepo.RowsError
+		return
+	}
+}

space/space/space/space/.env.example

@@ -1,9 +1,26 @@
-DB_HOST =
-DB_USER =
-DB_PASSWORD =
-DB_PORT =
-DB_NAME =
-SALT =
-HOST_ADDRESS = 
-HOST_PORT = 
-LOG_PATH = logs
+APP_URL=https://api.qobiltu.id
+ENV=production
+
+DB_HOST=db
+DB_USER=qobiltu
+DB_PASSWORD=
+DB_PORT=
+DB_NAME=
+SALT=
+HOST_ADDRESS=
+HOST_PORT=
+LOG_PATH=logs
+
+SMTP_SENDER_EMAIL=
+SMTP_SENDER_PASSWORD=
+SMTP_HOST=
+SMTP_PORT=
+EMAIL_VERIFICATION_DURATION=
+
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_PASSWORD=
+REDIS_DB=0
+REDIS_MIN_IDLE_CONNS=10
+REDIS_POOL_SIZE=10
+REDIS_POOL_TIMEOUT=30s

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

@@ -32,7 +32,7 @@ var inMemoryOptions = map[string][]string{
 	"body_shape":            {"Ideal", "Kurus", "Berisi", "Gemuk"},
 	"skin_color":            {"Putih", "Kuning Langsat", "Sawo Matang"},
 	"hair_type":             {"Lurus", "Bergelombang", "Keriting"},
-	"frequently":            {"Selalu", "Sering", "Kadang", "Jarang"},
+	"frequently":            {"Selalu", "Sering", "Kadang", "Jarang", "Tidak Pernah"},
 	"quran_reading_ability": {"Lancar", "Menengah", "Perlu Bimbingan"},
 }
 

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

@@ -3,7 +3,6 @@ package services
 import (
 	"context"
 	"errors"
-	"fmt"
 	"math"
 	"strconv"
 
@@ -648,26 +647,25 @@ func calculateProgress(
 	achievementCV int,
 ) *models.ProgressResponse {
 
-	exists := func(data int) float64 {
+	// fullIfPresent returns 100 if the data is greater than 0, otherwise returns 0
+	fullIfPresent := func(data int) float64 {
 		if data > 0 {
 			return 100
 		}
 		return 0
 	}
 
-	fmt.Println("accountDetails", accountDetails.GetFilledFields())
-	fmt.Println("accountDetailsTotal", accountDetails.TotalFields())
-
 	accountDetailsPercentage := float64(len(accountDetails.GetFilledFields())) / float64(accountDetails.TotalFields()) * 100
 	personalityAndPreferenceCVPercentage := float64(len(personalityAndPreferenceCV.GetFilledFields())) / float64(personalityAndPreferenceCV.TotalFields()) * 100
 	physicalAndHealthCVPercentage := float64(len(physicalAndHealthCV.GetFilledFields())) / float64(physicalAndHealthCV.TotalFields()) * 100
 	worshipAndReligiousUnderstandingCVPercentage := float64(len(worshipAndReligiousUnderstandingCV.GetFilledFields())) / float64(worshipAndReligiousUnderstandingCV.TotalFields()) * 100
-	edicationCVPercentage := exists(educationCV)
-	familyMemberCVPercentage := exists(familyMemberCV)
-	jobCVPercentage := exists(jobCV)
-	achievementCVPercentage := exists(achievementCV)
 
-	overallProgress := (accountDetailsPercentage + personalityAndPreferenceCVPercentage + physicalAndHealthCVPercentage + worshipAndReligiousUnderstandingCVPercentage + edicationCVPercentage + familyMemberCVPercentage + jobCVPercentage + achievementCVPercentage) / 8
+	educationCVPercentage := fullIfPresent(educationCV)
+	familyMemberCVPercentage := fullIfPresent(familyMemberCV)
+	jobCVPercentage := fullIfPresent(jobCV)
+	achievementCVPercentage := fullIfPresent(achievementCV)
+
+	overallProgress := (accountDetailsPercentage + personalityAndPreferenceCVPercentage + physicalAndHealthCVPercentage + worshipAndReligiousUnderstandingCVPercentage + educationCVPercentage + familyMemberCVPercentage + jobCVPercentage + achievementCVPercentage) / 8
 
 	return &models.ProgressResponse{
 		AccountDetailsProgress:                     math.Round(accountDetailsPercentage*100) / 100,
@@ -675,9 +673,9 @@ func calculateProgress(
 		FamilyMemberCVProgress:                     math.Round(familyMemberCVPercentage*100) / 100,
 		PhysicalAndHealthCVProgress:                math.Round(physicalAndHealthCVPercentage*100) / 100,
 		WorshipAndReligiousUnderstandingCVProgress: math.Round(worshipAndReligiousUnderstandingCVPercentage*100) / 100,
-		EducationCVProgress:                        math.Round(edicationCVPercentage*100) / 100,
-		JobCVProgress:                              jobCVPercentage,
-		AchievementCVProgress:                      achievementCVPercentage,
+		EducationCVProgress:                        math.Round(educationCVPercentage*100) / 100,
+		JobCVProgress:                              math.Round(jobCVPercentage*100) / 100,
+		AchievementCVProgress:                      math.Round(achievementCVPercentage*100) / 100,
 		TotalProgress:                              math.Round(overallProgress*100) / 100,
 	}
 }

space/space/space/space/space/space/space/controller/cv/cv_controller.go

@@ -1,13 +1,14 @@
 package cv_controller
 
 import (
+	"net/http"
+	"strconv"
+
 	"api.qobiltu.id/middleware"
 	"api.qobiltu.id/models"
 	"api.qobiltu.id/response"
 	"api.qobiltu.id/services"
 	"github.com/gin-gonic/gin"
-	"net/http"
-	"strconv"
 )
 
 type CVController interface {
@@ -48,6 +49,7 @@ type CVController interface {
 	DeleteAchievement(ctx *gin.Context)
 
 	UploadProfileImage(ctx *gin.Context)
+	GetProgress(ctx *gin.Context)
 }
 
 type cvController struct {
@@ -573,3 +575,16 @@ func (c *cvController) UploadProfileImage(ctx *gin.Context) {
 
 	response.HandleSuccess(ctx, http.StatusOK, "Profile image uploaded successfully", res, nil)
 }
+
+func (c *cvController) GetProgress(ctx *gin.Context) {
+	accountData := middleware.GetAccountData(ctx)
+	accountID := int64(accountData.UserID)
+
+	res, err := c.cvService.GetProgress(ctx, accountID)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Progress retrieved successfully", res, nil)
+}

space/space/space/space/space/space/space/models/field_counter.go

@@ -0,0 +1,163 @@
+package models
+
+import (
+	"reflect"
+	"time"
+)
+
+// CounterGetter adalah interface yang menyediakan method untuk menghitung dan mendapatkan field
+type CounterGetter interface {
+	TotalFields() int
+	GetFilledFields() []string
+}
+
+// FieldCounter menyediakan fungsionalitas generik penghitungan dan pengecekan field
+// untuk diembed ke dalam struct lain
+type FieldCounter struct{}
+
+// shouldSkipField menentukan apakah field harus dilewati dalam penghitungan
+func shouldSkipField(field reflect.StructField) bool {
+	// Skip field dengan nama FieldCounter (embedded type)
+	if field.Name == "FieldCounter" {
+		return true
+	}
+
+	// Skip field yang berasal dari GORM atau standard fields
+	// seperti ID, timestamps, dan foreign keys
+	if field.Name == "ID" || field.Name == "CreatedAt" || field.Name == "UpdatedAt" || field.Name == "DeletedAt" ||
+		field.Name == "AccountID" || field.Name == "Account" {
+		return true
+	}
+
+	// Periksa tag gorm untuk auto fields
+	gormTag := field.Tag.Get("gorm")
+	if len(gormTag) > 0 {
+		// Skip kolom yang auto-increment atau auto-timestamp
+		if gormTag == "primaryKey" || gormTag == "autoIncrement" ||
+			gormTag == "autoCreateTime" || gormTag == "autoUpdateTime" {
+			return true
+		}
+	}
+
+	return false
+}
+
+// TotalFields menghitung jumlah total field dalam struct
+// dengan mengecualikan field internal, metadata, dan embedded FieldCounter
+func (fc FieldCounter) TotalFields(s any) int {
+	t := reflect.TypeOf(s)
+	count := 0
+
+	// Jika s adalah pointer, dapatkan elemen yang ditunjuknya
+	if t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+
+	// Pastikan kita berurusan dengan struct
+	if t.Kind() != reflect.Struct {
+		return 0
+	}
+
+	// Hitung field yang sesuai dengan kriteria
+	for i := 0; i < t.NumField(); i++ {
+		field := t.Field(i)
+
+		// Skip field yang memenuhi kriteria yang ditentukan
+		if shouldSkipField(field) {
+			continue
+		}
+
+		count++
+	}
+
+	return count
+}
+
+// GetFilledFields mengembalikan slice berisi nama field yang telah diisi dengan nilai
+// (tidak nil, string tidak kosong, int/float tidak 0, dll)
+func (fc FieldCounter) GetFilledFields(s any) []string {
+	var filledFields []string
+	v := reflect.ValueOf(s)
+
+	// Jika s adalah pointer, dapatkan elemen yang ditunjuknya
+	if v.Kind() == reflect.Ptr {
+		if v.IsNil() {
+			return filledFields
+		}
+		v = v.Elem()
+	}
+
+	// Pastikan kita berurusan dengan struct
+	if v.Kind() != reflect.Struct {
+		return filledFields
+	}
+
+	t := v.Type()
+
+	// Loop melalui semua field
+	for i := 0; i < v.NumField(); i++ {
+		field := v.Field(i)
+		fieldType := t.Field(i)
+		fieldName := fieldType.Name
+
+		// Skip field yang memenuhi kriteria yang ditentukan
+		if shouldSkipField(fieldType) {
+			continue
+		}
+
+		// Cek apakah field diisi berdasarkan tipenya
+		if isFieldFilled(field) {
+			filledFields = append(filledFields, fieldName)
+		}
+	}
+
+	return filledFields
+}
+
+// isFieldFilled memeriksa apakah field memiliki nilai non-zero
+func isFieldFilled(field reflect.Value) bool {
+	// Jika field tidak dapat di-address atau diakses, anggap kosong
+	if !field.IsValid() || !field.CanInterface() {
+		return false
+	}
+
+	// Handle untuk pointer
+	if field.Kind() == reflect.Ptr {
+		if field.IsNil() {
+			return false
+		}
+		// Untuk pointer, periksa nilai yang ditunjuk
+		return isFieldFilled(field.Elem())
+	}
+
+	// Cek berdasarkan tipe data
+	switch field.Kind() {
+	case reflect.String:
+		return field.String() != ""
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return field.Int() != 0
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return field.Uint() != 0
+	case reflect.Float32, reflect.Float64:
+		return field.Float() != 0
+	case reflect.Bool:
+		return field.Bool()
+	case reflect.Slice, reflect.Map, reflect.Array:
+		return !field.IsNil() && field.Len() > 0
+	case reflect.Struct:
+		// Perlakuan khusus untuk time.Time
+		if field.Type() == reflect.TypeOf(time.Time{}) {
+			// Anggap time.Time kosong jika zero value atau tahun sangat awal
+			timeVal := field.Interface().(time.Time)
+			return !timeVal.IsZero() && timeVal.Year() > 1
+		}
+
+		// Untuk struct lain, bandingkan dengan zero value
+		return !reflect.DeepEqual(field.Interface(), reflect.Zero(field.Type()).Interface())
+	case reflect.Interface:
+		return !field.IsNil()
+	default:
+		// Untuk tipe lain, gunakan perbandingan dengan zero value
+		return !field.IsZero()
+	}
+}

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

@@ -161,4 +161,16 @@ type (
 	UploadProfileImageResponse struct {
 		URL string `json:"url"`
 	}
+
+	ProgressResponse struct {
+		AccountDetailsProgress                     float64 `json:"account_details_progress"`
+		PersonalityAndPreferenceCVProgress         float64 `json:"personality_and_preference_cv_progress"`
+		FamilyMemberCVProgress                     float64 `json:"family_member_cv_progress"`
+		PhysicalAndHealthCVProgress                float64 `json:"physical_and_health_cv_progress"`
+		WorshipAndReligiousUnderstandingCVProgress float64 `json:"worship_and_religious_understanding_cv_progress"`
+		EducationCVProgress                        float64 `json:"education_cv_progress"`
+		JobCVProgress                              float64 `json:"job_cv_progress"`
+		AchievementCVProgress                      float64 `json:"achievement_cv_progress"`
+		TotalProgress                              float64 `json:"total_progress"`
+	}
 )

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

@@ -41,5 +41,7 @@ func (s *Server) CVRoute() {
 		routerGroup.GET("/achievements/:id", s.cvController.GetAchievement)
 		routerGroup.PUT("/achievements/:id", s.cvController.UpdateAchievement)
 		routerGroup.DELETE("/achievements/:id", s.cvController.DeleteAchievement)
+
+		routerGroup.GET("/progress", s.cvController.GetProgress)
 	}
 }

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

@@ -3,6 +3,8 @@ package services
 import (
 	"context"
 	"errors"
+	"fmt"
+	"math"
 	"strconv"
 
 	"api.qobiltu.id/models"
@@ -51,6 +53,7 @@ type CVService interface {
 	DeleteAchievement(ctx context.Context, id int64) error
 
 	UploadProfileImage(ctx context.Context, req *models.UploadProfileImageRequest) (*models.UploadProfileImageResponse, error)
+	GetProgress(ctx context.Context, accountID int64) (*models.ProgressResponse, error)
 }
 
 type cvService struct {
@@ -566,3 +569,115 @@ func (s *cvService) UploadProfileImage(ctx context.Context, req *models.UploadPr
 		URL: url,
 	}, nil
 }
+
+func (s *cvService) GetProgress(ctx context.Context, accountID int64) (*models.ProgressResponse, error) {
+	accountDetails, err := s.cvRepository.GetAccountDetailsByAccountID(ctx, accountID)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, response.HandleGormError(err, "Internal Server Error")
+		}
+		accountDetails = &models.AccountDetails{}
+	}
+
+	personalityAndPreferenceCV, err := s.cvRepository.GetPersonalityAndPreferenceByAccountID(ctx, accountID)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, response.HandleGormError(err, "Internal Server Error")
+		}
+		personalityAndPreferenceCV = &models.PersonalityAndPreferenceCV{}
+	}
+
+	physicalAndHealthCV, err := s.cvRepository.GetPhysicalAndHealthByAccountID(ctx, accountID)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, response.HandleGormError(err, "Internal Server Error")
+		}
+		physicalAndHealthCV = &models.PhysicalAndHealthCV{}
+	}
+
+	worshipAndReligiousUnderstandingCV, err := s.cvRepository.GetWorshipAndReligiousUnderstandingByAccountID(ctx, accountID)
+	if err != nil {
+		if !errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, response.HandleGormError(err, "Internal Server Error")
+		}
+		worshipAndReligiousUnderstandingCV = &models.WorshipAndReligiousUnderstandingCV{}
+	}
+
+	educationCV, err := s.cvRepository.ListEducation(ctx, accountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	familyMemberCV, err := s.cvRepository.ListFamilyMember(ctx, accountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	jobCV, err := s.cvRepository.ListJob(ctx, accountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	achievementCV, err := s.cvRepository.ListAchievement(ctx, accountID)
+	if err != nil {
+		return nil, response.HandleGormError(err, "Internal Server Error")
+	}
+
+	progressDetails := calculateProgress(
+		accountDetails,
+		personalityAndPreferenceCV,
+		physicalAndHealthCV,
+		worshipAndReligiousUnderstandingCV,
+		len(educationCV),
+		len(familyMemberCV),
+		len(jobCV),
+		len(achievementCV),
+	)
+
+	return progressDetails, nil
+}
+
+func calculateProgress(
+	accountDetails *models.AccountDetails,
+	personalityAndPreferenceCV *models.PersonalityAndPreferenceCV,
+	physicalAndHealthCV *models.PhysicalAndHealthCV,
+	worshipAndReligiousUnderstandingCV *models.WorshipAndReligiousUnderstandingCV,
+	educationCV int,
+	familyMemberCV int,
+	jobCV int,
+	achievementCV int,
+) *models.ProgressResponse {
+
+	exists := func(data int) float64 {
+		if data > 0 {
+			return 100
+		}
+		return 0
+	}
+
+	fmt.Println("accountDetails", accountDetails.GetFilledFields())
+	fmt.Println("accountDetailsTotal", accountDetails.TotalFields())
+
+	accountDetailsPercentage := float64(len(accountDetails.GetFilledFields())) / float64(accountDetails.TotalFields()) * 100
+	personalityAndPreferenceCVPercentage := float64(len(personalityAndPreferenceCV.GetFilledFields())) / float64(personalityAndPreferenceCV.TotalFields()) * 100
+	physicalAndHealthCVPercentage := float64(len(physicalAndHealthCV.GetFilledFields())) / float64(physicalAndHealthCV.TotalFields()) * 100
+	worshipAndReligiousUnderstandingCVPercentage := float64(len(worshipAndReligiousUnderstandingCV.GetFilledFields())) / float64(worshipAndReligiousUnderstandingCV.TotalFields()) * 100
+	edicationCVPercentage := exists(educationCV)
+	familyMemberCVPercentage := exists(familyMemberCV)
+	jobCVPercentage := exists(jobCV)
+	achievementCVPercentage := exists(achievementCV)
+
+	overallProgress := (accountDetailsPercentage + personalityAndPreferenceCVPercentage + physicalAndHealthCVPercentage + worshipAndReligiousUnderstandingCVPercentage + edicationCVPercentage + familyMemberCVPercentage + jobCVPercentage + achievementCVPercentage) / 8
+
+	return &models.ProgressResponse{
+		AccountDetailsProgress:                     math.Round(accountDetailsPercentage*100) / 100,
+		PersonalityAndPreferenceCVProgress:         math.Round(personalityAndPreferenceCVPercentage*100) / 100,
+		FamilyMemberCVProgress:                     math.Round(familyMemberCVPercentage*100) / 100,
+		PhysicalAndHealthCVProgress:                math.Round(physicalAndHealthCVPercentage*100) / 100,
+		WorshipAndReligiousUnderstandingCVProgress: math.Round(worshipAndReligiousUnderstandingCVPercentage*100) / 100,
+		EducationCVProgress:                        math.Round(edicationCVPercentage*100) / 100,
+		JobCVProgress:                              jobCVPercentage,
+		AchievementCVProgress:                      achievementCVPercentage,
+		TotalProgress:                              math.Round(overallProgress*100) / 100,
+	}
+}

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

@@ -34,6 +34,7 @@ type AccountDetails struct {
 	PhoneNumber   *string    `gorm:"column:phone_number" json:"phone_number"`
 	CreatedAt     time.Time  `gorm:"column:created_at;autoCreateTime" json:"created_at"`
 	UpdatedAt     time.Time  `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+	FieldCounter
 }
 
 type EmailVerification struct {
@@ -154,15 +155,16 @@ type Question struct {
 	CorrectAnswer uint   `json:"-"`
 }
 type Quiz struct {
-	ID           uint      `gorm:"primaryKey" json:"id"`
-	AcademyID    uint      `json:"academy_id"`
-	Slug         string    `json:"slug" gorm:"uniqueIndex" `
-	Title        string    `json:"title"`
-	Description  string    `json:"description"`
-	AttemptLimit int       `json:"attempt_limit"`
-	TimeLimit    int       `json:"time_limit"`
-	MinScore     int       `json:"min_score"`
-	CreatedAt    time.Time `json:"created_at"`
+	ID             uint      `gorm:"primaryKey" json:"id"`
+	AcademyID      uint      `json:"academy_id"`
+	Slug           string    `json:"slug" gorm:"uniqueIndex" `
+	Title          string    `json:"title"`
+	Description    string    `json:"description"`
+	TotalQuestions string    `json:"total_questions"`
+	AttemptLimit   int       `json:"attempt_limit"`
+	TimeLimit      int       `json:"time_limit"`
+	MinScore       int       `json:"min_score"`
+	CreatedAt      time.Time `json:"created_at"`
 }
 
 type QuizAttempt struct {
@@ -209,6 +211,7 @@ type (
 		MonthlyExpenses       *string   `gorm:"column:monthly_expenses" json:"monthly_expenses"`                 // pengeluaran per bulan
 		CreatedAt             time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"`
 		UpdatedAt             time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+		FieldCounter
 	}
 
 	FamilyMemberCV struct {
@@ -223,6 +226,7 @@ type (
 		Age           *int      `gorm:"column:age" json:"age"`                       // Usia
 		CreatedAt     time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"`
 		UpdatedAt     time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+		FieldCounter
 	}
 
 	PhysicalAndHealthCV struct {
@@ -239,6 +243,7 @@ type (
 		PhysicalTraits   *string   `gorm:"column:physical_traits" json:"physical_traits"`      // Ciri khas fisik
 		CreatedAt        time.Time `gorm:"column:created_at;autoCreateTime" json:"created_at"` // Waktu data dibuat
 		UpdatedAt        time.Time `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"` // Waktu data terakhir diperbarui
+		FieldCounter
 	}
 
 	WorshipAndReligiousUnderstandingCV struct {
@@ -262,6 +267,7 @@ type (
 		FollowedUstadz             *string        `gorm:"column:followed_ustadz" json:"followed_ustadz"`                               // ustadz_yang_diikuti
 		CreatedAt                  time.Time      `gorm:"column:created_at;autoCreateTime" json:"created_at"`
 		UpdatedAt                  time.Time      `gorm:"column:updated_at;autoUpdateTime" json:"updated_at"`
+		FieldCounter
 	}
 
 	EducationCV struct {
@@ -300,6 +306,38 @@ type (
 	}
 )
 
+func (a AccountDetails) TotalFields() int {
+	return a.FieldCounter.TotalFields(a)
+}
+
+func (a AccountDetails) GetFilledFields() []string {
+	return a.FieldCounter.GetFilledFields(a)
+}
+
+func (p PersonalityAndPreferenceCV) TotalFields() int {
+	return p.FieldCounter.TotalFields(p)
+}
+
+func (p PersonalityAndPreferenceCV) GetFilledFields() []string {
+	return p.FieldCounter.GetFilledFields(p)
+}
+
+func (p PhysicalAndHealthCV) TotalFields() int {
+	return p.FieldCounter.TotalFields(p)
+}
+
+func (p PhysicalAndHealthCV) GetFilledFields() []string {
+	return p.FieldCounter.GetFilledFields(p)
+}
+
+func (w WorshipAndReligiousUnderstandingCV) TotalFields() int {
+	return w.FieldCounter.TotalFields(w)
+}
+
+func (w WorshipAndReligiousUnderstandingCV) GetFilledFields() []string {
+	return w.FieldCounter.GetFilledFields(w)
+}
+
 // Gorm table name settings
 func (Account) TableName() string                    { return "account" }
 func (AccountDetails) TableName() string             { return "account_details" }

space/space/space/space/space/space/space/space/repositories/quiz_repository.go

@@ -49,9 +49,12 @@ func GetUserLastAttempt(userId uint, quizId uint) Repository[models.QuizAttempt,
 	return *repo
 }
 
-func GetAttemptById(attemptId uint) Repository[models.QuizAttempt, models.QuizAttempt] {
+func GetAttemptByIdandUserId(attemptId uint, userId uint) Repository[models.QuizAttempt, models.QuizAttempt] {
 	repo := Construct[models.QuizAttempt, models.QuizAttempt](
-		models.QuizAttempt{ID: attemptId},
+		models.QuizAttempt{
+			ID:        attemptId,
+			AccountID: userId,
+		},
 	)
 	repo.Transactions(
 		WhereGivenConstructor[models.QuizAttempt, models.QuizAttempt],

space/space/space/space/space/space/space/space/services/academy_quiz_service.go

@@ -131,7 +131,7 @@ func (s *AttemptQuizService) Create(userID uint) {
 }
 
 func (s *SubmitQuizService) Create(userID uint) {
-	quizAttemptRepo := repositories.GetAttemptById(s.Constructor.ID)
+	quizAttemptRepo := repositories.GetAttemptByIdandUserId(s.Constructor.ID, userID)
 	if quizAttemptRepo.NoRecord {
 		s.Exception.DataNotFound = true
 		s.Exception.Message = "There is no quiz attempt with given user!"

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

@@ -1,6 +1,7 @@
 package validation
 
 import (
+	"regexp"
 	"strings"
 	"sync"
 
@@ -150,6 +151,11 @@ func (v *Validator) RegisterAllCustomRules(validate *v10.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("phone_number", v.PhoneNumberRule)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -160,3 +166,39 @@ func (v *Validator) PasswordRule(fl v10.FieldLevel) bool {
 		strings.ContainsAny(password, "ABCDEFGHIJKLMNOPQRSTUVWXYZ") &&
 		strings.ContainsAny(password, "0123456789")
 }
+
+func (v *Validator) PhoneNumberRule(fl v10.FieldLevel) bool {
+	phone := SanitizePhoneNumber(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 +
+	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:]
+	}
+
+	// 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/space/space/space/pkg/validation/validation.go

@@ -79,6 +79,7 @@ func setupValidations(validate *v10.Validate) error {
 	if err := rules.RegisterAllCustomRules(validate); err != nil {
 		return err
 	}
+
 	return nil
 }
 

space/space/space/space/space/space/space/space/space/space/Makefile

@@ -1,7 +1,15 @@
 up-dev:
 	docker compose -f docker-compose.dev.yml up -d
 
+down-dev:
+	docker compose -f docker-compose.dev.yml down
+
+up:
+	docker compose up -d --build
+down:
+	docker compose down
+
 run-dev:
 	go run main.go
 
-.PHONY : up-dev run-dev
+.PHONY : up-dev run-dev down-dev up down

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

@@ -29,6 +29,8 @@ var REDIS_MIN_IDLE_CONNS int
 var REDIS_POOL_SIZE int
 var REDIS_POOL_TIMEOUT time.Duration
 
+var APP_URL string
+
 func init() {
 	godotenv.Load()
 	ENV = os.Getenv("ENV")
@@ -49,6 +51,7 @@ func init() {
 	REDIS_POOL_SIZE = getValue(os.Getenv("REDIS_POOL_SIZE"), 10, func(s string) (int, error) { return strconv.Atoi(s) })
 	REDIS_MIN_IDLE_CONNS = getValue(os.Getenv("REDIS_MIN_IDLE_CONNS"), 10, func(s string) (int, error) { return strconv.Atoi(s) })
 	REDIS_POOL_TIMEOUT = getValue(os.Getenv("REDIS_POOL_TIMEOUT"), time.Second*30, func(s string) (time.Duration, error) { return time.ParseDuration(s) })
+	APP_URL = getValue(os.Getenv("APP_URL"), "http://localhost:3000", func(s string) (string, error) { return s, nil })
 }
 
 func getValue[T any](value string, defaultValue T, convert func(string) (T, error)) T {

space/space/space/space/space/space/space/space/space/space/controller/cv/cv_controller.go

@@ -46,6 +46,8 @@ type CVController interface {
 	ListAchievement(ctx *gin.Context)
 	GetAchievement(ctx *gin.Context)
 	DeleteAchievement(ctx *gin.Context)
+
+	UploadProfileImage(ctx *gin.Context)
 }
 
 type cvController struct {
@@ -553,3 +555,21 @@ func (c *cvController) DeleteAchievement(ctx *gin.Context) {
 
 	response.HandleSuccess(ctx, http.StatusOK, "Achievement deleted successfully", nil, nil)
 }
+
+func (c *cvController) UploadProfileImage(ctx *gin.Context) {
+	accountData := middleware.GetAccountData(ctx)
+
+	avatarFile, _ := ctx.FormFile("avatar")
+	req := models.UploadProfileImageRequest{
+		AccountID: int64(accountData.UserID),
+		File:      avatarFile,
+	}
+
+	res, err := c.cvService.UploadProfileImage(ctx, &req)
+	if err != nil {
+		response.HandleError(ctx, err)
+		return
+	}
+
+	response.HandleSuccess(ctx, http.StatusOK, "Profile image uploaded successfully", res, nil)
+}

space/space/space/space/space/space/space/space/space/space/docker-compose.yml

@@ -6,14 +6,15 @@ services:
     build: .
     depends_on:
       - db
+      - redis
     env_file: .env
     ports:
       - "8080:8080"
+    volumes:
+      - ./logs:/app/logs
+      - ./uploads:/app/uploads
     networks:
       - qobiltu-network
-    # volumes:
-    #   - ./logs:/app/logs
-    #   - /home/qobiltu/api-qobiltu:/app
     restart: unless-stopped
 
   db:
@@ -45,10 +46,6 @@ services:
           - qobiltu-network
       restart: always
 
-volumes:
-  db-data:
-  redis-data:
-
 networks:
   qobiltu-network:
     driver: bridge

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

@@ -8,6 +8,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1
 	github.com/go-playground/validator/v10 v10.25.0
 	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/google/uuid v1.6.0
 	github.com/gosimple/slug v1.15.0
 	github.com/hibiken/asynq v0.25.1
 	github.com/joho/godotenv v1.5.1
@@ -37,7 +38,6 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect

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

@@ -2,15 +2,16 @@ package main
 
 import (
 	"api.qobiltu.id/config"
-	cv_controller "api.qobiltu.id/controller/cv"
+	"api.qobiltu.id/controller/cv"
 	"api.qobiltu.id/controller/health_check"
 	"api.qobiltu.id/mail"
+	"api.qobiltu.id/pkg/storage"
+	"api.qobiltu.id/pkg/validation"
+	"api.qobiltu.id/pkg/worker"
 	"api.qobiltu.id/repositories"
 	"api.qobiltu.id/router"
 	"api.qobiltu.id/services"
 	"api.qobiltu.id/utils"
-	"api.qobiltu.id/validation"
-	"api.qobiltu.id/worker"
 	"github.com/hibiken/asynq"
 	"log/slog"
 	"net"
@@ -23,6 +24,9 @@ func main() {
 	err := validation.New(validation.LocaleID)
 	utils.FatalIfErr("failed to setup validator", err)
 
+	// setup storage
+	localStorage := storage.NewLocalStorage("uploads", config.APP_URL+"/storage/")
+
 	// setup email sender
 	emailConfig := mail.Config{
 		Host:     config.SMTP_HOST,
@@ -53,7 +57,7 @@ func main() {
 	healthCheckController := health_check_controller.NewHealthCheckController(healthCheckService)
 
 	cvRepository := repositories.NewCVRepository(config.DB)
-	cvService := services.NewCVService(cvRepository)
+	cvService := services.NewCVService(cvRepository, localStorage)
 	cvController := cv_controller.NewCVController(cvService)
 
 	// start task processor

space/space/space/space/space/space/space/space/space/space/models/exception_model.go

@@ -1,6 +1,8 @@
 package models
 
-import "api.qobiltu.id/validation"
+import (
+	"api.qobiltu.id/pkg/validation"
+)
 
 type Exception struct {
 	Unauthorized          bool `json:"unauthorized,omitempty"`